head	1.21;
access;
symbols
	RELEASE_8_3_0:1.15
	RELEASE_9_0_0:1.15
	RELEASE_7_4_0:1.15
	RELEASE_8_2_0:1.15
	RELEASE_6_EOL:1.15
	RELEASE_8_1_0:1.15
	RELEASE_7_3_0:1.15
	RELEASE_8_0_0:1.15
	RELEASE_7_2_0:1.14
	RELEASE_7_1_0:1.14
	RELEASE_6_4_0:1.14
	RELEASE_5_EOL:1.14
	RELEASE_7_0_0:1.14
	RELEASE_6_3_0:1.14
	PRE_XORG_7:1.12
	RELEASE_4_EOL:1.12
	RELEASE_6_2_0:1.12
	RELEASE_6_1_0:1.10
	RELEASE_5_5_0:1.10
	RELEASE_6_0_0:1.8
	RELEASE_5_4_0:1.6
	RELEASE_4_11_0:1.5
	RELEASE_5_3_0:1.5
	RELEASE_4_10_0:1.4;
locks; strict;
comment	@# @;


1.21
date	2013.04.07.12.23.38;	author svnexp;	state Exp;
branches;
next	1.20;

1.20
date	2012.11.17.06.01.22;	author svnexp;	state Exp;
branches;
next	1.19;

1.19
date	2012.11.02.18.45.31;	author ohauer;	state Exp;
branches;
next	1.18;

1.18
date	2012.09.07.21.34.03;	author eadler;	state Exp;
branches;
next	1.17;

1.17
date	2012.05.26.03.15.46;	author wxs;	state Exp;
branches;
next	1.16;

1.16
date	2012.04.12.00.16.50;	author eadler;	state Exp;
branches;
next	1.15;

1.15
date	2009.08.07.16.25.52;	author simon;	state Exp;
branches;
next	1.14;

1.14
date	2007.05.10.17.34.45;	author simon;	state Exp;
branches;
next	1.13;

1.13
date	2007.05.10.17.31.49;	author simon;	state Exp;
branches;
next	1.12;

1.12
date	2006.06.06.10.57.44;	author simon;	state Exp;
branches;
next	1.11;

1.11
date	2006.06.06.10.55.10;	author simon;	state Exp;
branches;
next	1.10;

1.10
date	2005.11.29.08.46.13;	author simon;	state Exp;
branches;
next	1.9;

1.9
date	2005.11.29.08.41.51;	author simon;	state Exp;
branches;
next	1.8;

1.8
date	2005.07.30.19.13.10;	author simon;	state Exp;
branches;
next	1.7;

1.7
date	2005.05.13.15.33.48;	author nectar;	state Exp;
branches;
next	1.6;

1.6
date	2005.01.08.15.43.23;	author nectar;	state Exp;
branches;
next	1.5;

1.5
date	2004.08.25.15.36.09;	author hrs;	state Exp;
branches;
next	1.4;

1.4
date	2004.04.02.23.31.03;	author nectar;	state Exp;
branches;
next	1.3;

1.3
date	2004.03.30.06.16.21;	author nectar;	state Exp;
branches;
next	1.2;

1.2
date	2004.02.25.17.03.18;	author nectar;	state Exp;
branches;
next	1.1;

1.1
date	2004.02.12.14.23.48;	author nectar;	state Exp;
branches;
next	;


desc
@@


1.21
log
@HACK: manual copy of vuxml data from svn to cvs
@
text
@# Created by: nectar@@FreeBSD.org
# $FreeBSD: head/security/vuxml/Makefile 315412 2013-03-27 20:44:50Z delphij $

PORTNAME=	vuxml
PORTVERSION=	1.1
PORTREVISION=	1
CATEGORIES=	security textproc
MASTER_SITES=	http://www.vuxml.org/dtd/vuxml-1/
DISTFILES=	vuxml-10.dtd  vuxml-model-10.mod \
		vuxml-11.dtd  vuxml-model-11.mod \
		xml1.dcl catalog catalog.xml
DIST_SUBDIR=	vuxml

MAINTAINER=	secteam@@FreeBSD.org
COMMENT=	Vulnerability and eXposure Markup Language DTD

RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr \
		${LOCALBASE}/share/xml/dtd/xhtml-modularization/VERSION:${PORTSDIR}/textproc/xhtml-modularization \
		${LOCALBASE}/share/xml/dtd/xhtml-basic/xhtml-basic10.dtd:${PORTSDIR}/textproc/xhtml-basic

NO_MTREE=	YES
NO_BUILD=	YES
WRKSRC=		${WRKDIR}

dir_DTD=	share/xml/dtd/vuxml

XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
XMLCAT=		${PREFIX}/share/xml/catalog.ports

XMLCAT_ADD=	${XMLCATMGR} -c ${XMLCAT} add nextCatalog \
		    ${PREFIX}/${dir_DTD}/catalog.xml
XMLCAT_RM=	${XMLCATMGR} -c ${XMLCAT} remove nextCatalog \
		    ${PREFIX}/${dir_DTD}/catalog.xml
SGMLCAT_ADD=	${XMLCATMGR} -sc ${SGMLCAT} add CATALOG \
		    ${PREFIX}/${dir_DTD}/catalog
SGMLCAT_RM=	${XMLCATMGR} -sc ${SGMLCAT} remove CATALOG \
		    ${PREFIX}/${dir_DTD}/catalog

CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports

PLIST=		${WRKDIR}/PLIST

VUXML_FILE?=	${PKGDIR}/vuln.xml

do-extract:
	@@${RM} -rf ${WRKDIR}
	@@${MKDIR} ${WRKDIR}
.for f in ${DISTFILES}
	${CP} ${_DISTDIR}/${f} ${WRKDIR}/${f}
.endfor

pre-install:
	${CP} ${PKGDIR}/pkg-plist ${PLIST}
	${ECHO} "@@unexec ${XMLCAT_RM}" >> ${PLIST}
	${ECHO} "@@exec ${XMLCAT_ADD}" >> ${PLIST}
	${ECHO} "@@unexec ${SGMLCAT_RM}" >> ${PLIST}
	${ECHO} "@@exec ${SGMLCAT_ADD}" >> ${PLIST}
	${ECHO} "@@dirrm ${dir_DTD}" >> ${PLIST}
	${ECHO} '@@unexec rmdir %D share/xml/dtd 2>/dev/null || true' >> \
	    ${PLIST}

do-install:
	@@[ -d ${PREFIX}/${dir_DTD} ] || \
	    ${MKDIR} ${PREFIX}/${dir_DTD}
.for f in ${DISTFILES}
	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${dir_DTD}/${f}
.endfor
	${XMLCAT_ADD}
	${SGMLCAT_ADD}

validate: tidy
	@@${SH} ${FILESDIR}/validate.sh "${VUXML_FILE}"
	@@${ECHO_MSG} Checking if tidy differs...
	@@if ${DIFF} -u "${VUXML_FILE}" "${VUXML_FILE}.tidy"; \
	then \
		${ECHO_MSG} ... seems okay; \
		${RM} "${VUXML_FILE}.tidy"; \
	else \
		return 1; \
	fi
	@@${ECHO_MSG} Checking for space/tab...
	@@unexpand "${VUXML_FILE}" | ${SED} -E 's,[[:space:]]*$$,,g' > "${VUXML_FILE}.unexpanded"
	@@if ${DIFF} -u "${VUXML_FILE}" "${VUXML_FILE}.unexpanded"; \
	then \
		${ECHO_MSG} ... seems okay; \
		${RM} "${VUXML_FILE}.unexpanded"; \
	else \
		${ECHO_MSG} ... see above; \
		${ECHO_CMD} Consider using ${VUXML_FILE}.unexpanded for final commit; \
		return 1; \
	fi

tidy: vuln.xml
	@@if [ ! -e ${LOCALBASE}/share/xml/dtd/vuxml/catalog.xml ]; \
	then \
		echo "Please install the VuXML port prior to running make validate/tidy."; \
		exit 1; \
	fi
	${SH} ${FILESDIR}/tidy.sh "${FILESDIR}/tidy.xsl" "${VUXML_FILE}" > "${VUXML_FILE}.tidy"

newentry:
	@@${SH} ${FILESDIR}/newentry.sh "${VUXML_FILE}"

.include <bsd.port.mk>
@


1.20
log
@Switch exporter over
@
text
@d2 1
a2 1
# $FreeBSD: head/security/vuxml/Makefile 306878 2012-11-02 18:45:31Z ohauer $
d83 11
@


1.19
log
@SVN rev 306878 on 2012-11-02 18:45:31Z by ohauer

- update apache22 to version 2.22.23
- trim vuxml/Makefile header

with hat apache@@

Feature safe: yes

Security:       CVE-2012-2687
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.18
log
@SVN rev 303830 on 2012-09-07 21:34:03Z by eadler

Add a sanity check to ensure vuxml is actually installed prior to performing
the tidy step in validate. This step actually requires just the dependancies
but the full validate requires that vuxml be installed.

Reviewed by:	simon
Approved by:	secteam (implicit)
@
text
@d1 1
a1 4
# New ports collection makefile for:	vuxml
# Date created:		2004/02/12
# Whom:			nectar@@FreeBSD.org
#
a2 1
#
@


1.17
log
@Make validate target remove the tidy file if it passes.

Approved by:	chimera@@
@
text
@d89 5
@


1.16
log
@Add logic to check for tidy differences in the 'make validate' target.

Approved by:	secteam (simon, maintainer)
@
text
@d83 1
@


1.15
log
@When running the tidy target:
- Pipe ouput into vuln.xml.tidy instead of stdout.
- Don't hide what command we are running so it's clear where the tidy
  version of the output went.
@
text
@d77 1
a77 1
validate:
d79 7
d87 1
a87 1
tidy:
@


1.14
log
@Backout last change.

Blackboard:

- I will remember to look at which files are committed.
- I will remember to look at which files are committed.
- I will remember to look at which files are committed.
- I will remember to look at which files are committed.
- I will remember to look at which files are committed.
- I will remember to look at which files are committed.
- I will remember to look at which files are committed.

x1000

Pointy hat to:	simon
@
text
@d81 1
a81 1
	@@${SH} ${FILESDIR}/tidy.sh "${FILESDIR}/tidy.xsl" "${VUXML_FILE}"
@


1.13
log
@Update PHP entry to include the vulnerable version so the entry is
correct for when PHP is updated in ports (yes it's being worked on),
or for people who upgrade "manually".

With hat:	secteam
Requested by:   several
@
text
@a85 4
eddie:
	scp "${VUXML_FILE}" eddie.nitro.dk:/FreeBSD/work/vuxml/
	ssh eddie.nitro.dk make -C /FreeBSD/sec/vuxml-web/freebsd VUXML=/FreeBSD/work/vuxml/vuln.xml TOPDEST=/home/simon/public_html/vuxml all install

@


1.12
log
@Mumble, back out local changes which should not have been committed.
@
text
@d86 4
@


1.11
log
@Mark squirrelmail-1.4.6_1 as fixed for squirrelmail -- plugin.php
local file inclusion vulnerability.
@
text
@a85 6
scp:
	rsync -zv ${VUXML_FILE} freefall.freebsd.org:vuxml/vuln.xml

web: scp
	ssh freefall.freebsd.org make -C priv/vuxml-web/freebsd all install

@


1.10
log
@Backup rev 1.9 which should not have been committed since it was just my
local hack.

Note to self: Do not commit before having at least two cups of coffee.

Pointy hat to:	simon
@
text
@d86 6
@


1.9
log
@Mark flyspar 0.9.8 as fixed wrt. "flyspray -- cross-site scripting
vulnerabilities" since our port version of 0.9.8 includes update1 which
fixes the issue.

Reported by:	Volodymyr Kostyrko via pav
@
text
@d83 2
a84 2
add newentry:
	@@env EDITOR="/usr/bin/true" ${SH} ${FILESDIR}/newentry.sh "${VUXML_FILE}"
@


1.8
log
@Change MAINTAINER address for ports maintained by the Security Team to
secteam@@ instead of security@@ to make it more clear that the ports are
not maintained by the freebsd-security@@ mailing list.  Both addresses
go to the same people.
@
text
@d83 2
a84 2
newentry:
	@@${SH} ${FILESDIR}/newentry.sh "${VUXML_FILE}"
@


1.7
log
@MAINTAINER -> security@@FreeBSD.org
@
text
@d18 1
a18 1
MAINTAINER=	security@@FreeBSD.org
@


1.6
log
@Add a target, `newentry', that will insert a VuXML <vuln> template
(including generated VID) to the top of the `vuln.xml' file.  This will
save a little time when adding new entries.

Inspired by:	a patch from simon
@
text
@d18 1
a18 1
MAINTAINER=	nectar@@FreeBSD.org
@


1.5
log
@- Fix "make validate" problem when textproc/xhtml-basic is
  installed by adding an SGML declaration and DTDDECL.
- Remove the --catalogs option for xmllint(1) in validate.sh.

Approved by:	nectar (maintainer)
PR:		ports/63035
@
text
@d83 3
@


1.4
log
@Add VuXML 1.1 DTD
Update document type declaration to VuXML 1.1
@
text
@d10 1
a10 1
PORTREVISION=	0
d15 1
a15 1
		catalog catalog.xml
@


1.3
log
@Add a `make tidy' target that will clean up and sort a VuXML
document.  Requires xsltproc.
@
text
@d9 1
a9 1
PORTVERSION=	1.0
d13 4
a16 1
DISTFILES=	vuxml-10.dtd vuxml-model-10.mod
d40 1
a40 1
		    ${PREFIX}/${dir_DTD}/vuxml.cat
d42 1
a42 1
		    ${PREFIX}/${dir_DTD}/vuxml.cat
a73 4
	${SED} -e "s;@@@@PREFIX@@@@;${PREFIX};g" ${FILESDIR}/catalog.xml > \
	    ${WRKDIR}/catalog.xml
	${INSTALL_DATA} ${WRKDIR}/catalog.xml ${PREFIX}/${dir_DTD}/catalog.xml
	${INSTALL_DATA} ${FILESDIR}/vuxml.cat ${PREFIX}/${dir_DTD}/vuxml.cat
@


1.2
log
@Allow validation without the need to specify which processor to use.
Now just invoke `make validate', and a shell script will be run and try
to use xmllint or nsgmls.

Requested by:	des
@
text
@d81 3
@


1.1
log
@Add VuXML DTDs and the VuXML document for FreeBSD.
@
text
@d79 1
a79 18
.if defined(WITH_XMLLINT)
	${SETENV} SGML_CATALOG_FILES="${CATALOG_PORTS_XML}" \
	xmllint --catalogs --valid --noout "${VUXML_FILE}"
.elif defined(WITH_NSGMLS)
	${SETENV} SP_CHARSET_FIXED=YES SP_ENCODING=XML \
	nsgmls -wxml -s "${VUXML_FILE}"
.elif defined(WITH_RXP)
	${SETENV} XML_CATALOG_FILES="${CATALOG_PORTS_XML}" \
	rxp -EVNxs "${VUXML_FILE}"
.else
	@@${ECHO} "Define one of the following to validate:"
	@@${ECHO} "  WITH_XMLLINT          Use xmllint from libxml2"
	@@${ECHO} "  WITH_NSGMLS           Use nsgmls from jade"
# RXP 1.4 works great, but the ports system is stuck at 1.2.5
#	@@${ECHO} "  WITH_RXP              Use rxp"
	@@${ECHO}
	@@${FALSE}
.endif
@

