- updated to 2.6.0 (note: new soname; some configurations may need manual update...

- updated PLD,install,asneeded patches
- changed http dir to /var/lib/news/http, INN stores HTML status pages there

diff --git a/inn-PLD.patch b/inn-PLD.patch
index 5446ef62c26273b88343c7236b25f4ee11146382..8738f6c3e6ac7f1e28e67b77a38104fb55d5e76f 100644 (file)
--- a/inn-PLD.patch
+++ b/inn-PLD.patch
@@ -26,20 +26,6 @@
  
  /* Default prefix path is pathfilter. */
  #define INN_PATH_PERL_STARTUP_INND      "startup_innd.pl"
---- inn-2.4.0.orig/Makefile    2003-05-09 06:25:27.000000000 +0200
-+++ inn-2.4.0/Makefile 2003-06-29 12:57:10.000000000 +0200
-@@ -91,9 +91,9 @@
- directories:
-       @chmod +x support/install-sh
-       for D in $(INSTDIRS) ; do \
--          support/install-sh $(OWNER) -m 0755 -d $(D)$$D ; \
-+          support/install-sh -m 0755 -d $(D)$$D ; \
-       done
--      support/install-sh $(OWNER) -m 0750 -d $(D)$(PATHRUN)
-+      support/install-sh -m 0750 -d $(D)$(PATHRUN)
- 
- update: 
-       @chmod +x support/install-sh
 --- inn-2.5.3/Makefile.global.in.orig  2013-06-11 17:54:53.957357808 +0200
 +++ inn-2.5.3/Makefile.global.in       2013-06-11 17:57:11.437354942 +0200
 @@ -250,7 +250,7 @@

diff --git a/inn-asneeded.patch b/inn-asneeded.patch
index 9db1e8e61da54c08c1a3eb5f9ef56a9713dcbd2f..c8af19d95484c3b84f89951989a1a740bd6fc2f9 100644 (file)
--- a/inn-asneeded.patch
+++ b/inn-asneeded.patch
@@ -33,9 +33,9 @@
  grephistory:  grephistory.o  $(BOTH)   ; $(LINK) grephistory.o  $(STORELIBS)
  makedbz:      makedbz.o      $(LIBINN) ; $(LINK) makedbz.o      $(INNLIBS)
  makehistory:  makehistory.o  $(BOTH)   ; $(LINK) makehistory.o  $(STORELIBS)
---- inn-2.4.3/frontends/Makefile.orig  2008-02-17 20:05:39.596270000 +0100
-+++ inn-2.4.3/frontends/Makefile       2008-02-17 21:18:41.001952358 +0100
-@@ -71,12 +71,12 @@
+--- inn-2.6.0/frontends/Makefile.orig  2016-01-27 17:55:05.173836912 +0100
++++ inn-2.6.0/frontends/Makefile       2016-01-27 18:37:03.467064565 +0100
+@@ -75,12 +75,12 @@
  getlist:      getlist.o      $(LIBINN) ; $(LINK) getlist.o      $(INNLIBS)
  inews:                inews.o        $(LIBINN) ; $(LINK) inews.o        $(INNLIBS)
  innconfval:   innconfval.o   $(LIBINN) ; $(LINK) innconfval.o   $(INNLIBS)
@@ -43,17 +43,17 @@
 -ovdb_monitor: ovdb_monitor.o $(BOTH)   ; $(LINK) ovdb_monitor.o $(STORELIBS)
 -ovdb_server:  ovdb_server.o  $(BOTH)   ; $(LINK) ovdb_server.o  $(STORELIBS)
 -ovdb_stat:    ovdb_stat.o    $(BOTH)   ; $(LINK) ovdb_stat.o    $(STORELIBS)
--rnews:                rnews.o        $(LIBINN) ; $(LINK) rnews.o        $(STORELIBS)
+-rnews:                rnews.o        $(BOTH)   ; $(LINK) rnews.o        $(STORELIBS)
 -sm:           sm.o           $(BOTH)   ; $(LINK) sm.o           $(STORELIBS)
 +ovdb_init:    ovdb_init.o    $(BOTH)   ; $(LINK) ovdb_init.o    -Wl,-no-as-needed $(STORELIBS)
 +ovdb_monitor: ovdb_monitor.o $(BOTH)   ; $(LINK) ovdb_monitor.o -Wl,-no-as-needed $(STORELIBS)
 +ovdb_server:  ovdb_server.o  $(BOTH)   ; $(LINK) ovdb_server.o  -Wl,-no-as-needed $(STORELIBS)
 +ovdb_stat:    ovdb_stat.o    $(BOTH)   ; $(LINK) ovdb_stat.o    -Wl,-no-as-needed $(STORELIBS)
-+rnews:                rnews.o        $(LIBINN) ; $(LINK) rnews.o        -Wl,-no-as-needed $(STORELIBS)
++rnews:                rnews.o        $(BOTH)   ; $(LINK) rnews.o        -Wl,-no-as-needed $(STORELIBS)
 +sm:           sm.o           $(BOTH)   ; $(LINK) sm.o           -Wl,-no-as-needed $(STORELIBS)
  
  ovdb_init.o: ovdb_init.c
-       $(CC) $(CFLAGS) $(BERKELEY_DB_CFLAGS) -c $<
+       $(CC) $(CFLAGS) $(BDB_CPPFLAGS) -c $<
 --- inn-2.5.3/innfeed/Makefile.orig    2013-06-13 17:45:04.430435070 +0200
 +++ inn-2.5.3/innfeed/Makefile 2013-06-13 17:52:19.910425989 +0200
 @@ -52,7 +52,7 @@
@@ -65,11 +65,11 @@
  
  config_y.c config_y.h: configfile.y
        $(YACC) -d $?
---- inn-2.5.3/storage/buffindexed/ovmethod.mk.orig     2012-06-15 20:25:36.000000000 +0200
-+++ inn-2.5.3/storage/buffindexed/ovmethod.mk  2013-06-13 18:00:36.177082319 +0200
+--- inn-2.6.0/storage/buffindexed/ovmethod.mk.orig     2016-01-27 17:55:05.177170246 +0100
++++ inn-2.6.0/storage/buffindexed/ovmethod.mk  2016-01-27 18:38:18.517061418 +0100
 @@ -5,4 +5,4 @@
  
- buffindexed/buffindexed_d: buffindexed/buffindexed_d.o libstorage.$(EXTLIB) $(LIBHIST)
-       $(LIBLD) $(LDFLAGS) -o $@ buffindexed/buffindexed_d.o \
+ buffindexed/buffindexed_d: buffindexed/buffindexed_d.$(EXTOBJ) libstorage.$(EXTLIB) $(LIBHIST)
+       $(LIBLD) $(LDFLAGS) -o $@ buffindexed/buffindexed_d.$(EXTOBJ) \
 -          $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)
 +          -Wl,-no-as-needed $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)

diff --git a/inn-install.patch b/inn-install.patch
index 6b9626fa482258010d53de25fbe660f6aff3b7f0..aed9deba0914a17f8dd0b01af5a3de46857ebf50 100644 (file)
--- a/inn-install.patch
+++ b/inn-install.patch
@@ -9,20 +9,3 @@
  LI_XPRI               = $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0550 $(BACKUP_OPTION)
  LI_XPUB               = $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0555 $(BACKUP_OPTION)
  
---- inn-2.5.3/site/Makefile.orig       2013-06-11 18:02:09.357348733 +0200
-+++ inn-2.5.3/site/Makefile    2013-06-11 18:05:13.754011556 +0200
-@@ -145,13 +145,9 @@
- $D$(PATH_NEWSGROUPS): ; $(CP_DATA) newsgroups.minimal $@
- $D$(PATH_ACTIVE_TIMES):
-       touch $@
--      chown $(RUNASUSER) $@
--      chgrp $(RUNASGROUP) $@
-       chmod $(FILEMODE) $@
- $D$(PATH_HISTORY):
-       touch $@
--      chown $(RUNASUSER) $@
--      chgrp $(RUNASGROUP) $@
-       chmod $(FILEMODE) $@
--      test -z "$D" && $(PATHBIN)/makedbz -i -o
-+      test -z "$D" && $(PATHBIN)/makedbz -i -o || :
- 

diff --git a/inn.spec b/inn.spec
index 24985ee7b2843527c4a87a6774115c7038b5e16d..20cd3d0fb681ac49471ff44c56709473abc039c0 100644 (file)
--- a/inn.spec
+++ b/inn.spec
@@ -1,6 +1,7 @@
-#
+
 # Conditional build:
 %bcond_with    largefiles      # enable largefiles (disables tagged hash)
+%bcond_without python          # embedded Python module support
 
 %include       /usr/lib/rpm/macros.perl
 Summary:       INN, the InterNet News System (news server)
@@ -11,12 +12,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.4
-Release:       4
+Version:       2.6.0
+Release:       1
 License:       distributable
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/inn/%{name}-%{version}.tar.gz
-# Source0-md5: ad9f77a1c84c668ccd268792721a2215
+# Source0-md5: e904c2a4d2f917d79b9cfdc94b17e275
 Source1:       %{name}-default-active
 Source2:       %{name}-default-distributions
 Source3:       %{name}-default-newsgroups
@@ -38,14 +39,17 @@ URL:                https://www.isc.org/software/inn/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
 BuildRequires: bison
+BuildRequires: cyrus-sasl-devel >= 2
 BuildRequires: db-devel >= 4.4
 BuildRequires: flex >= 2.5.37
 BuildRequires: heimdal-devel
 BuildRequires: libtool >= 2:2
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: perl-devel >= 1:5.8.0
+%{?with_python:BuildRequires:  python-devel >= 2.2}
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.663
+BuildRequires: zlib-devel
 Requires(post):        /bin/kill
 Requires(post):        /usr/bin/getent
 Requires(post):        /usr/sbin/usermod
@@ -269,22 +273,20 @@ cp -f /usr/share/automake/config.* support
        --with-control-dir=%{_datadir}/news/control \
        --with-db-dir=/var/lib/news \
        --with-filter-dir=%{_datadir}/news/filter \
-       --with-http-dir=%{_datadir}/news/http \
+       --with-http-dir=/var/lib/news/http \
        --with-innlib-dir=%{_datadir}/news \
        --with-libperl-dir=%{perl_vendorlib} \
        --with-log-dir=/var/log/news \
        --with-run-dir=/var/run/news \
        --with-spool-dir=/var/spool/news \
        --with-tmp-dir=/var/spool/news/incoming/tmp \
-       --with-berkeleydb=%{_prefix} \
+       --with-bdb=%{_prefix} \
        --with-openssl=%{_prefix} \
        --with-perl \
+       %{?with_python:--with-python} \
        --with-sendmail=/usr/lib/sendmail \
-       --enable-ipv6 \
        %{?with_largefiles:--enable-largefiles} \
-       --enable-libtool \
-       --enable-shared \
-       --enable-static \
+       --enable-reduced-depends \
        %{!?with_largefiles:--enable-tagged-hash}
 
 %{__make} all \
@@ -412,11 +414,14 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %attr(664,news,news) %ghost /var/lib/news/history
 
 # LOGS
-%{systemdtmpfilesdir}/%{name}.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/inn
 # note: innd (and maybe others) creates files in this directory
 %attr(771,root,news) %dir /var/log/news
 %attr(770,news,news) %dir /var/run/news
+%{systemdtmpfilesdir}/%{name}.conf
+# http status pages
+%attr(775,root,news) %dir /var/lib/news/http
+/var/lib/news/http/innreport.css
 
 # SPOOL
 %attr(771,root,news) %dir /var/spool/news
@@ -479,8 +484,6 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %attr(755,root,news) %dir %{_datadir}/news
 %dir %{_datadir}/news/control
 %dir %{_datadir}/news/filter
-%dir %{_datadir}/news/http
-%{_datadir}/news/http/innreport.css
 
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/news/innreport_inn.pm
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/news/innshellvars
@@ -646,6 +649,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %{_mandir}/man8/actsync.8*
 %{_mandir}/man8/actsyncd.8*
 %{_mandir}/man8/archive.8*
+%{_mandir}/man8/auth_krb5.8*
 %{_mandir}/man8/batcher.8*
 %{_mandir}/man8/buffchan.8*
 %{_mandir}/man8/ckpasswd.8*
@@ -705,11 +709,11 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libinn.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libinn.so.2
+%attr(755,root,root) %ghost %{_libdir}/libinn.so.3
 %attr(755,root,root) %{_libdir}/libinnhist.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libinnhist.so.2
+%attr(755,root,root) %ghost %{_libdir}/libinnhist.so.3
 %attr(755,root,root) %{_libdir}/libstorage.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libstorage.so.2
+%attr(755,root,root) %ghost %{_libdir}/libstorage.so.3
 
 %files devel
 %defattr(644,root,root,755)