diff options
| author | Treeve Jelbert | 2009-10-08 21:20:06 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2009-10-08 21:20:06 +0200 |
| commit | 4ec932ff2333724b1ed53778717a5356a8befeee (patch) | |
| tree | 906fc33b6baf3c9589df7d4aa9e886f0d42a181c | |
| parent | 4a2ad2846ef33ae7a89946bb1953df3bb1f8e71e (diff) | |
| parent | ad0b933a6086ae2971afd63f8ae2a7566e435e1c (diff) | |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
64 files changed, 297 insertions, 74 deletions
@@ -1,3 +1,13 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * libs/gssdp: new spell, SSDP library + * collab/gupnp: new spell, GNU UPnP framework + * collab/gupnp-av: new spell, GNU UPnP A/V + * collab/gupnp-igd: new spell, GNU UPnP port mapper + * collab/gupnp-tools: new spell, GNU UPnP tools + * collab/gupnp-ui: new spell, GNU UPnP GUI + * net/shorewall-perl: deprecated in favour of shorewall-common + * net/shorewall-shell: deprecated in favour of shorewall-common + 2009-10-06 Treeve Jelbert <treeve@sourcemage.org> * devel/generatorrunner: new spell, supercedes boostpythongenerator diff --git a/chat-im/amsn/DEPENDS b/chat-im/amsn/DEPENDS index feadf69ffe..835d61fee3 100755 --- a/chat-im/amsn/DEPENDS +++ b/chat-im/amsn/DEPENDS @@ -1,4 +1,8 @@ depends tk && depends imagemagick && depends g++ && -optional_depends tls "" "" "for secure connection using SSL, for MSNP9" +optional_depends tls "" "" "for secure connection using SSL, for MSNP9" && +optional_depends libv4l "" "--disable-libv4l" \ + "for webcam and audio support via v4l" && +optional_depends gupnp-igd "" "--disable-upnp" "for UPNP support" && +optional_depends farsight2 "" "" "for farsight video support, for webcam" diff --git a/chat-im/amsn/DETAILS b/chat-im/amsn/DETAILS index 90776f9df2..16e51c0205 100755 --- a/chat-im/amsn/DETAILS +++ b/chat-im/amsn/DETAILS @@ -1,11 +1,24 @@ SPELL=amsn +if [ "$AMSN_SCM" == "y" ]; then + if [ "$AMSN_SCM_AUTOUPDATE" == "y" ]; then + VERSION="$(date +%Y%m%d)" + else + VERSION=svnsnapshot + fi + SOURCE=${SPELL}_dev.tar.gz +SOURCE_DIRECTORY=$BUILD_DIRECTORY/msn + SOURCE_IGNORE=volatile + FORCE_DOWNLOAD=on + SOURCE_URL[0]=http://amsn.sourceforge.net/$SOURCE +else VERSION=0.98 - SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION + SOURCE=$SPELL-$VERSION.tar.bz2 + SOURCE_GPG="gurus.gpg:${SOURCE}.sig" SOURCE_URL[0]=$SOURCEFORGE_URL/amsn/$SOURCE +fi WEB_SITE=http://amsn.sourceforge.net ENTERED=20021220 - SOURCE_GPG="gurus.gpg:${SOURCE}.sig" LICENSE="GPL" KEYWORDS="messaging chat msn" SHORT="MSN messenger clone, no ads and GPL licensed" diff --git a/chat-im/amsn/HISTORY b/chat-im/amsn/HISTORY index 0948f0b88f..1984fd68fe 100644 --- a/chat-im/amsn/HISTORY +++ b/chat-im/amsn/HISTORY @@ -1,3 +1,7 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * PREPARE,DETAILS: added option for svn snapshot + * DEPENDS: added missing optional dependencies + 2009-08-28 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.98 * desktop/amsn.desktop: removed, used upstream one diff --git a/chat-im/amsn/PREPARE b/chat-im/amsn/PREPARE new file mode 100755 index 0000000000..822f5ec4e3 --- /dev/null +++ b/chat-im/amsn/PREPARE @@ -0,0 +1,6 @@ +config_query AMSN_SCM "Build a subversion snapshot?" n && + +if [ "$AMSN_SCM" == "y" ]; then + config_query AMSN_SCM_AUTOUPDATE \ + "Automatically update on every system update?" n +fi diff --git a/collab/gupnp-av/DEPENDS b/collab/gupnp-av/DEPENDS new file mode 100755 index 0000000000..5f1d8ae560 --- /dev/null +++ b/collab/gupnp-av/DEPENDS @@ -0,0 +1,13 @@ +depends gupnp && +optional_depends gtk-doc '--enable-gtk-doc' '--disable-gtk-doc' \ + 'for documentation generation' && +if is_depends_enabled $SPELL gtk-doc ; then + config_query_option GUPNPAV_HTML \ + 'build html docs?' y \ + '--enable-gtk-doc-html' \ + '--disable-gtk-doc-html' && + config_query_option GUPNPAV_PDF \ + 'build html docs?' n \ + '--enable-gtk-doc-pdf' \ + '--disable-gtk-doc-pdf' +fi diff --git a/collab/gupnp-av/DETAILS b/collab/gupnp-av/DETAILS new file mode 100755 index 0000000000..a3285cb7a2 --- /dev/null +++ b/collab/gupnp-av/DETAILS @@ -0,0 +1,14 @@ + SPELL=gupnp-av + VERSION=0.5.1 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://www.gupnp.org/sources/${SPELL}/${SOURCE} + SOURCE_HASH=sha512:e861de5314b143238c0c08e16918b212f8547442cc4e8338f80cf0a51c1b5d1b6661f0bc547614e53dcb0ff17c9de91a2be77b8a714e6d038537c1076a5c9738 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://www.gupnp.org" + LICENSE[0]=GPL + ENTERED=20091008 + SHORT="GUPnP A/V utilities" +cat << EOF +GUPnP A/V is a small utility library that aims to ease the handling and +implementation of UPnP A/V profiles. +EOF diff --git a/collab/gupnp-av/HISTORY b/collab/gupnp-av/HISTORY new file mode 100644 index 0000000000..001428b46a --- /dev/null +++ b/collab/gupnp-av/HISTORY @@ -0,0 +1,3 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DETAILS, DEPENDS: spell created + diff --git a/collab/gupnp-igd/DEPENDS b/collab/gupnp-igd/DEPENDS new file mode 100755 index 0000000000..f0fae740b5 --- /dev/null +++ b/collab/gupnp-igd/DEPENDS @@ -0,0 +1,3 @@ +depends gupnp && +optional_depends gtk-doc '--enable-gtk-doc' '--disable-gtk-doc' \ + 'for documentation generation' diff --git a/collab/gupnp-igd/DETAILS b/collab/gupnp-igd/DETAILS new file mode 100755 index 0000000000..98a40ee79f --- /dev/null +++ b/collab/gupnp-igd/DETAILS @@ -0,0 +1,13 @@ + SPELL=gupnp-igd + VERSION=0.1.3 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://www.gupnp.org/sources/${SPELL}/${SOURCE} + SOURCE_HASH=sha512:09033dac312dccf8180f48c3ac374324ff9945527bd3bcb3c49a89c172e5c27d32c70765e0900790907e539d2b2a4b6ceed2bd25f0922f388c66ccc79c09bd8b +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://www.gupnp.org/" + LICENSE[0]=GPL + ENTERED=20091008 + SHORT="UPnP IGD port mapping library" +cat << EOF +library to handle UPnP IGD port mapping and supposed to have a very simple API. +EOF diff --git a/collab/gupnp-igd/HISTORY b/collab/gupnp-igd/HISTORY new file mode 100644 index 0000000000..cf910e3425 --- /dev/null +++ b/collab/gupnp-igd/HISTORY @@ -0,0 +1,3 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DEPENDS, DETAILS: spell created + diff --git a/collab/gupnp-tools/DEPENDS b/collab/gupnp-tools/DEPENDS new file mode 100755 index 0000000000..ed855a93d8 --- /dev/null +++ b/collab/gupnp-tools/DEPENDS @@ -0,0 +1,3 @@ +depends gupnp && +depends gnome-icon-theme && +optional_depends gupnp-av '' '--disable-av' 'for AV tools' diff --git a/collab/gupnp-tools/DETAILS b/collab/gupnp-tools/DETAILS new file mode 100755 index 0000000000..21023de0ce --- /dev/null +++ b/collab/gupnp-tools/DETAILS @@ -0,0 +1,32 @@ + SPELL=gupnp-tools + VERSION=0.8 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://www.gupnp.org/sources/${SPELL}/${SOURCE} + SOURCE_HASH=sha512:babb48e95fa16bce66b84e1276b6d9ef5eb39b5558d9f07766f6a4471888b4056fc140cce78a5e6f8b309cd10704c97912955b9a3e5108a4d5bac7a5448ec832 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://www.gupnp.org" + LICENSE[0]=GPL + ENTERED=20091008 + SHORT="GUPnP tools" +cat << EOF +GUPnP Tools are free replacements of Intel UPnP tools that use GUPnP. They +provides the following client and server side tools which enable one to easily +test and debug one's UPnP devices and control points: + + * Universal Control Point: a tool that enables one to discover UPnP devices + and services, retrieve information about them, subscribe to events and + invoke actions. + + * Network Light: a virtual light bulb that allows control points to switch + it on and off, change its dimming level and query its current status. It + also provides a simple UI to control all the network lights available on + the network. + + * AV Control Point: a simple media player UI that enables one to discover and + play multimedia contents available on a network. It is strictly a control + point and therefore does not have any playback capabilities of it's own and + relies on external UPnP MediaRenderer devices for actual playback. + + * Upload: a simple commandline utility that uploads files to known + MediaServers. Use Universal Control Point for discovering the MediaServers. +EOF diff --git a/collab/gupnp-tools/HISTORY b/collab/gupnp-tools/HISTORY new file mode 100644 index 0000000000..cf910e3425 --- /dev/null +++ b/collab/gupnp-tools/HISTORY @@ -0,0 +1,3 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DEPENDS, DETAILS: spell created + diff --git a/collab/gupnp-ui/DEPENDS b/collab/gupnp-ui/DEPENDS new file mode 100755 index 0000000000..61a8d6619d --- /dev/null +++ b/collab/gupnp-ui/DEPENDS @@ -0,0 +1,2 @@ +depends gupnp && +depends GTK2 diff --git a/collab/gupnp-ui/DETAILS b/collab/gupnp-ui/DETAILS new file mode 100755 index 0000000000..465283a10e --- /dev/null +++ b/collab/gupnp-ui/DETAILS @@ -0,0 +1,13 @@ + SPELL=gupnp-ui + VERSION=0.1.1 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://www.gupnp.org/sources/${SPELL}/${SOURCE} + SOURCE_HASH=sha512:eae64352e96e6cc54411b5f9276a4386b60bc4af21246d3387024b8d5b7243ef988a98739adecc068f7d26fd85887b7500c4e9d89993aa68e5fe746ddc93dcab +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://www.gupnp.org" + LICENSE[0]=GPL + ENTERED=20091008 + SHORT="GUPnP GTK UI" +cat << EOF +GUPnP-UI provides a collection of simple GTK+ widgets on top of GUPnP. +EOF diff --git a/collab/gupnp-ui/HISTORY b/collab/gupnp-ui/HISTORY new file mode 100644 index 0000000000..cf910e3425 --- /dev/null +++ b/collab/gupnp-ui/HISTORY @@ -0,0 +1,3 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DEPENDS, DETAILS: spell created + diff --git a/collab/gupnp/DEPENDS b/collab/gupnp/DEPENDS new file mode 100755 index 0000000000..ae9556fab6 --- /dev/null +++ b/collab/gupnp/DEPENDS @@ -0,0 +1,2 @@ +depends vala && +depends gssdp diff --git a/collab/gupnp/DETAILS b/collab/gupnp/DETAILS new file mode 100755 index 0000000000..95b014f308 --- /dev/null +++ b/collab/gupnp/DETAILS @@ -0,0 +1,15 @@ + SPELL=gupnp + VERSION=0.13.1 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://www.${SPELL}.org/sources/${SPELL}/${SOURCE} + SOURCE_HASH=sha512:631e1858a46c4a681f67d6bca174ad24811b04bbb9a053b8f9c9d3742569384072dbecef77bfad1dce89436e1fea1e46eeda607e85efef7ca4115253ff5974dd +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://www.gupnp.org/" + LICENSE[0]=GPL + ENTERED=20091008 + SHORT="object-oriented UPNP framework" +cat << EOF +GUPnP is an object-oriented open source framework for creating UPnP devices +and control points, written in C using GObject and libsoup. +The GUPnP API is intended to be easy to use, efficient and flexible. +EOF diff --git a/collab/gupnp/HISTORY b/collab/gupnp/HISTORY new file mode 100644 index 0000000000..cf910e3425 --- /dev/null +++ b/collab/gupnp/HISTORY @@ -0,0 +1,3 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DEPENDS, DETAILS: spell created + diff --git a/devel/vala/CONFIGURE b/devel/vala/CONFIGURE new file mode 100755 index 0000000000..3acb0ec071 --- /dev/null +++ b/devel/vala/CONFIGURE @@ -0,0 +1,2 @@ +config_query_option VALA_VAPIGEN 'enable vapigen generator?' n \ + '--enable-vapigen' '--disable-vapigen' diff --git a/devel/vala/HISTORY b/devel/vala/HISTORY index 0f783de6ec..75e5b213de 100644 --- a/devel/vala/HISTORY +++ b/devel/vala/HISTORY @@ -1,3 +1,6 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * CONFIGURE: optionally build the vapigen generator + 2009-10-01 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.7.7 diff --git a/libs/gssdp/DEPENDS b/libs/gssdp/DEPENDS new file mode 100755 index 0000000000..d8dcd8fc5f --- /dev/null +++ b/libs/gssdp/DEPENDS @@ -0,0 +1,4 @@ +depends glib2 && +optional_depends gtk-doc '--enable-gtk-doc' '--disable-gtk-doc' \ + 'for documentation generation' && +optional_depends GTK2 '' '--without-gtk' 'for GTK+2 support' diff --git a/libs/gssdp/DETAILS b/libs/gssdp/DETAILS new file mode 100755 index 0000000000..00a026483f --- /dev/null +++ b/libs/gssdp/DETAILS @@ -0,0 +1,13 @@ + SPELL=gssdp + VERSION=0.7.0 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://www.gupnp.org/sources/${SPELL}/${SOURCE} + SOURCE_HASH=sha512:d8b2025901dd3b84126f4cdd110c94c397cf6dd8fc47b78c7ef1a6f9eec2cb55176c0ceb09ade93c90731b737f06588b0d8504dcbb16ff0536a1ff4b80931194 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://www.gupnp.org/" + LICENSE[0]=GPL + ENTERED=20091008 + SHORT="resource discovery and announcement over SSDP" +cat << EOF +A GObject-based API for handling resource discovery and announcement over SSDP. +EOF diff --git a/libs/gssdp/HISTORY b/libs/gssdp/HISTORY new file mode 100644 index 0000000000..001428b46a --- /dev/null +++ b/libs/gssdp/HISTORY @@ -0,0 +1,3 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DETAILS, DEPENDS: spell created + diff --git a/net/farsight2/DETAILS b/net/farsight2/DETAILS index 51b45e0f24..57d835b4de 100755 --- a/net/farsight2/DETAILS +++ b/net/farsight2/DETAILS @@ -1,6 +1,6 @@ SPELL=farsight2 - VERSION=0.0.15 - SOURCE_HASH=sha512:7a2391fb98c1a37e131d73154fe2315b860efca3612029cc960f66fac8d06b2c56f4da171beacd604c25396b2dfcf53d2bfde6e3cf84ab940683d807e9663034 + VERSION=0.0.16 + SOURCE_HASH=sha512:81983d19907be06c03705be8409602d039bd451e15975beb7462dae3aa82a47b5861db9cc2a235d1d80be647f3b850cded56ccbe7040fb6117ae74bdc0dd9f60 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://farsight.freedesktop.org/releases/farsight2/$SOURCE diff --git a/net/farsight2/HISTORY b/net/farsight2/HISTORY index 994ce75897..442419ec00 100644 --- a/net/farsight2/HISTORY +++ b/net/farsight2/HISTORY @@ -1,3 +1,6 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DETAILS: version 0.0.16 + 2009-09-30 Arjan Bouter <abouter@sourcemage.org> * DEPENDS: added missing deps on gst plugins diff --git a/net/shorewall-common/DEPENDS b/net/shorewall-common/DEPENDS index 2060a0efff..d8d30b1e52 100755 --- a/net/shorewall-common/DEPENDS +++ b/net/shorewall-common/DEPENDS @@ -1,4 +1,4 @@ -depends SHOREWALL_COMPILER && depends iproute2 && depends iptables && +depends perl && depends SYSTEM-LOGGER diff --git a/net/shorewall-common/DETAILS b/net/shorewall-common/DETAILS index 53c48a256f..c623ebf024 100755 --- a/net/shorewall-common/DETAILS +++ b/net/shorewall-common/DETAILS @@ -1,9 +1,9 @@ SPELL=shorewall-common - VERSION=4.2.9 + VERSION=4.4.2.2 MAINVER=${VERSION:0:3} - RELEASE=shorewall-$VERSION - SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE2=$SPELL-$VERSION.tar.bz2.asc + RELEASE=shorewall-${VERSION:0:5} + SOURCE=shorewall-$VERSION.tar.bz2 + SOURCE2=shorewall-$VERSION.tar.bz2.asc SOURCE_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE SOURCE_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE @@ -14,7 +14,7 @@ SOURCE2_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2 SOURCE2_IGNORE=signature SOURCE_GPG="shorewall.gpg:${SOURCE2}" -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION +SOURCE_DIRECTORY=$BUILD_DIRECTORY/shorewall-$VERSION WEB_SITE=http://www.shorewall.net/ ENTERED=20070902 LICENSE[0]=GPL diff --git a/net/shorewall-common/HISTORY b/net/shorewall-common/HISTORY index 221efcb65f..ba1ad6fc87 100644 --- a/net/shorewall-common/HISTORY +++ b/net/shorewall-common/HISTORY @@ -1,3 +1,8 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DETAILS: version 4.4.2.2 + * DEPENDS: no longer needs a shorewall-compiler but needs perl + as shorewall common now includes shorewall-perl + 2009-07-25 Arjan Bouter <abouter@sourcemage.org> * DEPENDS: use provider for the compiler diff --git a/net/shorewall-common/PREPARE b/net/shorewall-common/PREPARE new file mode 100755 index 0000000000..d93683f5f4 --- /dev/null +++ b/net/shorewall-common/PREPARE @@ -0,0 +1,3 @@ +message "WARNING: shorewall is being restructured!" && +message "read ftp://slovakia.shorewall.net/mirror/shorewall/4.4/shorewall-4.4.2/releasenotes.txt" && +message "to learn what to change after updating shorewall" diff --git a/net/shorewall-docs-html/DETAILS b/net/shorewall-docs-html/DETAILS index e2f74b8a98..3993b414d6 100755 --- a/net/shorewall-docs-html/DETAILS +++ b/net/shorewall-docs-html/DETAILS @@ -1,9 +1,9 @@ SPELL=shorewall-docs-html - VERSION=4.2.9 + VERSION=4.4.2.2 MAINVER=${VERSION:0:3} - RELEASE=shorewall-$VERSION - SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE2=$SPELL-$VERSION.tar.bz2.asc + RELEASE=shorewall-${VERSION:0:5} + SOURCE=$SPELL-${VERSION:0:5}.tar.bz2 + SOURCE2=$SPELL-${VERSION:0:5}.tar.bz2.asc SOURCE_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE SOURCE_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE @@ -14,7 +14,7 @@ SOURCE2_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2 SOURCE2_IGNORE=signature SOURCE_GPG="shorewall.gpg:${SOURCE2}" -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION:0:5} WEB_SITE=http://www.shorewall.net/ ENTERED=20070902 LICENSE[0]=GPL diff --git a/net/shorewall-docs-html/HISTORY b/net/shorewall-docs-html/HISTORY index bbea1ab338..a565d5af96 100644 --- a/net/shorewall-docs-html/HISTORY +++ b/net/shorewall-docs-html/HISTORY @@ -1,3 +1,6 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DETAILS: updated to 4.4.2.2 + 2009-06-02 Elisamuel Resto <ryuji@sourcemage.org> * DETAILS: updated to 4.2.9 diff --git a/net/shorewall-docs-xml/DETAILS b/net/shorewall-docs-xml/DETAILS index 97ad165e4b..60525f7fc9 100755 --- a/net/shorewall-docs-xml/DETAILS +++ b/net/shorewall-docs-xml/DETAILS @@ -1,9 +1,9 @@ SPELL=shorewall-docs-xml - VERSION=4.2.9 + VERSION="$(cat $GRIMOIRE/net/shorewall.version)" MAINVER=${VERSION:0:3} - RELEASE=shorewall-$VERSION - SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE2=$SPELL-$VERSION.tar.bz2.asc + RELEASE=shorewall-${VERSION:0:5} + SOURCE=$SPELL-${VERSION:0:5}.tar.bz2 + SOURCE2=$SPELL-${VERSION:0:5}.tar.bz2.asc SOURCE_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE SOURCE_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE @@ -14,7 +14,7 @@ SOURCE2_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2 SOURCE2_IGNORE=signature SOURCE_GPG="shorewall.gpg:${SOURCE2}" -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION:0:5} WEB_SITE=http://www.shorewall.net/ ENTERED=20070902 LICENSE[0]=GPL diff --git a/net/shorewall-docs-xml/HISTORY b/net/shorewall-docs-xml/HISTORY index 559f968fde..077ebd357b 100644 --- a/net/shorewall-docs-xml/HISTORY +++ b/net/shorewall-docs-xml/HISTORY @@ -1,3 +1,6 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DETAILS: updated to 4.4.2.2 + 2009-06-02 Elisamuel Resto <ryuji@sourcemage.org> * DETAILS: updated to 4.2.9 diff --git a/net/shorewall-lite/DETAILS b/net/shorewall-lite/DETAILS index beaf2fa1da..269154de58 100755 --- a/net/shorewall-lite/DETAILS +++ b/net/shorewall-lite/DETAILS @@ -1,7 +1,7 @@ SPELL=shorewall-lite - VERSION=4.2.9 + VERSION=4.4.2.2 MAINVER=${VERSION:0:3} - RELEASE=shorewall-$VERSION + RELEASE=shorewall-${VERSION:0:5} SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE2=$SPELL-$VERSION.tar.bz2.asc SOURCE_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE diff --git a/net/shorewall-lite/HISTORY b/net/shorewall-lite/HISTORY index bb7bf76a06..47f3b14474 100644 --- a/net/shorewall-lite/HISTORY +++ b/net/shorewall-lite/HISTORY @@ -1,3 +1,6 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DETAILS: updated to 4.4.2.2 + 2009-06-02 Elisamuel Resto <ryuji@sourcemage.org> * DETAILS: updated to 4.2.9 diff --git a/net/shorewall-perl/DEPENDS b/net/shorewall-perl/DEPENDS index 1dd0168982..1517e66f5d 100755 --- a/net/shorewall-perl/DEPENDS +++ b/net/shorewall-perl/DEPENDS @@ -1 +1 @@ -depends perl +depends shorewall-common diff --git a/net/shorewall-perl/DETAILS b/net/shorewall-perl/DETAILS index da7b28f9ae..5cf30ead7d 100755 --- a/net/shorewall-perl/DETAILS +++ b/net/shorewall-perl/DETAILS @@ -1,23 +1,7 @@ SPELL=shorewall-perl - VERSION=4.2.9 - MAINVER=${VERSION:0:3} - RELEASE=shorewall-${VERSION:0:5} - SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE2=$SPELL-$VERSION.tar.bz2.asc - SOURCE_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE - SOURCE_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE - SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE - SOURCE_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE - SOURCE2_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE2 - SOURCE2_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2 - SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2 - SOURCE2_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2 - SOURCE2_IGNORE=signature - SOURCE_GPG="shorewall.gpg:${SOURCE2}" -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION + VERSION=deprecated WEB_SITE=http://www.shorewall.net/ ENTERED=20070902 - LICENSE[0]=GPL KEYWORDS="firewall net" SHORT="A high-level tool for configuring Netfilter." cat << EOF diff --git a/net/shorewall-perl/HISTORY b/net/shorewall-perl/HISTORY index 17e583058b..957f9f1bbb 100644 --- a/net/shorewall-perl/HISTORY +++ b/net/shorewall-perl/HISTORY @@ -1,3 +1,6 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * deprecated in favour of shorewall-common + 2009-07-25 Arjan Bouter <abouter@sourcemage.org> * PROVIDES: added, provide SHOREWALL_COMPILER diff --git a/net/shorewall-perl/INSTALL b/net/shorewall-perl/INSTALL index b816bbc66b..27ba77ddaf 100755 --- a/net/shorewall-perl/INSTALL +++ b/net/shorewall-perl/INSTALL @@ -1 +1 @@ -PREFIX="$INSTALL_ROOT" ./install.sh +true diff --git a/net/shorewall-perl/PREPARE b/net/shorewall-perl/PREPARE new file mode 100755 index 0000000000..120a1ae04a --- /dev/null +++ b/net/shorewall-perl/PREPARE @@ -0,0 +1,2 @@ +message "shorewall-perl is deprecated and no longer available upstream." && +message "switching to shorewall-common" diff --git a/net/shorewall-perl/PRE_BUILD b/net/shorewall-perl/PRE_BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/net/shorewall-perl/PRE_BUILD @@ -0,0 +1 @@ +true diff --git a/net/shorewall-perl/REPAIR^all^TRIGGERS b/net/shorewall-perl/REPAIR^all^TRIGGERS new file mode 100755 index 0000000000..6afb62fc3c --- /dev/null +++ b/net/shorewall-perl/REPAIR^all^TRIGGERS @@ -0,0 +1 @@ +on_cast $SPELL dispel_self diff --git a/net/shorewall-perl/TRIGGERS b/net/shorewall-perl/TRIGGERS new file mode 100755 index 0000000000..6afb62fc3c --- /dev/null +++ b/net/shorewall-perl/TRIGGERS @@ -0,0 +1 @@ +on_cast $SPELL dispel_self diff --git a/net/shorewall-shell/DEPENDS b/net/shorewall-shell/DEPENDS new file mode 100755 index 0000000000..1a9ea50115 --- /dev/null +++ b/net/shorewall-shell/DEPENDS @@ -0,0 +1 @@ +depends shorewall-common diff --git a/net/shorewall-shell/DETAILS b/net/shorewall-shell/DETAILS index 8e630eb225..b633c8b1dd 100755 --- a/net/shorewall-shell/DETAILS +++ b/net/shorewall-shell/DETAILS @@ -1,23 +1,7 @@ SPELL=shorewall-shell - VERSION=4.2.9 - MAINVER=${VERSION:0:3} - RELEASE=shorewall-${VERSION} - SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE2=$SPELL-$VERSION.tar.bz2.asc - SOURCE_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE - SOURCE_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE - SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE - SOURCE_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE - SOURCE2_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE2 - SOURCE2_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2 - SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2 - SOURCE2_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2 - SOURCE2_IGNORE=signature - SOURCE_GPG="shorewall.gpg:${SOURCE2}" -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION + VERSION=deprecated WEB_SITE=http://www.shorewall.net/ ENTERED=20070902 - LICENSE[0]=GPL KEYWORDS="firewall net" SHORT="A high-level tool for configuring Netfilter." cat << EOF diff --git a/net/shorewall-shell/HISTORY b/net/shorewall-shell/HISTORY index bc3c08d469..60d01b62b2 100644 --- a/net/shorewall-shell/HISTORY +++ b/net/shorewall-shell/HISTORY @@ -1,3 +1,6 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * deprecated spell in favour of shorewall-common + 2009-07-25 Arjan Bouter <abouter@sourcemage.org> * PROVIDES: added, provide SHOREWALL_COMPILER diff --git a/net/shorewall-shell/INSTALL b/net/shorewall-shell/INSTALL index b816bbc66b..27ba77ddaf 100755 --- a/net/shorewall-shell/INSTALL +++ b/net/shorewall-shell/INSTALL @@ -1 +1 @@ -PREFIX="$INSTALL_ROOT" ./install.sh +true diff --git a/net/shorewall-shell/PREPARE b/net/shorewall-shell/PREPARE new file mode 100755 index 0000000000..820dc6cf07 --- /dev/null +++ b/net/shorewall-shell/PREPARE @@ -0,0 +1,21 @@ +message "shorewall-shell is deprecated and no longer available upstream." && +message "switching to shorewall-common" +echo << EOF +If you are currently using Shorewall-shell: + + a) In shorewall.conf, if you have specified + "SHOREWALL_COMPILER=shell" then you must either: + + - change that specification to "SHOREWALL_COMPILER=perl"; or + - change that specification to "SHOREWALL_COMPILER="; or + - delete the specification altogether. + + Failure to do so will result in the following warning: + + WARNING: SHOREWALL_COMPILER=shell ignored. Shorewall-shell + support has been removed in this release. + + b) Review the migration issues at + http://www.shorewall.net/LennyToSqueeze.html and make changes as + required. +EOF diff --git a/net/shorewall-shell/PRE_BUILD b/net/shorewall-shell/PRE_BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/net/shorewall-shell/PRE_BUILD @@ -0,0 +1 @@ +true diff --git a/net/shorewall-shell/REPAIR^all^TRIGGERS b/net/shorewall-shell/REPAIR^all^TRIGGERS new file mode 100755 index 0000000000..6afb62fc3c --- /dev/null +++ b/net/shorewall-shell/REPAIR^all^TRIGGERS @@ -0,0 +1 @@ +on_cast $SPELL dispel_self diff --git a/net/shorewall-shell/TRIGGERS b/net/shorewall-shell/TRIGGERS new file mode 100755 index 0000000000..6afb62fc3c --- /dev/null +++ b/net/shorewall-shell/TRIGGERS @@ -0,0 +1 @@ +on_cast $SPELL dispel_self diff --git a/net/shorewall/DETAILS b/net/shorewall/DETAILS index 67d8984172..3f2b41eac4 100755 --- a/net/shorewall/DETAILS +++ b/net/shorewall/DETAILS @@ -1,5 +1,5 @@ SPELL=shorewall - VERSION=4.2.9 + VERSION=4.4.2.2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION LICENSE[0]=GPL KEYWORDS="firewall net" diff --git a/net/shorewall/HISTORY b/net/shorewall/HISTORY index f14b73715d..05426b91e7 100644 --- a/net/shorewall/HISTORY +++ b/net/shorewall/HISTORY @@ -1,3 +1,6 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DETAILS: updated to 4.4.2.2 + 2009-06-02 Elisamuel Resto <ryuji@sourcemage.org> * DETAILS: updated to 4.2.9 diff --git a/net/shorewall6-lite/DETAILS b/net/shorewall6-lite/DETAILS index e6106eda95..e0d900ad2a 100755 --- a/net/shorewall6-lite/DETAILS +++ b/net/shorewall6-lite/DETAILS @@ -1,5 +1,5 @@ SPELL=shorewall6-lite - VERSION=4.2.9 + VERSION=4.4.2.2 MAINVER=${VERSION:0:3} RELEASE=shorewall-$VERSION SOURCE=$SPELL-$VERSION.tar.bz2 diff --git a/net/shorewall6-lite/HISTORY b/net/shorewall6-lite/HISTORY index 95de8ca790..755fcad331 100644 --- a/net/shorewall6-lite/HISTORY +++ b/net/shorewall6-lite/HISTORY @@ -1,3 +1,6 @@ +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DETAILS: updated to 4.4.2.2 + 2009-06-02 Elisamuel Resto <ryuji@sourcemage.org> * DETAILS: updated to 4.2.9 diff --git a/net/shorewall6/DEPENDS b/net/shorewall6/DEPENDS index ee4452b5ff..1517e66f5d 100755 --- a/net/shorewall6/DEPENDS +++ b/net/shorewall6/DEPENDS @@ -1,4 +1 @@ -depends shorewall-common && -depends iproute2 && -depends iptables && -depends SYSTEM-LOGGER +depends shorewall-common diff --git a/net/shorewall6/DETAILS b/net/shorewall6/DETAILS index 49574f5e07..ebf939dfee 100755 --- a/net/shorewall6/DETAILS +++ b/net/shorewall6/DETAILS @@ -1,9 +1,9 @@ SPELL=shorewall6 - VERSION=4.2.9 + VERSION=4.4.2.2 MAINVER=${VERSION:0:3} - RELEASE=shorewall-$VERSION - SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE2=$SPELL-$VERSION.tar.bz2.asc + RELEASE=shorewall-${VERSION:0:5} + SOURCE=$SPELL-${VERSION:0:5}.tar.bz2 + SOURCE2=$SPELL-${VERSION:0:5}.tar.bz2.asc SOURCE_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE SOURCE_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE @@ -14,7 +14,7 @@ SOURCE2_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2 SOURCE2_IGNORE=signature SOURCE_GPG="shorewall.gpg:${SOURCE2}" -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION:0:5} WEB_SITE=http://www.shorewall.net/ ENTERED=20070902 LICENSE[0]=GPL diff --git a/net/shorewall6/HISTORY b/net/shorewall6/HISTORY index 92ab98f1f3..dd8f8803b4 100644 --- a/net/shorewall6/HISTORY +++ b/net/shorewall6/HISTORY @@ -1,4 +1,6 @@ -2009-07-29 Arjan Bouter <abouter@sourcemage.org> +2009-10-08 Arjan Bouter <abouter@sourcemage.org> + * DETAILS: version 4.4.2.2 + * DEPENDS: removed shorewall compilers, those are selected in shorewall-common diff --git a/security-libs/trousers/DEPENDS b/security-libs/trousers/DEPENDS index 20d66f6318..a082f75277 100755 --- a/security-libs/trousers/DEPENDS +++ b/security-libs/trousers/DEPENDS @@ -1,6 +1,6 @@ depends openssl "--with-openssl=${INSTALL_ROOT}/usr" && -optional_depends gpm '--with-gmp' '--without-gmp' \ +optional_depends gmp '--with-gmp' '--without-gmp' \ 'support the GMP math lib? (used in DAA)' && optional_depends GTK2 '--with-gui=gtk' '--with-gui=none' \ diff --git a/security-libs/trousers/HISTORY b/security-libs/trousers/HISTORY index 9f71c129fc..174a89ddb1 100644 --- a/security-libs/trousers/HISTORY +++ b/security-libs/trousers/HISTORY @@ -1,3 +1,6 @@ +2009-10-02 Arjan Bouter <abouter@sourcemage.org> + * DEPENDS: fixed typo in gmp dependency + 2009-07-31 Arjan Bouter <abouter@sourcemage.org> * INSTALL: create account tss and groups tss and pkcs11 diff --git a/utils/eggdbus/DEPENDS b/utils/eggdbus/DEPENDS index 4e95395338..1a72968917 100755 --- a/utils/eggdbus/DEPENDS +++ b/utils/eggdbus/DEPENDS @@ -7,7 +7,7 @@ optional_depends gtk-doc \ "--disable-gtk-doc" \ "to build documentation" && -optional_depends libxslt \ +optional_depends docbook-xsl \ "--enable-man-pages" \ "--disable-man-pages" \ "to build man pages (seems broken)" diff --git a/utils/eggdbus/HISTORY b/utils/eggdbus/HISTORY index 58e3eef4ab..047fbf2e55 100644 --- a/utils/eggdbus/HISTORY +++ b/utils/eggdbus/HISTORY @@ -1,3 +1,7 @@ +2009-10-08 Arwed v. Merkatz <v.merkatz@gmx.net> + * DEPENDS: depends on docbook-xsl for man pages, + not libxslt + 2009-09-30 Arjan Bouter <abouter@sourcemage.org> * DEPENDS: added missing optional dep on libxslt * BUILD: removed, not needed anymore |