Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package inn for openSUSE:Factory checked in at 2021-02-15 23:17:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inn (Old) and /work/SRC/openSUSE:Factory/.inn.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inn" Mon Feb 15 23:17:53 2021 rev:41 rq:871604 version:2.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/inn/inn.changes 2020-11-09 16:30:50.187233275 +0100 +++ /work/SRC/openSUSE:Factory/.inn.new.28504/inn.changes 2021-02-15 23:20:20.635758174 +0100 @@ -1,0 +2,5 @@ +Sun Dec 20 17:07:57 UTC 2020 - Callum Farmer <gm...@opensuse.org> + +- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inn.spec ++++++ --- /var/tmp/diff_new_pack.DJrj06/_old 2021-02-15 23:20:21.527759506 +0100 +++ /var/tmp/diff_new_pack.DJrj06/_new 2021-02-15 23:20:21.531759513 +0100 @@ -15,7 +15,13 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - +%if "%{_libexecdir}"=="/usr/libexec" +%define search usr\\/libexec +%define nslash usr/libexec +%else +%define search usr\\/lib +%define nslash usr/lib +%endif Name: inn BuildRequires: bison BuildRequires: gdbm-devel @@ -92,6 +98,7 @@ %setup -n inn%{PatchVersion} %setup -n inn%{PatchVersion} -D -T -a 1 %setup -n inn%{PatchVersion} -D -T -a 3 +sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE7} %{PATCH0} %patch0 -p1 cp -a $RPM_SOURCE_DIR/pubring.pgp . @@ -100,7 +107,7 @@ LDFLAGS="-pie" CFLAGS="$RPM_OPT_FLAGS -pipe -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fPIE -fstack-protector -fcommon" ./configure \ --enable-uucp-rnews \ --enable-setgid-inews \ - --prefix=/usr/lib/news \ + --prefix=%{_libexecdir}/news \ --sysconfdir=/etc/news \ --mandir=%{_mandir} \ --disable-shared \ @@ -129,7 +136,7 @@ %install mkdir -p %{buildroot}/etc -mkdir -p %{buildroot}/usr/lib +mkdir -p %{buildroot}%{_libexecdir} mkdir -p %{buildroot}/usr/bin mkdir -p %{buildroot}/var/lib mkdir -p %{buildroot}/var/log @@ -148,12 +155,12 @@ gzip -nf9 "$i" fi done -chmod 444 %{buildroot}/usr/lib/news/lib/*.a +chmod 444 %{buildroot}%{_libexecdir}/news/lib/*.a # those just die("BerkeleyDB support not compiled"); -rm %{buildroot}/usr/lib/news/bin/ovdb_server -rm %{buildroot}/usr/lib/news/bin/ovdb_stat -ln %{buildroot}/usr/lib/news/bin/ovdb_init %{buildroot}/usr/lib/news/bin/ovdb_server -ln %{buildroot}/usr/lib/news/bin/ovdb_init %{buildroot}/usr/lib/news/bin/ovdb_stat +rm %{buildroot}%{_libexecdir}/news/bin/ovdb_server +rm %{buildroot}%{_libexecdir}/news/bin/ovdb_stat +ln %{buildroot}%{_libexecdir}/news/bin/ovdb_init %{buildroot}%{_libexecdir}/news/bin/ovdb_server +ln %{buildroot}%{_libexecdir}/news/bin/ovdb_init %{buildroot}%{_libexecdir}/news/bin/ovdb_stat # # # @@ -171,9 +178,9 @@ %{installnews} 0644 samples/send-uucp.cf %{buildroot}/etc/news %{installnews} 0755 -d %{buildroot}/var/log/news/http %{installnews} 0755 -d %{buildroot}/var/log/news/http/pics -%{installnews} 0555 convertspool %{buildroot}/usr/lib/news/bin -%{installnews} 0755 -d %{buildroot}/usr/lib/news/include -%{installnews} 0755 -d %{buildroot}/usr/lib/news/include/inn +%{installnews} 0555 convertspool %{buildroot}%{_libexecdir}/news/bin +%{installnews} 0755 -d %{buildroot}%{_libexecdir}/news/include +%{installnews} 0755 -d %{buildroot}%{_libexecdir}/news/include/inn # # # @@ -182,9 +189,9 @@ # # compat links # -ln -sf bin/inews %{buildroot}/usr/lib/news/inews -ln -sf ../lib/news/bin/inews %{buildroot}/usr/bin/inews -ln -sf ../lib/news/bin/rnews %{buildroot}/usr/bin/rnews +ln -sf bin/inews %{buildroot}%{_libexecdir}/news/inews +ln -sf %{_libexecdir}/news/bin/inews %{buildroot}/usr/bin/inews +ln -sf %{_libexecdir}/news/bin/rnews %{buildroot}/usr/bin/rnews # # other links # @@ -218,15 +225,15 @@ # %define filelist %{name}-filelist find %{buildroot} -type d -printf "/%%P\n" | awk ' -! /^\/(etc|usr\/lib|var\/lib|var\/log|var\/spool|var\/run)\/news/ { next } +! /^\/(etc|%{search}|var\/lib|var\/log|var\/spool|var\/run)\/news/ { next } $0 == "/etc/news" { next } -$0 == "/usr/lib/news/include" { next } -$0 == "/usr/lib/news/include/inn" { next } +$0 == "%{_libexecdir}/news/include" { next } +$0 == "%{_libexecdir}/news/include/inn" { next } $0 == "/var/run/news" { next } { pfx="" } -$0 == "/usr/lib/news" { pfx = "%%attr(755,root,root) " } +$0 == "%{_libexecdir}/news" { pfx = "%%attr(755,root,root) " } $0 == "/var/lib/news" { pfx = "%%attr(755,news,news) " } -$0 == "/usr/lib/news/bin" { pfx = "%%attr(755,root,root) " } +$0 == "%{_libexecdir}/news/bin" { pfx = "%%attr(755,root,root) " } $0 == "/var/spool/news" { pfx = "%%attr(775,news,news) " } $0 == "/var/run/news" { pfx = "%ghost %%attr(750,news,news) "} /\/news/ { @@ -236,12 +243,12 @@ ' > %{filelist} find %{buildroot} ! -type d -printf "/%%P\n" | awk ' { pfx="" } -/^\/usr\/lib\/news\/include/ { next } -/^\/usr\/lib\/news\/lib\/.*\.a/ { next } -$0 == "/usr/lib/news/bin/inews" { pfx="%attr(2555,news,news) " } -$0 == "/usr/lib/news/bin/rnews" { pfx="%attr(4550,news,uucp) " } -$0 == "/usr/lib/news/bin/innbind" { pfx="%verify(not mode) %attr(4550,root,news) " } -/^\/(etc\/news|usr\/lib\/news\/bin\/filter|var\/lib\/news)\// { +/^\/%{search}\/news\/include/ { next } +/^\/%{search}\/news\/lib\/.*\.a/ { next } +$0 == "%{_libexecdir}/news/bin/inews" { pfx="%attr(2555,news,news) " } +$0 == "%{_libexecdir}/news/bin/rnews" { pfx="%attr(4550,news,uucp) " } +$0 == "%{_libexecdir}/news/bin/innbind" { pfx="%verify(not mode) %attr(4550,root,news) " } +/^\/(etc\/news|%{search}\/news\/bin\/filter|var\/lib\/news)\// { pfx="%config(noreplace) "pfx } /\/man\/man/ { @@ -256,6 +263,7 @@ /^\/etc\/slp\.reg\.d\// { next } { print pfx $0 } ' >> %{filelist} + # # # @@ -273,27 +281,27 @@ var/log/news/news \ var/log/news/inn.status \ var/log/news/innfeed.status -if test -e usr/lib/news/bin/control/version -o -e usr/lib/news/bin/inndstart ; then +if test -e %{nslash}/news/bin/control/version -o -e %{nslash}/news/bin/inndstart ; then rm -f etc/news/inn.conf.OLD rm -f etc/news/newsfeeds.OLD - usr/lib/news/bin/innupgrade etc/news + %{nslash}/news/bin/innupgrade etc/news fi if ! test -d /var/run/news ; then install -d -m 750 -o news -g news /var/run/news fi -%set_permissions /usr/lib/news/bin/innbind /usr/lib/news/bin/inews /usr/lib/news/bin/rnews +%set_permissions %{_libexecdir}/news/bin/innbind %{_libexecdir}/news/bin/inews %{_libexecdir}/news/bin/rnews %service_add_post inn.service %tmpfiles_create inn.conf %post -n mininews -%set_permissions /usr/lib/news/bin/inews /usr/lib/news/bin/rnews +%set_permissions %{_libexecdir}/news/bin/inews %{_libexecdir}/news/bin/rnews %tmpfiles_create inn.conf %verifyscript -%verify_permissions -e /usr/lib/news/bin/innbind -e /usr/lib/news/bin/inews -e /usr/lib/news/bin/rnews +%verify_permissions -e %{_libexecdir}/news/bin/innbind -e %{_libexecdir}/news/bin/inews -e %{_libexecdir}/news/bin/rnews %verifyscript -n mininews -%verify_permissions -e /usr/lib/news/bin/inews -e /usr/lib/news/bin/rnews +%verify_permissions -e %{_libexecdir}/news/bin/inews -e %{_libexecdir}/news/bin/rnews %preun %service_del_preun inn.service @@ -310,17 +318,17 @@ %files devel %defattr(-,root,root) -/usr/lib/news/include -/usr/lib/news/lib/*.a +%{_libexecdir}/news/include +%{_libexecdir}/news/lib/*.a %files -n mininews %defattr(-,root,root) %config(noreplace) /etc/news/inn.conf -%dir /usr/lib/news/bin -%attr(4550,news,uucp) /usr/lib/news/bin/rnews -%attr(2555,news,news) /usr/lib/news/bin/inews +%dir %{_libexecdir}/news/bin +%attr(4550,news,uucp) %{_libexecdir}/news/bin/rnews +%attr(2555,news,news) %{_libexecdir}/news/bin/inews /usr/bin/[ri]news - /usr/lib/news/[ri]news + %{_libexecdir}/news/[ri]news %doc %{_mandir}/*/inn.conf.* %doc %{_mandir}/*/[ri]news.* ++++++ inn-2.6.3.diff ++++++ --- /var/tmp/diff_new_pack.DJrj06/_old 2021-02-15 23:20:21.559759554 +0100 +++ /var/tmp/diff_new_pack.DJrj06/_new 2021-02-15 23:20:21.563759560 +0100 @@ -7,8 +7,8 @@ +========================= + +The INN news system is installed under the directories /etc/news, -+/usr/lib/news, /var/lib/news, /var/spool/news and /var/log/news. -+/usr/lib/news contains only binaries and files that normally do not need ++@LIBEXECDIR@/news, /var/lib/news, /var/spool/news and /var/log/news. ++@LIBEXECDIR@/news contains only binaries and files that normally do not need +changes. All config files are in /etc/news, the database files in +/var/lib/news and the log files in /var/log/news. + @@ -17,7 +17,7 @@ +"tradindexed" overview goes into /var/spool/news/overview. + +rnews is in /usr/bin/rnews and inews is in /usr/bin/inews and -+/usr/lib/news/inews (deprecated). ++@LIBEXECDIR@/news/inews (deprecated). + +Many things have to be done as user "news". So you should give the "news" +user a normal password and work on that account. @@ -89,7 +89,7 @@ + overview entries. You also have to add an entry for the + controlchan channel: + controlchan!:!*,control,control.*,!control.cancel\ -+ :Tc,Wnsm:/usr/lib/news/bin/controlchan ++ :Tc,Wnsm:@LIBEXECDIR@/news/bin/controlchan + +After that you have to decide what to do with your old articles. +We have provided an upgrade script for your convenience: convertspool. @@ -116,7 +116,7 @@ +++ inn-2.6.3/convertspool @@ -0,0 +1,142 @@ +#!/bin/sh -+. /usr/lib/news/lib/innshellvars ++. @LIBEXECDIR@/news/lib/innshellvars + +test -n "$UID" || UID="$(id -ru)" +test "x$UID" = x0 && { @@ -267,7 +267,7 @@ + + +# to expire old news-artikel -+#15 4 * * * news /usr/lib/news/bin/news.daily expireover delayrm lowmark ++#15 4 * * * news @LIBEXECDIR@/news/bin/news.daily expireover delayrm lowmark + +# canceled articles are not removed from the overview database. so we just +# rnews stores news-artikel in /var/spool/news/in.coming, if INN ist @@ -281,16 +281,16 @@ +# -exec rnews -S localhost \{\} \; -exec rm -f \{\} \; + +# feed news via innxmit to multiple hosts, configured with nntpsend.ctl -+#*/5 * * * * news /usr/lib/news/bin/nntpsend ++#*/5 * * * * news @LIBEXECDIR@/news/bin/nntpsend + +# feed news for directly connected sites (if you don't use nntpsend) -+#15 * * * * news /usr/lib/news/bin/send-nntp news.server.com ++#15 * * * * news @LIBEXECDIR@/news/bin/send-nntp news.server.com + +# feed news to a uucp-connected machine -+#15 * * * * news /usr/lib/news/bin/sendbatch -c wg >/dev/null ++#15 * * * * news @LIBEXECDIR@/news/bin/sendbatch -c wg >/dev/null +# the configuration file for this alternate perl-script is +# /etc/news/send-uucp.cf. -+#15 * * * * news /usr/lib/news/bin/send-uucp.pl ++#15 * * * * news @LIBEXECDIR@/news/bin/send-uucp.pl + +# crontab-entry for uucp: +#20 */2 * * * uucp /usr/sbin/uucico -S wg @@ -365,8 +365,8 @@ --- /dev/null +++ inn-2.6.3/profile @@ -0,0 +1,3 @@ -+PATH=/usr/lib/news/bin:/usr/lib/news/bin/control:$PATH -+PATH=/usr/lib/news/lib:/usr/sbin:$PATH ++PATH=@LIBEXECDIR@/news/bin:@LIBEXECDIR@/news/bin/control:$PATH ++PATH=@LIBEXECDIR@/news/lib:/usr/sbin:$PATH +export PATH Index: inn-2.6.3/samples/cycbuff.conf =================================================================== ++++++ inn.service ++++++ --- /var/tmp/diff_new_pack.DJrj06/_old 2021-02-15 23:20:21.623759650 +0100 +++ /var/tmp/diff_new_pack.DJrj06/_new 2021-02-15 23:20:21.627759655 +0100 @@ -7,9 +7,9 @@ User=news PIDFile=/run/news/innd.pid Type=forking -ExecStart=/usr/lib/news/bin/rc.news -ExecStop=/usr/lib/news/bin/rc.news stop -ExecReload=/usr/lib/news/bin/rc.news reload +ExecStart=@LIBEXECDIR@/news/bin/rc.news +ExecStop=@LIBEXECDIR@/news/bin/rc.news stop +ExecReload=@LIBEXECDIR@/news/bin/rc.news reload KillMode=control-group [Install]
