summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Østergaard <kloeri@gentoo.org>2005-12-26 22:33:54 +0000
committerBryan Østergaard <kloeri@gentoo.org>2005-12-26 22:33:54 +0000
commit271eb143de6cf9124c4ed209ba36e9fda32a44a3 (patch)
tree27fa0b9ae66d65c9f2b6f9e8485fd94d11bcf272 /net-misc/scponly
parentspb maintains this now (diff)
downloadgentoo-2-271eb143de6cf9124c4ed209ba36e9fda32a44a3.tar.gz
gentoo-2-271eb143de6cf9124c4ed209ba36e9fda32a44a3.tar.bz2
gentoo-2-271eb143de6cf9124c4ed209ba36e9fda32a44a3.zip
Clean up patch.
(Portage version: 2.0.53)
Diffstat (limited to 'net-misc/scponly')
-rw-r--r--net-misc/scponly/ChangeLog6
-rw-r--r--net-misc/scponly/files/scponly-4.2-getopt.patch6
2 files changed, 7 insertions, 5 deletions
diff --git a/net-misc/scponly/ChangeLog b/net-misc/scponly/ChangeLog
index d28708c45f14..ed0f1a310fe8 100644
--- a/net-misc/scponly/ChangeLog
+++ b/net-misc/scponly/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/scponly
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.16 2005/12/26 21:55:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.17 2005/12/26 22:33:54 kloeri Exp $
+
+ 26 Dec 2005; Bryan Østergaard <kloeri@gentoo.org
+ files/scponly-4.2-getopt.patch:
+ Clean up patch.
26 Dec 2005; Simon Stelling <blubb@gentoo.org> scponly-4.2.ebuild:
stable on amd64 wrt bug 116526
diff --git a/net-misc/scponly/files/scponly-4.2-getopt.patch b/net-misc/scponly/files/scponly-4.2-getopt.patch
index f2765cdfb933..3f73ca51608f 100644
--- a/net-misc/scponly/files/scponly-4.2-getopt.patch
+++ b/net-misc/scponly/files/scponly-4.2-getopt.patch
@@ -1,5 +1,5 @@
--- scponly-4.2/helper.c.orig 2005-12-26 20:56:20.000000000 +0100
-+++ scponly-4.2/helper.c 2005-12-26 22:05:53.000000000 +0100
++++ scponly-4.2/helper.c 2005-12-26 23:28:45.000000000 +0100
@@ -36,7 +36,9 @@
extern char *optarg;
@@ -10,16 +10,14 @@
#ifdef UNIX_COMPAT
char* solaris_needs_strsep(char** str, char* delims)
-@@ -156,8 +158,16 @@
+@@ -156,8 +158,14 @@
/*
* now use getopt to look for our problem option
*/
+ #ifdef HAVE_OPTRESET
-+ printf("HAVE_OPTRESET defined\n"),
optreset=1;
+ #endif
+ #ifdef __GLIBC__
-+ printf("__GLIBC defined\n");
+ optind=0;
+ #else
optind=1;