Hello community, here is the log from the commit of package courier-authlib for openSUSE:Factory checked in at Thu Oct 13 12:18:04 CEST 2011.
-------- --- openSUSE:Factory/courier-authlib/courier-authlib.changes 2011-09-23 01:54:08.000000000 +0200 +++ courier-authlib/courier-authlib.changes 2011-09-22 01:10:22.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Sep 21 23:08:05 UTC 2011 - [email protected] + +- change --with-authdaemonvar to /var/run/{name} +- rework init script + * create PID DIR +- some spec cleanup + +------------------------------------------------------------------- +Sat Sep 17 23:54:20 UTC 2011 - [email protected] + +- Remove redundant tags/sections from specfile +- Use _smp_mflags for parallel build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ courier-authlib.spec ++++++ --- /var/tmp/diff_new_pack.z6Nfn2/_old 2011-10-13 12:18:01.000000000 +0200 +++ /var/tmp/diff_new_pack.z6Nfn2/_new 2011-10-13 12:18:01.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package courier-authlib (Version 0.63.0) +# spec file for package courier-authlib # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: courier-authlib @@ -30,9 +29,13 @@ Source2: rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils -BuildRequires: expect gcc-c++ gdbm-devel +BuildRequires: expect +BuildRequires: gcc-c++ +BuildRequires: gdbm-devel BuildRequires: mysql-devel -BuildRequires: openldap2-devel pam-devel postgresql-devel +BuildRequires: openldap2-devel +BuildRequires: pam-devel +BuildRequires: postgresql-devel BuildRequires: procps Requires: expect @@ -42,7 +45,6 @@ %package devel Summary: Development libraries for the Courier authentication library -License: GPLv2+ Group: Development/Libraries/Other Requires: %{name} = %{version} @@ -53,10 +55,8 @@ they are built and installed this package can be removed. Files in this package are not needed at runtime. - %package userdb Summary: Userdb support for the Courier authentication library -License: GPLv2+ Group: Productivity/Networking/Email/Servers %description userdb @@ -66,7 +66,6 @@ %package ldap Summary: LDAP support for the Courier authentication library -License: GPLv2+ Group: Productivity/Networking/Email/Servers %description ldap @@ -76,7 +75,6 @@ %package mysql Summary: MySQL support for the Courier authentication library -License: GPLv2+ Group: Productivity/Networking/Email/Servers %description mysql @@ -86,7 +84,6 @@ %package pgsql Summary: PostgreSQL support for the Courier authentication library -License: GPLv2+ Group: Productivity/Networking/Email/Servers %description pgsql @@ -96,7 +93,6 @@ %package pipe Summary: Pipe support for the Courier authentication library -License: GPLv2+ Group: Productivity/Networking/Email/Servers %description pipe @@ -116,25 +112,25 @@ --with-piddir=/var/run \ --disable-root-check \ --enable-unicode \ - --with-authdaemonvar=%{_localstatedir}/run/authdaemon.courier-imap \ + --with-authdaemonvar=%{_localstatedir}/run/%{name} \ --host=%{_host} --build=%{_build} --target=%{_target_platform} -%{__make} %{?jobs:-j%jobs} +%{__make} %{?_smp_mflags} %install -%{__make} install DESTDIR=$RPM_BUILD_ROOT -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.so* $RPM_BUILD_ROOT%{_libdir} -%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.{a,la} -%{__install} -m 755 sysconftool $RPM_BUILD_ROOT%{_prefix}/lib/%{name} -%{__install} -m 755 authmigrate $RPM_BUILD_ROOT%{_prefix}/lib/%{name} -%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/init.d -%{__install} -m 755 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/courier-authdaemon +%{__make} install DESTDIR=%{buildroot} +mv %{buildroot}%{_libdir}/%{name}/lib*.so* %{buildroot}%{_libdir} +%{__rm} -f %{buildroot}%{_libdir}/%{name}/*.{a,la} +%{__install} -m 755 sysconftool %{buildroot}%{_prefix}/lib/%{name} +%{__install} -m 755 authmigrate %{buildroot}%{_prefix}/lib/%{name} +%{__mkdir_p} %{buildroot}%{_sysconfdir}/init.d +%{__install} -m 755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/courier-authdaemon %{__ln_s} -f ../../%{_sysconfdir}/init.d/courier-authdaemon \ - $RPM_BUILD_ROOT%{_sbindir}/rccourier-authdaemon + %{buildroot}%{_sbindir}/rccourier-authdaemon %preun %stop_on_removal courier-authdaemon if [ "$1" = "0" ]; then - %{__rm} -f /var/run/authdaemon.courier-imap/{socket,pid,pid.lock} + %{__rm} -f %{_localstatedir}/run/%{name}/{socket,pid,pid.lock} fi %post @@ -171,7 +167,7 @@ %postun pipe -p /sbin/ldconfig %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) @@ -180,7 +176,6 @@ %{_sysconfdir}/init.d/courier-authdaemon %dir %{_sysconfdir}/authlib %config %{_sysconfdir}/authlib/* -%dir %attr(700,root,root) %{_localstatedir}/run/authdaemon.courier-imap %{_sbindir}/authdaemond %{_sbindir}/authenumerate %{_sbindir}/authpasswd ++++++ courier-authdaemon.init ++++++ --- /var/tmp/diff_new_pack.z6Nfn2/_old 2011-10-13 12:18:01.000000000 +0200 +++ /var/tmp/diff_new_pack.z6Nfn2/_new 2011-10-13 12:18:01.000000000 +0200 @@ -5,6 +5,8 @@ # Author: Thorsten Kukuk # # /etc/init.d/courier-authdaemon +# and its symbolic link +# /(usr/)sbin/rccourier-authdaemon # ### BEGIN INIT INFO # Provides: courier-authdaemon @@ -20,33 +22,65 @@ # Courier IMAP and POP3 daemons. ### END INIT INFO -# Check for missing binaries -test -x /usr/lib/courier-authlib/authdaemond || exit 5 +# Check for missing binaries (stale symlinks should not happen) +# Note: Special treatment of stop for LSB conformance +COURIER_AUTHLIB_BIN=/usr/lib/courier-authlib/authdaemond +test -x $COURIER_AUTHLIB_BIN || { echo "$COURIER_AUTHLIB_BIN not installed"; + if [ "$1" = "stop" ]; then exit 0; + else exit 5; fi; } + +# Check for existence of needed config file and read it +COURIER_AUTHLIB_CONFIG=/etc/authlib/authdaemonrc +test -r $COURIER_AUTHLIB_CONFIG || { echo "$COURIER_AUTHLIB_CONFIG not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } -. /etc/rc.status - -# Read configuration -. /etc/authlib/authdaemonrc +# Read config +. $COURIER_AUTHLIB_CONFIG # for debug log_level to work # all debugging output goes to syslog at facility 'mail', level 'debug' # add mail.debug to syslog-ng.conf.in export DEBUG_LOGIN +# some vars +SERVICE_NAME="Courier Authentication Daemon" +COURIER_AUTHLIB_PIDDIR=/var/run/courier-authlib +COURIER_AUTHLIB_PID=$COURIER_AUTHLIB_PIDDIR/pid + +# Check for PID DIR +[ ! -d $COURIER_AUTHLIB_PIDDIR ] && { + install -d -m0700 -o root -g root $COURIER_AUTHLIB_PIDDIR; +} + +# Shell functions sourced from /etc/rc.status: +# rc_check check and set local and overall rc status +# rc_status check and set local and overall rc status +# rc_status -v be verbose in local rc status and clear it afterwards +# rc_status -v -r ditto and clear both the local and overall rc status +# rc_status -s display "skipped" and exit with status 3 +# rc_status -u display "unused" and exit with status 3 +# rc_failed set local and overall rc status to failed +# rc_failed <num> set local and overall rc status to <num> +# rc_reset clear both the local and overall rc status +# rc_exit exit appropriate to overall rc status +# rc_active checks whether a service is activated by symlinks +. /etc/rc.status + # Reset status of this service rc_reset case "$1" in start) - echo -n "Starting Courier Authentication Daemon " - /usr/sbin/courierlogger -pid=/var/run/authdaemon.courier-imap/pid $LOGGEROPTS -start /usr/lib/courier-authlib/authdaemond + echo -n "Starting $SERVICE_NAME " + /usr/sbin/courierlogger -pid=$COURIER_AUTHLIB_PID $LOGGEROPTS -start $COURIER_AUTHLIB_BIN # remeber status and be verbose rc_status -v ;; stop) - echo -n "Shutting down Courier Authentication Daemon " - /usr/sbin/courierlogger -pid=/var/run/authdaemon.courier-imap/pid $LOGGEROPTS -stop /usr/lib/courier-authlib/authdaemond + echo -n "Shutting down $SERVICE_NAME " + /usr/sbin/courierlogger -pid=$COURIER_AUTHLIB_PID $LOGGEROPTS -stop $COURIER_AUTHLIB_BIN # remeber status and be verbose rc_status -v @@ -71,21 +105,21 @@ rc_status ;; reload) - echo -n "Reload Courier Authentication Daemon " + echo -n "Reload service $SERVICE_NAME " rc_failed 3 # remeber status and be verbose rc_status -v ;; status) - echo -n "Checking for Courier Authentication Daemon " - checkproc /usr/lib/courier-authlib/authdaemond + echo -n "Checking for service $SERVICE_NAME " + checkproc $COURIER_AUTHLIB_BIN # remeber status and be verbose rc_status -v ;; probe) - test /etc/authlib/authdaemonrc -nt /var/run/authdaemon.courier-imap/pid && echo restart + test $COURIER_AUTHLIB_CONFIG -nt $COURIER_AUTHLIB_PID && echo restart ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
