Hello community,
here is the log from the commit of package inn
checked in at Wed Feb 14 21:04:38 CET 2007.
--------
--- inn/inn.changes 2006-11-13 20:47:09.000000000 +0100
+++ /mounts/work_src_done/STABLE/inn/inn.changes 2007-02-14 15:34:38.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Feb 14 15:34:29 CET 2007 - schwab@suse.de
+
+- Fix building as non-root.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ inn.spec ++++++
--- /var/tmp/diff_new_pack.Ag2898/_old 2007-02-14 21:03:46.000000000 +0100
+++ /var/tmp/diff_new_pack.Ag2898/_new 2007-02-14 21:03:46.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package inn (Version 2.4.2)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,14 +13,14 @@
BuildRequires: pam-devel postfix
URL: http://www.isc.org/sw/inn/
Summary: InterNetNews
-License: GNU General Public License (GPL) - all versions, Other License(s), see package
+License: GNU General Public License (GPL)
Group: Productivity/Networking/News/Servers
Provides: inn_pkg nntp_daemon
Conflicts: cnews nntpd mininews
PreReq: perl %fillup_prereq %insserv_prereq permissions
Autoreqprov: on
Version: 2.4.2
-Release: 37
+Release: 48
%define PatchVersion -%{version}
Source: inn%{PatchVersion}.tar.bz2
Source1: doc-inn.tar.bz2
@@ -92,7 +92,6 @@
make
%install
-%{?buildroot:rm -rf $RPM_BUILD_ROOT}
mkdir -p %{buildroot}/etc
mkdir -p %{buildroot}/usr/lib
mkdir -p %{buildroot}/usr/bin
@@ -101,17 +100,17 @@
mkdir -p %{buildroot}/var/spool
mkdir -p %{buildroot}%{_mandir}
#
-make DESTDIR=%{buildroot} install
-gzip -f9 %{buildroot}%{_mandir}/*/*
+make DESTDIR=%{buildroot} OWNER= ROWNER= install
+gzip -nf9 %{buildroot}%{_mandir}/*/*
chmod 444 %{buildroot}/usr/lib/news/lib/libinn.a
chmod 444 %{buildroot}/usr/lib/news/lib/libstorage.a
-chown 0:0 %{buildroot}/usr/lib/news
-chown 0:0 %{buildroot}/usr/lib/news/bin
#
#
#
%define installnews install -o news -g news -m
+%define installnews install -m
%define installroot install -o root -g root -m
+%define installroot install -m
%{installnews} 0644 subscriptions %{buildroot}/etc/news
%{installnews} 0644 distributions %{buildroot}/etc/news
%{installnews} 0644 crontab.sample %{buildroot}/etc/news
@@ -177,7 +176,10 @@
$0 == "/usr/lib/news" { next }
$0 == "/var/lib/news" { next }
{ pfx="" }
-$0 == "/etc/news" { pfx="%attr(750,news,news) " }
+$0 == "/var/spool/news" { pfx = "%%attr(775,news,news) " }
+/\/news/ {
+ if (!match(pfx, /%%attr/)) pfx = "%%attr(-,news,news) " pfx
+}
{ print "%dir " pfx $0 }
' > %{filelist}
find %{buildroot} ! -type d -printf "/%%P\n" | awk '
@@ -196,6 +198,9 @@
/^\/var\/log\/news\/(news|inn\.status|innfeed\.status)/ {
pfx="%ghost %attr(644,news,news) "pfx
}
+/\/news\// {
+ if (!match(pfx, /%%attr/)) pfx = "%%attr(-,news,news) " pfx
+}
/^\/etc\/slp\.reg\.d\// { next }
{ print pfx $0 }
' >> %{filelist}
@@ -235,12 +240,14 @@
%{insserv_cleanup}
%files -f %{filelist}
+%defattr(-,root,root)
%dir /etc/slp.reg.d
%config(noreplace) /etc/slp.reg.d/inn.reg
%doc CONTRIBUTORS LICENSE ChangeLog INSTALL NEWS README*
%doc doc-inn/*
%files -n mininews
+%defattr(-,root,root)
%config(noreplace) /etc/news/inn.conf
%dir /usr/lib/news/bin
%attr(4550,news,uucp) /usr/lib/news/bin/rnews
@@ -251,6 +258,8 @@
%doc %{_mandir}/*/[ri]news.*
%changelog -n inn
+* Wed Feb 14 2007 - schwab@suse.de
+- Fix building as non-root.
* Mon Nov 13 2006 - mls@suse.de
- initialize mechusing variable to shut up intel compiler [#197713]
* Mon Jan 30 2006 - mls@suse.de
++++++ inn-2.4.2.dif ++++++
--- /var/tmp/diff_new_pack.Ag2898/_old 2007-02-14 21:03:46.000000000 +0100
+++ /var/tmp/diff_new_pack.Ag2898/_new 2007-02-14 21:03:46.000000000 +0100
@@ -1,5 +1,5 @@
---- ./Makefile.global.in.orig 2004-12-22 04:21:19.000000000 +0000
-+++ ./Makefile.global.in 2005-02-04 16:07:51.000000000 +0000
+--- Makefile.global.in
++++ Makefile.global.in
@@ -33,7 +33,7 @@
## libraries built as part of INN. Using relative paths confuses libtool
## when linking the test suite.
@@ -9,8 +9,8 @@
## Basic compiler settings. COPT is the variable to override on the make
## command line to change the optimization or add warning flags (such as
---- ./README.linux.orig 2005-02-04 16:07:51.000000000 +0000
-+++ ./README.linux 2005-02-04 16:07:51.000000000 +0000
+--- README.linux
++++ README.linux
@@ -0,0 +1,95 @@
+Installing a news system: Florian La Roche
+=========================
@@ -107,8 +107,8 @@
+(recomended if you have lots of articles and little time), use
+the "--fresh" option to just create a new history database.
+
---- ./backends/actsyncd.in.orig 2004-12-22 04:21:19.000000000 +0000
-+++ ./backends/actsyncd.in 2005-02-04 16:07:51.000000000 +0000
+--- backends/actsyncd.in
++++ backends/actsyncd.in
@@ -53,23 +53,23 @@
# parse config_file
@@ -138,8 +138,8 @@
if [ -z "$spool" ]; then
spool=$SPOOL
#echo "$0: no spool directory specified in $cfg" 1>&2
---- ./backends/send-uucp.in.orig 2004-12-22 04:21:19.000000000 +0000
-+++ ./backends/send-uucp.in 2005-02-04 16:07:51.000000000 +0000
+--- backends/send-uucp.in
++++ backends/send-uucp.in
@@ -21,6 +21,10 @@
use strict;
use Sys::Syslog;
@@ -151,8 +151,8 @@
# for compatibility with INN 1.x
$inn::pathetc ||= '/etc/news';
$inn::syslog_facility ||= 'news';
---- ./configure.in.orig 2004-12-22 04:21:19.000000000 +0000
-+++ ./configure.in 2005-02-04 16:07:51.000000000 +0000
+--- configure.in
++++ configure.in
@@ -108,6 +108,7 @@
AC_AIX
AC_ISC_POSIX
@@ -239,8 +239,8 @@
dnl If replacing fseeko or ftello, see if we can use fsetpos/fgetpos.
if test "$ac_cv_func_fseeko" = no || test "$ac_cv_func_ftello" = no ; then
---- ./convertspool.orig 2005-02-04 16:07:51.000000000 +0000
-+++ ./convertspool 2005-02-04 16:07:51.000000000 +0000
+--- convertspool
++++ convertspool
@@ -0,0 +1,141 @@
+#!/bin/sh
+. /usr/lib/news/lib/innshellvars
@@ -383,8 +383,8 @@
+cd $PATHSPOOL
+rmdir --ignore-fail-on-non-empty oldspool
+echo "done."
---- ./crontab.sample.orig 2005-02-04 16:07:51.000000000 +0000
-+++ ./crontab.sample 2005-02-04 16:07:51.000000000 +0000
+--- crontab.sample
++++ crontab.sample
@@ -0,0 +1,38 @@
+# Here are sample entries that could be added to /etc/crontab for
+# your INN News-System.
@@ -424,15 +424,15 @@
+# generate a uucp transmission statistic
+#0 6 10 * * nobody /usr/bin/tua -U
+
---- ./distributions.orig 2005-02-04 16:07:51.000000000 +0000
-+++ ./distributions 2005-02-04 16:07:51.000000000 +0000
+--- distributions
++++ distributions
@@ -0,0 +1,4 @@
+world Use no distribution rather than world
+na North America
+usa United States
+local This site only
---- ./include/clibrary.h.orig 2005-02-04 17:14:06.000000000 +0000
-+++ ./include/clibrary.h 2005-02-04 17:14:50.000000000 +0000
+--- include/clibrary.h
++++ include/clibrary.h
@@ -24,6 +24,17 @@
/* Make sure we have our configuration information. */
#include "config.h"
@@ -451,8 +451,8 @@
/* Assume stdarg is available; don't bother with varargs support any more.
We need this to be able to declare vsnprintf. */
#include