debian/0000755000000000000000000000000012247460150007167 5ustar debian/preprocess0000644000000000000000000000030311674106364011302 0ustar #!/bin/sh DEB_HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH` for file in debian/*.in; do target="${file%.in}" sed -e s/DEB_HOST_MULTIARCH/$DEB_HOST_MULTIARCH/g $file > $target done debian/libpopt-dev.install.in0000644000000000000000000000024611761513545013422 0ustar usr/lib/*/libpopt.so usr/lib/*/libpopt.la usr/lib/*/libpopt.a usr/share/man/man3/popt.3 usr/include/popt.h usr/lib/pkgconfig/* usr/lib/DEB_HOST_MULTIARCH/pkgconfig debian/docs0000644000000000000000000000000711372673544010052 0ustar README debian/libpopt0.install.in0000644000000000000000000000014711750276351012725 0ustar usr/lib/DEB_HOST_MULTIARCH/libpopt.so.* lib/DEB_HOST_MULTIARCH usr/share/locale/*/LC_MESSAGES/popt.mo debian/copyright0000644000000000000000000000512111750267466011136 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: popt Upstream-Contact: Jeff Johnson Source: http://rpm5.org/files/popt/ Comment: popt was originally written by Erik Troan when he was with RedHat. It's now maintained as part of Fedora. Files: * Copyright: Copyright (c) 1998 Red Hat Software (C) 1998-2002 Red Hat, Inc. License: X-Consortium Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. . Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. Files: debian/* Copyright: GNU copyright 1997 to 1999 by Joey Hess 2012, Paul Martin License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. debian/changelog0000644000000000000000000003562612247457370011067 0ustar popt (1.16-8ubuntu1) trusty; urgency=low * Update libtool.m4. -- Matthias Klose Tue, 03 Dec 2013 23:44:52 +0100 popt (1.16-8) unstable; urgency=low * Remove build dependency on quilt. (Closes: #709541) * Fix renamed __secure_getenv() function for building with glibc 2.17 and later. (Closes: #728596) * Use dh_autotools-dev_updateconfig and dh_autotools-dev_restoreconfig to keep config.sub and config.guess up to date. Build-depend on autotools-dev. -- Paul Martin Sun, 03 Nov 2013 20:33:05 +0000 popt (1.16-7) unstable; urgency=low * Fix install directory for the pkgconfig file. (Closes: #658663) Thanks to Christoph Biedl for spotting the oddity. dh_install strikes again! -- Paul Martin Wed, 30 May 2012 22:56:47 +0100 popt (1.16-6) unstable; urgency=low * Change dependency on gettext to a version that has a msgfmt that always builds little endian .mo files. (Closes: #670023) -- Paul Martin Tue, 29 May 2012 10:27:53 +0100 popt (1.16-5) unstable; urgency=low * Enabled hardened build flags. (Closes: #672835) -- Paul Martin Mon, 14 May 2012 11:23:52 +0100 popt (1.16-4) unstable; urgency=low * Multiarch build cleanup take 2. (Closes: #670022) * Ignoring localizations binary endianness versus multiarch problem. That's something for gettext to fix. Thanks for the advice, vorlon. (Ignoring: #670023) * Update to debhelper 9. * Update to standards version 3.9.2 * Updated copyright file and converted to machine readable format. -- Paul Martin Wed, 02 May 2012 16:22:09 +0100 popt (1.16-3) unstable; urgency=low * Multiarch build cleanup. Thanks to Jakub Wilk. (Closes: #638447) -- Paul Martin Tue, 20 Dec 2011 13:26:18 +0000 popt (1.16-2) unstable; urgency=low * Update to standards version 3.9.2 + Comply with new build-arch/build-indep requirements. + Note that libtool .la files are deprecated under Debian policy 3.9.1, but continute to include libpopt.la under the "historical" exception. * Package upstream's libpopt.pc (Closes: #421575) * Add multiarch support. Thanks to Steve Langasek for patch. (Closes: #638447) * Update debian/compat to 8. * Add a debian/symbols file. (Closes: #551437) -- Paul Martin Mon, 19 Dec 2011 13:21:06 +0000 popt (1.16-1) unstable; urgency=low * New upstream release (Closes: #581439) * Switch to dpkg-source 3.0 (quilt) format * Add a watch file. * Update to standards version 3.8.4 (no changes) -- Paul Martin Thu, 13 May 2010 05:14:50 +0100 popt (1.15-1) unstable; urgency=low * New upstream release * Update to standards version 3.8.3 + debian/README.source added * debian/rules: Switch from using "dh_clean -k" to "dh_prep". -- Paul Martin Tue, 06 Oct 2009 19:13:19 +0100 popt (1.14-4) unstable; urgency=low * Remove locale data from the udeb, and change the package description. The debian-installer developers are sure that they don't need the localization information, mainly error messages. (Thanks to Frans Pop for bringing this to my attention.) -- Paul Martin Wed, 25 Jun 2008 07:25:34 +0100 popt (1.14-3) unstable; urgency=low * Add the locale data to the udeb, as per the package description. (Closes: #485926) -- Paul Martin Thu, 12 Jun 2008 17:39:07 +0100 popt (1.14-2) unstable; urgency=low * Fix conflicts typo on libpopt0/libpopt-dev. (Closes: #485603) -- Paul Martin Tue, 10 Jun 2008 14:37:05 +0100 popt (1.14-1) unstable; urgency=low * New upstream version. + See CHANGES file for details. + debian/patches/374797.patch no longer needed + Upstream now has po/de.po, po/zh_CN.po * Move existing bug fixes into quilt: + debian/patches/217602.patch: Drop alignment check in poptSaveLong() and poptSaveInt() + debian/patches/356669.patch: po/ca.po (Catalan). * Fix debian/patches/ to allow future source format 3.0 (quilt). (Closes: #484951) * Fix lintian errors: + substvar-source-version-is-deprecated, changed to ${binary:Version} + debian-rules-ignores-make-clean-error * Updates to CFLAGS in debian/rules to ensure correct build. * Update to standards-version 3.8.0 and debhelper 7, and move to section libs. * Note: config.sub and config.guess are whatever upstream supplies. The previous use of the latest locally installed versions was a kluge to avoid build problems on new architectures. This is not compatible with future source packaging formats, and if not carefully handled causes build problems when autotools is not installed. * Accommodate cross-compilation. (Closes: #282913) -- Paul Martin Mon, 09 Jun 2008 21:42:27 +0100 popt (1.10-3) unstable; urgency=low * The lib64 problem remains, as an rpath problem. Patch 374797.patch changes Makefile.in so that ./configure doesn't put the libraries in the wrong place or give them the wrong rpath. (Closes: #374797) PS. This fix is fragile to any of the autoconf files (eg. configure.ac or Makefile.ac) being touched or modified. -- Paul Martin Tue, 8 Aug 2006 01:41:49 +0100 popt (1.10-2) unstable; urgency=low * Fix building on 64-bit architectures where the autoconf tools want to put things in /usr/lib64 instead of /usr/lib. Thanks to Roberto Pariset for the advice and Simon Huggins for the patch. (Closes: #370414) -- Paul Martin Tue, 6 Jun 2006 18:28:41 +0100 popt (1.10-1) unstable; urgency=low * New upstream release + Fixes wide character problem (Closes: #197416,#275234) * Build a udeb. Thanks to David Härdeman for the poking. (Closes: #358671) * Automatically update config.sub and config.guess on build if these files are available in /usr/share/misc. (Closes: #342668) * Removed popt.ps from the source tarball as it's non-free. (Closes: #179959) * Use quilt to apply local patches: + 318833.patch: Incorrect handling of leftovers together with poptStuffArgs. (Closes: #318833) + 278402-manpage.patch Fix manpage example code problem. Thanks to Carl Henrik Lunde for the patch. (Closes: #278402) + 367153-manpage.patch Fix manpage typos. Thanks to A Costa for the patch. (Closes: #367153) * Move po/zh_CN.GB2312.* po/zh_CN.* (Closes: #356659) * Install Catalan translation ca.po. (Closes: #356669); * Install new German translation de.po. (Closes: #353068) * Standards-Version: 3.7.2 * Depend on debhelper 5 * Fix debian/copyright (Closes: #236282,#237290) -- Paul Martin Mon, 15 May 2006 12:09:09 +0100 popt (1.7-5) unstable; urgency=high * The "I hate automake" release. * Make sure configure.in and configure.ac are the same, including timestamp. This allows a compile if you have two different versions of automake installed. (Closes: #245819) * Standards-Version: 3.6.1 -- Paul Martin Sun, 29 Aug 2004 16:36:43 +0100 popt (1.7-4) unstable; urgency=low * Missed alignment check in poptSaveInt(). (Closes: #217602) * Add shlibdeps check for 1.7-4 if building on m68k, due to brokenness with older versions of libpopt0 (the alignment checks). Other archs may be broken, too. Please make yourselves known if so. -- Paul Martin Thu, 20 Nov 2003 19:50:10 +0000 popt (1.7-3) unstable; urgency=low * Drop alignment check in poptSaveLong(). (Closes: #217602) * Depend on "libc6-dev | libc-dev". (Closes: #218008) * Updated config.guess and config.sub. (Closes: #218010) -- Paul Martin Tue, 11 Nov 2003 14:44:21 +0000 popt (1.7-2) unstable; urgency=low * The "Apart from that, how was the play, Mrs Lincoln?" release. * Acknowledging NMU. (Closes: #195072) It got unstuck because the pattern it was matching for was X.X.X, and this version is just X.X. Filip's method is much cleaner. -- Paul Martin Thu, 29 May 2003 20:24:32 +0100 popt (1.7-1.1) unstable; urgency=low * NMU. Sorry Paul, but this way popt could be fixed before the broken version got installed into the archives. * Use a different way of figuring out the package version. (Closes: #195072) Packages in incoming which got (auto)built against the broken version should be bin-NMUed. -- Filip Van Raemdonck Wed, 28 May 2003 19:25:38 +0200 popt (1.7-1) unstable; urgency=low * New upstream version. (Closes: #178773, #182248, #193434) * Changed section of libpopt-dev to libdevel. * Added in some .po files I'd missed. * Standards version: 3.5.10 -- Paul Martin Tue, 27 May 2003 19:29:25 +0100 popt (1.6.4-2) unstable; urgency=low * Last upload broke shlibs. This one fixes it. (Sorry joeyh.) * Use and depend on debhelper v4. * Standards-Version 3.5.6 -- Paul Martin Thu, 27 Jun 2002 00:12:41 +0100 popt (1.6.4-1) unstable; urgency=low * New upstream release (Closes: #150760) - Updates config.guess and config.sub - Adds a lot of checks for unexpected internal errors. -- Paul Martin Mon, 24 Jun 2002 19:55:47 +0100 popt (1.6.2-7) unstable; urgency=HIGH * Backported fix from 1.6.3 to segfault in poptStrippedArgv. (Closes: #135953) * Please consider for inclusion in woody. -- Paul Martin Wed, 27 Feb 2002 11:31:19 +0000 popt (1.6.2-6) unstable; urgency=HIGH * Modified depends in libpopt-dev to depend on libpopt0 (= ${Source-Version}). Previous uploads would allow libpopt0 to get out of step with libpopt-dev, causing compiles to fail if the user starts from having 1.5-1 installed, and only upgrades libpopt0. This is a violation of a "should" policy directive. (Closes: #125685) * Removed redundant ldconfig call from debian/libpopt0.postinst, as debhelper does it for us. Fixes lintian postinst-unsafe-ldconfig warning. * Uploading with urgency=high, since this upload contains only minimal, "important" bugfixes. -- Paul Martin Wed, 19 Dec 2001 15:59:03 +0000 popt (1.6.2-5) unstable; urgency=low * Add versioned shlibs. This helps out rpm's Bug#95789. -- Paul Martin Mon, 30 Apr 2001 12:31:24 +0100 popt (1.6.2-4) unstable; urgency=low * Update config.guess and config.sub to the latest from GNU, to allow configure to run on PARISC architecture. (Closes: #94691) -- Paul Martin Fri, 27 Apr 2001 05:53:17 +0100 popt (1.6.2-3) unstable; urgency=low * Add Build-Depends on gettext. (Closes: #95292) -- Paul Martin Thu, 26 Apr 2001 11:26:18 +0100 popt (1.6.2-2) unstable; urgency=low * Added versioned conflict to rpm which is statically built, as that also includes all the .po files from popt. (Closes: #95026,#95029) * Changed libpopt0's section from libs to base, so that it agrees with the override on ftp.debian.org. -- Paul Martin Tue, 24 Apr 2001 17:21:26 +0100 popt (1.6.2-1) unstable; urgency=low * New maintainer. * Thanks for the NMUs. (Closes: #59324,#62314) * New upstream release. (Closes: #89690,#94691) * Corrected copyright file. (Closes: #61411) * Corrected location of upstream. (Closes: #77653) * Added Build-Depends to comply with current policy. * Ensure all .po files get included in libpopt0. * Updated debian/rules to debhelper 3. -- Paul Martin Mon, 23 Apr 2001 11:57:20 +0100 popt (1.5-0.1) unstable; urgency=low * New upstream release. (closes: Bug#59324) * Non maintainer release. -- Takuo KITAME Sat, 24 Jun 2000 06:13:12 +0900 popt (1.4-1.1) frozen unstable; urgency=low * Non-maintainer upload. * Move libpopt to /lib since pump (/sbin) uses it. (Closes: Bug#62314) * Add conflicts for libpopt-dev (old versions of -dev point to /usr/lib, which makes ldconfig complain) -- Anthony Towns Sun, 16 Apr 2000 14:55:29 +1000 popt (1.4-1) unstable; urgency=low * New upstream version * New version uses newer libtool (Closes: 52085) -- Joseph Carter Tue, 14 Dec 1999 05:10:43 -0800 popt (1.3-4) unstable; urgency=low * Removed popt.ps from the "upstream" tarball (which I make from the rpm anyway) and the package---it's non-free! (Closes: #41578) * Added README.Debian to tell people about man 3 popt, which Erik Troan says contains everything the postscript doc does -- Joseph Carter Thu, 29 Jul 1999 05:05:52 -0700 popt (1.3-3) unstable; urgency=low * -2 is going to fail dinstall's signature check, here's -3 -- Joseph Carter Sun, 4 Jul 1999 06:11:17 -0700 popt (1.3-2) unstable; urgency=low * Whee, split libpopt0 and libpopt-dev packages * Standards-version 3.0.0 * Since I had to rewrite the rules file, it now uses debhelper v2 -- Joseph Carter Sun, 4 Jul 1999 06:11:11 -0700 popt (1.3-1) unstable; urgency=low * Adopting package from Enrique * 1.3-0.1 provided a proper dynamic library. Closes: bug#22918 * Fixed dependencies -- Joseph Carter Mon, 24 May 1999 01:31:16 -0700 popt (1.3-0.1) unstable; urgency=low * Non-maintainer Upload * New upstream version * Changes required due to the new upstream in excruciatingly exact detail since this is a NMU: - make PREFIX= is now make DESTDIR= - clean target now uses make distclean, not make squeaky - popt.3 manpage gets compressed - /usr/lib/libpopt.la is chmod'd 644 to kill lintian warning - libpopt.so is now --strip-unneeded'd and chmod'd 644 - added postinst file and made it call ldconfig on configure - added shlibs file -- Joseph Carter Thu, 22 Apr 1999 14:22:11 -0700 popt (1.1.1-3) unstable; urgency=low * Now popt builds properly from clean sources. Fixes: 25581, 26277. -- Enrique Zanardi Tue, 1 Sep 1998 11:26:54 +0100 popt (1.1.1-2) unstable; urgency=low * Don't strip libpopt.a -- Enrique Zanardi Thu, 30 Jul 1998 18:37:27 +0100 popt (1.1.1-1) unstable; urgency=low * New upstream version. (fixes: #22466) * New documentation. (fixes: #22467) -- Enrique Zanardi Fri, 15 May 1998 13:34:10 +0100 popt (1.0-4) unstable; urgency=low * Updated Standards-Version. -- Enrique Zanardi Thu, 12 Feb 1998 10:06:42 +0000 popt (1.0-3) unstable; urgency=low * Defines the dependency on libc*-dev at build-time, fixes: Bug#17208 -- Enrique Zanardi Sat, 30 Jan 1998 20:10:12 +0000 popt (1.0-2) unstable; urgency=low * Added patch by Bruce Perens to use "const" in poptOption structs. -- Enrique Zanardi Mon, 7 Jan 1998 12:15:24 +0000 popt (1.0-1) unstable; urgency=low * New package. -- Enrique Zanardi Mon, 5 Jan 1998 16:36:29 +0000 debian/libpopt-dev.links.in0000644000000000000000000000011211673631770013067 0ustar lib/DEB_HOST_MULTIARCH/libpopt.so.0 usr/lib/DEB_HOST_MULTIARCH/libpopt.so debian/libpopt-dev.install0000644000000000000000000000024412235531460013004 0ustar usr/lib/*/libpopt.so usr/lib/*/libpopt.la usr/lib/*/libpopt.a usr/share/man/man3/popt.3 usr/include/popt.h usr/lib/pkgconfig/* usr/lib/x86_64-linux-gnu/pkgconfig debian/compat0000644000000000000000000000000211750250440010362 0ustar 9 debian/symbols0000644000000000000000000000307111673636503010614 0ustar libpopt.so.0 libpopt0 #MINVER# LIBPOPT_0@LIBPOPT_0 1.14 _poptArgMask@LIBPOPT_0 1.15 _poptBitsK@LIBPOPT_0 1.16 _poptBitsM@LIBPOPT_0 1.16 _poptBitsN@LIBPOPT_0 1.16 _poptGroupMask@LIBPOPT_0 1.15 poptAddAlias@LIBPOPT_0 1.14 poptAddItem@LIBPOPT_0 1.14 poptAliasOptions@LIBPOPT_0 1.14 poptBadOption@LIBPOPT_0 1.14 poptBitsAdd@LIBPOPT_0 1.16 poptBitsArgs@LIBPOPT_0 1.16 poptBitsChk@LIBPOPT_0 1.16 poptBitsClr@LIBPOPT_0 1.16 poptBitsDel@LIBPOPT_0 1.16 poptBitsIntersect@LIBPOPT_0 1.16 poptBitsUnion@LIBPOPT_0 1.16 poptConfigFileToString@LIBPOPT_0 1.14 poptDupArgv@LIBPOPT_0 1.14 poptFini@LIBPOPT_0 1.16 poptFreeContext@LIBPOPT_0 1.14 poptGetArg@LIBPOPT_0 1.14 poptGetArgs@LIBPOPT_0 1.14 poptGetContext@LIBPOPT_0 1.14 poptGetInvocationName@LIBPOPT_0 1.14 poptGetNextOpt@LIBPOPT_0 1.14 poptGetOptArg@LIBPOPT_0 1.14 poptHelpOptions@LIBPOPT_0 1.14 poptHelpOptionsI18N@LIBPOPT_0 1.14 poptInit@LIBPOPT_0 1.15 poptParseArgvString@LIBPOPT_0 1.14 poptPeekArg@LIBPOPT_0 1.14 poptPrintHelp@LIBPOPT_0 1.14 poptPrintUsage@LIBPOPT_0 1.14 poptReadConfigFile@LIBPOPT_0 1.14 poptReadConfigFiles@LIBPOPT_0 1.15 poptReadDefaultConfig@LIBPOPT_0 1.14 poptReadFile@LIBPOPT_0 1.15 poptResetContext@LIBPOPT_0 1.14 poptSaneFile@LIBPOPT_0 1.15 poptSaveBits@LIBPOPT_0 1.16 poptSaveInt@LIBPOPT_0 1.14 poptSaveLong@LIBPOPT_0 1.14 poptSaveLongLong@LIBPOPT_0 1.14 poptSaveShort@LIBPOPT_0 1.16 poptSaveString@LIBPOPT_0 1.14 poptSetExecPath@LIBPOPT_0 1.14 poptSetOtherOptionHelp@LIBPOPT_0 1.14 poptStrerror@LIBPOPT_0 1.14 poptStrippedArgv@LIBPOPT_0 1.14 poptStuffArgs@LIBPOPT_0 1.14 debian/patches/0000755000000000000000000000000012247460174010624 5ustar debian/patches/367153-manpage.patch0000644000000000000000000000476111372674316014036 0ustar Index: popt-1.16/popt.3 =================================================================== --- popt-1.16.orig/popt.3 2010-05-13 04:57:46.665009784 +0100 +++ popt-1.16/popt.3 2010-05-13 04:58:04.357009234 +0100 @@ -200,7 +200,7 @@ .RB "This macro includes another option table (via " POPT_ARG_INCLUDE_TABLE ; see below) in the main one which provides the table entries for these .RB "arguments. When " --usage " or " --help " are passed to programs which -use popt's automatical help, popt displays the appropriate message on +use popt's automatic help, popt displays the appropriate message on stderr as soon as it finds the option, and exits the program with a return code of 0. If you want to use popt's automatic help generation in a different way, you need to explicitly add the option entries to your programs @@ -210,7 +210,7 @@ the argument will not be shown in help output. .sp If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_SHOW_DEFAULT\fR, -the inital value of the arg will be shown in help output. +the initial value of the arg will be shown in help output. .sp The final structure in the table should have all the pointer values set .RB "to " NULL " and all the arithmetic values set to 0, marking the " @@ -233,7 +233,7 @@ contain a overall description of the option table being included. .sp The other special option table entry type tells popt to call a function (a -callback) when any option in that table is found. This is especially usefull +callback) when any option in that table is found. This is especially useful when included option tables are being used, as the program which provides the top-level option table doesn't need to be aware of the other options which are provided by the included table. When a callback is set for @@ -517,7 +517,7 @@ applications. When an error is detected from most of the functions, an error message is printed along with the error string from .BR poptStrerror() ". When an error occurs during argument parsing, " -code similiar to the following displays a useful error message: +code similar to the following displays a useful error message: .sp .nf fprintf(stderr, "%s: %s\\n", @@ -608,7 +608,7 @@ .RI "an " argv "-style array, some programs need to parse strings that " are formatted identically to command lines. To facilitate this, popt provides a function that parses a string into an array of strings, -using rules similiar to normal shell parsing. +using rules similar to normal shell parsing. .sp .nf .B "#include " debian/patches/318833.patch0000644000000000000000000000425711372674312012425 0ustar Index: popt-1.16/popt.c =================================================================== --- popt-1.16.orig/popt.c 2010-05-13 04:57:46.853009777 +0100 +++ popt-1.16/popt.c 2010-05-13 04:57:52.006009545 +0100 @@ -184,6 +184,7 @@ con->os->next = 1; /* skip argv[0] */ con->leftovers = calloc( (size_t)(argc + 1), sizeof(*con->leftovers) ); + con->allocLeftovers = argc + 1; /*@-dependenttrans -assignexpose@*/ /* FIX: W2DO? */ con->options = options; /*@=dependenttrans =assignexpose@*/ @@ -1358,7 +1359,19 @@ return 0; } if (con->leftovers != NULL) /* XXX can't happen */ - con->leftovers[con->numLeftovers++] = origOptString; + /* One might think we can never overflow the leftovers + array. Actually, that's true, as long as you don't + use poptStuffArgs()... */ + if ((con->numLeftovers + 1) >= (con->allocLeftovers)) { + con->allocLeftovers += 10; + con->leftovers = + realloc(con->leftovers, + sizeof(*con->leftovers) * con->allocLeftovers); + } + con->leftovers[con->numLeftovers++] + = xstrdup(origOptString); /* so a free of a stuffed + argv doesn't give us a + dangling pointer */ continue; } @@ -1612,6 +1625,8 @@ poptContext poptFreeContext(poptContext con) { + int i; + if (con == NULL) return con; poptResetContext(con); con->os->argb = _free(con->os->argb); @@ -1622,7 +1637,11 @@ con->execs = poptFreeItems(con->execs, con->numExecs); con->numExecs = 0; + for (i = 0; i < con->numLeftovers; i++) { + con->leftovers[i] = _free(&con->leftovers[i]); + } con->leftovers = _free(con->leftovers); + con->finalArgv = _free(con->finalArgv); con->appName = _free(con->appName); con->otherHelp = _free(con->otherHelp); Index: popt-1.16/poptint.h =================================================================== --- popt-1.16.orig/poptint.h 2010-05-13 04:57:46.878010140 +0100 +++ popt-1.16/poptint.h 2010-05-13 04:57:52.008009414 +0100 @@ -119,6 +119,7 @@ /*@owned@*/ /*@null@*/ poptArgv leftovers; int numLeftovers; + int allocLeftovers; int nextLeftover; /*@keep@*/ const struct poptOption * options; debian/patches/278402-manpage.patch0000644000000000000000000000207611372674325014031 0ustar Index: popt-1.16/popt.3 =================================================================== --- popt-1.16.orig/popt.3 2010-05-13 04:58:04.357009234 +0100 +++ popt-1.16/popt.3 2010-05-13 04:58:09.716009057 +0100 @@ -657,21 +657,22 @@ .nf #include #include +#include void usage(poptContext optCon, int exitcode, char *error, char *addl) { poptPrintUsage(optCon, stderr, 0); - if (error) fprintf(stderr, "%s: %s\n", error, addl); + if (error) fprintf(stderr, "%s: %s\\n", error, addl); exit(exitcode); } int main(int argc, char *argv[]) { - char c; /* used for argument parsing */ + int c; /* used for argument parsing */ int i = 0; /* used for tracking options */ - char *portname; int speed = 0; /* used in argument parsing to set speed */ int raw = 0; /* raw mode? */ int j; char buf[BUFSIZ+1]; + const char *portname; poptContext optCon; /* context for parsing command-line options */ struct poptOption optionsTable[] = { debian/patches/217602.patch0000644000000000000000000000170411372674331012410 0ustar Index: popt-1.16/popt.c =================================================================== --- popt-1.16.orig/popt.c 2010-05-13 04:57:52.006009545 +0100 +++ popt-1.16/popt.c 2010-05-13 04:58:15.027009502 +0100 @@ -1023,8 +1023,13 @@ int poptSaveLong(long * arg, unsigned int argInfo, long aLong) { +#if 0 /* XXX Check alignment, may fail on funky platforms. */ if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1))) +#else + /* It does! pm@debian.org */ + if (arg == NULL) +#endif return POPT_ERROR_NULLARG; if (aLong != 0 && LF_ISSET(RANDOM)) { @@ -1056,8 +1061,13 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong) { +#if 0 /* XXX Check alignment, may fail on funky platforms. */ if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1))) +#else + /* It does! pm@debian.org */ + if (arg == NULL) +#endif return POPT_ERROR_NULLARG; if (aLong != 0 && LF_ISSET(RANDOM)) { debian/patches/series0000644000000000000000000000020012247460155012030 0ustar 318833.patch 367153-manpage.patch 278402-manpage.patch 217602.patch 356669.patch 728596-secure-getenv.patch libtool-update.diff debian/patches/356669.patch0000644000000000000000000000643311372674475012446 0ustar Index: popt-1.16/po/ca.po =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ popt-1.16/po/ca.po 2010-05-13 04:59:13.757009036 +0100 @@ -0,0 +1,116 @@ +# Catalan translation of popt. +# Copyright © Free Software Foundation, Inc. +# This file is distributed under the same license as the popt package. +# Jordi Mallach , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: popt 1.7\n" +"POT-Creation-Date: 2002-09-16 13:31-0400\n" +"PO-Revision-Date: 2006-03-13 10:22+0000\n" +"Last-Translator: Jordi Mallach \n" +"Language-Team: Catalan \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: popt.c:34 +msgid "unknown errno" +msgstr "número d'error desconegut" + +#: popt.c:940 +#, c-format +msgid "option type (%d) not implemented in popt\n" +msgstr "el tipus d'opció (%d) no està implementat en popt\n" + +#: popt.c:1160 +msgid "missing argument" +msgstr "manca un argument" + +#: popt.c:1162 +msgid "unknown option" +msgstr "opció desconeguda" + +#: popt.c:1164 +msgid "mutually exclusive logical operations requested" +msgstr "s'ha demanat operacions lògiques mutuament excloents" + +#: popt.c:1166 +msgid "opt->arg should not be NULL" +msgstr "opt->arg no hauria de ser NULL" + +#: popt.c:1168 +msgid "aliases nested too deeply" +msgstr "la recursió d'àlias és massa profunda" + +#: popt.c:1170 +msgid "error in parameter quoting" +msgstr "hi ha un error en l'entrecomillat dels paràmetres" + +#: popt.c:1172 +msgid "invalid numeric value" +msgstr "el valor numèric és invàlid" + +#: popt.c:1174 +msgid "number too large or too small" +msgstr "el número és massa gran o massa petit" + +#: popt.c:1176 +msgid "memory allocation failed" +msgstr "l'assignació de memòria ha fallat" + +#: popt.c:1180 +msgid "unknown error" +msgstr "s'ha produït un error desconegut" + +#: popthelp.c:57 +msgid "Show this help message" +msgstr "Mostra aquest missatge d'ajuda" + +#: popthelp.c:58 +msgid "Display brief usage message" +msgstr "Mostra un missatge breu d'ús" + +#: popthelp.c:61 +msgid "Display option defaults in message" +msgstr "Mostra els valors predeterminats de les opcions al missatge" + +#: popthelp.c:103 +msgid "NONE" +msgstr "CAP" + +#: popthelp.c:105 +msgid "VAL" +msgstr "VAL" + +#: popthelp.c:109 +msgid "INT" +msgstr "INT" + +#: popthelp.c:110 +msgid "LONG" +msgstr "LONG" + +#: popthelp.c:111 +msgid "STRING" +msgstr "STRING" + +#: popthelp.c:112 +msgid "FLOAT" +msgstr "FLOAT" + +#: popthelp.c:113 +msgid "DOUBLE" +msgstr "DOUBLE" + +#: popthelp.c:114 +msgid "ARG" +msgstr "ARG" + +#: popthelp.c:486 +msgid "Usage:" +msgstr "Forma d'ús:" + +#: popthelp.c:510 +msgid "[OPTION...]" +msgstr "[OPCIÓ...]" Index: popt-1.16/configure =================================================================== --- popt-1.16.orig/configure 2010-05-04 21:55:59.000000000 +0100 +++ popt-1.16/configure 2010-05-13 04:59:47.938008097 +0100 @@ -2765,7 +2765,7 @@ LT_AGE=8 -ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko lv nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN" +ALL_LINGUAS="ca cs da de eo es fi fr ga gl hu id is it ja ko lv nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN" DEPDIR="${am__leading_dot}deps" debian/patches/728596-secure-getenv.patch0000644000000000000000000000347712235526347015220 0ustar From: Elia Pinto (devzero2000) Subject: libpopt-dev: __secure_getenv() function renamed to secure_getenv() Use secure_getenv if it is available. Fall back to __secure_getenv if it is not. In glibc 2.17, __secure_getenv was renamed to secure_getenv. So check also for it. Reference: http://sourceware.org/glibc/wiki/Tips_and_Tricks/secure_getenv http://marc.info/?t=134192618500001&r=1&w=2 Origin: upstream, http://rpm5.org/cvs/chngview?cn=16984 Bug-Debian: http://bugs.debian.org/728596 Index: popt-1.16/configure.ac =================================================================== --- popt-1.16.orig/configure.ac 2010-05-04 21:55:54.000000000 +0100 +++ popt-1.16/configure.ac 2013-11-03 19:54:39.838667371 +0000 @@ -82,7 +82,7 @@ AC_CHECK_FUNC(setreuid, [], [ AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) ]) -AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom) +AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv secure_getenv setregid stpcpy strerror vasprintf srandom) AM_GNU_GETTEXT([external]) AM_ICONV_LINK Index: popt-1.16/system.h =================================================================== --- popt-1.16.orig/system.h 2008-12-18 17:09:49.000000000 +0000 +++ popt-1.16/system.h 2013-11-03 20:06:58.305755167 +0000 @@ -91,9 +91,13 @@ #define xstrdup(_str) strdup(_str) #endif /* defined(HAVE_MCHECK_H) && defined(__GNUC__) */ -#if defined(HAVE___SECURE_GETENV) && !defined(__LCLINT__) +#if !defined(__LCLINT__) +#if defined(HAVE_SECURE_GETENV) +#define getenv(_s) secure_getenv(_s) +#elseif defined(HAVE___SECURE_GETENV) #define getenv(_s) __secure_getenv(_s) #endif +#endif #if !defined(__GNUC__) && !defined(__attribute__) #define __attribute__(x) debian/patches/197416.patch0000644000000000000000000000112511372673544012424 0ustar Index: popt-1.10/popthelp.c =================================================================== --- popt-1.10.orig/popthelp.c 2006-05-12 13:56:30.572854743 +0100 +++ popt-1.10/popthelp.c 2006-05-12 13:57:26.403052753 +0100 @@ -222,7 +222,7 @@ /*@modifies *fp, fileSystem @*/ { size_t indentLength = maxLeftCol + 5; - size_t lineLength = 79 - indentLength; + size_t lineLength = (indentLength > 78) ? 1 : (79 - indentLength); const char * help = D_(translation_domain, opt->descrip); const char * argDescrip = getArgDescrip(opt, translation_domain); size_t helpLength; debian/patches/libtool-update.diff0000644000000000000000000000441412247460174014405 0ustar Index: b/configure =================================================================== --- a/configure +++ b/configure @@ -7004,7 +7004,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -7020,9 +7020,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7041,7 +7051,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) Index: b/m4/libtool.m4 =================================================================== --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1267,7 +1267,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1279,9 +1279,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1300,7 +1310,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) debian/control0000644000000000000000000000460612235530700010574 0ustar Source: popt Section: devel Priority: optional Maintainer: Paul Martin Build-Depends: debhelper (>> 9), gettext (>= 0.18.1.1-8), autotools-dev Homepage: http://rpm5.org/ Standards-Version: 3.9.3 Package: libpopt0 Architecture: any Section: libs Priority: important Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Conflicts: popt, libpopt-dev (<= 1.4-1), rpm (<= 4.0.2-3) Replaces: popt Description: lib for parsing cmdline parameters Popt was heavily influenced by the getopt() and getopt_long() functions, but it allows more powerful argument expansion. It can parse arbitrary argv[] style arrays and automatically set variables based on command line arguments. It also allows command line arguments to be aliased via configuration files and includes utility functions for parsing arbitrary strings into argv[] arrays using shell-like rules. . This package contains the runtime library and locale data. Package: libpopt-dev Architecture: any Section: libdevel Priority: optional Depends: libc6-dev | libc-dev, libpopt0 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Conflicts: popt Replaces: popt Description: lib for parsing cmdline parameters - development files Popt was heavily influenced by the getopt() and getopt_long() functions, but it allows more powerful argument expansion. It can parse arbitrary argv[] style arrays and automatically set variables based on command line arguments. It also allows command line arguments to be aliased via configuration files and includes utility functions for parsing arbitrary strings into argv[] arrays using shell-like rules. . This package contains the popt static library and header file. Package: libpopt0-udeb XC-Package-Type: udeb Architecture: any Section: debian-installer Depends: ${shlibs:Depends}, ${misc:Depends} Description: lib for parsing cmdline parameters Popt was heavily influenced by the getopt() and getopt_long() functions, but it allows more powerful argument expansion. It can parse arbitrary argv[] style arrays and automatically set variables based on command line arguments. It also allows command line arguments to be aliased via configuration files and includes utility functions for parsing arbitrary strings into argv[] arrays using shell-like rules. . This package contains the runtime library only. . This is a minimal package for use in debian-installer. debian/libpopt0-udeb.install0000644000000000000000000000005011372673544013233 0ustar debian/tmp-udeb/lib*/libpopt.so.* lib debian/libpopt-dev.README.Debian0000644000000000000000000000062611372673544013473 0ustar popt for Debian --------------- Because of its non-free license, the postscript documentation for popt has been removed. man 3 popt will still give you pretty good information on how to use popt in your programs. Sorry about the inconvenience, but you can always email Erik Troan about it if the manpage isn't useful to you. => -- Joseph Carter Thu, 29 Jul 1999 04:56:36 -0700 debian/libpopt0.links.in0000644000000000000000000000011411673632147012374 0ustar lib/DEB_HOST_MULTIARCH/libpopt.so.0.0.0 lib/DEB_HOST_MULTIARCH/libpopt.so.0 debian/rules0000755000000000000000000001024112235531144010244 0ustar #!/usr/bin/make -f # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) else CROSS= --build $(DEB_BUILD_GNU_TYPE) endif # shared library versions, option 1 source = $(shell grep "^Source: " debian/control|head -1|sed 's/Source: \(.*\)/\1/g') version = $(shell grep "^$(source) " debian/changelog|head -1 |sed 's/.*(\(.*\)\-[^\-]*).*/\1/g') major=0 # Work around past library brokenness ifeq ($(version),1.7) ifeq ($(DEB_HOST_ARCH),m68k) version = 1.7-4 endif endif cflags = `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS` cflags += -Wall -W -D_GNU_SOURCE -D_REENTRANT cflags_udeb = -Os -Wall -W -g -D_GNU_SOURCE -D_REENTRANT ldflags = `dpkg-buildflags --get LDFLAGS` ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) install = install else install = install-strip endif objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE) objdir_udeb = $(objdir)-udeb configure: configure-deb-stamp configure-udeb-stamp configure-deb-stamp: dh_testdir dh_autotools-dev_updateconfig # make build dir mkdir $(objdir) # Add here commands to configure the package. cd $(objdir) && \ ../configure --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --prefix=/usr --mandir=/usr/share/man --enable-shared $(CROSS) dh_autotools-dev_restoreconfig touch $@ configure-udeb-stamp: dh_testdir dh_autotools-dev_updateconfig # make build dir mkdir $(objdir_udeb) # Add here commands to configure the package. cd $(objdir_udeb) && \ ../configure --prefix=/usr --mandir=/usr/share/man --enable-shared $(CROSS) dh_autotools-dev_restoreconfig touch $@ build: build-arch build-indep build-arch: build-stamp build-indep: build-stamp build-stamp: build-arch-deb-stamp build-arch-udeb-stamp build-arch-deb-stamp: configure-deb-stamp dh_testdir cd $(objdir) && $(MAKE) CFLAGS="$(cflags)" LDFLAGS="$(ldflags)" touch $@ build-arch-udeb-stamp: configure-udeb-stamp dh_testdir cd $(objdir_udeb) && $(MAKE) CFLAGS="$(cflags_udeb)" touch $@ clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp config.log rm -f config.log rm -f build-arch-deb-stamp build-arch-udeb-stamp rm -f configure-deb-stamp configure-udeb-stamp rm -f po/*.gmo po/stamp-po # Remove build trees rm -rf $(objdir) $(objdir_udeb) # Remove install dirs rm -rf $(CURDIR)/debian/tmp $(CURDIR)/debian/tmp-udeb # Remove auto-generated files rm -f $(CURDIR)/debian/libpopt0.install rm -f $(CURDIR)/debian/libpopt0.links rm -f $(CURDIR)/debian/libpopt-dev.links # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean dh_clean rm -rf $(CURDIR)/tmp install: build dh_testdir dh_testroot dh_prep dh_installdirs # Main install cd $(objdir) && \ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # udeb install cd $(objdir_udeb) && \ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-udeb # Move the udeb library to /lib or /lib64 mkdir $(CURDIR)/debian/tmp-udeb/lib/ mv $(CURDIR)/debian/tmp-udeb/usr/lib*/libpopt.so.* \ $(CURDIR)/debian/tmp-udeb/lib/ # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot sh debian/preprocess dh_install --list-missing # dh_installdebconf dh_installdocs dh_installexamples # dh_installmenu # dh_installlogrotate # dh_installemacsen # dh_installpam # dh_installmime # dh_installinit # dh_installcron dh_installman # dh_installinfo # dh_undocumented dh_installchangelogs CHANGES dh_link dh_strip dh_compress dh_fixperms dh_makeshlibs -V "libpopt0 (>= $(version))" -plibpopt0 --add-udeb="libpopt0-udeb" dh_installdeb # dh_perl dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure debian/source/0000755000000000000000000000000011372674250010475 5ustar debian/source/format0000644000000000000000000000001411372674250011703 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000015111372675634010232 0ustar # Compulsory line, this is a version 3 file version=3 http://rpm5.org/files/popt/popt-([\d\.]+).tar.gz