- updated to 2.6.4

- updated PLD,asneeded patches
- removed obsolete no-common patch

diff --git a/inn-PLD.patch b/inn-PLD.patch
index 8738f6c3e6ac7f1e28e67b77a38104fb55d5e76f..4ed225750f2b81069aab926c439f39ec7106d72d 100644 (file)
--- a/inn-PLD.patch
+++ b/inn-PLD.patch
@@ -1,14 +1,23 @@
---- inn-2.5.3/doc/man/rnews.1.orig     2013-06-11 17:19:04.427402611 +0200
-+++ inn-2.5.3/doc/man/rnews.1  2013-06-11 17:41:12.624041596 +0200
-@@ -181,7 +181,7 @@
+--- inn-2.6.4/doc/man/rnews.1.orig     2021-05-16 18:02:27.608638493 +0200
++++ inn-2.6.4/doc/man/rnews.1  2021-05-16 18:06:02.730806409 +0200
+@@ -191,7 +191,7 @@
  .PP
- Otherwise, if the command is any other word, then \fBrnews\fR will try to
- execute a program with that name, looking for it in the directory
--\&\fIpathbin\fR/rnews.libexec.  The rest of the batch will be fed to that
-+/usr/lib*/news/rnews .  The rest of the batch will be fed to that
- program's standard input, and the standard output from the program will be
- treated as if it were the original input to \fBrnews\fR.  \s-1INN\s0 comes with three
- such standard batch processors:
+ Otherwise, if the command is any other word and the \fB\-a\fR flag is not
+ given, \fBrnews\fR will try to execute a program with that name, looking
+-for it in the directory \fIpathbin\fR/rnews.libexec.  The rest of the
++for it in the directory /usr/lib*/news/rnews .  The rest of the
+ batch will be fed to that program's standard input, and the standard
+ output from the program will be treated as if it were the original
+ input to \fBrnews\fR.  \s-1INN\s0 comes with three such standard batch processors:
+@@ -210,7 +210,7 @@
+ .IP "\fB\-a\fR" 4
+ .IX Item "-a"
+ By default, \fBrnews\fR looks for additional unpackers in the
+-\&\fIrnews.libexec\fR sub-directory of \fIpathbin\fR (as set in \fIinn.conf\fR).
++/usr/lib*/news/rnews directory (as set in \fIinn.conf\fR).
+ If \fB\-a\fR is given, no additional batch processor will be used; only
+ \&\f(CW\*(C`rnews\*(C'\fR and \f(CW\*(C`cunbatch\*(C'\fR will be recognized as valid batch commands.
+ .IP "\fB\-b\fR" 4
 --- inn-2.5.3/include/inn/paths.h.in.orig      2013-06-11 17:42:12.677373675 +0200
 +++ inn-2.5.3/include/inn/paths.h.in   2013-06-11 17:49:38.687364380 +0200
 @@ -22,12 +22,12 @@

diff --git a/inn-asneeded.patch b/inn-asneeded.patch
index 3ce62645ecc71ac7f67c51b202ad299f3aec6f70..0c0ff59e48ca29a6c19558db65421b59fd2ea64a 100644 (file)
--- a/inn-asneeded.patch
+++ b/inn-asneeded.patch
@@ -1,24 +1,24 @@
---- inn-2.5.3/backends/Makefile.orig   2013-06-13 17:45:04.427101736 +0200
-+++ inn-2.5.3/backends/Makefile        2013-06-13 17:51:35.673760252 +0200
-@@ -84,16 +84,16 @@
+--- inn-2.6.4/backends/Makefile.orig   2021-05-16 18:32:25.802230175 +0200
++++ inn-2.6.4/backends/Makefile        2021-05-16 18:36:01.467728481 +0200
+@@ -81,16 +81,16 @@
        @exit 1
  
  actsync:      actsync.o    $(LIBINN)  ; $(LINK) actsync.o    $(INNLIBS)
--archive:      archive.o    $(BOTH)    ; $(LINK) archive.o    $(STORELIBS)
--batcher:      batcher.o    $(BOTH)    ; $(LINK) batcher.o    $(STORELIBS)
--cvtbatch:     cvtbatch.o   $(BOTH)    ; $(LINK) cvtbatch.o   $(STORELIBS)
-+archive:      archive.o    $(BOTH)    ; $(LINK) archive.o    -Wl,-no-as-needed $(STORELIBS)
-+batcher:      batcher.o    $(BOTH)    ; $(LINK) batcher.o    -Wl,-no-as-needed $(STORELIBS)
-+cvtbatch:     cvtbatch.o   $(BOTH)    ; $(LINK) cvtbatch.o   -Wl,-no-as-needed $(STORELIBS)
+-archive:      archive.o    $(BOTH)    ; $(LINKDEPS) archive.o  $(STORELIBS)
+-batcher:      batcher.o    $(BOTH)    ; $(LINKDEPS) batcher.o  $(STORELIBS)
+-cvtbatch:     cvtbatch.o   $(BOTH)    ; $(LINKDEPS) cvtbatch.o $(STORELIBS)
++archive:      archive.o    $(BOTH)    ; $(LINKDEPS) archive.o  -Wl,-no-as-needed $(STORELIBS)
++batcher:      batcher.o    $(BOTH)    ; $(LINKDEPS) batcher.o  -Wl,-no-as-needed $(STORELIBS)
++cvtbatch:     cvtbatch.o   $(BOTH)    ; $(LINKDEPS) cvtbatch.o -Wl,-no-as-needed $(STORELIBS)
  innbind:      innbind.o    $(LIBINN)  ; $(LINK) innbind.o    $(INNLIBS)
--inndf:                inndf.o      $(BOTH)    ; $(LINK) inndf.o      $(STORELIBS)
-+inndf:                inndf.o      $(BOTH)    ; $(LINK) inndf.o      -Wl,-no-as-needed $(STORELIBS)
+-inndf:                inndf.o      $(BOTH)    ; $(LINKDEPS) inndf.o  $(STORELIBS)
++inndf:                inndf.o      $(BOTH)    ; $(LINKDEPS) inndf.o  -Wl,-no-as-needed $(STORELIBS)
  innxbatch:    innxbatch.o  $(LIBINN)  ; $(LINK) innxbatch.o  $(INNLIBS)
  innxmit:      innxmit.o    $(BOTH)    ; $(LINK) innxmit.o    $(STORELIBS)
  ninpaths:     ninpaths.o              ; $(LINK) ninpaths.o
  nntpget:      nntpget.o    $(BOTH)    ; $(LINK) nntpget.o    $(STORELIBS)
--overchan:     overchan.o   $(BOTH)    ; $(LINK) overchan.o   $(STORELIBS)
-+overchan:     overchan.o   $(BOTH)    ; $(LINK) overchan.o   -Wl,-no-as-needed $(STORELIBS)
+-overchan:     overchan.o   $(BOTH)    ; $(LINKDEPS) overchan.o $(STORELIBS)
++overchan:     overchan.o   $(BOTH)    ; $(LINKDEPS) overchan.o -Wl,-no-as-needed $(STORELIBS)
  shlock:               shlock.o     $(LIBINN)  ; $(LINK) shlock.o     $(INNLIBS)
  shrinkfile:   shrinkfile.o $(LIBINN)  ; $(LINK) shrinkfile.o $(INNLIBS)
  
@@ -33,24 +33,28 @@
  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.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)
+--- inn-2.6.4/frontends/Makefile.orig  2021-05-16 18:38:55.630118296 +0200
++++ inn-2.6.4/frontends/Makefile       2021-05-16 18:39:40.139877166 +0200
+@@ -81,16 +81,16 @@
  inews:                inews.o        $(LIBINN) ; $(LINK) inews.o        $(INNLIBS)
  innconfval:   innconfval.o   $(LIBINN) ; $(LINK) innconfval.o   $(INNLIBS)
--ovdb_init:    ovdb_init.o    $(BOTH)   ; $(LINK) ovdb_init.o    $(STORELIBS)
--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)
+ ovdb_init:    ovdb_init.o    $(BOTH)
+-      $(LINKDEPS) ovdb_init.o    $(STORELIBS)
++      $(LINKDEPS) ovdb_init.o    -Wl,-no-as-needed $(STORELIBS)
+ ovdb_monitor: ovdb_monitor.o $(BOTH)
+-      $(LINKDEPS) ovdb_monitor.o $(STORELIBS)
++      $(LINKDEPS) ovdb_monitor.o -Wl,-no-as-needed $(STORELIBS)
+ ovdb_server:  ovdb_server.o  $(BOTH)
+-      $(LINKDEPS) ovdb_server.o  $(STORELIBS)
++      $(LINKDEPS) ovdb_server.o  -Wl,-no-as-needed $(STORELIBS)
+ ovdb_stat:    ovdb_stat.o    $(BOTH)
+-      $(LINKDEPS) ovdb_stat.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)
++      $(LINKDEPS) ovdb_stat.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)
+ sm:           sm.o           $(BOTH)
+-      $(LINKDEPS) sm.o           $(STORELIBS)
++      $(LINKDEPS) sm.o           -Wl,-no-as-needed $(STORELIBS)
  
  ovdb_init.o: ovdb_init.c
        $(CC) $(CFLAGS) $(BDB_CPPFLAGS) -c $<
@@ -65,11 +69,11 @@
  
  config_y.c config_y.h: configfile.y
        $(YACC) -d configfile.y
---- 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
+--- inn-2.6.4/storage/buffindexed/ovmethod.mk.orig     2021-05-16 18:41:59.082457783 +0200
++++ inn-2.6.4/storage/buffindexed/ovmethod.mk  2021-05-16 18:42:25.558981014 +0200
 @@ -5,4 +5,4 @@
  
  buffindexed/buffindexed_d: buffindexed/buffindexed_d.$(EXTOBJ) libstorage.$(EXTLIB) $(LIBHIST)
-       $(LIBLD) $(LDFLAGS) -o $@ buffindexed/buffindexed_d.$(EXTOBJ) \
+       $(LIBLDDEPS) $(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-no-common.patch b/inn-no-common.patch
deleted file mode 100644 (file)
index c58e53d..0000000
--- a/inn-no-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- inn-2.6.3/innd/python.c.orig       2019-02-07 16:02:22.000000000 +0100
-+++ inn-2.6.3/innd/python.c    2020-11-07 18:39:55.705362751 +0100
-@@ -60,7 +60,7 @@
- #include "innd.h"
- 
- bool          PythonFilterActive;
--char          *filterPath;    /* This gets set in art.c. */
-+extern const char *filterPath;        /* This gets set in art.c. */
- PyObject      *PYFilterObject = NULL;
- PyObject      *PYFilterModule = NULL;
- 

diff --git a/inn.spec b/inn.spec
index a36c727d9af16d6f9d5845ba81784c28b40707cb..f1ffacba19db03052dc0f6597f9541311f1518fc 100644 (file)
--- a/inn.spec
+++ b/inn.spec
@@ -12,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.6.3
-Release:       6
+Version:       2.6.4
+Release:       1
 License:       distributable
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/inn/%{name}-%{version}.tar.gz
-# Source0-md5: cbbebf4c984cd54871b25f6c649d6ad2
+# Source0-md5: 720aafc4c1b6c22f37356685d7e4747c
 Source1:       %{name}-default-active
 Source2:       %{name}-default-distributions
 Source3:       %{name}-default-newsgroups
@@ -30,7 +30,6 @@ Source9:      %{name}d.8.pl
 Source10:      %{name}.tmpfiles
 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-install.patch
-Patch2:                %{name}-no-common.patch
 Patch3:                %{name}-setgid.patch
 Patch4:                %{name}-config.patch
 Patch5:                %{name}-asneeded.patch
@@ -252,7 +251,6 @@ sunucuya makaleyi yollar.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -262,7 +260,10 @@ sunucuya makaleyi yollar.
 touch innfeed/*.[ly]
 
 %build
+# INN uses modified install-sh file
+%{__mv} support/install-sh{,.inn}
 %{__libtoolize}
+%{__mv} support/install-sh{.inn,}
 # not updated automatically by libtool
 cp -f /usr/share/aclocal/{libtool,lt*}.m4 m4
 cp -f /usr/share/automake/config.* support