From 210f2d9d1cb9ce8e305b0f30e692407bc59aa159 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 21 Jun 2014 22:23:16 +0200 Subject: [PATCH] - updated to 2.5.4 - updated config patch - removed obsolete db,flex patches --- inn-config.patch | 23 +++++++++++++---------- inn-db.patch | 46 ---------------------------------------------- inn-flex.patch | 11 ----------- inn.spec | 17 ++++++++--------- 4 files changed, 21 insertions(+), 76 deletions(-) delete mode 100644 inn-db.patch delete mode 100644 inn-flex.patch diff --git a/inn-config.patch b/inn-config.patch index 72c7808..6e79425 100644 --- a/inn-config.patch +++ b/inn-config.patch @@ -114,14 +114,11 @@ diff -Nur old/samples/cycbuff.conf new/samples/cycbuff.conf nicenewnews: 0 nicennrpd: 0 pauseretrytime: 300 ---- inn-2.5.3/samples/newsfeeds.in.orig 2012-06-15 20:25:36.000000000 +0200 -+++ inn-2.5.3/samples/newsfeeds.in 2013-06-13 16:26:55.857199461 +0200 -@@ -41,8 +41,18 @@ - # Empty default subscription list, reject all incoming articles (including - # locally posted articles) with a distribution of "local" or - # "collabra-internal", accept all others. --ME:!*/!local,!collabra-internal:: -+#ME:!*/!local,!collabra-internal:: +--- inn-2.5.4/samples/newsfeeds.in.orig 2014-05-17 10:24:49.000000000 +0200 ++++ inn-2.5.4/samples/newsfeeds.in 2014-06-21 21:14:00.955356887 +0200 +@@ -40,11 +40,21 @@ + ## For the ME line (and the ME line *only*), patterns affect *outgoing* + ## feeds and distributions affect *incoming* feeds (including local posts). +## Default of everything to everybody except for junk, control, anything +## with "local" as the newsgroup prefix (i.e. matches "localhost.stuff") or @@ -133,10 +130,16 @@ diff -Nur old/samples/cycbuff.conf new/samples/cycbuff.conf + /pl,world,usa,na,gnu,bionet,pubnet,u3b,eunet,vmsnet,inet,ddn,k12\ + :: + + # Empty default subscription list, reject all incoming articles (including + # locally posted articles) with a distribution of "local" or + # "collabra-internal", accept all others (including articles that do not + # have a Distribution: header field). +-ME:!*/!local,!collabra-internal:: ++#ME:!*/!local,!collabra-internal:: + # The same as the above, but would reject all posts that have # news.example.com in the path (posts passing through that site). - #ME/news.example.com:!*/!local,!collabra-internal:: -@@ -139,4 +149,4 @@ +@@ -142,4 +152,4 @@ # come with INN). #capture!\ # :*/foo\ diff --git a/inn-db.patch b/inn-db.patch deleted file mode 100644 index a8dcddf..0000000 --- a/inn-db.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- inn-2.4.4/authprogs/ckpasswd.c.orig 2008-05-05 12:18:36.000000000 +0200 -+++ inn-2.4.4/authprogs/ckpasswd.c 2008-06-12 23:17:16.157845226 +0200 -@@ -26,11 +26,11 @@ - #include - - #if defined(HAVE_DBM) || defined(HAVE_BDB_DBM) --# if HAVE_NDBM_H --# include --# elif HAVE_BDB_DBM -+# if HAVE_BDB_DBM - # define DB_DBM_HSEARCH 1 - # include -+# elif HAVE_NDBM_H -+# include - # elif HAVE_GDBM_NDBM_H - # include - # elif HAVE_DB1_NDBM_H ---- inn-2.5.3/m4/berkeleydb.m4.orig 2013-06-11 21:16:28.320439059 +0200 -+++ inn-2.5.3/m4/berkeleydb.m4 2013-06-11 20:36:38.617155533 +0200 -@@ -33,8 +33,13 @@ - if test x"$DB_DIR" = xyes ; then - AC_MSG_ERROR([cannot find Berkeley DB]) - else -+ if test x"$DB_DIR" = x"/usr" ; then -+ DB_CPPFLAGS= -+ DB_LDFLAGS= -+ else - DB_CPPFLAGS="-I$DB_DIR/include" - DB_LDFLAGS="-L$DB_DIR/lib" -+ fi - DB_LIBS="-ldb" - AC_MSG_RESULT([$DB_DIR]) - fi ---- inn-2.5.3/configure.ac.orig 2013-06-11 21:17:03.440438325 +0200 -+++ inn-2.5.3/configure.ac 2013-06-11 21:47:46.747066572 +0200 -@@ -384,10 +384,6 @@ - stdint.h string.h sys/bitypes.h sys/filio.h sys/loadavg.h \ - sys/select.h sys/time.h unistd.h]) - --dnl Some Linux systems have db1/ndbm.h instead of ndbm.h. Others have --dnl gdbm-ndbm.h. --AC_CHECK_HEADERS([ndbm.h db1/ndbm.h gdbm-ndbm.h], [break]) -- - dnl Check for whether various symbols are declared. - AC_CHECK_DECLS([pread, pwrite, snprintf, setproctitle, strlcat, - strlcpy, vsnprintf]) diff --git a/inn-flex.patch b/inn-flex.patch deleted file mode 100644 index 6b3c6bb..0000000 --- a/inn-flex.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- inn-2.5.3/innfeed/configfile.l.orig 2013-06-13 17:24:55.700460265 +0200 -+++ inn-2.5.3/innfeed/configfile.l 2013-06-13 17:32:01.870451380 +0200 -@@ -36,7 +36,7 @@ - int yyget_lineno(void); - FILE *yyget_in(void); - FILE *yyget_out(void); --int yyget_leng(void); -+yy_size_t yyget_leng(void); - char *yyget_text(void); - int yyget_debug(void); - void yyset_lineno(int); diff --git a/inn.spec b/inn.spec index 3010b47..754b796 100644 --- a/inn.spec +++ b/inn.spec @@ -11,12 +11,12 @@ Summary(pl.UTF-8): INN, serwer nowinek Summary(pt_BR.UTF-8): INN, InterNet News System (servidor news) Summary(tr.UTF-8): INN, InterNet Haber Sistemi (haber sunucu) Name: inn -Version: 2.5.3 -Release: 2 +Version: 2.5.4 +Release: 1 License: distributable Group: Networking/Daemons Source0: ftp://ftp.isc.org/isc/inn/%{name}-%{version}.tar.gz -# Source0-md5: 353fe95232828ddbc80debff86c240bc +# Source0-md5: ad9f77a1c84c668ccd268792721a2215 Source1: %{name}-default-active Source2: %{name}-default-distributions Source3: %{name}-default-newsgroups @@ -29,12 +29,10 @@ Source9: %{name}d.8.pl Source10: %{name}.tmpfiles Patch0: %{name}-PLD.patch Patch1: %{name}-install.patch -Patch2: %{name}-db.patch Patch3: %{name}-setgid.patch Patch4: %{name}-config.patch Patch5: %{name}-asneeded.patch Patch6: %{name}-nnrpd_no_trace.patch -Patch7: %{name}-flex.patch Patch8: %{name}-libdir.patch URL: https://www.isc.org/software/inn/ BuildRequires: autoconf >= 2.61 @@ -247,12 +245,10 @@ sunucuya makaleyi yollar. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 touch innfeed/*.[ly] @@ -316,6 +312,7 @@ install -d $RPM_BUILD_ROOT/etc/{news/pgp,rc.d/init.d,cron.d,logrotate.d} \ PATHAUTHRESOLV=%{_libdir}/news/auth/resolv cp -p samples/readers.conf $RPM_BUILD_ROOT%{_sysconfdir}/readers.conf +touch $RPM_BUILD_ROOT%{_sysconfdir}/motd.{innd,nnrpd} cp -p %{SOURCE1} $RPM_BUILD_ROOT/var/lib/news/active cp -p %{SOURCE2} $RPM_BUILD_ROOT/var/lib/news/distributions @@ -453,6 +450,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/expire.ctl %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/incoming.conf %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/inn.conf +%attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/inn-radius.conf %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/innfeed.conf %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/innreport.conf %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/innshellvars.local @@ -462,7 +460,9 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/localgroups %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/moderators %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/motd.innd +%{_sysconfdir}/motd.innd.sample %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/motd.nnrpd +%{_sysconfdir}/motd.nnrpd.sample %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/news2mail.cf %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/newsfeeds %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nnrpd.track @@ -470,7 +470,6 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nocem.ctl %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ovdb.conf %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/passwd.nntp -%attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/radius.conf %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/readers.conf %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/send-uucp.cf %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/storage.conf @@ -625,6 +624,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a %{_mandir}/man5/history.5* %{_mandir}/man5/incoming.conf.5* %{_mandir}/man5/inn.conf.5* +%{_mandir}/man5/inn-radius.conf.5* %{_mandir}/man5/innfeed.conf.5* %{_mandir}/man5/innwatch.ctl.5* %{_mandir}/man5/localgroups.5* @@ -640,7 +640,6 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a %{_mandir}/man5/nocem.ctl.5* %{_mandir}/man5/ovdb.5* %{_mandir}/man5/passwd.nntp.5* -%{_mandir}/man5/radius.conf.5* %{_mandir}/man5/readers.conf.5* %{_mandir}/man5/storage.conf.5* %{_mandir}/man5/subscriptions.5* -- 2.43.0