commit: edf081726fb7f942189e688e384ea12eb74666de Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Feb 13 18:07:57 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Feb 14 21:39:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edf08172
www-servers/fnord: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/3959 www-servers/fnord/files/fnord-1.9-gentoo.diff | 96 --------------------------- 1 file changed, 96 deletions(-) diff --git a/www-servers/fnord/files/fnord-1.9-gentoo.diff b/www-servers/fnord/files/fnord-1.9-gentoo.diff deleted file mode 100644 index c32c53daf5..0000000000 --- a/www-servers/fnord/files/fnord-1.9-gentoo.diff +++ /dev/null @@ -1,96 +0,0 @@ -diff --exclude='*~' -urN fnord-1.9.orig/fnord-conf fnord-1.9/fnord-conf ---- fnord-1.9.orig/fnord-conf 2003-06-05 19:32:39.000000000 -0400 -+++ fnord-1.9/fnord-conf 2005-03-06 22:39:30.243806792 -0500 -@@ -17,7 +17,7 @@ - mkdir -p $dir - echo "#!/bin/sh" > $dir/run - echo "cd $webroot" >> $dir/run --echo "exec envuidgid $acct tcpserver -RHl localhost ${myip:-0} 80 fnord 2>&1" >> $dir/run -+echo "exec envuidgid $acct tcpserver -RHl localhost ${myip:-0} 80 /usr/bin/fnord 2>&1" >> $dir/run - chmod 755 $dir/run - - # tell old daemontools that it should spawn a log process, too -diff --exclude='*~' -urN fnord-1.9.orig/httpd.c fnord-1.9/httpd.c ---- fnord-1.9.orig/httpd.c 2005-01-31 11:10:39.000000000 -0500 -+++ fnord-1.9/httpd.c 2005-03-06 22:42:07.761860408 -0500 -@@ -25,7 +25,9 @@ - #include "scan.h" - - /* uncomment the following line to enable support for CGI */ --// #define CGI -+#ifndef CGI -+# define CGI -+#endif - - #ifdef CGI - /* uncomment the following line to enable support for "index.cgi" -@@ -39,7 +41,9 @@ - - /* uncomment the following line to enable support for autogenerated - * directory-listings for directories without index */ --/* #define DIR_LIST */ -+#ifndef DIR_LIST -+# define DIR_LIST -+#endif - - #ifdef DIR_LIST - /* uncomment the following line to enable support for system symlink -diff --exclude='*~' -urN fnord-1.9.orig/Makefile fnord-1.9/Makefile ---- fnord-1.9.orig/Makefile 2005-01-31 13:33:58.000000000 -0500 -+++ fnord-1.9/Makefile 2005-03-06 22:51:27.914704232 -0500 -@@ -1,28 +1,19 @@ --CC=gcc --CXX=g++ -- --#LIBOWFAT=../libowfat/ --DIET=diet -Os -- --CFLAGS=-Os -fomit-frame-pointer --#CFLAGS=-g -+CC:=gcc -+CXX:=g++ - - all: fnord fnord-cgi fnord-idx - - fnord: httpd - cp -p $^ $@ -- -strip -R .note -R .comment $@ - - httpd: httpd.o libowfat.a - $(DIET) $(CC) -o $@ $^ $(CFLAGS) - - fnord-cgi: httpd-cgi.o libowfat.a - $(DIET) $(CC) -o $@ $^ $(CFLAGS) -- -strip -R .note -R .comment $@ - - fnord-idx: httpd-idx.o libowfat.a - $(DIET) $(CC) -o $@ $^ $(CFLAGS) -- -strip -R .note -R .comment $@ - - libowfat.a: httpd.o buffer_1.o buffer_puts.o buffer_flush.o buffer_put.o \ - buffer_putulong.o buffer_2.o buffer_putspace.o buffer_stubborn.o \ -@@ -32,19 +23,19 @@ - -ranlib $@ - - httpd.o: httpd.c -- $(DIET) $(CC) -pipe $(CFLAGS) -c $^ -DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\" -+ $(DIET) $(CC) $(CFLAGS) -c $^ -DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\" - - httpd-cgi.o: httpd.c -- $(DIET) $(CC) -pipe $(CFLAGS) -c httpd.c -o $@ -DCGI -DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\" -+ $(DIET) $(CC) $(CFLAGS) -c httpd.c -o $@ -DCGI -DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\" - - httpd-idx.o: httpd.c -- $(DIET) $(CC) -pipe $(CFLAGS) -c httpd.c -o $@ -DDIR_LIST -DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\" -+ $(DIET) $(CC) $(CFLAGS) -c httpd.c -o $@ -DDIR_LIST -DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\" - - %.o: %.c -- $(DIET) $(CC) -pipe $(CFLAGS) -c $^ -+ $(DIET) $(CC) $(CFLAGS) -c $^ - - %.o: %.cpp -- $(DIET) $(CXX) -pipe $(CFLAGS) -c $^ -+ $(DIET) $(CXX) $(CFLAGS) -c $^ - - .PHONY: rename clean install server - server: fnord
