Hello community, here is the log from the commit of package dante for openSUSE:Factory checked in at 2013-01-02 12:55:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dante (Old) and /work/SRC/openSUSE:Factory/.dante.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dante", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/dante/dante.changes 2012-02-07 14:45:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dante.new/dante.changes 2013-01-02 12:56:19.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 31 19:21:03 UTC 2012 - [email protected] + +- Add dante-glibc-2.17.patch to use getauxval() function instead + of private __libc_enable_secure. + +------------------------------------------------------------------- New: ---- dante-glibc-2.17.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dante.spec ++++++ --- /var/tmp/diff_new_pack.UXSfUb/_old 2013-01-02 12:56:20.000000000 +0100 +++ /var/tmp/diff_new_pack.UXSfUb/_new 2013-01-02 12:56:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dante # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products 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,20 +16,20 @@ # - Name: dante %define lname libsocks0 -BuildRequires: pam-devel +BuildRequires: autoconf >= 2.61 BuildRequires: cyrus-sasl-devel BuildRequires: libtool -BuildRequires: autoconf >= 2.61 +BuildRequires: pam-devel %if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1000 BuildRequires: krb5-devel %endif Summary: A Free Socks v4 and v5 Client Implementation -Version: 1.3.2 -Release: 1 License: BSD-3-Clause +Group: Productivity/Networking/Security +Version: 1.3.2 +Release: 0 Url: http://www.inet.no/dante/ # http://www.inet.no/dante/files/dante-%%{version}.tar.gz Source: dante-%{version}.tar.gz @@ -39,8 +39,8 @@ Patch: dante-1.3.2-64bit_portability.patch Patch2: dante-1.3.2-sockd_conf_man_format.patch Patch3: dante-1.3.2-socksify_man_format.patch +Patch4: dante-glibc-2.17.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Group: Productivity/Networking/Security # SuSE series: sec %description @@ -91,7 +91,9 @@ %patch %patch2 %patch3 -%{?suse_update_config:%{suse_update_config -l -f}} +%if 0%{?suse_version} > 1220 +%patch4 -p1 +%endif %build DANTELIBC=`find /%{_lib}/ -maxdepth 1 -iname "libc.so.*"` ++++++ dante-glibc-2.17.patch ++++++ Index: dante-1.3.2/libscompat/issetugid.c =================================================================== --- dante-1.3.2.orig/libscompat/issetugid.c +++ dante-1.3.2/libscompat/issetugid.c @@ -4,6 +4,8 @@ #include "autoconf.h" #endif /* HAVE_CONFIG_H */ +#include <sys/auxv.h> + /* * Copyright (c) 1999, 2005, 2008, 2009 * Inferno Nettverk A/S, Norway. All rights reserved. @@ -47,22 +49,14 @@ * */ -#if HAVE_LIBC_ENABLE_SECURE -extern int __libc_enable_secure; -#endif /* HAVE_LIBC_ENABLE_SECURE */ - #include "issetugid.h" int issetugid(void) { -#if HAVE_LIBC_ENABLE_SECURE - if (!__libc_enable_secure) - return 0; -#elif HAVE_LIBC_ENABLE_SECURE_DISABLED - if (getuid() == geteuid() && getgid() == getegid()) - return 0; -#endif /* HAVE_LIBC_ENABLE_SECURE_DISABLED */ + unsigned long secure = getauxval(AT_SECURE); + if (secure != 0) + return 1; - return 1; /* don't know, better safe than sorry. */ + return 0; } Index: dante-1.3.2/libscompat.m4 =================================================================== --- dante-1.3.2.orig/libscompat.m4 +++ dante-1.3.2/libscompat.m4 @@ -157,30 +157,3 @@ AC_SUBST([LIBSCSRC]) if test x${ac_cv_func_bzero} = xno; then AC_DEFINE(bzero(b, len), memset((b), 0, (len)), [bzero replacement]) fi - -m4_ifdef([dantebuild], [ -#causes problems with packaging, allow test to be turned off -AC_ARG_WITH(glibc-secure, -[ --without-glibc-secure disable libc_enable_secure check @<:@default=detect@:>@], -[GLIBCSEC=$withval]) - -if test "${GLIBCSEC}" != no; then - AC_MSG_CHECKING([for __libc_enable_secure]) - AC_TRY_RUN([ -extern int __libc_enable_secure; - -int main() -{ - if (__libc_enable_secure == 0) - return 0; - - return 1; -}],[AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_LIBC_ENABLE_SECURE, 1, [linux version of issetugid()])], - AC_MSG_RESULT([no])) -fi -], -[AC_DEFINE(HAVE_LIBC_ENABLE_SECURE, 0, [not used])]) -if test x"$GLIBCSEC" = xno; then - AC_DEFINE(HAVE_LIBC_ENABLE_SECURE_DISABLED, 1, [glibc variable disable]) -fi Index: dante-1.3.2/include/autoconf.h.in =================================================================== --- dante-1.3.2.orig/include/autoconf.h.in +++ dante-1.3.2/include/autoconf.h.in @@ -262,12 +262,6 @@ /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO -/* linux version of issetugid() */ -#undef HAVE_LIBC_ENABLE_SECURE - -/* glibc variable disable */ -#undef HAVE_LIBC_ENABLE_SECURE_DISABLED - /* Define to 1 if you have the `des' library (-ldes). */ #undef HAVE_LIBDES -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
