summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandro Bonazzola <sanchan@gentoo.org>2006-11-07 21:41:56 +0000
committerSandro Bonazzola <sanchan@gentoo.org>2006-11-07 21:41:56 +0000
commitce64dbf9e8c3f00f96d17ad355e4516910f09d20 (patch)
tree68883d47d143de3546252e1c56a7a81383e9f0cb /dev-libs/popt/files
parentStable on sparc (diff)
downloadgentoo-2-ce64dbf9e8c3f00f96d17ad355e4516910f09d20.tar.gz
gentoo-2-ce64dbf9e8c3f00f96d17ad355e4516910f09d20.tar.bz2
gentoo-2-ce64dbf9e8c3f00f96d17ad355e4516910f09d20.zip
Version bump, including a fix for a regression found by wormo@gentoo.org and fixed with a patch provided by drizzt@gentoo.org, last fix needed for bug #121862.
(Portage version: 2.1.2_rc1-r4)
Diffstat (limited to 'dev-libs/popt/files')
-rw-r--r--dev-libs/popt/files/digest-popt-1.10.4-r33
-rw-r--r--dev-libs/popt/files/popt-1.10.4-regression.patch13
2 files changed, 16 insertions, 0 deletions
diff --git a/dev-libs/popt/files/digest-popt-1.10.4-r3 b/dev-libs/popt/files/digest-popt-1.10.4-r3
new file mode 100644
index 000000000000..7e169cde2429
--- /dev/null
+++ b/dev-libs/popt/files/digest-popt-1.10.4-r3
@@ -0,0 +1,3 @@
+MD5 dd22a6873b43d00f75e1c1b7dcfd1ff7 popt-1.10.4.tar.gz 1169462
+RMD160 c59c383f5e9f53b2fc17294bb2568cc46f204784 popt-1.10.4.tar.gz 1169462
+SHA256 1ce47451c9ac9d81f42b2b7fcb11c2f211b4943e3e5d7d946da53ced7fb04114 popt-1.10.4.tar.gz 1169462
diff --git a/dev-libs/popt/files/popt-1.10.4-regression.patch b/dev-libs/popt/files/popt-1.10.4-regression.patch
new file mode 100644
index 000000000000..141a25e5d573
--- /dev/null
+++ b/dev-libs/popt/files/popt-1.10.4-regression.patch
@@ -0,0 +1,13 @@
+--- popt.c.bak 2006-11-04 00:14:31.553881369 +0100
++++ popt.c 2006-11-04 00:15:19.607576097 +0100
+@@ -748,9 +748,7 @@
+ if (origOptString == NULL) /* XXX can't happen */
+ return POPT_ERROR_BADOPT;
+
+- if (con->restLeftover || *origOptString != '-' ||
+- (*origOptString == '-' && origOptString[1] == '\0'))
+- {
++ if (con->restLeftover || *origOptString != '-') {
+ if (con->flags & POPT_CONTEXT_POSIXMEHARDER)
+ con->restLeftover = 1;
+ if (con->flags & POPT_CONTEXT_ARG_OPTS) {