rpms/inn/devel .cvsignore, 1.14, 1.15 inn-2.4.1.pie.patch, 1.2, 1.3 inn-2.4.2-makedbz.patch, 1.2, 1.3 inn-2.4.3-nologinshell.patch, 1.2, 1.3 inn-2.4.3.rh.patch, 1.2, 1.3 inn-2.4.3.warn.patch, 1.1, 1.2 inn-2.4.5-dynlib.patch, 1.1, 1.2 inn.spec, 1.61, 1.62 sources, 1.15, 1.16 inn-2.4.1.headusage.patch, 1.2, NONE inn-2.4.3.rcreaderaddrinuse.patch, 1.1, NONE

Ondrej Vasik ovasik at fedoraproject.org
Tue Jun 9 14:10:43 UTC 2009 

Author: ovasik

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8167

Modified Files:
	.cvsignore inn-2.4.1.pie.patch inn-2.4.2-makedbz.patch 
	inn-2.4.3-nologinshell.patch inn-2.4.3.rh.patch 
	inn-2.4.3.warn.patch inn-2.4.5-dynlib.patch inn.spec sources 
Removed Files:
	inn-2.4.1.headusage.patch inn-2.4.3.rcreaderaddrinuse.patch 
Log Message:
new upstream release 2.5.0, remove applied, adjust modified patches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	11 Mar 2009 11:10:19 -0000	1.14
+++ .cvsignore	9 Jun 2009 14:10:41 -0000	1.15
@@ -1,2 +1,2 @@
 inn-faq.tar.gz
-inn-2.4.6.tar.gz
+inn-2.5.0.tar.gz

inn-2.4.1.pie.patch:

Index: inn-2.4.1.pie.patch
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn-2.4.1.pie.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- inn-2.4.1.pie.patch	29 Aug 2008 14:46:18 -0000	1.2
+++ inn-2.4.1.pie.patch	9 Jun 2009 14:10:42 -0000	1.3
@@ -9,29 +9,14 @@
  sm:		sm.o           $(BOTH)   ; $(LINK) sm.o           $(STORELIBS)
  
  ovdb_init.o: ovdb_init.c
---- inn-2.4.1/innfeed/Makefile.pie	2004-12-13 13:09:57.000000000 +0100
-+++ inn-2.4.1/innfeed/Makefile	2004-12-13 15:14:45.127971224 +0100
-@@ -73,7 +73,7 @@
- 	$(FIXSCRIPT) procbatch.in
- 
- startinnfeed: startinnfeed.o $(LIBINN)
--	$(LIBLD) $(LDFLAGS) -o $@ startinnfeed.o $(LIBINN) $(LIBS)
-+	$(LIBLD) -pie $(LDFLAGS) -o $@ startinnfeed.o $(LIBINN) $(LIBS)
- 
- # Not normally built.
- innfeed-convcfg: innfeed-convcfg.in $(FIXSCRIPT)
 --- inn-2.4.1/innd/Makefile.pie	2004-12-13 13:09:57.000000000 +0100
 +++ inn-2.4.1/innd/Makefile	2004-12-13 15:16:25.808665432 +0100
-@@ -44,10 +44,10 @@
- python.o:	python.c	; $(CC) $(CFLAGS) $(PYTHONINC) -c python.c
+@@ -44,7 +44,7 @@
+ python.o:	python.c	; $(CC) $(CFLAGS) $(PYTHON_CPPFLAGS) -c python.c
  
  innd: $(OBJECTS) $(LIBSTORAGE) $(LIBHIST) $(LIBINN)
 -	$(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
 +	$(LIBLD) -pie $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
  
- inndstart: inndstart.o $(LIBINN)
--	$(LIBLD) $(LDFLAGS) -o $@ inndstart.o $(LIBINN) $(LIBS)
-+	$(LIBLD) -pie $(LDFLAGS) -o $@ inndstart.o $(LIBINN) $(LIBS)
- 
- $(LIBINN):	; (cd ../lib ; $(MAKE))
- $(LIBSTORAGE):	; (cd ../storage ; $(MAKE))
+ tinyleaf: tinyleaf.o $(LIBINN)
+ 	$(LIBLD) $(LDFLAGS) -o $@ tinyleaf.o $(LIBINN)

inn-2.4.2-makedbz.patch:

Index: inn-2.4.2-makedbz.patch
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn-2.4.2-makedbz.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- inn-2.4.2-makedbz.patch	15 May 2008 09:33:46 -0000	1.2
+++ inn-2.4.2-makedbz.patch	9 Jun 2009 14:10:42 -0000	1.3
@@ -5,14 +5,14 @@ diff -urNp inn-2.4.4-orig/site/Makefile 
  	chmod $(FILEMODE) $@
  $D$(PATH_HISTORY):
  	touch $@
--	chown $(NEWSUSER) $@
--	chgrp $(NEWSGROUP) $@
+-	chown $(RUNASUSER) $@
+-	chgrp $(RUNASGROUP) $@
 -	chmod $(FILEMODE) $@
--	$(PATHBIN)/makedbz -i -o
-+#	chown $(NEWSUSER) $@
-+#	chgrp $(NEWSGROUP) $@
+-	test -z "$D" && $(PATHBIN)/makedbz -i -o
++#	chown $(RUNASUSER) $@
++#	chgrp $(RUNASGROUP) $@
 +#	chmod $(FILEMODE) $@
-+#	$(PATHBIN)/makedbz -i -o
++#  test -z "$D" && $(PATHBIN)/makedbz -i -o
  
  ##  Remove files that are unchanged from the release version.
  clean:

inn-2.4.3-nologinshell.patch:

Index: inn-2.4.3-nologinshell.patch
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn-2.4.3-nologinshell.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- inn-2.4.3-nologinshell.patch	19 May 2008 14:15:27 -0000	1.2
+++ inn-2.4.3-nologinshell.patch	9 Jun 2009 14:10:42 -0000	1.3
@@ -5,22 +5,22 @@ diff -urNp inn-2.4.3-orig/doc/man/rc.new
  To start \s-1INN\s0 and leave certain error messages going to the terminal:
  .PP
  .Vb 1
--\&       su \- news \-c ~news/bin/rc.news
+-\&       su \- news \-c <pathbin in inn.conf>/rc.news
 +\&       su \-m news \-c /etc/rc.news
  .Ve
  .PP
  To run \s-1INN\s0 at startup time from appropriate system boot scripts:
  .PP
  .Vb 1
--\&       su \- news \-c ~news/bin/rc.news >/dev/console
+-\&       su \- news \-c <pathbin>/rc.news >/dev/console
 +\&       su \-m news \-c /etc/rc.news >/dev/console
  .Ve
  .PP
  To stop \s-1INN\s0 (throttling first):
  .PP
  .Vb 2
- \&       ~news/bin/ctlinnd throttle reason
--\&       su \- news \-c '~news/bin/rc.news stop'
+ \&       <pathbin>/ctlinnd throttle reason
+-\&       su \- news \-c '<pathbin>/rc.news stop'
 +\&       su \-m news \-c '/etc/rc.news stop'
  .Ve
  .SH "BUGS"
@@ -32,16 +32,16 @@ diff -urNp inn-2.4.3-orig/doc/pod/instal
  news user and not as root.  To start INN on system boot, you therefore
  want to put something like:
  
--    su - news -c /usr/local/news/bin/rc.news
+-    su news -c <pathbin in inn.conf>/rc.news
 +    su -m news -c /etc/rc.news
  
- in the system boot scripts.  If innd is stopped or killed, you can restart
- it by running rc.news by hand as the news user.
+ in the system boot scripts.  If B<innd> is stopped or killed, you can restart
+ it by running B<rc.news> by hand as the news user.
 @@ -1497,7 +1497,7 @@ it by running rc.news by hand as the new
- The rc.news script may also be used to shut down INN, with the C<stop>
+ The B<rc.news> script may also be used to shut down INN, with the C<stop>
  option:
  
--    su - news -c '/usr/local/news/bin/rc.news stop'
+-    su news -c '<pathbin in inn.conf>/rc.news stop'
 +    su -m news -c '/etc/rc.news stop'
  
  In the F<contrib> directory of this source tree is a sample init script
@@ -53,18 +53,18 @@ diff -urNp inn-2.4.3-orig/doc/pod/rc.new
  
  To start INN and leave certain error messages going to the terminal:
  
--       su - news -c ~news/bin/rc.news
+-       su - news -c <pathbin in inn.conf>/rc.news
 +       su -m news -c /etc/rc.news
  
  To run INN at startup time from appropriate system boot scripts:
  
--       su - news -c ~news/bin/rc.news >/dev/console
+-       su - news -c <pathbin>/rc.news >/dev/console
 +       su -m news -c /etc/rc.news >/dev/console
-   
+ 
  To stop INN (throttling first):
  
-        ~news/bin/ctlinnd throttle reason
--       su - news -c '~news/bin/rc.news stop'
+        <pathbin>/ctlinnd throttle reason
+-       su - news -c '<pathbin>/rc.news stop'
 +       su -m news -c '/etc/rc.news stop'
  
  =head1 BUGS
@@ -76,7 +76,7 @@ diff -urNp inn-2.4.3-orig/INSTALL inn-2.
      news user and not as root.  To start INN on system boot, you therefore
      want to put something like:
  
--        su - news -c /usr/local/news/bin/rc.news
+-        su news -c <pathbin in inn.conf>/rc.news
 +        su -m news -c /etc/rc.news
  
      in the system boot scripts.  If innd is stopped or killed, you can
@@ -85,7 +85,7 @@ diff -urNp inn-2.4.3-orig/INSTALL inn-2.
      The rc.news script may also be used to shut down INN, with the "stop"
      option:
  
--        su - news -c '/usr/local/news/bin/rc.news stop'
+-        su news -c '<pathbin in inn.conf>/rc.news stop'
 +        su -m news -c '/etc/rc.news stop'
  
      In the contrib directory of this source tree is a sample init script for

inn-2.4.3.rh.patch:

Index: inn-2.4.3.rh.patch
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn-2.4.3.rh.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- inn-2.4.3.rh.patch	29 Aug 2008 14:46:18 -0000	1.2
+++ inn-2.4.3.rh.patch	9 Jun 2009 14:10:42 -0000	1.3
@@ -1,50 +1,39 @@
 --- inn-2.4.1/Makefile.global.in.old	2004-12-13 13:09:57.000000000 +0100
 +++ inn-2.4.1/Makefile.global.in	2004-12-13 13:57:18.826316440 +0100
 @@ -241,8 +241,8 @@
- RNEWSMODE       = @RNEWSMODE@
- FILEMODE        = @FILEMODE@
+ RNEWSMODE	= @RNEWSMODE@
+ FILEMODE	= @FILEMODE@
  
--OWNER           = -o $(NEWSUSER) -g $(NEWSGROUP)
--ROWNER          = -o $(NEWSUSER) -g @RNEWSGRP@
+-OWNER		= -o $(RUNASUSER) -g $(RUNASGROUP)
+-ROWNER		= -o $(RUNASUSER) -g $(RNEWSGROUP)
 +OWNER           =
 +ROWNER          =
  
- INSTALL         = $(top)/support/install-sh -c
+ INSTALL		= $(top)/support/install-sh -c
  
 @@ -259,17 +259,17 @@
- ##  files like active and newsgroups that should have the same permissions as
- ##  article files.
  
--LI_SPRI         = $(LIBTOOL) $(INSTALL) -o root -g $(NEWSGROUP) -m 4550 -B .OLD
--LI_XPRI         = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0550 -B .OLD
--LI_XPUB         = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0555 -B .OLD
-+LI_SPRI         = $(LIBTOOL) $(INSTALL) -m 4750 -B .OLD
-+LI_XPRI         = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0750 -B .OLD
-+LI_XPUB         = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0755 -B .OLD
- 
- LI_INEWS        = $(LIBTOOL) $(INSTALL) $(OWNER) -m $(INEWSMODE) -B .OLD
- LI_RNEWS        = $(LIBTOOL) $(INSTALL) $(ROWNER) -m $(RNEWSMODE) -B .OLD
- 
- CP_RPRI         = $(INSTALL) $(OWNER) -m 0640 -B .OLD
- CP_RPUB         = $(INSTALL) $(OWNER) -m 0644 -B .OLD
--CP_XPRI         = $(INSTALL) $(OWNER) -m 0550 -B .OLD
--CP_XPUB         = $(INSTALL) $(OWNER) -m 0555 -B .OLD
-+CP_XPRI         = $(INSTALL) $(OWNER) -m 0750 -B .OLD
-+CP_XPUB         = $(INSTALL) $(OWNER) -m 0755 -B .OLD
- 
- CP_DATA	        = $(INSTALL) $(OWNER) -m $(FILEMODE) -B .OLD
- 
---- inn-2.4.1/site/Makefile.old	2004-12-13 13:09:57.000000000 +0100
-+++ inn-2.4.1/site/Makefile	2004-12-13 13:35:45.459938016 +0100
-@@ -129,8 +129,6 @@
- $D$(PATH_NEWSGROUPS):	; $(CP_DATA) newsgroups.minimal $@
- $D$(PATH_ACTIVE_TIMES):
- 	touch $@
--	chown $(NEWSUSER) $@
--	chgrp $(NEWSGROUP) $@
- 	chmod $(FILEMODE) $@
- $D$(PATH_HISTORY):
- 	touch $@
+ BACKUP_OPTION	= -B .OLD
+ 
+-LI_SPRI		= $(LIBTOOLINST) $(INSTALL) -o root -g $(RUNASGROUP) -m 4550 $(BACKUP_OPTION)
+-LI_XPRI		= $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0550 $(BACKUP_OPTION)
+-LI_XPUB		= $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0555 $(BACKUP_OPTION)
++LI_SPRI		= $(LIBTOOLINST) $(INSTALL) -o root -g $(RUNASGROUP) -m 4750 $(BACKUP_OPTION)
++LI_XPRI		= $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0750 $(BACKUP_OPTION)
++LI_XPUB		= $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0755 $(BACKUP_OPTION)
+ 
+ LI_INEWS	= $(LIBTOOLINST) $(INSTALL) $(OWNER) -m $(INEWSMODE) $(BACKUP_OPTION)
+ LI_RNEWS	= $(LIBTOOLINST) $(INSTALL) $(ROWNER) -m $(RNEWSMODE) $(BACKUP_OPTION)
+ 
+ CP_RPRI		= $(INSTALL) $(OWNER) -m 0640 $(BACKUP_OPTION)
+ CP_RPUB		= $(INSTALL) $(OWNER) -m 0644 $(BACKUP_OPTION)
+-CP_XPRI		= $(INSTALL) $(OWNER) -m 0550 $(BACKUP_OPTION)
+-CP_XPUB		= $(INSTALL) $(OWNER) -m 0555 $(BACKUP_OPTION)
++CP_XPRI		= $(INSTALL) $(OWNER) -m 0750 $(BACKUP_OPTION)
++CP_XPUB		= $(INSTALL) $(OWNER) -m 0755 $(BACKUP_OPTION)
+ 
+ CP_DATA		= $(INSTALL) $(OWNER) -m $(FILEMODE) $(BACKUP_OPTION)
+ CP_MAN		= $(INSTALL) $(OWNER) -m 0444
 --- inn-2.4.1/Makefile.old	2004-12-13 13:09:57.000000000 +0100
 +++ inn-2.4.1/Makefile	2004-12-13 14:29:56.625685696 +0100
 @@ -91,9 +91,9 @@
@@ -69,23 +58,14 @@
 +#pathhost:               localhost
  pathnews:               @prefix@
  
- # General Settings
-@@ -73,7 +73,7 @@
- 
- allownewnews:           true
- articlemmap:            false
--clienttimeout:          600
-+clienttimeout:          1800
- initialtimeout:         10
- msgidcachesize:         10000
- nnrpdcheckart:          true
+ #runasuser:
 @@ -122,7 +122,7 @@
  
  # Monitoring
  
 -doinnwatch:             true
 +doinnwatch:             false
- innwatchbatchspace:     800
+ innwatchbatchspace:     4000
  innwatchlibspace:       25000
  innwatchloload:         1000
 @@ -157,7 +157,7 @@

inn-2.4.3.warn.patch:

Index: inn-2.4.3.warn.patch
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn-2.4.3.warn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- inn-2.4.3.warn.patch	27 Mar 2006 12:47:04 -0000	1.1
+++ inn-2.4.3.warn.patch	9 Jun 2009 14:10:42 -0000	1.2
@@ -6,6 +6,6 @@
  #ifdef HAVE_SASL
 -    const char *mechusing;
 +    const char *mechusing = NULL;
-     char *inbase64;
-     int inbase64len;
      int saslresult=SASL_NOMECH;
+ 
+     sasl_interact_t *client_interact=NULL;

inn-2.4.5-dynlib.patch:

Index: inn-2.4.5-dynlib.patch
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn-2.4.5-dynlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- inn-2.4.5-dynlib.patch	10 Jul 2008 16:22:01 -0000	1.1
+++ inn-2.4.5-dynlib.patch	9 Jun 2009 14:10:42 -0000	1.2
@@ -5,8 +5,8 @@ diff -up inn-2.4.5/history/Makefile.dynl
  
  libinnhist.la: $(OBJECTS) $(LIBSTORAGE) $(LIBINN)
  	$(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \
--	    $(LIBSTORAGE) $(LIBINN) $(EXTSTORAGELIBS) $(LIBS) \
-+	    $(LIBSTORAGE) $(LIBINN) $(EXTSTORAGELIBS)  -L../lib/.libs -L../storage/.libs ${LIBS} \
+-	    $(LIBSTORAGE) $(LIBINN) $(STORAGE_LIBS) $(LIBS) \
++	    $(LIBSTORAGE) $(LIBINN) $(STORAGE_LIBS)  -L../lib/.libs -L../storage/.libs ${LIBS} \
  	    -rpath $(PATHLIB) -version-info 2:0:0
  
  libinnhist.a: $(OBJECTS)
@@ -17,8 +17,8 @@ diff -up inn-2.4.5/storage/Makefile.dynl
  
  libstorage.la: $(OBJECTS) $(LIBINN)
  	$(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \
--	    $(LIBINN) $(EXTSTORAGELIBS) $(LIBS) \
-+	    $(LIBINN) $(EXTSTORAGELIBS) -L../lib/.libs ${LIBS} \
+-	    $(LIBINN) $(STORAGE_LIBS) $(LIBS) \
++	    $(LIBINN) $(STORAGE_LIBS) -L../lib/.libs ${LIBS} \
  	    -rpath $(PATHLIB) -version-info 2:0:0
  
  libstorage.a: $(OBJECTS)


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- inn.spec	19 May 2009 14:30:58 -0000	1.61
+++ inn.spec	9 Jun 2009 14:10:42 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
-Version: 2.4.6
-Release: 2%{?dist}
+Version: 2.5.0
+Release: 1
 #see LICENSE file for details
 License: GPL+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -15,12 +15,10 @@ Source8: innd.init
 Source10: inn-faq.tar.gz
 Patch1:  inn-2.4.3.rh.patch
 Patch2: inn-2.4.1.perl.patch
-Patch3: inn-2.4.1.headusage.patch
 Patch4: inn-2.4.1.pie.patch
 Patch6: inn-2.4.1.posix.patch
 Patch7: inn-2.4.3.warn.patch
 Patch8: inn-2.4.2-makedbz.patch
-Patch9: inn-2.4.3.rcreaderaddrinuse.patch
 Patch10: inn-2.4.3-nologinshell.patch
 Patch11: inn-2.4.5-dynlib.patch
 Patch12: inn-sasl_encode64nullterm.patch
@@ -86,12 +84,10 @@ exit 0
 %setup  -q  -a 10
 %patch1 -p1 -b .rh
 %patch2 -p1 -b .perl
-%patch3 -p1 -b .headusage
 %patch4 -p1 -b .pie
 %patch6 -p1 -b .posix
 %patch7 -p1 -b .warn
 %patch8 -p1 -b .makedbz
-%patch9 -p1 -b .addrinuse
 %patch10 -p1 -b .nologin
 %patch11 -p1 -b .dynlib
 %patch12 -p1 -b .nullterm
@@ -356,6 +352,10 @@ exit 0
 %{_mandir}/man1/inews*
 
 %changelog
+* Tue Jun 09 2009 Ondrej Vasik <ovasik at redhat.com> - 2.5.0-1
+- new upstream release 2.5.0
+- remove applied and adjust modified patches
+
 * Tue May 19 2009 Ondrej Vasik <ovasik at redhat.com> - 2.4.6-2
 - reflect change in sasl_encode64 abi(null terminator) - #501452
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	11 Mar 2009 11:10:20 -0000	1.15
+++ sources	9 Jun 2009 14:10:42 -0000	1.16
@@ -1,2 +1,2 @@
 b5e6321446594749eea087c6710eefa5  inn-faq.tar.gz
-50741ff1b9c230af9109aafc7e98b1a2  inn-2.4.6.tar.gz
+be60e463b2c21286eca45e994df307b2  inn-2.5.0.tar.gz


--- inn-2.4.1.headusage.patch DELETED ---


--- inn-2.4.3.rcreaderaddrinuse.patch DELETED ---

More information about the fedora-extras-commits mailing list