]> git.pld-linux.org Git - packages/inn.git/blobdiff - inn.spec
projects / packages / inn.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- massive change: BR openssl-devel >= 0.9.7d
[packages/inn.git] / inn.spec
diff --git a/inn.spec b/inn.spec
index dbf73a4f114a391d3d227c2d169a832cce3dcd4f..4c6570584e206e612e16b3cefa044674a544d4f9 100644 (file)
--- a/inn.spec
+++ b/inn.spec
@@ -7,11 +7,12 @@ Summary(pl):  INN, serwer nowinek
 Summary(pt_BR):        INN, InterNet News System (servidor news)
 Summary(tr):   INN, InterNet Haber Sistemi (haber sunucu)
 Name:          inn
-Version:       2.3.3
-Release:       1
+Version:       2.4.1
+Release:       0.4
 License:       distributable
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/inn/%{name}-%{version}.tar.gz
+# Source0-md5: bec635b6e70188071fdb539cd374f2ba
 Source1:       %{name}-default-active
 Source2:       %{name}-default-distributions
 Source3:       %{name}-default-newsgroups
@@ -24,24 +25,38 @@ Source9:    %{name}.logrotate
 Source10:      %{name}-etc-readers.conf
 Source11:      getlist.1.pl
 Source12:      %{name}d.8.pl
-#Patch0:       ftp://ftp.north.ad.jp/pub/IPv6/INN/tmp/%{name}-2.3.0-v6-20001011.diff.gz
-Patch0:                %{name}-ipv6.patch
-Patch1:                %{name}-PLD.patch
-Patch2:                %{name}-install.patch
-Patch3:                %{name}-db3.patch
-Patch4:                %{name}-setreuid.patch
-Patch5:                %{name}-sec.patch
-Patch6:                %{name}-frsize.patch
-Patch7:                %{name}-ac25x.patch
-Patch8:                %{name}-ac253.patch
+Patch0:                %{name}-PLD.patch
+Patch1:                %{name}-install.patch
+Patch2:                %{name}-db.patch
+Patch3:                %{name}-ac25x.patch
+Patch4:                %{name}-ac253.patch
+Patch5:                %{name}-setgid.patch
+Patch6:                %{name}-db4.patch
+Patch7:                %{name}-timecaf_oversized_art.patch
+Patch8:                %{name}-lib_install_modes.patch
+Patch9:                %{name}-kill_warnings.patch
+Patch10:       %{name}-64bit_pointers.patch
+#Patch11:      %{name}-setreuid.patch
+#Patch12:      %{name}-sec.patch
+#Patch13:      %{name}-frsize.patch
 URL:           http://www.isc.org/inn.html
 BuildRequires: autoconf
-BuildRequires: libtool
-BuildRequires: flex
+BuildRequires: automake
 BuildRequires: bison
-BuildRequires: db3-devel
-BuildRequires: openssl-devel >= 0.9.6a
-BuildRequires: perl-devel >= 5.6.1
+BuildRequires: db-devel
+BuildRequires: flex
+BuildRequires: libtool >= 1:1.4.2-9
+BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: perl-devel >= 1:5.8.0
+PreReq:                %{name}-libs = %{version}
+PreReq:                rc-scripts
+Requires(post):        /bin/kill
+Requires(post):        /usr/bin/getent
+Requires(post,preun):  /sbin/chkconfig
+Requires(post):        sed
+Requires(post):        fileutils
+Requires(post):        textutils
+Requires(post):        /usr/sbin/usermod
 Requires:      cleanfeed >= 0.95.7b-4
 Requires:      rc-scripts >= 0.2.0
 Requires:      /etc/cron.d
@@ -50,23 +65,18 @@ Requires:   util-linux
 Requires:      procps
 Requires:      textutils
 Requires:      awk
-PreReq:                %{name}-libs = %{version}
-PreReq:                rc-scripts
-Requires(post,preun):  /sbin/chkconfig
-Requires(post):        sed
-Requires(post):        fileutils
-Requires(post):        /usr/sbin/usermod
 Provides:      nntpserver
 Obsoletes:     leafnode
 Obsoletes:     leafnode+
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/news
+%define                _includedir     %{_prefix}/include/inn
 
 # /usr/bin/pullnews doesn't provide perl(Net::NNTP) - perl-libnet does.
-%define                _noautoprov     "perl(Net::NNTP)"
+%define                _noautoprov     'perl(Net::NNTP)'
 # it's necessary only for sample nnrpd_auth.pl hook
-%define                _noautoreq      "perl(CDB_File)"
+%define                _noautoreq      'perl(CDB_File)'
 
 %description
 INN is a news server, which can be set up to handle USENET news, as
@@ -131,7 +141,7 @@ Summary(pt_BR):     Biblioteca INN
 Summary(tr):   INN kitaplýðý
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}
-Requires:      db3-devel
+Requires:      db-devel
 
 %description devel
 Header files and developer documentations for INN libraries.
@@ -241,17 +251,23 @@ sunucuya makaleyi yollar.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
+%patch6
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
+#%patch11 -p1  -- obsolete? (no setreuid test)
+#%patch12 -p1  -- obsolete? (pathrun not used in inndstart)
+#%patch13 -p1  -- obsolete? (?)
 
-%build
 touch innfeed/*.[ly]
 
-rm -f config.cache
-%{__autoconf}
+%build
 %{__libtoolize}
+%{__aclocal}
+%{__autoconf}
 %configure \
+       CFLAGS="%{rpmcflags} -D_GNU_SOURCE" \
        --with-news-user=news \
        --with-news-group=news \
        --with-news-master=news \
@@ -266,7 +282,7 @@ rm -f config.cache
        --with-sendmail=%{_libdir}/sendmail \
        --with-openssl=%{_prefix} \
        --with-berkeleydb=%{_prefix} \
-       %{?_with_largefiles:--with-largefiles} \
+       %{?_with_largefiles:--enable-largefiles} \
        %{!?_with_largefiles:--enable-tagged-hash} \
        --enable-merge-to-groups \
        --enable-pgp-verify \
@@ -276,13 +292,14 @@ rm -f config.cache
        --enable-ipv6 \
        --enable-dual-socket
 
-%{__make} all PATHFILTER=%{_datadir}/news/filter \
+%{__make} all \
+       PATHFILTER=%{_datadir}/news/filter \
        PATHCONTROL=%{_datadir}/news/control
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{news,rc.d/init.d,cron.d,logrotate.d} \
-       $RPM_BUILD_ROOT{%{_libdir}/news/{rnews,auth/generic},%{_includedir}/inn} \
+       $RPM_BUILD_ROOT{%{_libdir}/news/{rnews,auth/generic},%{_includedir}} \
        $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/news/{control,filter,auth}} \
        $RPM_BUILD_ROOT%{_mandir}/{man{1,3,5,8},pl/man{1,8}} \
        $RPM_BUILD_ROOT/var/{run/news,lib/news/backoff,log/{news,archiv/news}} \
@@ -308,14 +325,14 @@ install %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/inn
 install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/inn
 install %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}/cnfsstat.cron
 install %{SOURCE9} $RPM_BUILD_ROOT/etc/logrotate.d/inn
-install %{SOURCE10} $RPM_BUILD_ROOT/%{_sysconfdir}/readers.conf
-install %{SOURCE11} $RPM_BUILD_ROOT/%{_mandir}/pl/man1/getlist.1
-install %{SOURCE12} $RPM_BUILD_ROOT/%{_mandir}/pl/man8/innd.8
+install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/readers.conf
+install %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/pl/man1/getlist.1
+install %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/pl/man8/innd.8
 
 rm -f $RPM_BUILD_ROOT/var/lib/news/history
 
 umask 002
-touch $RPM_BUILD_ROOT/var/lib/news/subscriptions
+> $RPM_BUILD_ROOT%{_sysconfdir}/subscriptions
 touch $RPM_BUILD_ROOT/var/lib/news/history
 touch $RPM_BUILD_ROOT/var/lib/news/.news.daily
 touch $RPM_BUILD_ROOT/var/lib/news/active.times
@@ -323,13 +340,12 @@ touch $RPM_BUILD_ROOT/var/log/news/news.notice
 touch $RPM_BUILD_ROOT/var/log/news/news.crit
 touch $RPM_BUILD_ROOT/var/log/news/news.err
 
-touch $RPM_BUILD_ROOT%{_includedir}/inn/configdata.h
-install include/{clibrary,dbz,libinn,nntp,ov,qio,ppport,rwlock,storage}.h \
-       $RPM_BUILD_ROOT%{_includedir}/inn
+# obsolete?
+#touch $RPM_BUILD_ROOT%{_includedir}/inn/configdata.h
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/news/*.{a,la,so*} $RPM_BUILD_ROOT%{_libdir}
 
-LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_datadir} $RPM_BUILD_ROOT%{_bindir}/makehistory \
+LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/makehistory \
        -a $RPM_BUILD_ROOT/var/lib/news/active \
        -i -r -f $RPM_BUILD_ROOT/var/lib/news/history || :
 
@@ -340,16 +356,17 @@ find samples -name "*.in" -exec chmod a-x {} \;
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ "`su - news -s /bin/sh -c pwd 2>/dev/null`" = "/var/spool/news" ]; then
+if [ "`getent passwd http | cut -d: -f6`" = "/var/spool/news" ]; then
        /usr/sbin/usermod -d /home/services/news news
 fi
+umask 022
 if [ -f /var/lib/news/history ]; then
        cd /var/lib/news
        %{_bindir}/makedbz -s `wc -l <history` -f history
        for i in dir hash index pag; do
                [ -f history.n.$i ] && mv history.n.$i history.$i
        done
-       chown news.news history.*
+       chown news:news history.*
        chmod 644 history.*
 else
        cd /var/lib/news
@@ -359,38 +376,39 @@ else
        for i in dir hash index pag; do
                [ -f history.n.$i ] && mv history.n.$i history.$i
        done
-       chown news.news history history.*
+       chown news:news history history.*
        chmod 644 history history.*
 fi
 [ -f /var/lib/news/active.times ] || {
        touch /var/lib/news/active.times
-       chown news.news /var/lib/news/active.times
+       chown news:news /var/lib/news/active.times
 }
 
 [ -f /var/log/news/news.notice ] || {
        touch /var/log/news/news.notice
-       chown news.news /var/log/news/news.notice
+       chown news:news /var/log/news/news.notice
        chmod 664 /var/log/news/news.notice
 }
 
 [ -f /var/log/news/news.crit ] || {
        touch /var/log/news/news.crit
-       chown news.news /var/log/news/news.crit
+       chown news:news /var/log/news/news.crit
        chmod 660 /var/log/news/news.crit
 }
 
 [ -f /var/log/news/news.err ] || {
        touch /var/log/news/news.err
-       chown news.news /var/log/news/news.err
+       chown news:news /var/log/news/news.err
        chmod 660 /var/log/news/news.err
 }
 
 [ -f /var/lib/news/.news.daily ] || {
        touch /var/lib/news/.news.daily
-       chown news.news /var/lib/news/.news.daily
+       chown news:news /var/lib/news/.news.daily
        chmod 664 /var/lib/news/.news.daily
 }
 
+umask 027
 if [ -f /etc/syslog.conf ]; then
   if ! grep -q INN /etc/syslog.conf; then
     sed 's/mail.none;/mail.none;news.none;/' < /etc/syslog.conf > /etc/syslog.conf.inn
@@ -431,12 +449,17 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del inn
 fi
 
+%triggerpostun -- inn < 2.4.0
+cp -af %{_sysconfdir}/inn.conf{,.rpmorig}
+sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6address/sourceaddress6/' \
+       %{_sysconfdir}/inn.conf.rpmorig > %{_sysconfdir}/inn.conf
+
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc CONTRIBUTORS INSTALL HISTORY README* ChangeLog LICENSE NEWS
+%doc CONTRIBUTORS ChangeLog INSTALL LICENSE NEWS README TODO doc/[Icehs]*
 
 # DB
 %attr(770,root,news) %dir /var/lib/news
@@ -444,7 +467,6 @@ fi
 %attr(664,root,news) %config(noreplace) %verify(not size mtime md5) /var/lib/news/active
 %attr(664,root,news) %config(noreplace) %verify(not size mtime md5) /var/lib/news/distributions
 %attr(664,root,news) %config(noreplace) %verify(not size mtime md5) /var/lib/news/newsgroups
-%attr(664,root,news) %config(noreplace) %verify(not size mtime md5) /var/lib/news/subscriptions
 %attr(664,root,news) %config(noreplace) %verify(not size mtime md5) /var/lib/news/active.times
 %attr(664,news,news) %ghost /var/lib/news/.news.daily
 %attr(664,news,news) %ghost /var/lib/news/history
@@ -504,12 +526,12 @@ fi
 %attr(640,root,news) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/readers.conf
 %attr(640,root,news) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sasl.conf
 %attr(640,root,news) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/storage.conf
+%attr(640,root,news) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/subscriptions
 
 %attr(755,root,news) %dir %{_datadir}/news
 %attr(755,root,root) %dir %{_datadir}/news/control
 %attr(755,root,root) %dir %{_datadir}/news/filter
 
-%attr(755,root,root) %{_datadir}/news/docheckgroups
 %config(noreplace) %verify(not size mtime md5) %{_datadir}/news/innreport_inn.pm
 %config(noreplace) %verify(not size mtime md5) %{_datadir}/news/innshellvars
 %config(noreplace) %verify(not size mtime md5) %{_datadir}/news/innshellvars.pl
@@ -523,22 +545,13 @@ fi
 %config(noreplace) %verify(not size mtime md5) %{_datadir}/news/filter/startup_innd.pl
 %config(noreplace) %verify(not size mtime md5) %{_datadir}/news/filter/startup.tcl
 
-%attr(755,root,root) %{_datadir}/news/control/checkgroups
 %attr(755,root,root) %{_datadir}/news/control/checkgroups.pl
-%attr(755,root,root) %{_datadir}/news/control/default
-%attr(755,root,root) %{_datadir}/news/control/ihave
 %attr(755,root,root) %{_datadir}/news/control/ihave.pl
-%attr(755,root,root) %{_datadir}/news/control/newgroup
 %attr(755,root,root) %{_datadir}/news/control/newgroup.pl
-%attr(755,root,root) %{_datadir}/news/control/rmgroup
 %attr(755,root,root) %{_datadir}/news/control/rmgroup.pl
-%attr(755,root,root) %{_datadir}/news/control/sendme
 %attr(755,root,root) %{_datadir}/news/control/sendme.pl
-%attr(755,root,root) %{_datadir}/news/control/sendsys
 %attr(755,root,root) %{_datadir}/news/control/sendsys.pl
-%attr(755,root,root) %{_datadir}/news/control/senduuname
 %attr(755,root,root) %{_datadir}/news/control/senduuname.pl
-%attr(755,root,root) %{_datadir}/news/control/version
 %attr(755,root,root) %{_datadir}/news/control/version.pl
 
 %attr(755,root,news) %dir %{_libdir}/news
@@ -572,14 +585,16 @@ fi
 %attr(755,root,root) %{_bindir}/convdate
 %attr(755,root,root) %{_bindir}/ctlinnd
 %attr(755,root,root) %{_bindir}/cvtbatch
-%attr(755,root,root) %{_bindir}/dbprocs
+%attr(755,root,root) %{_bindir}/docheckgroups
 %attr(755,root,root) %{_bindir}/expire
 %attr(755,root,root) %{_bindir}/expireover
 %attr(755,root,root) %{_bindir}/expirerm
 %attr(755,root,root) %{_bindir}/fastrm
 %attr(755,root,root) %{_bindir}/filechan
 %attr(755,root,root) %{_bindir}/getlist
+%attr(755,root,root) %{_bindir}/gpgverify
 %attr(755,root,root) %{_bindir}/grephistory
+%attr(755,root,root) %{_bindir}/imapfeed
 %attr(755,root,root) %{_bindir}/inncheck
 %attr(755,root,root) %{_bindir}/innconfval
 %attr(755,root,root) %{_bindir}/innd
@@ -588,6 +603,7 @@ fi
 %attr(755,root,root) %{_bindir}/innmail
 %attr(755,root,root) %{_bindir}/innreport
 %attr(755,root,root) %{_bindir}/innstat
+%attr(755,root,root) %{_bindir}/innupgrade
 %attr(755,root,root) %{_bindir}/innwatch
 %attr(755,root,root) %{_bindir}/innxbatch
 %attr(755,root,root) %{_bindir}/innxmit
@@ -597,23 +613,23 @@ fi
 %attr(755,root,root) %{_bindir}/mod-active
 %attr(755,root,root) %{_bindir}/news.daily
 %attr(755,root,root) %{_bindir}/news2mail
-%attr(755,root,root) %{_bindir}/newsrequeue
+%attr(755,root,root) %{_bindir}/ninpaths
 %attr(755,root,root) %{_bindir}/nnrpd
 %attr(755,root,root) %{_bindir}/nntpget
 %attr(755,root,root) %{_bindir}/nntpsend
 %attr(755,root,root) %{_bindir}/ovdb_*
 %attr(755,root,root) %{_bindir}/overchan
-%attr(755,root,root) %{_bindir}/parsecontrol
+%attr(755,root,root) %{_bindir}/perl-nocem
 %attr(755,root,root) %{_bindir}/pgpverify
 %attr(755,root,root) %{_bindir}/procbatch
 %attr(755,root,root) %{_bindir}/prunehistory
 %attr(755,root,root) %{_bindir}/pullnews
 %attr(755,root,root) %{_bindir}/scanlogs
 %attr(755,root,root) %{_bindir}/scanspool
-%attr(755,root,root) %{_bindir}/sendbatch
 %attr(755,root,root) %{_bindir}/send-ihave
 %attr(755,root,root) %{_bindir}/send-nntp
 %attr(755,root,root) %{_bindir}/send-uucp
+%attr(755,root,root) %{_bindir}/sendinpaths
 %attr(755,root,root) %{_bindir}/sendxbatches
 %attr(755,root,root) %{_bindir}/shlock
 %attr(755,root,root) %{_bindir}/shrinkfile
@@ -621,20 +637,24 @@ fi
 %attr(755,root,root) %{_bindir}/simpleftp
 %attr(755,root,root) %{_bindir}/sm
 %attr(755,root,root) %{_bindir}/tally.control
+%attr(755,root,root) %{_bindir}/tdx-util
 %attr(755,root,root) %{_bindir}/writelog
 
 # MAN
-%{_mandir}/man1/ckpasswd.1*
 %{_mandir}/man1/convdate.1*
+%{_mandir}/man1/fastrm.1*
 %{_mandir}/man1/getlist.1*
 %{_mandir}/man1/grephistory.1*
 %{_mandir}/man1/innconfval.1*
 %{_mandir}/man1/innfeed.1*
+%{_mandir}/man1/innmail.1*
 %{_mandir}/man1/nntpget.1*
+%{_mandir}/man1/pgpverify.1*
 %{_mandir}/man1/rnews.1*
 %{_mandir}/man1/shlock.1*
 %{_mandir}/man1/shrinkfile.1*
 %{_mandir}/man1/simpleftp.1*
+%{_mandir}/man1/sm.1*
 %{_mandir}/man1/startinnfeed.1*
 %{_mandir}/man[58]/*
 %lang(pl) %{_mandir}/pl/man1/getlist.1*
@@ -646,7 +666,7 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/inn
+%{_includedir}
 %{_libdir}/lib*.la
 %{_libdir}/lib*.so
 %{_mandir}/man3/*
INN, the InterNet News System (news server)
This page took 0.117619 seconds and 4 git commands to generate.