Hello community,
here is the log from the commit of package aaa_base for openSUSE:12.2 checked
in at 2012-07-04 13:50:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/aaa_base (Old)
and /work/SRC/openSUSE:12.2/.aaa_base.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base", Maintainer is "r...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.2/aaa_base/aaa_base.changes 2012-06-29
14:12:37.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.aaa_base.new/aaa_base.changes 2012-07-04
13:50:23.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Jul 4 09:40:15 UTC 2012 - lnus...@suse.de
+
+- support beeing called as rc* symlink wrapper (bnc#769902)
+- use systemctl instead of loop for --status-all (bnc#769902)
+
+-------------------------------------------------------------------
+Sun Jul 1 14:57:08 UTC 2012 - dims...@opensuse.org
+
+- Add aaa_base-bnc756012.patch: unset ftp_proxy is not the same
+ as ftp_proxy="", which can drip libproxy over. (bnc#756012)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aaa_base.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aaa_base/files/etc/profile.d/profile.csh
new/aaa_base/files/etc/profile.d/profile.csh
--- old/aaa_base/files/etc/profile.d/profile.csh 2012-06-22
16:15:22.000000000 +0200
+++ new/aaa_base/files/etc/profile.d/profile.csh 2012-07-04
11:34:10.000000000 +0200
@@ -50,23 +50,23 @@
set proxy_enabled=${val:q}
breaksw
case HTTP_PROXY=*:
- if (! ${%val} ) continue
+ if (! ${%proxy_enabled} == yes ) continue
setenv http_proxy ${val:q}
breaksw
case HTTPS_PROXY=*:
- if (! ${%val} ) continue
+ if (! ${%proxy_enabled} == yes ) continue
setenv https_proxy ${val:q}
breaksw
case FTP_PROXY=*:
- if (! ${%val} ) continue
+ if (! ${%proxy_enabled} == yes ) continue
setenv ftp_proxy ${val:q}
breaksw
case GOPHER_PROXY=*:
- if (! ${%val} ) continue
+ if (! ${%proxy_enabled} == yes ) continue
setenv gopher_proxy ${val:q}
breaksw
case NO_PROXY=*:
- if (! ${%val} ) continue
+ if (! ${%proxy_enabled} == yes ) continue
setenv no_proxy ${val:q}
breaksw
case DEFAULT_WM=*:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aaa_base/files/etc/profile.d/profile.sh
new/aaa_base/files/etc/profile.d/profile.sh
--- old/aaa_base/files/etc/profile.d/profile.sh 2012-06-22 16:15:22.000000000
+0200
+++ new/aaa_base/files/etc/profile.d/profile.sh 2012-07-04 11:34:10.000000000
+0200
@@ -45,27 +45,27 @@
PROXY_ENABLED="${val}"
;;
HTTP_PROXY=*)
- test -n "$val" || continue
+ test "$PROXY_ENABLED" = "yes" || continue
http_proxy="${val}"
export http_proxy
;;
HTTPS_PROXY=*)
- test -n "$val" || continue
+ test "$PROXY_ENABLED" = "yes" || continue
https_proxy="${val}"
export https_proxy
;;
FTP_PROXY=*)
- test -n "$val" || continue
+ test "$PROXY_ENABLED" = "yes" || continue
ftp_proxy="${val}"
export ftp_proxy
;;
GOPHER_PROXY=*)
- test -n "$val" || continue
+ test "$PROXY_ENABLED" = "yes" || continue
gopher_proxy="${val}"
export gopher_proxy
;;
NO_PROXY=*)
- test -n "$val" || continue
+ test "$PROXY_ENABLED" = "yes" || continue
no_proxy="${val}"
export no_proxy
NO_PROXY="${val}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aaa_base/files/sbin/service
new/aaa_base/files/sbin/service
--- old/aaa_base/files/sbin/service 2012-06-22 16:15:22.000000000 +0200
+++ new/aaa_base/files/sbin/service 2012-07-04 11:34:10.000000000 +0200
@@ -1,12 +1,17 @@
-#!/bin/sh
+#!/bin/bash
#
# /sbin/service Handle boot and runlevel services
#
+sd_booted()
+{
+ test -d /sys/fs/cgroup/systemd/
+}
+
#
# Only root should do
#
-if test "$(id -u)" -ne 0; then
+if ! sd_booted && test "$(id -u)" -ne 0; then
echo "${0##*/}: only root can use ${0##*/}" 1>&2
exit 1
fi
@@ -27,7 +32,44 @@
exec_rc ()
{
- env -i LANG=$LANG PATH=$PATH TERM=$TERM SYSTEMD_NO_WRAP=$SYSTEMD_NO_WRAP
${1+"$@"}
+ if sd_booted; then
+ case "$2" in
+ "")
+ echo "Usage: $0 "$1"
{start|stop|reload|restart|try-restart|force-reload|status}"
+ return 1
+ ;;
+ start|stop|reload|restart|try-restart|force-reload|status)
+ systemctl "$2" "$1.service"
+ return "$?"
+ ;;
+ esac
+ fi
+ local rc="${RCDIR}/$1"
+ shift
+ env -i LANG=$LANG PATH=$PATH TERM=$TERM SYSTEMD_NO_WRAP=$SYSTEMD_NO_WRAP
"$rc" ${1+"$@"}
+}
+
+check_rc ()
+{
+ local rc="$1"
+ shift
+ if sd_booted; then
+ systemctl --quiet --lines=0 status "$rc.service" > /dev/null 2>&1
+ else
+ test -x ${RCDIR}/$rc
+ fi
+}
+
+check_wrapper ()
+{
+ local n="${0##*/}"
+ if test "${n#rc}" != "$n"; then
+ rc="${n#rc}"
+ return 0
+ else
+ rc="$1"
+ return 1
+ fi
}
usage ()
@@ -83,18 +125,23 @@
usage 1>&2
exit 1
fi
- for rc in ${RCDIR}/*; do
- test ! -x "$rc" -o -d "$rc" && continue
- case "${rc##*/}" in
- *.local|*.rpm*|*.ba*|*.old|*.new) continue ;;
- *.dpkg|*.save|*.swp|*.core) continue ;;
- *.disabled) continue ;;
- boot|rc|single|halt|reboot) continue ;;
- powerfail|rx|Makefile|README) continue ;;
- skeleton|*.d) continue ;;
- esac
- exec_rc $rc status
- done
+ if sd_booted; then
+ systemctl --full --no-legend --no-pager --type=service list-units
+ else
+ for rc in ${RCDIR}/*; do
+ test ! -x "$rc" -o -d "$rc" && continue
+ rc=${rc##*/}
+ case "$rc" in
+ *.local|*.rpm*|*.ba*|*.old|*.new) continue ;;
+ *.dpkg|*.save|*.swp|*.core) continue ;;
+ *.disabled) continue ;;
+ boot|rc|single|halt|reboot) continue ;;
+ powerfail|rx|Makefile|README) continue ;;
+ skeleton|*.d) continue ;;
+ esac
+ exec_rc $rc status
+ done
+ fi
exit 0
fi
@@ -107,14 +154,13 @@
exit 1
fi
for rc in $args; do
- if test ! -x ${RCDIR}/$rc ; then
+ if check_rc $rc ; then
echo "${0##*/}: no such service $rc" 1>&2
exit 1
fi
done
status=0
for rc in $args; do
- rc=${RCDIR}/$rc
exec_rc $rc stop
exec_rc $rc start
test $? -gt 0 && status=1
@@ -132,12 +178,13 @@
fi
set -- $args
-if test ! -x ${RCDIR}/$1 ; then
- echo "${0##*/}: no such service $1" 1>&2
+if ! check_wrapper "$@"; then
+ shift
+fi
+if ! check_rc "$rc" ; then
+ echo "${0##*/}: no such service $rc" 1>&2
exit 1
fi
-rc=${RCDIR}/$1
-shift
exec_rc $rc ${1+"$@"}
exit $?
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
