Hello community, here is the log from the commit of package dante for openSUSE:Factory checked in at 2013-11-12 09:49:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dante (Old) and /work/SRC/openSUSE:Factory/.dante.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dante" Changes: -------- --- /work/SRC/openSUSE:Factory/dante/dante.changes 2013-01-02 12:56:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dante.new/dante.changes 2013-11-12 09:49:57.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Oct 27 14:30:14 UTC 2013 - [email protected] + +- Replace sysvinit with systemd + Package build only for Factory; no need to keep sysvinit support + alive +- Replace hard paths with RPM macros + +------------------------------------------------------------------- Old: ---- sockd.init New: ---- sockd.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dante.spec ++++++ --- /var/tmp/diff_new_pack.S6fcPz/_old 2013-11-12 09:49:58.000000000 +0100 +++ /var/tmp/diff_new_pack.S6fcPz/_new 2013-11-12 09:49:58.000000000 +0100 @@ -22,9 +22,8 @@ BuildRequires: cyrus-sasl-devel BuildRequires: libtool BuildRequires: pam-devel -%if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1000 BuildRequires: krb5-devel -%endif +BuildRequires: pkgconfig(systemd) Summary: A Free Socks v4 and v5 Client Implementation License: BSD-3-Clause Group: Productivity/Networking/Security @@ -33,14 +32,13 @@ Url: http://www.inet.no/dante/ # http://www.inet.no/dante/files/dante-%%{version}.tar.gz Source: dante-%{version}.tar.gz -Source1: sockd.init +Source1: sockd.service Source2: baselibs.conf Source3: %name-rpmlintrc 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 # SuSE series: sec %description @@ -68,7 +66,7 @@ Summary: A Free Socks v4/v5 Server Implementation Group: Productivity/Networking/Other Requires: dante -PreReq: %insserv_prereq %fillup_prereq +%{?systemd_requires} %description -n dante-server This package contains the socks proxy daemon and its documentation. The @@ -99,50 +97,50 @@ DANTELIBC=`find /%{_lib}/ -maxdepth 1 -iname "libc.so.*"` echo >> acinclude.m4 autoreconf --force --install --verbose -CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" \ +CFLAGS="%{optflags} -fno-strict-aliasing" \ %configure --disable-static --with-pic --enable-shared --with-libc=$DANTELIBC make %{?_smp_mflags} V=1 %install make install DESTDIR=${RPM_BUILD_ROOT} #set library as executable - prevent ldd from complaining -chmod +x ${RPM_BUILD_ROOT}%{_libdir}/*.so.*.* -install -d ${RPM_BUILD_ROOT}/etc/init.d \ - ${RPM_BUILD_ROOT}%{prefix}/bin \ - ${RPM_BUILD_ROOT}%{prefix}/usr/sbin -install -m 644 example/socks.conf ${RPM_BUILD_ROOT}/etc -install -m 644 example/sockd.conf ${RPM_BUILD_ROOT}/etc -install -m 755 %{S:1} ${RPM_BUILD_ROOT}/etc/init.d/sockd -ln -sf ../../etc/init.d/sockd ${RPM_BUILD_ROOT}/usr/sbin/rcsockd +chmod +x %{buildroot}%{_libdir}/*.so.*.* +install -d %{buildroot}%{_unitdir} \ + %{buildroot}%{_bindir} \ + %{buildroot}%{_sbindir} \ + %{buildroot}%{_sysconfdir} +install -m 644 example/socks.conf %{buildroot}/%{_sysconfdir} +install -m 644 example/sockd.conf %{buildroot}/%{_sysconfdir} +install -m 755 %{S:1} %{buildroot}/%{_unitdir}/sockd.service +ln -sf ../../%{_unitdir}/sockd.service %{buildroot}%{_sbindir}/rcsockd # # fix bug #23141 # -mv ${RPM_BUILD_ROOT}/usr/bin/socksify ${RPM_BUILD_ROOT}/usr/bin/socksify.old +mv %{buildroot}%{_bindir}/socksify %{buildroot}%{_bindir}/socksify.old # %ifarch alpha -sed -e 's|libdl.so|/lib/libdl.so.2.1|' < ${RPM_BUILD_ROOT}/usr/bin/socksify.old > ${RPM_BUILD_ROOT}/usr/bin/socksify +sed -e 's|libdl.so|/lib/libdl.so.2.1|' < %{buildroot}%{_bindir}/socksify.old > %{buildroot}%{_bindir}/socksify %else -sed -e 's|libdl.so|/%{_lib}/libdl.so.2|' < ${RPM_BUILD_ROOT}/usr/bin/socksify.old > ${RPM_BUILD_ROOT}/usr/bin/socksify +sed -e 's|libdl.so|/%{_lib}/libdl.so.2|' < %{buildroot}%{_bindir}/socksify.old > %{buildroot}%{_bindir}/socksify %endif # -rm ${RPM_BUILD_ROOT}/usr/bin/socksify.old +rm %{buildroot}%{_bindir}/socksify.old %{__rm} -f %{buildroot}%{_libdir}/*.la %__rm Makefile* SPECS/Makefile* %preun -n dante-server -%stop_on_removal +%service_del_preun sockd.service %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %post -n dante-server -%{fillup_and_insserv sockd} +%service_add_post sockd.service %postun -n dante-server -%{insserv_cleanup} -%restart_on_update +%service_del_postun sockd.service %files %defattr(-,root,root) @@ -152,7 +150,7 @@ %attr(755,root,root) %{_bindir}/socksify %doc %{_mandir}/man1/socksify.1.gz %doc %{_mandir}/man5/socks.conf.5.gz -%config(noreplace) /etc/socks.conf +%config(noreplace) %{_sysconfdir}/socks.conf %files -n %lname %defattr(-,root,root) @@ -165,9 +163,9 @@ %doc %{_mandir}/man8/sockd.8.gz %doc %{_mandir}/man5/sockd.conf.5.gz %attr(755,root,root) %{_sbindir}/sockd -%config(noreplace) /etc/sockd.conf -%attr(755,root,root) /etc/init.d/sockd -/usr/sbin/rcsockd +%config(noreplace) %{_sysconfdir}/sockd.conf +%attr(755,root,root) %{_unitdir}/sockd.service +%{_sbindir}/rcsockd %files -n dante-devel %defattr(-,root,root) ++++++ sockd.service ++++++ [Unit] Description=SOCKS v4 and v5 compatible proxy server and client After=network.target [Service] Type=forking EnvironmentFile=/etc/sockd.conf PIDFile=/run/sockd.pid ExecStart=/usr/sbin/sockd $SOCKD_OPTS [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
