Commit 9b7f86ae authored by Paul Martin's avatar Paul Martin Committed by Michael Jeanson

Import Debian changes 1.16-8

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.
parent cecdeb47
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 <pm@debian.org> Sun, 03 Nov 2013 20:33:05 +0000
popt (1.16-7) unstable; urgency=low
* Fix install directory for the pkgconfig file. (Closes: #658663)
......
......@@ -2,7 +2,7 @@ Source: popt
Section: devel
Priority: optional
Maintainer: Paul Martin <pm@debian.org>
Build-Depends: debhelper (>> 9), gettext (>= 0.18.1.1-8), quilt
Build-Depends: debhelper (>> 9), gettext (>= 0.18.1.1-8), autotools-dev
Homepage: http://rpm5.org/
Standards-Version: 3.9.3
......
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
From: Elia Pinto (devzero2000) <pinto.elia@gmail.com>
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)
......@@ -3,3 +3,4 @@
278402-manpage.patch
217602.patch
356669.patch
728596-secure-getenv.patch
......@@ -46,20 +46,24 @@ 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment