From 6fbeda28e903b1bd960f62b75d9053c693e5af1d Mon Sep 17 00:00:00 2001 From: athimm Date: Oct 05 2008 11:22:10 +0000 Subject: Fix getpeername/getsockname socklen initialization. --- diff --git a/fakechroot-2.8-initsocketlen.patch b/fakechroot-2.8-initsocketlen.patch new file mode 100644 index 0000000..4db0441 --- /dev/null +++ b/fakechroot-2.8-initsocketlen.patch @@ -0,0 +1,22 @@ +--- fakechroot-2.8/src/libfakechroot.c.init 2008-10-05 10:18:21.000000000 +0200 ++++ fakechroot-2.8/src/libfakechroot.c 2008-10-05 10:21:45.000000000 +0200 +@@ -1778,7 +1778,8 @@ + char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH]; + + if (next_getpeername == NULL) fakechroot_init(); +- memset(&newname, 0, sizeof(struct sockaddr_un)); ++ newnamelen = sizeof(struct sockaddr_un); ++ memset(&newname, 0, newnamelen); + status = next_getpeername(s, (struct sockaddr *)&newname, &newnamelen); + if (status != 0) { + return status; +@@ -1806,7 +1807,8 @@ + char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH]; + + if (next_getsockname == NULL) fakechroot_init(); +- memset(&newname, 0, sizeof(struct sockaddr_un)); ++ newnamelen = sizeof(struct sockaddr_un); ++ memset(&newname, 0, newnamelen); + status = next_getsockname(s, (struct sockaddr *)&newname, &newnamelen); + if (status != 0) { + return status; diff --git a/fakechroot.spec b/fakechroot.spec index 0908c9e..8e0e0ee 100644 --- a/fakechroot.spec +++ b/fakechroot.spec @@ -1,11 +1,12 @@ Summary: Gives a fake chroot environment Name: fakechroot Version: 2.8 -Release: 14%{?dist} +Release: 15%{?dist} License: LGPLv2+ Group: Development/Tools URL: http://packages.debian.org/unstable/utils/fakechroot.html Source0: http://ftp.debian.org/debian/pool/main/f/fakechroot/%{name}_%{version}.orig.tar.gz +Patch0: fakechroot-2.8-initsocketlen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description @@ -17,6 +18,7 @@ privileges. %prep %setup -q +%patch0 -p1 -b .missinginit perl -pi -e's,int readlink,ssize_t readlink,' src/libfakechroot.c chmod -x scripts/ldd.fake scripts/restoremode.sh scripts/savemode.sh @@ -53,6 +55,9 @@ rm -rf %{buildroot} %{_mandir}/man1/fakechroot.1.gz %changelog +* Sun Oct 5 2008 Axel Thimm - 2.8-15 +- Fix getpeername/getsockname socklen initialization. + * Sun Aug 24 2008 Axel Thimm - 2.8-14 - %%check || : does not work anymore.