Hello community, here is the log from the commit of package dante for openSUSE:Factory checked in at 2015-05-07 09:21:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dante (Old) and /work/SRC/openSUSE:Factory/.dante.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dante" Changes: -------- --- /work/SRC/openSUSE:Factory/dante/dante.changes 2015-02-22 17:26:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dante.new/dante.changes 2015-05-07 09:21:27.000000000 +0200 @@ -1,0 +2,30 @@ +Wed May 6 08:15:33 UTC 2015 - [email protected] + +- Enable libwrap +- Be more explicit in configure stage +- Readd updated dante-1.4.0-glibc-2.17.patch + +------------------------------------------------------------------- +Tue Apr 28 06:29:58 UTC 2015 - [email protected] + +- Update to 1.4.1 + * Fixed configure problem with detection of libc.so on recent + FreeBSD versions. + * Fixed problem in configure test used for figuring out which + buffer in an IPC socket is used for determining bytes that can + be buffered. Should fix problem on FreeBSD. + * Fixed bug in handling of buffered GSSAPI data. + * AIX 6.1 compilation fixes. + * NetBSD 6.1.3 gethostbyaddr() configure fix. + * for a full list of changes see NEWS file +- Use url for source +- Cleanup spec-file with spec-cleaner +- Remove upstreamed/obsolete patches + * dante-1.4.0-64bit_portability.patch + * dante-1.4.0-glibc-2.17.patch + * dante-1.4.0-sockd_conf.patch +- Update dependencies +- Enable upnp support +- Do not mark systemd unit file as executable + +------------------------------------------------------------------- Old: ---- dante-1.4.0-64bit_portability.patch dante-1.4.0-sockd_conf.patch dante-1.4.0.tar.gz New: ---- dante-1.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dante.spec ++++++ --- /var/tmp/diff_new_pack.52pOjH/_old 2015-05-07 09:21:28.000000000 +0200 +++ /var/tmp/diff_new_pack.52pOjH/_new 2015-05-07 09:21:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dante # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,32 +16,36 @@ # -Name: dante %define lname libsocks0 -BuildRequires: autoconf >= 2.61 -BuildRequires: cyrus-sasl-devel -BuildRequires: krb5-devel -BuildRequires: libtool -BuildRequires: pam-devel -BuildRequires: pkgconfig(systemd) +Name: dante +Version: 1.4.1 +Release: 0 Summary: A Free Socks v4 and v5 Client Implementation License: BSD-3-Clause Group: Productivity/Networking/Security -Version: 1.4.0 -Release: 0 Url: http://www.inet.no/dante/ -# http://www.inet.no/dante/files/dante-%%{version}.tar.gz -Source: dante-%{version}.tar.gz +Source0: https://www.inet.no/dante/files/dante-%{version}.tar.gz Source1: sockd.service Source2: baselibs.conf -Source3: %name-rpmlintrc -Patch: dante-1.4.0-64bit_portability.patch +Source3: %{name}-rpmlintrc Patch2: dante-1.4.0-sockd_conf_man_format.patch Patch3: dante-1.4.0-socksify_man_format.patch Patch4: dante-1.4.0-glibc-2.17.patch Patch5: dante-1.4.0-sendbuf_macro.patch -Patch6: dante-1.4.0-sockd_conf.patch -# SuSE series: sec +BuildRequires: autoconf >= 2.61 +BuildRequires: automake +BuildRequires: bison +BuildRequires: cyrus-sasl-devel +BuildRequires: flex +BuildRequires: krb5-devel +BuildRequires: libtool +BuildRequires: pam-devel +BuildRequires: systemd-rpm-macros +BuildRequires: tcpd-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} != 1315 +BuildRequires: libminiupnpc-devel +%endif %description Dante is a free implementation of the following proxy protocols: socks @@ -49,11 +53,11 @@ firewall between networks. It is being developed by Inferno Nettverk A/S, a Norwegian consulting company. Commercial support is available. -%package -n %lname +%package -n %{lname} Summary: A Free Socks v4 and v5 Client Implementation Group: Productivity/Networking/Security -%description -n %lname +%description -n %{lname} Dante is a free implementation of the following proxy protocols: socks version 4, socks version 5 (rfc1928), and msproxy. It can be used as a firewall between networks. It is being developed by Inferno Nettverk @@ -63,11 +67,11 @@ applications become socks clients. %package -n dante-server -Provides: dantesrv = %{version} -Obsoletes: dantesrv < %{version} Summary: A Free Socks v4/v5 Server Implementation Group: Productivity/Networking/Other Requires: dante +Provides: dantesrv = %{version} +Obsoletes: dantesrv < %{version} %{?systemd_requires} %description -n dante-server @@ -76,11 +80,11 @@ socks clients to connect through it to the network. %package -n dante-devel -Provides: dantedev = %{version} -Obsoletes: dantedev < %{version} Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %{lname} = %{version} +Provides: dantedev = %{version} +Obsoletes: dantedev < %{version} %description -n dante-devel This package contains all necessary include files and libraries needed @@ -88,28 +92,33 @@ %prep %setup -q -%patch %patch2 %patch3 -%if 0%{?suse_version} > 1220 %patch4 -%endif %patch5 -p1 -%patch6 -p1 %build DANTELIBC=`find /%{_lib}/ -maxdepth 1 -iname "libc.so.*"` echo >> acinclude.m4 +sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac autoreconf --force --install --verbose # optflags contains -grecord-gcc-switches which is breaking configure -#CFLAGS="%{optflags} -fno-strict-aliasing" \ +#CFLAGS="%%{optflags} -fno-strict-aliasing" \ CFLAGS=$(echo "%{optflags}" | sed "s|-grecord-gcc-switches||") -%configure --disable-static --with-pic --enable-shared --with-libc=$DANTELIBC +%configure \ + --disable-static \ + --with-pic \ + --enable-preload \ + --enable-clientdl \ + --enable-serverdl \ + --enable-drt-fallback \ + --enable-shared \ + --with-libc=$DANTELIBC make %{?_smp_mflags} V=1 %install -make install DESTDIR=${RPM_BUILD_ROOT} +make DESTDIR=%{buildroot} install %{?_smp_mflags} #set library as executable - prevent ldd from complaining chmod +x %{buildroot}%{_libdir}/*.so.*.* install -d %{buildroot}%{_unitdir} \ @@ -118,23 +127,18 @@ %{buildroot}%{_sysconfdir} install -m 644 example/socks.conf %{buildroot}/%{_sysconfdir} install -m 644 example/sockd.conf %{buildroot}/%{_sysconfdir} -install -m 755 %{S:1} %{buildroot}/%{_unitdir}/sockd.service +install -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/sockd.service ln -sf ../../%{_unitdir}/sockd.service %{buildroot}%{_sbindir}/rcsockd # # fix bug #23141 # mv %{buildroot}%{_bindir}/socksify %{buildroot}%{_bindir}/socksify.old -# -%ifarch alpha -sed -e 's|libdl.so|/lib/libdl.so.2.1|' < %{buildroot}%{_bindir}/socksify.old > %{buildroot}%{_bindir}/socksify -%else sed -e 's|libdl.so|/%{_lib}/libdl.so.2|' < %{buildroot}%{_bindir}/socksify.old > %{buildroot}%{_bindir}/socksify -%endif # rm %{buildroot}%{_bindir}/socksify.old -%{__rm} -f %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print -%__rm Makefile* SPECS/Makefile* +rm Makefile* SPECS/Makefile* %pre -n dante-server %service_add_pre sockd.service @@ -142,9 +146,9 @@ %preun -n dante-server %service_del_preun sockd.service -%post -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig %post -n dante-server %service_add_post sockd.service @@ -158,11 +162,11 @@ %doc [A-Z][A-Z]* %{_libdir}/libdsocks.so %attr(755,root,root) %{_bindir}/socksify -%doc %{_mandir}/man1/socksify.1.gz -%doc %{_mandir}/man5/socks.conf.5.gz +%{_mandir}/man1/socksify.1.gz +%{_mandir}/man5/socks.conf.5.gz %config(noreplace) %{_sysconfdir}/socks.conf -%files -n %lname +%files -n %{lname} %defattr(-,root,root) %{_libdir}/libsocks.so.0.1.1 %{_libdir}/libsocks.so.0 @@ -170,11 +174,11 @@ %files -n dante-server %defattr(-,root,root) #doc [A-Z][A-Z]* -%doc %{_mandir}/man8/sockd.8.gz -%doc %{_mandir}/man5/sockd.conf.5.gz +%{_mandir}/man8/sockd.8.gz +%{_mandir}/man5/sockd.conf.5.gz %attr(755,root,root) %{_sbindir}/sockd %config(noreplace) %{_sysconfdir}/sockd.conf -%attr(755,root,root) %{_unitdir}/sockd.service +%{_unitdir}/sockd.service %{_sbindir}/rcsockd %files -n dante-devel ++++++ dante-1.4.0-glibc-2.17.patch ++++++ --- /var/tmp/diff_new_pack.52pOjH/_old 2015-05-07 09:21:28.000000000 +0200 +++ /var/tmp/diff_new_pack.52pOjH/_new 2015-05-07 09:21:28.000000000 +0200 @@ -1,5 +1,7 @@ ---- libscompat/issetugid.c.orig 2013-12-13 16:05:15.838297349 -0500 -+++ libscompat/issetugid.c 2013-12-13 16:08:08.623285534 -0500 +Index: libscompat/issetugid.c +=================================================================== +--- libscompat/issetugid.c.orig ++++ libscompat/issetugid.c @@ -4,6 +4,7 @@ #include "autoconf.h" #endif /* HAVE_CONFIG_H */ @@ -33,9 +35,11 @@ + return 1; + return 0; } ---- libscompat.m4.orig 2013-12-13 16:11:45.601270697 -0500 -+++ libscompat.m4 2013-12-13 16:10:49.916274505 -0500 -@@ -263,35 +263,6 @@ +Index: libscompat.m4 +=================================================================== +--- libscompat.m4.orig ++++ libscompat.m4 +@@ -266,35 +266,6 @@ if test x"${ac_cv_func_bzero}" = xno; th AC_DEFINE(bzero(b, len), memset((b), 0, (len)), [bzero replacement]) fi @@ -68,12 +72,14 @@ - AC_DEFINE(HAVE_LIBC_ENABLE_SECURE_DISABLED, 1, [glibc variable disable]) -fi - - L_PIPETYPE() - AC_MSG_CHECKING([for FIONREAD socket support]) ---- include/autoconf.h.in.orig 2013-12-13 16:13:44.171262589 -0500 -+++ include/autoconf.h.in 2013-12-13 16:14:48.444258194 -0500 -@@ -566,12 +566,6 @@ + AC_TRY_RUN([ + #include <sys/types.h> +Index: include/autoconf.h.in +=================================================================== +--- include/autoconf.h.in.orig ++++ include/autoconf.h.in +@@ -701,12 +701,6 @@ /* Define to 1 if you have the `crypt' library (-lcrypt). */ #undef HAVE_LIBCRYPT ++++++ dante-1.4.0-sendbuf_macro.patch ++++++ --- /var/tmp/diff_new_pack.52pOjH/_old 2015-05-07 09:21:28.000000000 +0200 +++ /var/tmp/diff_new_pack.52pOjH/_new 2015-05-07 09:21:28.000000000 +0200 @@ -1,8 +1,8 @@ -Index: dante-1.4.0/libscompat.m4 +Index: dante-1.4.1/libscompat.m4 =================================================================== ---- dante-1.4.0.orig/libscompat.m4 -+++ dante-1.4.0/libscompat.m4 -@@ -373,7 +373,7 @@ main(void) +--- dante-1.4.1.orig/libscompat.m4 ++++ dante-1.4.1/libscompat.m4 +@@ -374,7 +374,7 @@ main(void) return 0; }], [AC_MSG_RESULT(yes) ++++++ dante-1.4.0-sockd_conf_man_format.patch ++++++ --- /var/tmp/diff_new_pack.52pOjH/_old 2015-05-07 09:21:28.000000000 +0200 +++ /var/tmp/diff_new_pack.52pOjH/_new 2015-05-07 09:21:28.000000000 +0200 @@ -1,6 +1,8 @@ ---- doc/sockd.conf.5.orig 2013-12-13 15:56:15.078334326 -0500 -+++ doc/sockd.conf.5 2013-12-13 15:58:58.993323118 -0500 -@@ -678,11 +678,9 @@ +Index: doc/sockd.conf.5 +=================================================================== +--- doc/sockd.conf.5.orig ++++ doc/sockd.conf.5 +@@ -710,11 +710,9 @@ Requires the redirect module. The syntax of the redirect statement is as follows: @@ -13,7 +15,7 @@ See the redirect manual for detailed information. -@@ -766,10 +764,8 @@ +@@ -798,10 +796,8 @@ Requires the redirect module. The syntax of the redirect statement is as follows: @@ -24,7 +26,7 @@ \fBredirect\fP to: \fBADDRESS\fP The semantics of \fBfrom\fP and \fBto\fP vary according to -@@ -874,7 +870,7 @@ +@@ -1092,7 +1088,7 @@ For inferno Nettverk A/S: .SH SEE ALSO sockd(8), socks.conf(5), hosts_access(5) ++++++ dante-1.4.0-socksify_man_format.patch ++++++ --- /var/tmp/diff_new_pack.52pOjH/_old 2015-05-07 09:21:28.000000000 +0200 +++ /var/tmp/diff_new_pack.52pOjH/_new 2015-05-07 09:21:28.000000000 +0200 @@ -1,6 +1,8 @@ ---- doc/socksify.1.orig 2013-12-13 16:01:14.284313866 -0500 -+++ doc/socksify.1 2013-12-13 16:01:55.033311080 -0500 -@@ -136,7 +136,7 @@ +Index: doc/socksify.1 +=================================================================== +--- doc/socksify.1.orig ++++ doc/socksify.1 +@@ -138,7 +138,7 @@ For inferno Nettverk A/S: Karl-Andre' Skevik .SH SEE ALSO socks.conf(5), sockd(8), sockd.conf(5) ++++++ dante-1.4.0.tar.gz -> dante-1.4.1.tar.gz ++++++ ++++ 57517 lines of diff (skipped)
