mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-03 11:12:13 +00:00
Code Issues Releases Activity

o Fix the htpasswd logic bug around -c and -n options

Browse Source 
o Take away WITH_BUNDLED_EXPAT option (use textproc/expat2)
o Bump PORTREVISION

Prompted by:	Jon Noack <noackjr@rice.edu> (htpasswd)
Obtained from:	Apache Project's CVS (htpasswd)
This commit is contained in:
Hye-Shik Chang 2002-06-27 00:22:40 +00:00
parent c9b6382140
commit d1eb2ba3f9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=62064
12 changed files with 60 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
www/apache2/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 2.0.39
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
http://apache.mirrorcentral.com/dist/httpd/ \
@ -23,6 +23,8 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= perky@fallin.lv
LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
LATEST_LINK= apache2
WITH_MPM?= prefork # or worker, perchild
@ -37,6 +39,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
--with-expat=${LOCALBASE} \
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
@ -50,15 +53,6 @@ MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
MAKE_ENV+= -DNOPORTDOCS
.endif
.if !defined(WITHOUT_BUNDLED_EXPAT)
EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat
PLIST_SUB+= EXPAT=""
.else
LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,^${DESTDIR},,}
PLIST_SUB+= EXPAT="@comment "
.endif
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
@ -132,8 +126,6 @@ post-patch:
${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
); done
@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout

11
www/apache2/files/patch-support:htpasswd.c Normal file
View File

@ -0,0 +1,11 @@
--- support/htpasswd.c 2002/06/18 02:58:36 1.48
+++ support/htpasswd.c 2002/06/19 17:31:19 1.49
@@ -375,7 +375,7 @@
}
}
- if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
+ if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
exit(ERR_SYNTAX);
}

6
www/apache2/pkg-plist
View File

@ -78,7 +78,6 @@ include/apache2/apr_xlate.h
include/apache2/apr_xml.h
include/apache2/apu.h
include/apache2/apu_compat.h
%%EXPAT%%include/apache2/expat.h
include/apache2/http_config.h
include/apache2/http_connection.h
include/apache2/http_core.h
@ -131,11 +130,6 @@ lib/apache2/libaprutil.la
lib/apache2/libaprutil.so.0
@unexec rm -f %D/lib/apache2/libaprutil.so
@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
%%EXPAT%%lib/apache2/libexpat.a
%%EXPAT%%lib/apache2/libexpat.la
%%EXPAT%%lib/apache2/libexpat.so.1
%%EXPAT%%@unexec rm -f %D/lib/apache2/libexpat.so
%%EXPAT%%@exec ln -fs libexpat.so.1 %D/lib/apache2/libexpat.so
libexec/apache2/httpd.exp
libexec/apache2/mod_access.so
libexec/apache2/mod_actions.so

16
www/apache20/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 2.0.39
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
http://apache.mirrorcentral.com/dist/httpd/ \
@ -23,6 +23,8 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= perky@fallin.lv
LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
LATEST_LINK= apache2
WITH_MPM?= prefork # or worker, perchild
@ -37,6 +39,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
--with-expat=${LOCALBASE} \
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
@ -50,15 +53,6 @@ MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
MAKE_ENV+= -DNOPORTDOCS
.endif
.if !defined(WITHOUT_BUNDLED_EXPAT)
EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat
PLIST_SUB+= EXPAT=""
.else
LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,^${DESTDIR},,}
PLIST_SUB+= EXPAT="@comment "
.endif
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
@ -132,8 +126,6 @@ post-patch:
${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
); done
@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout

11
www/apache20/files/patch-support:htpasswd.c Normal file
View File

@ -0,0 +1,11 @@
--- support/htpasswd.c 2002/06/18 02:58:36 1.48
+++ support/htpasswd.c 2002/06/19 17:31:19 1.49
@@ -375,7 +375,7 @@
}
}
- if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
+ if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
exit(ERR_SYNTAX);
}

6
www/apache20/pkg-plist
View File

@ -78,7 +78,6 @@ include/apache2/apr_xlate.h
include/apache2/apr_xml.h
include/apache2/apu.h
include/apache2/apu_compat.h
%%EXPAT%%include/apache2/expat.h
include/apache2/http_config.h
include/apache2/http_connection.h
include/apache2/http_core.h
@ -131,11 +130,6 @@ lib/apache2/libaprutil.la
lib/apache2/libaprutil.so.0
@unexec rm -f %D/lib/apache2/libaprutil.so
@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
%%EXPAT%%lib/apache2/libexpat.a
%%EXPAT%%lib/apache2/libexpat.la
%%EXPAT%%lib/apache2/libexpat.so.1
%%EXPAT%%@unexec rm -f %D/lib/apache2/libexpat.so
%%EXPAT%%@exec ln -fs libexpat.so.1 %D/lib/apache2/libexpat.so
libexec/apache2/httpd.exp
libexec/apache2/mod_access.so
libexec/apache2/mod_actions.so

16
www/apache21/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 2.0.39
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
http://apache.mirrorcentral.com/dist/httpd/ \
@ -23,6 +23,8 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= perky@fallin.lv
LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
LATEST_LINK= apache2
WITH_MPM?= prefork # or worker, perchild
@ -37,6 +39,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
--with-expat=${LOCALBASE} \
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
@ -50,15 +53,6 @@ MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
MAKE_ENV+= -DNOPORTDOCS
.endif
.if !defined(WITHOUT_BUNDLED_EXPAT)
EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat
PLIST_SUB+= EXPAT=""
.else
LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,^${DESTDIR},,}
PLIST_SUB+= EXPAT="@comment "
.endif
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
@ -132,8 +126,6 @@ post-patch:
${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
); done
@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout

11
www/apache21/files/patch-support:htpasswd.c Normal file
View File

@ -0,0 +1,11 @@
--- support/htpasswd.c 2002/06/18 02:58:36 1.48
+++ support/htpasswd.c 2002/06/19 17:31:19 1.49
@@ -375,7 +375,7 @@
}
}
- if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
+ if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
exit(ERR_SYNTAX);
}

6
www/apache21/pkg-plist
View File

@ -78,7 +78,6 @@ include/apache2/apr_xlate.h
include/apache2/apr_xml.h
include/apache2/apu.h
include/apache2/apu_compat.h
%%EXPAT%%include/apache2/expat.h
include/apache2/http_config.h
include/apache2/http_connection.h
include/apache2/http_core.h
@ -131,11 +130,6 @@ lib/apache2/libaprutil.la
lib/apache2/libaprutil.so.0
@unexec rm -f %D/lib/apache2/libaprutil.so
@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
%%EXPAT%%lib/apache2/libexpat.a
%%EXPAT%%lib/apache2/libexpat.la
%%EXPAT%%lib/apache2/libexpat.so.1
%%EXPAT%%@unexec rm -f %D/lib/apache2/libexpat.so
%%EXPAT%%@exec ln -fs libexpat.so.1 %D/lib/apache2/libexpat.so
libexec/apache2/httpd.exp
libexec/apache2/mod_access.so
libexec/apache2/mod_actions.so

16
www/apache22/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 2.0.39
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
http://apache.mirrorcentral.com/dist/httpd/ \
@ -23,6 +23,8 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= perky@fallin.lv
LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
LATEST_LINK= apache2
WITH_MPM?= prefork # or worker, perchild
@ -37,6 +39,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
--with-expat=${LOCALBASE} \
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
@ -50,15 +53,6 @@ MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
MAKE_ENV+= -DNOPORTDOCS
.endif
.if !defined(WITHOUT_BUNDLED_EXPAT)
EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat
PLIST_SUB+= EXPAT=""
.else
LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,^${DESTDIR},,}
PLIST_SUB+= EXPAT="@comment "
.endif
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
@ -132,8 +126,6 @@ post-patch:
${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
); done
@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout

11
www/apache22/files/patch-support:htpasswd.c Normal file
View File

@ -0,0 +1,11 @@
--- support/htpasswd.c 2002/06/18 02:58:36 1.48
+++ support/htpasswd.c 2002/06/19 17:31:19 1.49
@@ -375,7 +375,7 @@
}
}
- if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
+ if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
exit(ERR_SYNTAX);
}

6
www/apache22/pkg-plist
View File

@ -78,7 +78,6 @@ include/apache2/apr_xlate.h
include/apache2/apr_xml.h
include/apache2/apu.h
include/apache2/apu_compat.h
%%EXPAT%%include/apache2/expat.h
include/apache2/http_config.h
include/apache2/http_connection.h
include/apache2/http_core.h
@ -131,11 +130,6 @@ lib/apache2/libaprutil.la
lib/apache2/libaprutil.so.0
@unexec rm -f %D/lib/apache2/libaprutil.so
@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
%%EXPAT%%lib/apache2/libexpat.a
%%EXPAT%%lib/apache2/libexpat.la
%%EXPAT%%lib/apache2/libexpat.so.1
%%EXPAT%%@unexec rm -f %D/lib/apache2/libexpat.so
%%EXPAT%%@exec ln -fs libexpat.so.1 %D/lib/apache2/libexpat.so
libexec/apache2/httpd.exp
libexec/apache2/mod_access.so
libexec/apache2/mod_actions.so