- patches rediffed with fuzz 0

- added no-common patch (fix build with -fno-common, gcc 10 default)
- release 5

diff --git a/inn-asneeded.patch b/inn-asneeded.patch
index c8af19d95484c3b84f89951989a1a740bd6fc2f9..3ce62645ecc71ac7f67c51b202ad299f3aec6f70 100644 (file)
--- a/inn-asneeded.patch
+++ b/inn-asneeded.patch
@@ -54,9 +54,9 @@
  
  ovdb_init.o: ovdb_init.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 @@
+--- inn-2.6.3/innfeed/Makefile.orig    2019-02-07 16:02:22.000000000 +0100
++++ inn-2.6.3/innfeed/Makefile 2020-11-07 18:35:27.924853080 +0100
+@@ -49,7 +49,7 @@
  
  ##  Compilation rules.
  
@@ -64,7 +64,7 @@
 +INNFEEDLIBS   = -Wl,-no-as-needed $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)
  
  config_y.c config_y.h: configfile.y
-       $(YACC) -d $?
+       $(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
 @@ -5,4 +5,4 @@

diff --git a/inn-config.patch b/inn-config.patch
index 6e79425867ba71c4acfc821531206321433f8efd..06b2c666a0b066dffb96451a83a8adada80e9b0f 100644 (file)
--- a/inn-config.patch
+++ b/inn-config.patch
@@ -1,9 +1,8 @@
-diff -Nur old/samples/cycbuff.conf new/samples/cycbuff.conf
---- old/samples/cycbuff.conf   2004-01-07 22:47:19.000000000 +0000
-+++ new/samples/cycbuff.conf   2004-08-06 12:33:41.000000000 +0000
-@@ -10,9 +10,9 @@
- # "cycbuff" (literally) : symbolic buffer name : path to buffer file : 
- #       length of symbolic buffer in kilobytes in decimal (1KB = 1024 bytes)
+--- inn-2.6.3/samples/cycbuff.conf.orig        2019-02-07 16:02:22.000000000 +0100
++++ inn-2.6.3/samples/cycbuff.conf     2020-11-07 18:34:28.741795625 +0100
+@@ -28,9 +28,9 @@
+ ##
+ ##  If you're trying to stay under 2 GB, keep your sizes below 2097152.
  
 -cycbuff:ONE:/export/cycbuffs/one:512000
 -cycbuff:TWO:/export/cycbuffs/two:512000
@@ -12,8 +11,8 @@ diff -Nur old/samples/cycbuff.conf new/samples/cycbuff.conf
 +cycbuff:TWO:/var/spool/news/cycbuffs/two:512000
 +cycbuff:THREE:/var/spool/news/cycbuffs/three:512000
  
- # 2. Meta-cyclic buffers
- # Format:
+ ##  2. Meta-cyclic buffers
+ ##  Format:
 --- inn-2.5.3/samples/inn.conf.in.orig 2013-06-13 15:49:58.887245670 +0200
 +++ inn-2.5.3/samples/inn.conf.in      2013-06-13 16:20:45.710540510 +0200
 @@ -17,11 +17,11 @@
@@ -59,14 +58,14 @@ diff -Nur old/samples/cycbuff.conf new/samples/cycbuff.conf
  verifygroups:                false
  wanttrash:                   false
  wipcheck:                    5
-@@ -71,6 +71,7 @@
+@@ -72,6 +72,7 @@
  nfswriter:                   false
- overcachesize:               64
+ overcachesize:               128
  #ovgrouppat:
 +# note: must not be changed to false if using tradspool
  storeonxref:                 true
  useoverchan:                 false
- wireformat:                  false
+ wireformat:                  true
 @@ -78,7 +79,7 @@
  
  # Reading
@@ -76,9 +75,9 @@ diff -Nur old/samples/cycbuff.conf new/samples/cycbuff.conf
  articlemmap:                 true
  clienttimeout:               1800
  initialtimeout:              10
-@@ -109,8 +110,8 @@
- addnntppostingdate:          true
- addnntppostinghost:          true
+@@ -111,8 +112,8 @@
+ addinjectionpostingaccount:  false
+ addinjectionpostinghost:     true
  checkincludedtext:           false
 -#complaints:
 -#fromhost:

diff --git a/inn-install.patch b/inn-install.patch
index aed9deba0914a17f8dd0b01af5a3de46857ebf50..4c46935f1f2fd2be9e31ce12b6ec1718a85a3990 100644 (file)
--- a/inn-install.patch
+++ b/inn-install.patch
@@ -1,6 +1,6 @@
---- inn-2.5.3/Makefile.global.in.orig  2013-06-11 18:02:09.360682066 +0200
-+++ inn-2.5.3/Makefile.global.in       2013-06-11 18:04:16.297346087 +0200
-@@ -305,7 +305,7 @@
+--- inn-2.6.3/Makefile.global.in.orig  2020-11-07 17:33:18.128984967 +0100
++++ inn-2.6.3/Makefile.global.in       2020-11-07 18:30:28.819400995 +0100
+@@ -337,7 +337,7 @@
  
  BACKUP_OPTION = -B .OLD
  
@@ -8,4 +8,4 @@
 +LI_SPRI               = $(LIBTOOLINST) $(INSTALL) -m 4550 $(BACKUP_OPTION)
  LI_XPRI               = $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0550 $(BACKUP_OPTION)
  LI_XPUB               = $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0555 $(BACKUP_OPTION)
- 
+ LI_LPUB               = $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0555

diff --git a/inn-no-common.patch b/inn-no-common.patch
new file mode 100644 (file)
index 0000000..c58e53d
--- /dev/null
+++ b/inn-no-common.patch
@@ -0,0 +1,11 @@
+--- 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-setgid.patch b/inn-setgid.patch
index 652f99411b21dc113049693dfc63f77b3c1b51fa..be49d1682251b6b1d80bb317d2b6b89ab7b5801a 100644 (file)
--- a/inn-setgid.patch
+++ b/inn-setgid.patch
@@ -1,8 +1,8 @@
---- inn-2.5.3/lib/newsuser.c.orig      2012-06-15 20:25:36.000000000 +0200
-+++ inn-2.5.3/lib/newsuser.c   2013-06-13 15:36:33.750595785 +0200
-@@ -93,6 +93,8 @@
-     if (getegid() != gid || getgid() != gid) {
-         die ("must be run as %s group", innconf->runasgroup);
+--- inn-2.6.3/lib/newsuser.c.orig      2019-02-07 16:02:22.000000000 +0100
++++ inn-2.6.3/lib/newsuser.c   2020-11-07 18:31:54.357153294 +0100
+@@ -100,6 +100,8 @@
+         die ("must be run as %s group",
+              innconf != NULL ? innconf->runasgroup : RUNASGROUP);
      }
 +    const char *runasuser = innconf != NULL ? innconf->runasuser : RUNASUSER;
 +    initgroups(runasuser, gid);

diff --git a/inn.spec b/inn.spec
index bd802851f5b1c8ad57b0d131794a014fd3b7e2af..e62f85af383bbcba2739305c399548144e60c7f3 100644 (file)
--- a/inn.spec
+++ b/inn.spec
@@ -13,7 +13,7 @@ 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:       4
+Release:       5
 License:       distributable
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/inn/%{name}-%{version}.tar.gz
@@ -30,6 +30,7 @@ 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
@@ -251,6 +252,7 @@ sunucuya makaleyi yollar.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1