Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2015-04-28 20:41:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2015-03-23 12:11:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2015-04-28 20:41:33.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 24 08:30:11 UTC 2015 - r...@suse.com + +- add SOCKS5_SERVER and socks_proxy to proxy settings (bnc#928398) +- Simplify version check + +------------------------------------------------------------------- Old: ---- aaa_base-13.2+git20150309.be5760c.tar.xz New: ---- aaa_base-13.2+git20150424.4a32a7a.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.7VFN82/_old 2015-04-28 20:41:34.000000000 +0200 +++ /var/tmp/diff_new_pack.7VFN82/_new 2015-04-28 20:41:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package aaa_base # -# 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 @@ -18,7 +18,7 @@ Name: aaa_base -Version: 13.2+git20150309.be5760c +Version: 13.2+git20150424.4a32a7a Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} ++++++ aaa_base-13.2+git20150309.be5760c.tar.xz -> aaa_base-13.2+git20150424.4a32a7a.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20150309.be5760c/files/etc/profile.d/profile.csh new/aaa_base-13.2+git20150424.4a32a7a/files/etc/profile.d/profile.csh --- old/aaa_base-13.2+git20150309.be5760c/files/etc/profile.d/profile.csh 2015-03-09 15:26:21.000000000 +0100 +++ new/aaa_base-13.2+git20150424.4a32a7a/files/etc/profile.d/profile.csh 2015-04-24 10:28:37.000000000 +0200 @@ -65,6 +65,15 @@ if (! ${%proxy_enabled} == yes ) continue setenv gopher_proxy "${val:q}" breaksw + case SOCKS_PROXY=*: + if (! ${%proxy_enabled} == yes ) continue + setenv socks_proxy "${val:q}" + setenv SOCKS_PROXY "${val:q}" + breaksw + case SOCKS5_SERVER=*: + if (! ${%proxy_enabled} == yes ) continue + setenv SOCKS5_SERVER "${val:q}" + breaksw case NO_PROXY=*: if (! ${%proxy_enabled} == yes ) continue setenv no_proxy "${val:q}" @@ -99,7 +108,7 @@ if ( ${?proxy_enabled} ) then if ( "$proxy_enabled" != "yes" ) then - unsetenv http_proxy https_proxy ftp_proxy gopher_proxy no_proxy + unsetenv http_proxy https_proxy ftp_proxy gopher_proxy no_proxy socks_proxy SOCKS_PROXY SOCKS5_SERVER endif unset proxy_enabled endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20150309.be5760c/files/etc/profile.d/profile.sh new/aaa_base-13.2+git20150424.4a32a7a/files/etc/profile.d/profile.sh --- old/aaa_base-13.2+git20150309.be5760c/files/etc/profile.d/profile.sh 2015-03-09 15:26:21.000000000 +0100 +++ new/aaa_base-13.2+git20150424.4a32a7a/files/etc/profile.d/profile.sh 2015-04-24 10:28:37.000000000 +0200 @@ -64,6 +64,18 @@ gopher_proxy="${val}" export gopher_proxy ;; + SOCKS_PROXY=*) + test "$PROXY_ENABLED" = "yes" || continue + socks_proxy="${val}" + export socks_proxy + SOCKS_PROXY="${val}" + export SOCKS_PROXY + ;; + SOCKS5_SERVER=*) + test "$PROXY_ENABLED" = "yes" || continue + SOCKS5_SERVER="${val}" + export SOCKS5_SERVER + ;; NO_PROXY=*) test "$PROXY_ENABLED" = "yes" || continue no_proxy="${val}" @@ -102,7 +114,7 @@ fi if test "$PROXY_ENABLED" != "yes" ; then - unset http_proxy https_proxy ftp_proxy gopher_proxy no_proxy NO_PROXY + unset http_proxy https_proxy ftp_proxy gopher_proxy no_proxy NO_PROXY socks_proxy SOCKS_PROXY SOCKS5_SERVER fi unset PROXY_ENABLED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20150309.be5760c/files/var/adm/fillup-templates/sysconfig.proxy new/aaa_base-13.2+git20150424.4a32a7a/files/var/adm/fillup-templates/sysconfig.proxy --- old/aaa_base-13.2+git20150309.be5760c/files/var/adm/fillup-templates/sysconfig.proxy 2015-03-09 15:26:21.000000000 +0100 +++ new/aaa_base-13.2+git20150424.4a32a7a/files/var/adm/fillup-templates/sysconfig.proxy 2015-04-24 10:28:37.000000000 +0200 @@ -40,6 +40,20 @@ # GOPHER_PROXY="" +## Type: string +## Default: "" +# +# Example: SOCKS_PROXY="socks://proxy.example.com:8080" +# +SOCKS_PROXY="" + +## Type: string +## Default: "" +# +# Example: SOCKS5_SERVER="office-proxy.example.com:8881" +# +SOCKS5_SERVER="" + ## Type: string(localhost) ## Default: localhost # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20150309.be5760c/get_kernel_version.c new/aaa_base-13.2+git20150424.4a32a7a/get_kernel_version.c --- old/aaa_base-13.2+git20150309.be5760c/get_kernel_version.c 2015-03-09 15:26:21.000000000 +0100 +++ new/aaa_base-13.2+git20150424.4a32a7a/get_kernel_version.c 2015-04-24 10:28:37.000000000 +0200 @@ -102,7 +102,6 @@ buffer[i+12] == 'n' && buffer[i+13] == ' ') { int j = i+14; - int invalid_char = 0; int number_dots = 0; /* check if we really found a version */ @@ -118,17 +117,13 @@ if (((number_dots < 2) && !isdigit(c)) || ((number_dots >= 2) && !my_is_alnum_punct(c))) { - //invalid_char = 1; - fprintf(stderr, "invalid=1 for %c\n", c); + fprintf(stderr, "invalid char %c\n", c); break; } } - - if (!invalid_char) - { - found = 1; - break; - } + /* Use the result anyway */ + found = 1; + break; } if (found)
