rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Patch status tracking updates.

Browse Source
This commit is contained in:
jorton 2004-10-13 16:35:07 +00:00
parent 0ba3e33bdc
commit 2bc479e770
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,5 +1,5 @@
# Makefile for source rpm: httpd # Makefile for source rpm: httpd
# $Id: Makefile,v 1.3 2004/09/17 10:28:46 jorton Exp $ # $Id: Makefile,v 1.4 2004/10/13 10:44:51 jorton Exp $
NAME := httpd NAME := httpd
SPECFILE = $(firstword $(wildcard *.spec)) SPECFILE = $(firstword $(wildcard *.spec))
UPSTREAM_CHECKS = asc UPSTREAM_CHECKS = asc
@ -9,12 +9,12 @@ include ../common/Makefile.common
migration.html: migration.xml html.xsl migration.html: migration.xml html.xsl
xmlto -x html.xsl html-nochunks migration.xml xmlto -x html.xsl html-nochunks migration.xml
migration-view: migration.html view-migration: migration.html
gnome-moz-remote `pwd`/migration.html gnome-moz-remote `pwd`/migration.html
ALL_PATCHES := $(wildcard *.patch) ALL_PATCHES := $(wildcard *.patch)
status.xml: $(ALL_PATCHES) status.xml: $(ALL_PATCHES) mkstatus.sh
@./mkstatus.sh $(ALL_PATCHES) > $@ @./mkstatus.sh $(ALL_PATCHES) > $@
status.html: status.xml status-html.xsl status.html: status.xml status-html.xsl

3
httpd-2.0.40-xfsz.patch
View File

@ -4,7 +4,8 @@ E2BIG rather than killing the process
Upstream-HEAD: omit Upstream-HEAD: omit
Upstream-2.0: omit Upstream-2.0: omit
Upstream-Status: Obsoleted by proper LFS support in APR 1.0 Upstream-Status: Obsoleted by proper LFS support in APR
Upstream-PR: 13511
--- ./server/mpm/prefork/prefork.c.xfsz Wed Jul 17 22:39:55 2002 --- ./server/mpm/prefork/prefork.c.xfsz Wed Jul 17 22:39:55 2002
+++ ./server/mpm/prefork/prefork.c Mon Aug 26 15:40:24 2002 +++ ./server/mpm/prefork/prefork.c Mon Aug 26 15:40:24 2002

4
httpd-2.0.45-deplibs.patch
View File

@ -2,9 +2,9 @@
apr and apr-util are patched to correctly depend on their deps, so apr and apr-util are patched to correctly depend on their deps, so
it's sufficient to just link httpd against the .la file. it's sufficient to just link httpd against the .la file.
Upstream-HEAD: pending Upstream-HEAD: needed
Upstream-2.0: omit Upstream-2.0: omit
Upstream-Status: apr-util fixes pending on 0.9 branch, OK for HEAD Upstream-Status: apr-util still to be fixed properly on HEAD
--- httpd-2.0.45/configure.in.deplibs 2003-04-29 10:27:05.000000000 +0100 --- httpd-2.0.45/configure.in.deplibs 2003-04-29 10:27:05.000000000 +0100
+++ httpd-2.0.45/configure.in 2003-04-29 10:26:45.000000000 +0100 +++ httpd-2.0.45/configure.in 2003-04-29 10:26:45.000000000 +0100

2
httpd-2.0.45-export.patch
View File

@ -2,7 +2,7 @@
There is no need to "suck in" the apr/apr-util symbols when using There is no need to "suck in" the apr/apr-util symbols when using
a shared libapr{,util}, it just bloats the symbol table; so don't. a shared libapr{,util}, it just bloats the symbol table; so don't.
Upstream-HEAD: Upstream-HEAD: needed
Upstream-2.0: omit Upstream-2.0: omit
Upstream-Status: EXPORT_DIRS change is conditional on using shared apr Upstream-Status: EXPORT_DIRS change is conditional on using shared apr

11
mkstatus.sh
View File

@ -7,7 +7,14 @@ for f in $*; do
s_HEAD=`grep ^Upstream-HEAD $f | sed 's/Upstream-HEAD: //'` s_HEAD=`grep ^Upstream-HEAD $f | sed 's/Upstream-HEAD: //'`
s_20=`grep ^Upstream-2.0: $f | sed 's/Upstream-2.0: //'` s_20=`grep ^Upstream-2.0: $f | sed 's/Upstream-2.0: //'`
s_Com=`grep ^Upstream-Status: $f | sed 's/Upstream-Status: //'` s_Com=`grep ^Upstream-Status: $f | sed 's/Upstream-Status: //'`
printf '<patch name="%s" status-head="%s" status-2.0="%s" status-comment="%s"/>\n' \ s_PR=`grep ^Upstream-PR: $f | sed 's/Upstream-PR: //'`
$n "$s_HEAD" "$s_20" "$s_Com" printf ' <patch name="%s">\n' $n
printf ' <status branch="HEAD">%s</status>\n' "$s_HEAD"
printf ' <status branch="2.0">%s</status>\n' "$s_20"
printf ' <comment>%s</comment>\n' "$s_Com"
if [ -n "$s_PR" ]; then
printf ' <bug pr="%s"/>\n' "$s_PR"
fi
printf ' </patch>\n'
done done
echo '</patches>' echo '</patches>'