[packages/wwwoffle] - remove useless and duplicate trigger - fix patches - add _GNU_SOURCE for setresuid/setresgid

baggins baggins at pld-linux.org
Mon Aug 24 00:09:07 CEST 2026


commit 9f76f42220bd6fa2df8c865a4627cfc541a10ca0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Aug 24 00:08:16 2026 +0200

    - remove useless and duplicate trigger
    - fix patches
    - add _GNU_SOURCE for setresuid/setresgid

 wwwoffle-namazu.patch      |  2 +-
 wwwoffle-replacement.patch |  2 +-
 wwwoffle.spec              | 15 +++------------
 3 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/wwwoffle.spec b/wwwoffle.spec
index 8a5474b..f719e4c 100644
--- a/wwwoffle.spec
+++ b/wwwoffle.spec
@@ -146,7 +146,7 @@ cp /usr/share/automake/config.sub .
 	%{?with_ipv6:--with-ipv6} \
 	--with-spooldir=%{_var}/cache/wwwoffle
 %{__make} \
-	CFLAGS="%{rpmcflags}" \
+	CFLAGS="%{rpmcflags} -D_GNU_SOURCE" \
 	LDFLAGS="%{rpmldflags}"
 
 %install
@@ -193,22 +193,13 @@ install doc/fr/wwwoffle.conf.man $RPM_BUILD_ROOT%{_mandir}/fr/man5/wwwoffle.conf
 
 rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
 
-%triggerpostun -- %{name} < 2.7
-
-echo Note!  Your existing cache and config file look earlier than
-echo 2.7 version. There have been several major changes in config
-echo file and some minor changes in cache handling. Read the file
-echo NEWS and following at a pinch for details. All the necessary
-echo files are available from within your documentation directory.
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %triggerpostun -- %{name} < 2.8
-
 chown wwwoffle:wwwoffle -R \
 	%{_var}/cache/wwwoffle/{ftp,http,lastout,lasttime,local,monitor,outgoing,temp,prevout[1-7],prevtime[1-7]}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %pretrans
 test -h %{_var}/cache/wwwoffle/html || rm -rf %{_var}/cache/wwwoffle/html
 
diff --git a/wwwoffle-namazu.patch b/wwwoffle-namazu.patch
index 7c8ef04..522c3ab 100644
--- a/wwwoffle-namazu.patch
+++ b/wwwoffle-namazu.patch
@@ -60,8 +60,8 @@ diff -urN wwwoffle-2.8.orig/cache/search/namazu/scripts/wwwoffle-mknmz-lasttime
 +mknmz-wwwoffle -f /etc/wwwoffle/namazu/mknmzrc \
 +               -T /usr/share/namazu/template \
                 -O search/namazu/db \
+                -Y \
                 -V \
-                lasttime \
 --- wwwoffle-2.8b/cache/search/namazu/scripts/wwwoffle-namazu	2004-03-01 02:33:23.000000000 +0100
 +++ wwwoffle-2.8/cache/search/namazu/scripts/wwwoffle-namazu	2004-03-01 02:35:36.000000000 +0100
 @@ -1,25 +1,12 @@
diff --git a/wwwoffle-replacement.patch b/wwwoffle-replacement.patch
index 3aeec34..f5a31fc 100644
--- a/wwwoffle-replacement.patch
+++ b/wwwoffle-replacement.patch
@@ -15,4 +15,4 @@ diff -urN wwwoffle-2.7e.old/conf/wwwoffle.conf.template wwwoffle-2.7e/conf/wwwof
 +# replacement = /local/dontget/replacement.html
  
  #### Example ####
- # Don't get from any hosts in the barfoo.com domain.
+ # Do get files from /good/ in the barfoo.com domain.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wwwoffle.git/commitdiff/9f76f42220bd6fa2df8c865a4627cfc541a10ca0



More information about the pld-cvs-commit mailing list