[rpms/inn] epel10.3: New upstream release

[Jochen Schmitt <s4504kr@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/inn
Branch : epel10.3
Commit : ee2764a860f93c4db31011639973b296b2697dc9
Author : Jochen Schmitt <s4504kr@fedoraproject.org>
Date   : 2010-07-04T18:24:58+00:00
Stats  : +49/-23 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/inn/c/ee2764a860f93c4db31011639973b296b2697dc9?branch=epel10.3

Log:
New upstream release

---
diff --git a/.cvsignore b/.cvsignore
index 23cc2b9..58cb463 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-inn-faq.tar.gz
+inn-2.5.2.tar.gz

diff --git a/inn-2.4.1.posix.patch b/inn-2.4.1.posix.patch
deleted file mode 100644
index 410bd19..0000000
--- a/inn-2.4.1.posix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- inn-2.4.1/storage/cnfs/cnfs.h.old	2004-12-15 17:38:22.038029888 +0100
-+++ inn-2.4.1/storage/cnfs/cnfs.h	2004-12-15 17:38:22.037030040 +0100
-@@ -17,4 +17,12 @@
- void cnfs_printfiles(FILE *file, TOKEN token, char **xref, int ngroups);
- void cnfs_shutdown(void);
- 
-+/* Patch for POSIX
-+*/
-+#ifndef MADV_SEQUENTIAL 
-+  #ifdef  POSIX_MADV_SEQUENTIAL
-+    #define MADV_SEQUENTIAL  POSIX_MADV_SEQUENTIAL
-+  #endif
-+#endif
-+
- #endif

diff --git a/inn-2.5.2-hdr.patch b/inn-2.5.2-hdr.patch
new file mode 100644
index 0000000..cf15a6a
--- /dev/null
+++ b/inn-2.5.2-hdr.patch
@@ -0,0 +1,23 @@
+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 @@
+ 
+ #include "config.h"
+ #include "clibrary.h"
+-#include "headers.c"
++#include "headers.h"
+ #include <ctype.h>
+ #include <time.h>
+ 
+diff -up inn-2.5.2/lib/headers.h.hdr inn-2.5.2/lib/headers.h
+--- inn-2.5.2/lib/headers.h.hdr	2010-06-28 17:59:40.585930051 +0200
++++ inn-2.5.2/lib/headers.h	2010-06-28 18:02:52.365930244 +0200
+@@ -0,0 +1,7 @@
++/*  $Id: headers.c 9024 2010-03-21 16:49:30Z iulius $
++**
++**  Routines for headers:  manipulation and checks.
++*/
++bool IsValidHeaderName(const char *string);
++const char *skip_cfws(const char *p);
++const char *skip_fws(const char *p);

diff --git a/inn-2.5.2-pconf.patch b/inn-2.5.2-pconf.patch
new file mode 100644
index 0000000..bac608d
--- /dev/null
+++ b/inn-2.5.2-pconf.patch
@@ -0,0 +1,12 @@
+diff -up inn-2.5.2/perl/INN/Config.pm.in.pfix inn-2.5.2/perl/INN/Config.pm.in
+--- inn-2.5.2/perl/INN/Config.pm.in.pfix	2010-06-29 17:13:57.507194722 +0200
++++ inn-2.5.2/perl/INN/Config.pm.in	2010-06-29 17:14:32.270853010 +0200
+@@ -20,7 +20,7 @@ our $exec_prefix = "@exec_prefix@";
+ 
+ ##  Then, process the variables provided by innconfval.
+ my @INNCONFVAR = ();
+-my @values = `${exec_prefix}/bin/innconfval -p`;
++my @values = `${exec_prefix}/innconfval -p`;
+ foreach $line (@values) {
+   eval 'our '.$line;
+   if ($line =~ /^(.*?) = /m) {

diff --git a/inn.spec b/inn.spec
index f452210..c7adf69 100644
--- a/inn.spec
+++ b/inn.spec
@@ -1,7 +1,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
-Version: 2.5.1
-Release: 5%{?dist}
+Version: 2.5.2
+Release: 1%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -15,13 +15,15 @@ Source8: innd.init
 Source10: inn-faq.tar.gz
 Patch1:  inn-2.4.3.rh.patch
 Patch4: inn-2.5.1.pie.patch
-Patch6: inn-2.4.1.posix.patch
+Patch6: inn-2.5.2.posix.patch
 Patch7: inn-2.4.3.warn.patch
 Patch8: inn-2.4.2-makedbz.patch
 Patch10: inn-2.5.1-nologinshell.patch
 Patch13: inn-2.5.0-chown.patch
 Patch14: inn-redhat_build.patch
 Patch15: inn-shared.patch
+Patch16: inn-2.5.2-hdr.patch
+patch17: inn-2.5.2-pconf.patch
 BuildRequires: python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel perl
 BuildRequires: perl(ExtUtils::Embed) flex
 Requires(pre): shadow-utils
@@ -100,6 +102,8 @@ exit 0
 %patch13 -p1 -b .chown
 %patch14 -p1 -b .redhat_build
 %patch15 -p1 -b .shared
+%patch16 -p1 -b .hdr
+%patch17 -p1 -b .pfix
 
 perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
 perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
@@ -453,7 +457,7 @@ fi
 %{_libexecdir}/news/innshellvars
 %{_libexecdir}/news/innshellvars.tcl
 
-%dir %{_sharedstatedir}/news/http
+%attr(0775,root,news) %dir %{_sharedstatedir}/news/http
 %{_sharedstatedir}/news/http/innreport.css
 
 %dir %{perl_vendorlib}/INN
@@ -481,11 +485,11 @@ fi
 %{_mandir}/man1/r*.1.gz
 %{_mandir}/man1/s*.1.gz
 %{_mandir}/man[58]/*
+%defattr(-,root,root,0755)
 %doc NEWS README* HACKING ChangeLog CONTRIBUTORS LICENSE INSTALL FAQ.html 
 %doc doc/config-design doc/history-innfeed doc/GPL doc/sample-control
 %doc doc/config-semantics doc/external-auth TODO doc/hook-python doc/config-syntax
 %doc doc/hook-perl doc/history
-%defattr(0755,root,root,-)
 %doc %dir samples
 
 %files libs
@@ -507,6 +511,9 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Mon Jun 28 2010 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.2-1
+- New upstream release
+
 * Wed Jun 2 2010 Nikola Pajkovsky <npajkovs@redhat.com> - 2.5.1-5
 - Resolves: #597799 - Two typos in /etc/init.d/inn, three typos in /etc/cron.*/inn* in F13
 - Resolves: #596580 - Migration from /usr/lib/news/bin to /usr/libexec/news is not complete

diff --git a/sources b/sources
index 0f05930..8265a69 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-e0b99d07392723b2ac2390856f7e44e5  inn-2.5.1.tar.gz
-6c0a3600167940e6c0f5771ede22648b  inn-faq.tar.gz
+a6e577dceb90d07501b96149508b974b  inn-2.5.2.tar.gz