[inn] new upstream release 2.5.3
Ondrej Vasik
ovasik at fedoraproject.org
Thu Sep 6 07:42:59 UTC 2012
commit da084e0b689f9f915386aa2e8cf747ef0f093163
Author: Ondřej Vašík <ovasik at redhat.com>
Date: Thu Sep 6 09:42:49 2012 +0200
new upstream release 2.5.3
.gitignore | 1 +
inn-2.4.3.rh.patch | 36 ++++++++++++++++++------------------
inn-2.5.2-docrun.patch | 18 ------------------
inn-2.5.2-hdr.patch | 3 +--
inn-2.5.2-pconf.patch | 2 +-
inn-shared.patch | 4 +---
inn.spec | 7 +++++--
sources | 2 +-
8 files changed, 28 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2450ebb..574c8af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
inn-2.5.2.tar.gz
inn-faq.tar.gz
+/inn-2.5.3.tar.gz
diff --git a/inn-2.4.3.rh.patch b/inn-2.4.3.rh.patch
index 2b1a13c..94fd673 100644
--- a/inn-2.4.3.rh.patch
+++ b/inn-2.4.3.rh.patch
@@ -51,29 +51,29 @@
--- inn-2.4.1/samples/inn.conf.in.old 2004-12-13 13:09:57.000000000 +0100
+++ inn-2.4.1/samples/inn.conf.in 2004-12-13 13:31:12.475437968 +0100
@@ -21,7 +21,7 @@
- organization: "A poorly-installed InterNetNews site"
- ovmethod: tradindexed
- hismethod: hisv6
--pathhost: @HOSTNAME@
-+#pathhost: localhost
- pathnews: @prefix@
+ organization: "A poorly-installed InterNetNews site"
+ ovmethod: tradindexed
+ hismethod: hisv6
+-pathhost: @HOSTNAME@
++#pathhost: localhost
+ pathnews: @prefix@
#runasuser:
@@ -122,7 +122,7 @@
# Monitoring
--doinnwatch: true
-+doinnwatch: false
- innwatchbatchspace: 4000
- innwatchlibspace: 25000
- innwatchloload: 1000
+-doinnwatch: true
++doinnwatch: false
+ innwatchbatchspace: 4000
+ innwatchlibspace: 25000
+ innwatchloload: 1000
@@ -157,7 +157,7 @@
- keepmmappedthreshold: 1024
+ keepmmappedthreshold: 1024
#maxcmdreadsize:
- maxforks: 10
--nicekids: 4
-+nicekids: 0
- nicenewnews: 0
- nicennrpd: 0
- pauseretrytime: 300
+ maxforks: 10
+-nicekids: 4
++nicekids: 0
+ nicenewnews: 0
+ nicennrpd: 0
+ pauseretrytime: 300
diff --git a/inn-2.5.2-docrun.patch b/inn-2.5.2-docrun.patch
index 8a0ca60..bd113d3 100644
--- a/inn-2.5.2-docrun.patch
+++ b/inn-2.5.2-docrun.patch
@@ -28,21 +28,3 @@ diff -up inn-2.5.2/doc/FAQ.docrun inn-2.5.2/doc/FAQ
pathtmp: /usr/local/news/tmp /usr/tmp
pathspool: /usr/local/news/spool /var/spool/news
patharchive: /usr/local/news/spool/archive /var/spool/news/archive
-diff -up inn-2.5.2/doc/man/innfeed.1.docrun inn-2.5.2/doc/man/innfeed.1
---- inn-2.5.2/doc/man/innfeed.1.docrun 2011-05-31 19:41:45.972525674 +0200
-+++ inn-2.5.2/doc/man/innfeed.1 2011-05-31 19:42:30.722525668 +0200
-@@ -127,12 +127,12 @@ will close the file and open the new fil
- .PP
- .RS
- .nf
--innfeed -p /var/run/news/innfeed.pid my-funnel-file &
-+innfeed -p /run/news/innfeed.pid my-funnel-file &
- while true; do
- sleep 43200
- rm -f my-funnel-file
- ctlinnd flush funnel-file-site
-- kill -ALRM `cat /var/run/news/innfeed.pid`
-+ kill -ALRM `cat /run/news/innfeed.pid`
- done
- .fi
- .RE
diff --git a/inn-2.5.2-hdr.patch b/inn-2.5.2-hdr.patch
index cf15a6a..7fe4999 100644
--- a/inn-2.5.2-hdr.patch
+++ b/inn-2.5.2-hdr.patch
@@ -1,11 +1,10 @@
diff -up inn-2.5.2/lib/date.c.hdr inn-2.5.2/lib/date.c
--- inn-2.5.2/lib/date.c.hdr 2010-06-28 17:34:29.119928905 +0200
+++ inn-2.5.2/lib/date.c 2010-06-28 18:04:11.457807048 +0200
-@@ -8,7 +8,7 @@
+@@ -8,6 +8,7 @@
#include "config.h"
#include "clibrary.h"
--#include "headers.c"
+#include "headers.h"
#include <ctype.h>
#include <time.h>
diff --git a/inn-2.5.2-pconf.patch b/inn-2.5.2-pconf.patch
index bac608d..c04d7f9 100644
--- a/inn-2.5.2-pconf.patch
+++ b/inn-2.5.2-pconf.patch
@@ -7,6 +7,6 @@ diff -up inn-2.5.2/perl/INN/Config.pm.in.pfix inn-2.5.2/perl/INN/Config.pm.in
my @INNCONFVAR = ();
-my @values = `${exec_prefix}/bin/innconfval -p`;
+my @values = `${exec_prefix}/innconfval -p`;
- foreach $line (@values) {
+ foreach my $line (@values) {
eval 'our '.$line;
if ($line =~ /^(.*?) = /m) {
diff --git a/inn-shared.patch b/inn-shared.patch
index 4dad12b..07cbaa4 100644
--- a/inn-shared.patch
+++ b/inn-shared.patch
@@ -1,7 +1,7 @@
diff -up inn-2.5.1/storage/buffindexed/ovmethod.mk.shared inn-2.5.1/storage/buffindexed/ovmethod.mk
--- inn-2.5.1/storage/buffindexed/ovmethod.mk.shared 2009-12-01 16:50:37.174811272 +0100
+++ inn-2.5.1/storage/buffindexed/ovmethod.mk 2009-12-01 16:53:24.914809560 +0100
-@@ -1,9 +1,9 @@
+@@ -1,8 +1,8 @@
# This rule requires a compiler that supports -o with -c. Since it's normally
# used by developers, that should be acceptable.
-buffindexed/buffindexed_d.o: buffindexed/buffindexed.c
@@ -11,10 +11,8 @@ diff -up inn-2.5.1/storage/buffindexed/ovmethod.mk.shared inn-2.5.1/storage/buff
-buffindexed/buffindexed_d: buffindexed/buffindexed_d.o libstorage.$(EXTLIB) $(LIBHIST)
- $(LIBLD) $(LDFLAGS) -o $@ buffindexed/buffindexed_d.o \
-- buffindexed/shmem.o expire.o ov.o \
+buffindexed/buffindexed_d: buffindexed/buffindexed_d.$(EXTOBJ) libstorage.$(EXTLIB) $(LIBHIST)
+ $(LIBLD) $(LDFLAGS) -o $@ buffindexed/buffindexed_d.$(EXTOBJ) \
-+ buffindexed/shmem.$(EXTOBJ) expire.$(EXTOBJ) ov.$(EXTOBJ) \
$(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)
diff -up inn-2.5.1/storage/tradindexed/ovmethod.mk.shared inn-2.5.1/storage/tradindexed/ovmethod.mk
--- inn-2.5.1/storage/tradindexed/ovmethod.mk.shared 2009-12-01 16:53:35.644811390 +0100
diff --git a/inn.spec b/inn.spec
index ef3a2eb..d2da6da 100644
--- a/inn.spec
+++ b/inn.spec
@@ -1,7 +1,7 @@
Summary: The InterNetNews system, an Usenet news server
Name: inn
-Version: 2.5.2
-Release: 23%{?dist}
+Version: 2.5.3
+Release: 1%{?dist}
#see LICENSE file for details
License: GPLv2+ and BSD and MIT and Public Domain
Group: System Environment/Daemons
@@ -524,6 +524,9 @@ fi
%{_mandir}/man1/inews*
%changelog
+* Thu Sep 06 2012 Ondrej Vasik <ovasik at redhat.com> - 2.5.3-1
+- new upstream release 2.5.3
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.2-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index b220cf0..f77cbb8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a6e577dceb90d07501b96149508b974b inn-2.5.2.tar.gz
6c0a3600167940e6c0f5771ede22648b inn-faq.tar.gz
+353fe95232828ddbc80debff86c240bc inn-2.5.3.tar.gz
More information about the scm-commits
mailing list