Hello community, here is the log from the commit of package pcsc-lite for openSUSE:Factory checked in at 2014-11-04 17:28:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcsc-lite (Old) and /work/SRC/openSUSE:Factory/.pcsc-lite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcsc-lite" Changes: -------- --- /work/SRC/openSUSE:Factory/pcsc-lite/pcsc-lite.changes 2014-10-01 11:22:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pcsc-lite.new/pcsc-lite.changes 2014-11-04 17:28:11.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Oct 30 20:54:55 CET 2014 - [email protected] + +- Fix systemd integration and socket activation (boo#900115): + * fix quoting in systemd-service.patch + * add missing systemd service preset +- Drop obsolete upgrade protection in %pre. + +------------------------------------------------------------------- +Wed Oct 29 21:00:59 UTC 2014 - [email protected] + +- fixed sysconfig fillup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-lite.spec ++++++ --- /var/tmp/diff_new_pack.DBTl5y/_old 2014-11-04 17:28:12.000000000 +0100 +++ /var/tmp/diff_new_pack.DBTl5y/_new 2014-11-04 17:28:12.000000000 +0100 @@ -173,35 +173,35 @@ cp %{name}.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pcscd mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} cp -a AUTHORS ChangeLog ChangeLog.svn COPYING DRIVERS HELP NEWS README README.SUSE SECURITY TODO $RPM_BUILD_ROOT%{_docdir}/%{name} +# Use socket activated pcscd by default. +mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system-preset +echo -e 'enable pcscd.socket\nenable pcscd.service' >$RPM_BUILD_ROOT/usr/lib/systemd/system-preset/50-pcscd.preset %clean rm -rf $RPM_BUILD_ROOT %pre getent group %{GROUP} >/dev/null || groupadd -r %{GROUP} -if getent passwd %{USER} >/dev/null ; then - # There was a bad login shell up to openSUSE 12.2 (bnc#796242), never in SLE. Fix it. - usermod -s /usr/sbin/nologin %{USER} -else - useradd -r -g %{GROUP} -s /usr/sbin/nologin -c "Smart Card Reader" -d /var/run/pcscd %{USER} -fi +getent passwd %{USER} >/dev/null || useradd -r -g %{GROUP} -s /usr/sbin/nologin -c "Smart Card Reader" -d /var/run/pcscd %{USER} %if %suse_version > 1140 %service_add_pre pcscd.service pcscd.socket +# trick: service existed before, but it had no preset before 13.2 and in SLE12. Force %%service_add_post to run preset. +if [ $1 -gt 1 ] ; then + if ! test -f /usr/lib/systemd/system-preset/50-pcscd.preset ; then + echo -n "" >/run/rpm-%{name}-update-pcscd.socket-new-in-upgrade + echo -n "" >/run/rpm-%{name}-update-pcscd.service-new-in-upgrade + fi +fi %endif -exit 0 %post %if %suse_version > 1140 %service_add_post pcscd.service pcscd.socket -/bin/systemctl disable pcscd.service || : -/bin/systemctl enable pcscd.socket || : -/bin/systemctl try-restart pcscd.service || : -/bin/systemctl restart pcscd.socket || : %endif %if %suse_version < 1310 %fillup_and_insserv -y -n pcscd pcscd %else -%fillup_only pcscd +%fillup_only -n pcscd %endif %preun @@ -259,6 +259,7 @@ %if %suse_version < 1310 %{_initrddir}/pcscd %endif +/usr/lib/systemd/system-preset/50-pcscd.preset /var/adm/fillup-templates/sysconfig.pcscd # libpcsclite.so should stay in the main package (#732911). Third party packages may need it for dlopen(). %{_libdir}/libpcsclite.so ++++++ systemd-service.patch ++++++ --- /var/tmp/diff_new_pack.DBTl5y/_old 2014-11-04 17:28:12.000000000 +0100 +++ /var/tmp/diff_new_pack.DBTl5y/_new 2014-11-04 17:28:12.000000000 +0100 @@ -7,7 +7,7 @@ [Service] -ExecStart=@sbindir_exp@/pcscd --foreground --auto-exit -+Environment=PCSCD_OPTIONS="" ++Environment="PCSCD_OPTIONS=" +EnvironmentFile=-/etc/sysconfig/pcscd +ExecStart=@sbindir_exp@/pcscd --foreground --auto-exit $PCSCD_OPTIONS ExecReload=@sbindir_exp@/pcscd --hotplug -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
