diff options
Diffstat (limited to 'app-admin/system-config-httpd/files/1.4.3-gentooify.patch')
| -rw-r--r-- | app-admin/system-config-httpd/files/1.4.3-gentooify.patch | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/app-admin/system-config-httpd/files/1.4.3-gentooify.patch b/app-admin/system-config-httpd/files/1.4.3-gentooify.patch deleted file mode 100644 index 09cda3c575ed..000000000000 --- a/app-admin/system-config-httpd/files/1.4.3-gentooify.patch +++ /dev/null @@ -1,95 +0,0 @@ -Index: README.1st -=================================================================== -RCS file: /usr/local/CVS/apacheconf/README.1st,v -retrieving revision 1.4 -diff -u -b -B -r1.4 README.1st ---- README.1st 20 Nov 2006 16:41:44 -0000 1.4 -+++ README.1st 15 Jul 2007 03:31:11 -0000 -@@ -21,7 +21,7 @@ - Small update on the plan of parsing: - - As with the newer httpd packages we started supporting and automatically --including /etc/httpd/conf.d/* in our default setup, so the plan is to -+including /etc/apache2/conf.d/* in our default setup, so the plan is to - store the configuration generated by system-config-httpd in a file (or more - files) in that directory. - -Index: system-config-httpd.1 -=================================================================== -RCS file: /usr/local/CVS/apacheconf/system-config-httpd.1,v -retrieving revision 1.2 -diff -u -b -B -r1.2 system-config-httpd.1 ---- system-config-httpd.1 11 Jan 2007 11:57:56 -0000 1.2 -+++ system-config-httpd.1 15 Jul 2007 03:31:11 -0000 -@@ -26,7 +26,7 @@ - .SH "BUGS" - Not all possible checks for correct values are done yet. - --The current /etc/httpd/conf/httpd.conf file is \fBNOT\fR parsed, so changing the -+The current /etc/apache2/conf/httpd.conf file is \fBNOT\fR parsed, so changing the - configuration with system-config-httpd will overwrite any manual changes to the httpd.conf file or - the changes done with system-config-httpd are discarded. In case of overwriting the manually - editied file a backup file will be generated. -Index: src/ApacheBase.py -=================================================================== -RCS file: /usr/local/CVS/apacheconf/src/ApacheBase.py,v -retrieving revision 1.29 -diff -u -b -B -r1.29 ApacheBase.py ---- src/ApacheBase.py 10 Nov 2006 16:43:46 -0000 1.29 -+++ src/ApacheBase.py 15 Jul 2007 03:31:12 -0000 -@@ -4349,7 +4349,7 @@ - - # Compute md5sum of currently installed httpd.conf - try: -- rmd5 = hexstr (md5 (open ('/etc/httpd/conf.d/system-config-httpd.conf', 'r').read ()).digest()) -+ rmd5 = hexstr (md5 (open ('/etc/apache2/modules.d/system-config-httpd.conf', 'r').read ()).digest()) - except: - rmd5 = '' - -@@ -4361,14 +4361,14 @@ - if omd5 != rmd5: - if force: - try: -- os.remove ('/etc/httpd/conf.d/system-config-httpd.conf.bak') -+ os.remove ('/etc/apache2/modules.d/system-config-httpd.conf.bak') - except: - pass - try: -- os.rename ('/etc/httpd/conf.d/system-config-httpd.conf', '/etc/httpd/conf.d/system-config-httpd.conf.bak') -+ os.rename ('/etc/apache2/modules.d/system-config-httpd.conf', '/etc/apache2/modules.d/system-config-httpd.conf.bak') - except: - pass -- open ('/etc/httpd/conf.d/system-config-httpd.conf', 'w').write (result) -+ open ('/etc/apache2/modules.d/system-config-httpd.conf', 'w').write (result) - open ('/usr/share/system-config-httpd/system-config-httpd.conf.md5', 'w').write (nmd5) - local_box.write (ctx) - return 0 -@@ -4377,7 +4377,7 @@ - else: - return -2 - else: -- open ('/etc/httpd/conf.d/system-config-httpd.conf', 'w').write (result) -+ open ('/etc/apache2/modules.d/system-config-httpd.conf', 'w').write (result) - open ('/usr/share/system-config-httpd/system-config-httpd.conf.md5', 'w').write (nmd5) - local_box.write (ctx) - return 0 -Index: src/rpm.xml -=================================================================== -RCS file: /usr/local/CVS/apacheconf/src/rpm.xml,v -retrieving revision 1.17 -diff -u -b -B -r1.17 rpm.xml ---- src/rpm.xml 10 Nov 2006 16:43:47 -0000 1.17 -+++ src/rpm.xml 15 Jul 2007 03:31:12 -0000 -@@ -7,10 +7,10 @@ - <datatree> - <apache TYPE="LIST"> - <serveroptions TYPE="LIST"> -- <ServerRoot TYPE="STRING" VALUE="/etc/httpd"/> -+ <ServerRoot TYPE="STRING" VALUE="/etc/apache2"/> - <ServerName TYPE="STRING" VALUE=""/> - <ServerAdmin TYPE="STRING" VALUE="root@localhost"/> -- <CoreDumpDirectory TYPE="STRING" VALUE="/etc/httpd"/> -+ <CoreDumpDirectory TYPE="STRING" VALUE="/etc/apache2"/> - <listener ANONYMOUS="TRUE" ATOMIC="TRUE" TYPE="LIST"> - </listener> - <Port TYPE="INT" VALUE="80"/> |