r6845 - in glibc-package/branches/glibc-2.22/debian: . debhelper.in patches patches/s390 sysdeps
Author: aurel32
Date: 2015-12-25 02:51:16 +0000 (Fri, 25 Dec 2015)
New Revision: 6845
Added:
glibc-package/branches/glibc-2.22/debian/patches/s390/
glibc-package/branches/glibc-2.22/debian/patches/s390/submitted-socketcall.diff
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-alt.lintian-overrides
glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-otherbuild.lintian-overrides
glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.lintian-overrides
glibc-package/branches/glibc-2.22/debian/patches/series
glibc-package/branches/glibc-2.22/debian/sysdeps/armel.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/armhf.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd.mk
Log:
Merge from unstable
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-25 02:38:55 UTC (rev 6844)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-25 02:51:16 UTC (rev 6845)
@@ -191,15 +191,33 @@
-- Aurelien Jarno <aurel32@debian.org> Wed, 02 Dec 2015 00:06:13 +0100
-glibc (2.21-5) UNRELEASED; urgency=medium
+glibc (2.21-6) unstable; urgency=medium
+ [ Aurelien Jarno ]
+ * sysdeps/kfreebsd.mk: test if the header directory exists before
+ trying to link directories from there. Fixes FTBFS on GNU/kFreeBSD.
+ * patches/s390/submitted-socketcall.diff: new patch to fix broken
+ socketcall related function on s390x when built against 4.3+ kernel
+ headers.
+
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 25 Dec 2015 03:35:01 +0100
+
+glibc (2.21-5) unstable; urgency=medium
+
[ Samuel Thibault ]
+ * Team upload.
* patches/hurd-i386/cvs-libpthread-api.diff: Update patch, add missing throw
specifications.
* patches/any/local-stdio-lock.diff: Update to git commit, and
rename into patches/any/cvs-stdio-lock.diff.
+ * debhelper.in/libc.lintian-overrides: Override error about the embedded
+ libidn.
- -- Aurelien Jarno <aurel32@debian.org> Thu, 10 Dec 2015 23:25:07 +0100
+ [ Aurelien Jarno ]
+ * sysdeps/armel.mk, sysdeps/armhf.mk: pass --disable-multi-arch on armel and
+ armhf as IFUNC support is broken in binutils (see #807974).
+
+ -- Samuel Thibault <sthibault@debian.org> Tue, 22 Dec 2015 15:23:35 +0100
glibc (2.21-4) unstable; urgency=medium
Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-alt.lintian-overrides
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-alt.lintian-overrides 2015-12-25 02:38:55 UTC (rev 6844)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-alt.lintian-overrides 2015-12-25 02:51:16 UTC (rev 6845)
@@ -13,3 +13,7 @@
# It is normal that the ELF dynamic linker does not need any other
# library
LIBC-FLAVOR: shared-lib-without-dependency-information */ld-GLIBC_VERSION.so
+
+# we indeed embed a fork of libidn. We don't want a loop between libc and libidn
+# anyway
+LIBC-FLAVOR: embedded-library */libcidn-GLIBC_VERSION.so: libidn
Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-otherbuild.lintian-overrides
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-otherbuild.lintian-overrides 2015-12-25 02:38:55 UTC (rev 6844)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-otherbuild.lintian-overrides 2015-12-25 02:51:16 UTC (rev 6845)
@@ -13,3 +13,7 @@
# to what lintian thinks, is controlled by ldconfig
LIBC-FLAVOR: postinst-has-useless-call-to-ldconfig
LIBC-FLAVOR: postrm-has-useless-call-to-ldconfig
+
+# we indeed embed a fork of libidn. We don't want a loop between libc and libidn
+# anyway
+LIBC-FLAVOR: embedded-library */libcidn-GLIBC_VERSION.so: libidn
Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.lintian-overrides
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.lintian-overrides 2015-12-25 02:38:55 UTC (rev 6844)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.lintian-overrides 2015-12-25 02:51:16 UTC (rev 6845)
@@ -14,3 +14,7 @@
# this is a false positive because the string "ldconfig" is in preinst
LIBC: preinst-calls-ldconfig
+
+# we indeed embed a fork of libidn. We don't want a loop between libc and libidn
+# anyway
+LIBC: embedded-library */libcidn-GLIBC_VERSION.so: libidn
Added: glibc-package/branches/glibc-2.22/debian/patches/s390/submitted-socketcall.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/s390/submitted-socketcall.diff (rev 0)
+++ glibc-package/branches/glibc-2.22/debian/patches/s390/submitted-socketcall.diff 2015-12-25 02:51:16 UTC (rev 6845)
@@ -0,0 +1,31 @@
+2015-12-25 Stefan Liebler <stli@linux.vnet.ibm.com>
+
+ * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list:
+ Remove socketcall syscalls.
+ [BZ #19174]
+
+--- a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
++++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
+@@ -12,22 +12,3 @@ shmget - shmget i:iii __shmget shmget
+ semop - semop i:ipi __semop semop
+ semget - semget i:iii __semget semget
+ semctl - semctl i:iiii __semctl semctl
+-
+-# proper socket implementations:
+-accept - accept Ci:iBN __libc_accept __accept accept
+-bind - bind i:ipi __bind bind
+-connect - connect Ci:ipi __libc_connect __connect connect
+-getpeername - getpeername i:ipp __getpeername getpeername
+-getsockname - getsockname i:ipp __getsockname getsockname
+-getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
+-listen - listen i:ii __listen listen
+-recv - recv Ci:ibni __libc_recv __recv recv
+-recvfrom - recvfrom Ci:ibniBN __libc_recvfrom __recvfrom recvfrom
+-recvmsg - recvmsg Ci:ipi __libc_recvmsg __recvmsg recvmsg
+-send - send Ci:ibni __libc_send __send send
+-sendmsg - sendmsg Ci:ipi __libc_sendmsg __sendmsg sendmsg
+-sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
+-setsockopt - setsockopt i:iiibn __setsockopt setsockopt
+-shutdown - shutdown i:ii __shutdown shutdown
+-socket - socket i:iii __socket socket
+-socketpair - socketpair i:iiif __socketpair socketpair
Modified: glibc-package/branches/glibc-2.22/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-25 02:38:55 UTC (rev 6844)
+++ glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-25 02:51:16 UTC (rev 6845)
@@ -174,6 +174,8 @@
powerpc/local-powerpc8xx-dcbz.diff
+s390/submitted-socketcall.diff
+
sh4/local-fpscr_values.diff
sparc/local-sparcv9-target.diff
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/armel.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/armel.mk 2015-12-25 02:38:55 UTC (rev 6844)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/armel.mk 2015-12-25 02:51:16 UTC (rev 6845)
@@ -1,5 +1,5 @@
# configuration options for all flavours
-extra_config_options = --enable-multi-arch
+extra_config_options = --disable-multi-arch
# build hard-float (armhf) alternative library
#GLIBC_MULTILIB_PASSES += armhf
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/armhf.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/armhf.mk 2015-12-25 02:38:55 UTC (rev 6844)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/armhf.mk 2015-12-25 02:51:16 UTC (rev 6845)
@@ -1,5 +1,5 @@
# configuration options for all flavours
-extra_config_options = --enable-multi-arch
+extra_config_options = --disable-multi-arch
# Install a compat symlink so old binaries keep working:
define libc6_extra_pkg_install
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd.mk 2015-12-25 02:38:55 UTC (rev 6844)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd.mk 2015-12-25 02:51:16 UTC (rev 6845)
@@ -45,12 +45,16 @@
mkdir -p debian/include/sys
# Link to any headers found in the old locations first
- find $(KFREEBSD_HEADERS)/sys -mindepth 1 \
- -exec ln -sf '{}' debian/include/sys ';'
+ if test -d $(KFREEBSD_HEADERS)/sys ; then \
+ find $(KFREEBSD_HEADERS)/sys -mindepth 1 \
+ -exec ln -sf '{}' debian/include/sys ';' ; \
+ fi
# Link to any headers found at the new multiarch location,
# replacing any existing links
- find $(KFREEBSD_ARCH_HEADERS)/sys -mindepth 1 \
- -exec ln -sf '{}' debian/include/sys ';'
+ if test -d $(KFREEBSD_ARCH_HEADERS)/sys ; then \
+ find $(KFREEBSD_ARCH_HEADERS)/sys -mindepth 1 \
+ -exec ln -sf '{}' debian/include/sys ';' ; \
+ fi
# To make configure happy if libc0.1-dev is not installed.
touch debian/include/assert.h
Reply to: