From bdwalton at users.sourceforge.net Fri Oct 1 04:15:32 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Oct 2010 02:15:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11114] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 11114 http://gar.svn.sourceforge.net/gar/?rev=11114&view=rev Author: bdwalton Date: 2010-10-01 02:15:32 +0000 (Fri, 01 Oct 2010) Log Message: ----------- cswclassutils: update behaviour of ap2mod CAS to honour values from csw.conf Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswap2mod Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-09-30 21:54:26 UTC (rev 11113) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-10-01 02:15:32 UTC (rev 11114) @@ -1,7 +1,7 @@ # $HeadURL$ GARNAME = cswclassutils -GARVERSION = 1.41 +GARVERSION = 1.42 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod 2010-09-30 21:54:26 UTC (rev 11113) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod 2010-10-01 02:15:32 UTC (rev 11114) @@ -2,13 +2,19 @@ # # i.cswap2mod - Class action script for installing apache2 modules # -# $Id$ -# # Written by Ben Walton # # 2010-09-29 First Release # +# Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + AP2_PREFIX=/opt/csw/apache2 AP2_BINDIR=$AP2_PREFIX/sbin AP2_LIBEXEC=$AP2_PREFIX/libexec @@ -28,24 +34,46 @@ MODFILE=`basename $dest` MODNAME=`echo $MODFILE | sed 's/mod_//; s/\.so$//'` - # This check ensures we have an httpd.conf where we expect it - # and that apxs is available. This (hopefully) prevents us from - # doing anything if the local system has completely reworked the - # etc/ file structure + # Modules will be enabled by default, but a global kill switch + # is checked , followed by a module specific value. Thus, + # either ap2_enable_modules or ap2_enable_suexec (for example) + # could disable activation of the suexec module. The + # + # This value is passed to apxs (-a: add, enable; -A: add, + # disable) + enmod=-a + + if [ "$ap2_enable_modules" = "no" ]; then + enmod=-A + fi + + eval ap2_mod_specific="\$ap2_enable_$MODNAME" + if [ "$ap2_mod_specific" = "no" ]; then + enmod=-A + elif [ "$ap2_mod_specific" = "yes" ]; then + enmod=-a + fi + if [ -f "$CONF" -a -x "$APXS" ]; then - # Enable the module + # Add the module module, optionally enabling it by default chroot $PKG_INSTALL_ROOT \ - $APXS -e -a -n $MODNAME $MODFILE + $APXS -e $enmod -n $MODNAME $MODFILE + conftouched=1 + fi +done + +if [ "$conftouched" = "1" ]; then cat < Revision: 11115 http://gar.svn.sourceforge.net/gar/?rev=11115&view=rev Author: dmichelsen Date: 2010-10-01 08:45:06 +0000 (Fri, 01 Oct 2010) Log Message: ----------- asciidoc: Update to 8.6.1 and remove dependency to CSWgnulinks Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile csw/mgar/pkg/asciidoc/trunk/checksums Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2010-10-01 02:15:32 UTC (rev 11114) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2010-10-01 08:45:06 UTC (rev 11115) @@ -1,5 +1,5 @@ GARNAME = asciidoc -GARVERSION = 8.5.3 +GARVERSION = 8.6.1 CATEGORIES = utils DESCRIPTION = An Documentation Generator @@ -18,7 +18,7 @@ ARCHALL_CSWasciidoc = 1 -RUNTIME_DEP_PKGS_CSWasciidoc = CSWpython CSWgnulinks CSWggetopt +RUNTIME_DEP_PKGS_CSWasciidoc = CSWpython CSWggetopt MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz @@ -39,7 +39,6 @@ INSTALL_ARGS = vimdir=/opt/csw/etc/vim CHECKPKG_OVERRIDES_CSWasciidoc += surplus-dependency|CSWggetopt -CHECKPKG_OVERRIDES_CSWasciidoc += surplus-dependency|CSWgnulinks include gar/category.mk Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2010-10-01 02:15:32 UTC (rev 11114) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2010-10-01 08:45:06 UTC (rev 11115) @@ -1,3 +1 @@ -2eb00364bbc7660438507e630d5a5ac9 0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch -7377872275c2a575151655b19ac6dd3e asciidoc-8.5.3.tar.gz -ec48eeea1eafdaa7e507bc11327f6eae handle-csw-etc-paths.patch +3d16b16a953c0c2d00b6a6d089882d0e asciidoc-8.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 1 14:23:35 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Oct 2010 12:23:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[11116] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 11116 http://gar.svn.sourceforge.net/gar/?rev=11116&view=rev Author: bdwalton Date: 2010-10-01 12:23:34 +0000 (Fri, 01 Oct 2010) Log Message: ----------- cswclassutils: move the ap2mod CAS scripts for delivery with apache Removed Paths: ------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswap2mod Deleted: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod 2010-10-01 08:45:06 UTC (rev 11115) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod 2010-10-01 12:23:34 UTC (rev 11116) @@ -1,79 +0,0 @@ -#!/bin/sh -# -# i.cswap2mod - Class action script for installing apache2 modules -# -# Written by Ben Walton -# -# 2010-09-29 First Release -# - -# Source csw.conf, if it exists -if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then - . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf -fi -if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then - . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -fi - -AP2_PREFIX=/opt/csw/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_LIBEXEC=$AP2_PREFIX/libexec -AP2_CONFDIR=$AP2_PREFIX/etc -AP2_CONFIG=$AP2_CONFDIR/httpd.conf -AP2_APXS=$AP2_BINDIR/apxs - -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} - -while read src dest; do - # Place the file first - /usr/bin/cp -p $src $dest || exit 2 - echo $dest - - CONF=$PKG_INSTALL_ROOT/$AP2_CONFIG - APXS=$PKG_INSTALL_ROOT/$AP2_APXS - MODFILE=`basename $dest` - MODNAME=`echo $MODFILE | sed 's/mod_//; s/\.so$//'` - - # Modules will be enabled by default, but a global kill switch - # is checked , followed by a module specific value. Thus, - # either ap2_enable_modules or ap2_enable_suexec (for example) - # could disable activation of the suexec module. The - # - # This value is passed to apxs (-a: add, enable; -A: add, - # disable) - enmod=-a - - if [ "$ap2_enable_modules" = "no" ]; then - enmod=-A - fi - - eval ap2_mod_specific="\$ap2_enable_$MODNAME" - if [ "$ap2_mod_specific" = "no" ]; then - enmod=-A - elif [ "$ap2_mod_specific" = "yes" ]; then - enmod=-a - fi - - if [ -f "$CONF" -a -x "$APXS" ]; then - # Add the module module, optionally enabling it by default - chroot $PKG_INSTALL_ROOT \ - $APXS -e $enmod -n $MODNAME $MODFILE - conftouched=1 - fi -done - -if [ "$conftouched" = "1" ]; then - cat < Revision: 11117 http://gar.svn.sourceforge.net/gar/?rev=11117&view=rev Author: bdwalton Date: 2010-10-01 12:46:18 +0000 (Fri, 01 Oct 2010) Log Message: ----------- apache2: add the ap2mod CAS and install them appropriately Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/apache2/trunk/files/i.cswap2mod csw/mgar/pkg/apache2/trunk/files/r.cswap2mod Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-01 12:23:34 UTC (rev 11116) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-01 12:46:18 UTC (rev 11117) @@ -45,6 +45,7 @@ DISTFILES += update20to22 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork DISTFILES += README.CSW.apache2rt +DISTFILES += i.cswap2mod r.cswap2mod UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -201,8 +202,16 @@ @$(MAKECOOKIE) -post-install-modulated: rename-httpd copy-local-files create-templates copy-readmes +post-install-modulated: rename-httpd copy-local-files create-templates copy-readmes install-cas +install-cas: CASD = $(DESTDIR)/usr/sadm/install/scripts +install-cas: + @(cd $(WORKDIR); \ + ginstall -d -m0755 $(CASD); \ + for f in *cswap2mod; do \ + ginstall -m 0555 $$f $(CASD); \ + done) + copy-readmes: @(cd $(WORKDIR); for f in README.CSW*; do \ p=`echo $$f | sed 's/README.CSW.//'`; \ Added: csw/mgar/pkg/apache2/trunk/files/i.cswap2mod =================================================================== --- csw/mgar/pkg/apache2/trunk/files/i.cswap2mod (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/i.cswap2mod 2010-10-01 12:46:18 UTC (rev 11117) @@ -0,0 +1,79 @@ +#!/bin/sh +# +# i.cswap2mod - Class action script for installing apache2 modules +# +# Written by Ben Walton +# +# 2010-09-29 First Release +# + +# Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +AP2_PREFIX=/opt/csw/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_CONFIG=$AP2_CONFDIR/httpd.conf +AP2_APXS=$AP2_BINDIR/apxs + +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} + +while read src dest; do + # Place the file first + /usr/bin/cp -p $src $dest || exit 2 + echo $dest + + CONF=$PKG_INSTALL_ROOT/$AP2_CONFIG + APXS=$PKG_INSTALL_ROOT/$AP2_APXS + MODFILE=`basename $dest` + MODNAME=`echo $MODFILE | sed 's/mod_//; s/\.so$//'` + + # Modules will be enabled by default, but a global kill switch + # is checked , followed by a module specific value. Thus, + # either ap2_enable_modules or ap2_enable_suexec (for example) + # could disable activation of the suexec module. The + # + # This value is passed to apxs (-a: add, enable; -A: add, + # disable) + enmod=-a + + if [ "$ap2_enable_modules" = "no" ]; then + enmod=-A + fi + + eval ap2_mod_specific="\$ap2_enable_$MODNAME" + if [ "$ap2_mod_specific" = "no" ]; then + enmod=-A + elif [ "$ap2_mod_specific" = "yes" ]; then + enmod=-a + fi + + if [ -f "$CONF" -a -x "$APXS" ]; then + # Add the module module, optionally enabling it by default + chroot $PKG_INSTALL_ROOT \ + $APXS -e $enmod -n $MODNAME $MODFILE + conftouched=1 + fi +done + +if [ "$conftouched" = "1" ]; then + cat < Revision: 11118 http://gar.svn.sourceforge.net/gar/?rev=11118&view=rev Author: dmichelsen Date: 2010-10-01 13:46:57 +0000 (Fri, 01 Oct 2010) Log Message: ----------- texinfo: Fix an issue when there are no info files installed at all Modified Paths: -------------- csw/mgar/pkg/texinfo/trunk/Makefile csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall Modified: csw/mgar/pkg/texinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/texinfo/trunk/Makefile 2010-10-01 12:46:18 UTC (rev 11117) +++ csw/mgar/pkg/texinfo/trunk/Makefile 2010-10-01 13:46:57 UTC (rev 11118) @@ -34,6 +34,11 @@ EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias +# Are these really needed? May investigate deeply later. +CHECKPKG_OVERRIDES_CSWtexinfo += surplus-dependency|CSWbash +CHECKPKG_OVERRIDES_CSWtexinfo += surplus-dependency|CSWgsed +CHECKPKG_OVERRIDES_CSWtexinfo += surplus-dependency|CSWiconv + include gar/category.mk post-extract-modulated: Modified: csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall =================================================================== --- csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall 2010-10-01 12:46:18 UTC (rev 11117) +++ csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall 2010-10-01 13:46:57 UTC (rev 11118) @@ -9,10 +9,12 @@ touch ${BASE}/share/info/dir 2>/dev/null; then echo "Registering existing texinfo-files..." - FILES=`ls ${BASE}/share/info/*.info ${BASE}/share/info/*.info-*` - for i in $FILES; do - ${BASE}/bin/install-info $i ${BASE}/share/info/dir 2> /dev/null - done + FILES=${BASE}/share/info/* + if [ "${FILES}" != "${BASE}/share/info/*" ]; then + for i in $FILES; do + ${BASE}/bin/install-info $i ${BASE}/share/info/dir 2> /dev/null + done + fi else echo "Skip registering pages as ${BASE}/share/info/dir is not writable" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 1 15:50:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Oct 2010 13:50:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11119] csw/mgar/pkg Message-ID: Revision: 11119 http://gar.svn.sourceforge.net/gar/?rev=11119&view=rev Author: dmichelsen Date: 2010-10-01 13:50:52 +0000 (Fri, 01 Oct 2010) Log Message: ----------- varnish: Initial commit, requires stdbool.h from C99 and hence does not compile on Solaris Added Paths: ----------- csw/mgar/pkg/varnish/ csw/mgar/pkg/varnish/branches/ csw/mgar/pkg/varnish/tags/ csw/mgar/pkg/varnish/trunk/ csw/mgar/pkg/varnish/trunk/Makefile csw/mgar/pkg/varnish/trunk/checksums csw/mgar/pkg/varnish/trunk/files/ Property changes on: csw/mgar/pkg/varnish/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/varnish/trunk/Makefile =================================================================== --- csw/mgar/pkg/varnish/trunk/Makefile (rev 0) +++ csw/mgar/pkg/varnish/trunk/Makefile 2010-10-01 13:50:52 UTC (rev 11119) @@ -0,0 +1,21 @@ +# $Id$ +GARNAME = varnish +GARVERSION = 2.1.3 +CATEGORIES = apps + +DESCRIPTION = Varnish Web Cache +define BLURB + Long description +endef + +MASTER_SITES = http://www.varnish-software.com/sites/default/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://www.varnish-cache.org + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/varnish/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/varnish/trunk/checksums =================================================================== --- csw/mgar/pkg/varnish/trunk/checksums (rev 0) +++ csw/mgar/pkg/varnish/trunk/checksums 2010-10-01 13:50:52 UTC (rev 11119) @@ -0,0 +1 @@ +357d99a760de173d841ac37bf2052be8 varnish-2.1.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 1 16:54:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Oct 2010 14:54:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11120] csw/mgar/pkg/varnish/trunk Message-ID: Revision: 11120 http://gar.svn.sourceforge.net/gar/?rev=11120&view=rev Author: dmichelsen Date: 2010-10-01 14:54:33 +0000 (Fri, 01 Oct 2010) Log Message: ----------- varnish: Move to Solaris 10 for full C99, patch needs autoconf bootstrapping Modified Paths: -------------- csw/mgar/pkg/varnish/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/varnish/trunk/files/varnish_autoconf_pthread.patch Modified: csw/mgar/pkg/varnish/trunk/Makefile =================================================================== --- csw/mgar/pkg/varnish/trunk/Makefile 2010-10-01 13:50:52 UTC (rev 11119) +++ csw/mgar/pkg/varnish/trunk/Makefile 2010-10-01 14:54:33 UTC (rev 11120) @@ -11,11 +11,19 @@ MASTER_SITES = http://www.varnish-software.com/sites/default/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# From http://www.varnish-cache.org/trac/ticket/663 +PATCHFILES = varnish_autoconf_pthread.patch + # File name regex to get notifications about upstream software releases UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz VENDOR_URL = http://www.varnish-cache.org +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk Added: csw/mgar/pkg/varnish/trunk/files/varnish_autoconf_pthread.patch =================================================================== --- csw/mgar/pkg/varnish/trunk/files/varnish_autoconf_pthread.patch (rev 0) +++ csw/mgar/pkg/varnish/trunk/files/varnish_autoconf_pthread.patch 2010-10-01 14:54:33 UTC (rev 11120) @@ -0,0 +1,370 @@ +Index: varnish-cache/m4/ax_pthread.m4 +=================================================================== +--- varnish-cache/m4/ax_pthread.m4 (revision 0) ++++ varnish-cache/m4/ax_pthread.m4 (revision 0) +@@ -0,0 +1,283 @@ ++# =========================================================================== ++# http://www.gnu.org/software/autoconf-archive/ax_pthread.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) ++# ++# DESCRIPTION ++# ++# This macro figures out how to build C programs using POSIX threads. It ++# sets the PTHREAD_LIBS output variable to the threads library and linker ++# flags, and the PTHREAD_CFLAGS output variable to any special C compiler ++# flags that are needed. (The user can also force certain compiler ++# flags/libs to be tested by setting these environment variables.) ++# ++# Also sets PTHREAD_CC to any special C compiler that is needed for ++# multi-threaded programs (defaults to the value of CC otherwise). (This ++# is necessary on AIX to use the special cc_r compiler alias.) ++# ++# NOTE: You are assumed to not only compile your program with these flags, ++# but also link it with them as well. e.g. you should link with ++# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS ++# ++# If you are only building threads programs, you may wish to use these ++# variables in your default LIBS, CFLAGS, and CC: ++# ++# LIBS="$PTHREAD_LIBS $LIBS" ++# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++# CC="$PTHREAD_CC" ++# ++# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant ++# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name ++# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). ++# ++# ACTION-IF-FOUND is a list of shell commands to run if a threads library ++# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it ++# is not found. If ACTION-IF-FOUND is not specified, the default action ++# will define HAVE_PTHREAD. ++# ++# Please let the authors know if this macro fails on any platform, or if ++# you have any other suggestions or comments. This macro was based on work ++# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help ++# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by ++# Alejandro Forero Cuervo to the autoconf macro repository. We are also ++# grateful for the helpful feedback of numerous users. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Steven G. Johnson ++# ++# This program is free software: you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by the ++# Free Software Foundation, either version 3 of the License, or (at your ++# option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General ++# Public License for more details. ++# ++# You should have received a copy of the GNU General Public License along ++# with this program. If not, see . ++# ++# As a special exception, the respective Autoconf Macro's copyright owner ++# gives unlimited permission to copy, distribute and modify the configure ++# scripts that are the output of Autoconf when processing the Macro. You ++# need not follow the terms of the GNU General Public License when using ++# or distributing such scripts, even though portions of the text of the ++# Macro appear in them. The GNU General Public License (GPL) does govern ++# all other use of the material that constitutes the Autoconf Macro. ++# ++# This special exception to the GPL applies to versions of the Autoconf ++# Macro released by the Autoconf Archive. When you make and distribute a ++# modified version of the Autoconf Macro, you may extend this special ++# exception to the GPL to apply to your modified version as well. ++ ++#serial 7 ++ ++AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) ++AC_DEFUN([AX_PTHREAD], [ ++AC_REQUIRE([AC_CANONICAL_HOST]) ++AC_LANG_SAVE ++AC_LANG_C ++ax_pthread_ok=no ++ ++# We used to check for pthread.h first, but this fails if pthread.h ++# requires special compiler flags (e.g. on True64 or Sequent). ++# It gets checked for in the link test anyway. ++ ++# First of all, check if the user has set any of the PTHREAD_LIBS, ++# etcetera environment variables, and if threads linking works using ++# them: ++if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++ save_LIBS="$LIBS" ++ LIBS="$PTHREAD_LIBS $LIBS" ++ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) ++ AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes) ++ AC_MSG_RESULT($ax_pthread_ok) ++ if test x"$ax_pthread_ok" = xno; then ++ PTHREAD_LIBS="" ++ PTHREAD_CFLAGS="" ++ fi ++ LIBS="$save_LIBS" ++ CFLAGS="$save_CFLAGS" ++fi ++ ++# We must check for the threads library under a number of different ++# names; the ordering is very important because some systems ++# (e.g. DEC) have both -lpthread and -lpthreads, where one of the ++# libraries is broken (non-POSIX). ++ ++# Create a list of thread flags to try. Items starting with a "-" are ++# C compiler flags, and other items are library names, except for "none" ++# which indicates that we try without any flags at all, and "pthread-config" ++# which is a program returning the flags for the Pth emulation library. ++ ++ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" ++ ++# The ordering *is* (sometimes) important. Some notes on the ++# individual items follow: ++ ++# pthreads: AIX (must check this before -lpthread) ++# none: in case threads are in libc; should be tried before -Kthread and ++# other compiler flags to prevent continual compiler warnings ++# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) ++# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) ++# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) ++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) ++# -pthreads: Solaris/gcc ++# -mthreads: Mingw32/gcc, Lynx/gcc ++# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it ++# doesn't hurt to check since this sometimes defines pthreads too; ++# also defines -D_REENTRANT) ++# ... -mt is also the pthreads flag for HP/aCC ++# pthread: Linux, etcetera ++# --thread-safe: KAI C++ ++# pthread-config: use pthread-config program (for GNU Pth library) ++ ++case "${host_cpu}-${host_os}" in ++ *solaris*) ++ ++ # On Solaris (at least, for some versions), libc contains stubbed ++ # (non-functional) versions of the pthreads routines, so link-based ++ # tests will erroneously succeed. (We need to link with -pthreads/-mt/ ++ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather ++ # a function called by this macro, so we could check for that, but ++ # who knows whether they'll stub that too in a future libc.) So, ++ # we'll just look for -pthreads and -lpthread first: ++ ++ ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" ++ ;; ++ ++ *-darwin*) ++ acx_pthread_flags="-pthread $acx_pthread_flags" ++ ;; ++esac ++ ++if test x"$ax_pthread_ok" = xno; then ++for flag in $ax_pthread_flags; do ++ ++ case $flag in ++ none) ++ AC_MSG_CHECKING([whether pthreads work without any flags]) ++ ;; ++ ++ -*) ++ AC_MSG_CHECKING([whether pthreads work with $flag]) ++ PTHREAD_CFLAGS="$flag" ++ ;; ++ ++ pthread-config) ++ AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no) ++ if test x"$ax_pthread_config" = xno; then continue; fi ++ PTHREAD_CFLAGS="`pthread-config --cflags`" ++ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" ++ ;; ++ ++ *) ++ AC_MSG_CHECKING([for the pthreads library -l$flag]) ++ PTHREAD_LIBS="-l$flag" ++ ;; ++ esac ++ ++ save_LIBS="$LIBS" ++ save_CFLAGS="$CFLAGS" ++ LIBS="$PTHREAD_LIBS $LIBS" ++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++ ++ # Check for various functions. We must include pthread.h, ++ # since some functions may be macros. (On the Sequent, we ++ # need a special flag -Kthread to make this header compile.) ++ # We check for pthread_join because it is in -lpthread on IRIX ++ # while pthread_create is in libc. We check for pthread_attr_init ++ # due to DEC craziness with -lpthreads. We check for ++ # pthread_cleanup_push because it is one of the few pthread ++ # functions on Solaris that doesn't have a non-functional libc stub. ++ # We try pthread_create on general principles. ++ AC_TRY_LINK([#include ++ static void routine(void* a) {a=0;} ++ static void* start_routine(void* a) {return a;}], ++ [pthread_t th; pthread_attr_t attr; ++ pthread_join(th, 0); ++ pthread_attr_init(&attr); ++ pthread_cleanup_push(routine, 0); ++ pthread_create(&th,0,start_routine,0); ++ pthread_cleanup_pop(0); ], ++ [ax_pthread_ok=yes]) ++ ++ LIBS="$save_LIBS" ++ CFLAGS="$save_CFLAGS" ++ ++ AC_MSG_RESULT($ax_pthread_ok) ++ if test "x$ax_pthread_ok" = xyes; then ++ break; ++ fi ++ ++ PTHREAD_LIBS="" ++ PTHREAD_CFLAGS="" ++done ++fi ++ ++# Various other checks: ++if test "x$ax_pthread_ok" = xyes; then ++ save_LIBS="$LIBS" ++ LIBS="$PTHREAD_LIBS $LIBS" ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++ ++ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. ++ AC_MSG_CHECKING([for joinable pthread attribute]) ++ attr_name=unknown ++ for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do ++ AC_TRY_LINK([#include ], [int attr=$attr; return attr;], ++ [attr_name=$attr; break]) ++ done ++ AC_MSG_RESULT($attr_name) ++ if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then ++ AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, ++ [Define to necessary symbol if this constant ++ uses a non-standard name on your system.]) ++ fi ++ ++ AC_MSG_CHECKING([if more special flags are required for pthreads]) ++ flag=no ++ case "${host_cpu}-${host_os}" in ++ *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; ++ *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; ++ esac ++ AC_MSG_RESULT(${flag}) ++ if test "x$flag" != xno; then ++ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" ++ fi ++ ++ LIBS="$save_LIBS" ++ CFLAGS="$save_CFLAGS" ++ ++ # More AIX lossage: must compile with xlc_r or cc_r ++ if test x"$GCC" != xyes; then ++ AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) ++ else ++ PTHREAD_CC=$CC ++ fi ++else ++ PTHREAD_CC="$CC" ++fi ++ ++AC_SUBST(PTHREAD_LIBS) ++AC_SUBST(PTHREAD_CFLAGS) ++AC_SUBST(PTHREAD_CC) ++ ++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: ++if test x"$ax_pthread_ok" = xyes; then ++ ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) ++ : ++else ++ ax_pthread_ok=no ++ $2 ++fi ++AC_LANG_RESTORE ++])dnl AX_PTHREAD +Index: varnish-cache/configure.ac +=================================================================== +--- varnish-cache/configure.ac (revision 5224) ++++ varnish-cache/configure.ac (working copy) +@@ -8,6 +8,9 @@ + AC_CONFIG_SRCDIR(include/varnishapi.h) + AM_CONFIG_HEADER(config.h) + ++# save command line CFLAGS for use in VCC_CC (to pass through things like -m64) ++OCFLAGS="$CFLAGS" ++ + AC_CANONICAL_SYSTEM + AC_LANG(C) + +@@ -21,6 +24,13 @@ + AC_MSG_ERROR([Could not find a C99 compatible compiler]) + fi + AC_PROG_CPP ++ ++AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])]) ++ ++LIBS="$PTHREAD_LIBS $LIBS" ++CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++CC="$PTHREAD_CC" ++ + AC_PROG_INSTALL + AC_PROG_LIBTOOL + AC_PROG_MAKE_SET +@@ -406,16 +416,25 @@ + else + case $target in + *-*-solaris*) +- VCC_CC="cc -Kpic -G -o %o %s" ++ case $PTHREAD_CC in ++ *gcc*) ++ VCC_CC="$PTHREAD_CC $OCFLAGS $PTHREAD_CFLAGS -fpic -shared -o %o %s" ++ break ++ ;; ++ *cc) ++ VCC_CC="$PTHREAD_CC $OCFLAGS $PTHREAD_CFLAGS -Kpic -G -o %o %s" ++ ;; ++ esac + ;; + *-*-darwin*) +- VCC_CC="exec cc -dynamiclib -Wl,-undefined,dynamic_lookup -o %o %s" ++ VCC_CC="exec cc $OCFLAGS -dynamiclib -Wl,-undefined,dynamic_lookup -o %o %s" + ;; + *) +- VCC_CC="exec cc -fpic -shared -Wl,-x -o %o %s" ++ VCC_CC="exec $PTHREAD_CC $OCFLAGS $PTHREAD_CFLAGS -fpic -shared -Wl,-x -o %o %s" + ;; + esac + fi ++ + AC_DEFINE_UNQUOTED([VCC_CC],"$VCC_CC",[C compiler command line for VCL code]) + + # Use jemalloc on Linux +Index: varnish-cache/Makefile.am +=================================================================== +--- varnish-cache/Makefile.am (revision 5224) ++++ varnish-cache/Makefile.am (working copy) +@@ -1,5 +1,7 @@ + # $Id$ + ++ACLOCAL_AMFLAGS = -I m4 ++ + SUBDIRS = include lib bin man etc doc + + SUBDIRS += redhat +Index: varnish-cache/autogen.sh +=================================================================== +--- varnish-cache/autogen.sh (revision 5224) ++++ varnish-cache/autogen.sh (working copy) +@@ -40,7 +40,7 @@ + + set -ex + +-aclocal ++aclocal -I m4 + $LIBTOOLIZE --copy --force + autoheader + automake --add-missing --copy --foreign This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 1 17:15:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Oct 2010 15:15:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11121] csw/mgar/pkg/varnish/trunk/Makefile Message-ID: Revision: 11121 http://gar.svn.sourceforge.net/gar/?rev=11121&view=rev Author: dmichelsen Date: 2010-10-01 15:15:32 +0000 (Fri, 01 Oct 2010) Log Message: ----------- varnish: Add extra flags and fix autoreconfiguration Modified Paths: -------------- csw/mgar/pkg/varnish/trunk/Makefile Modified: csw/mgar/pkg/varnish/trunk/Makefile =================================================================== --- csw/mgar/pkg/varnish/trunk/Makefile 2010-10-01 14:54:33 UTC (rev 11120) +++ csw/mgar/pkg/varnish/trunk/Makefile 2010-10-01 15:15:32 UTC (rev 11121) @@ -21,9 +21,17 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +# Otherwise testsuite is failing +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check include gar/category.mk + +pre-configure-modulated: + -cd $(WORKSRC) && autoreconf -fi + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 2 03:02:28 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Oct 2010 01:02:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[11122] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11122 http://gar.svn.sourceforge.net/gar/?rev=11122&view=rev Author: bdwalton Date: 2010-10-02 01:02:27 +0000 (Sat, 02 Oct 2010) Log Message: ----------- apache2: remove the dummy ap2 stuff (confusing, not needed) Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-01 15:15:32 UTC (rev 11121) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 01:02:27 UTC (rev 11122) @@ -51,43 +51,32 @@ # The PACKAGES variable tell GAR which packages to build PACKAGES = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2suexec - -NEED_DUMMY_AP2 = 1 - -ifeq ($(NEED_DUMMY_AP2), 1) # These packages are dummy versions to make dependencies nicer # as various things depend on CSWap2prefork currently -PACKAGES += CSWap2prefork CSWapache2rt -endif +PACKAGES += CSWap2prefork CSWapache2rt CSWap2worker ARCHALL_CSWapache2-manual = 1 -ifeq ($(NEED_DUMMY_AP2), 1) ARCHALL_CSWap2prefork = 1 ARCHALL_CSWapache2rt = 1 -endif +ARCHALL_CSWap2worker = 1 CATALOGNAME_CSWapache2 = apache2 CATALOGNAME_CSWapache2-devel = apache2_devel CATALOGNAME_CSWapache2-manual = apache2_manual CATALOGNAME_CSWap2suexec = ap2_suexec -ifeq ($(NEED_DUMMY_AP2), 1) CATALOGNAME_CSWap2prefork = ap2_prefork +CATALOGNAME_CSWap2worker = ap2_worker CATALOGNAME_CSWapache2rt = apache2rt -endif SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server. SPKG_DESC_CSWapache2-devel = The development files for Apache2. SPKG_DESC_CSWapache2-manual = The Apache2 manual files. SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2. -ifeq ($(NEED_DUMMY_AP2), 1) -SPKG_DESC_CSWap2prefork = A dummy stub for the old prefork mpm package -SPKG_DESC_CSWapache2rt = A dummy stub for the old apache2rt package -endif +SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package +SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package +SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package -INCOMPATIBLE_PKGS_CSWapache2 = CSWapache2c CSWap2worker -ifneq ($(NEED_DUMMY_AP2), 1) -INCOMPATIBLE_PKGS_CSWapache2 += CSWap2prefork CSWapache2rt -endif +INCOMPATIBLE_PKGS_CSWapache2 = CSWapache2c RUNTIME_DEP_PKGS_CSWapache2 += CSWexpat CSWiconv RUNTIME_DEP_PKGS_CSWapache2 += CSWoldaprt CSWosslrt CSWzlib @@ -95,19 +84,17 @@ RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2 RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 -ifeq ($(NEED_DUMMY_AP2), 1) RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 +RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 -endif CHECKPKG_OVERRIDES_CSWap2suexec += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives -ifeq ($(NEED_DUMMY_AP2), 1) CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 -endif # We need this to get bdb48/lib into the runpath EXTRA_LIB = $(prefix)/bdb48/lib @@ -181,10 +168,9 @@ PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL) PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf -ifeq ($(NEED_DUMMY_AP2), 1) PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.* +PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -endif PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; { print }' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 2 03:09:05 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Oct 2010 01:09:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11123] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11123 http://gar.svn.sourceforge.net/gar/?rev=11123&view=rev Author: bdwalton Date: 2010-10-02 01:09:05 +0000 (Sat, 02 Oct 2010) Log Message: ----------- apache2: we need ap2_worker again to preserve behaviour of mpm preference; deliver a readme and a postinstall script Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 01:02:27 UTC (rev 11122) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 01:09:05 UTC (rev 11123) @@ -45,6 +45,8 @@ DISTFILES += update20to22 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork DISTFILES += README.CSW.apache2rt +DISTFILES += README.CSW.ap2worker CSWap2worker.postinstall + DISTFILES += i.cswap2mod r.cswap2mod UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Added: csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall 2010-10-02 01:09:05 UTC (rev 11123) @@ -0,0 +1,12 @@ +#!/bin/sh + +# Although CSWap2worker is a dummy package, shipping no real files +# now, we still need to use it to trigger a call to alternatives at +# install time to mimick the behaviour of the old packages...mostly, +# this will allow us to preserve the proper httpd upon upgrades. At +# some point in the future, we can drop this package again with the +# assumption that everyone will have upgraded and thus have an +# alternatives set httpd symlink. + + +exec chroot $PKG_INSTALL_ROOT /opt/csw/sbin/altneratives --set httpd /opt/csw/apache2/sbin/httpd.worker Added: csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker =================================================================== --- csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker 2010-10-02 01:09:05 UTC (rev 11123) @@ -0,0 +1,21 @@ +Hello CSW User/Sysadmin, + +This package (CSWap2worker) is only a stub package now. The httpd +worker mpm is now delivered via the CSWapache2 package. + +The purpose of this package going forward is to do nothing other +deliver a postinstall script that triggers a call to: + +alternatives --set httpd /opt/csw/apache2/sbin/httpd.worker + +This allows us to preserve the behaviour of the old packages. + +Once you've installed it (presumably during an update from the +previous packages), it is safe to remove completely. There is no +*remove script, and as httpd.worker is in CSWapache2, you still have +the worker mpm installed and activated. See: + +/opt/csw/sbin/altneratives --display httpd + +Thanks +-The OpenCSW apache2 team. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 2 03:16:49 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Oct 2010 01:16:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[11124] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11124 http://gar.svn.sourceforge.net/gar/?rev=11124&view=rev Author: bdwalton Date: 2010-10-02 01:16:49 +0000 (Sat, 02 Oct 2010) Log Message: ----------- apache2: correct typo in README distfile Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 01:09:05 UTC (rev 11123) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 01:16:49 UTC (rev 11124) @@ -45,7 +45,7 @@ DISTFILES += update20to22 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork DISTFILES += README.CSW.apache2rt -DISTFILES += README.CSW.ap2worker CSWap2worker.postinstall +DISTFILES += README.CSW.ap2_worker CSWap2worker.postinstall DISTFILES += i.cswap2mod r.cswap2mod This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 2 04:16:53 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Oct 2010 02:16:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11125] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11125 http://gar.svn.sourceforge.net/gar/?rev=11125&view=rev Author: bdwalton Date: 2010-10-02 02:16:53 +0000 (Sat, 02 Oct 2010) Log Message: ----------- apache2: tweak perm setting on CAS scripts to keep pax happy Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 01:16:49 UTC (rev 11124) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 02:16:53 UTC (rev 11125) @@ -174,7 +174,7 @@ PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; { print }' +PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }' include gar/category.mk @@ -197,7 +197,7 @@ @(cd $(WORKDIR); \ ginstall -d -m0755 $(CASD); \ for f in *cswap2mod; do \ - ginstall -m 0555 $$f $(CASD); \ + ginstall -m 0755 $$f $(CASD); \ done) copy-readmes: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 2 04:17:46 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Oct 2010 02:17:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[11126] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11126 http://gar.svn.sourceforge.net/gar/?rev=11126&view=rev Author: bdwalton Date: 2010-10-02 02:17:45 +0000 (Sat, 02 Oct 2010) Log Message: ----------- apache2: set the ap2_worker README as a post message too Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 02:16:53 UTC (rev 11125) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 02:17:45 UTC (rev 11126) @@ -108,6 +108,7 @@ INITSMF = /etc/opt/csw/init.d/cswapache2 POSTMSG = /opt/csw/share/doc/apache2/README.CSW +POSTMSG += /opt/csw/share/docs/ap2_worker/README.CSW AP2_MODS = 1 AP2_MODFILES = /opt/csw/apache2/libexec/.*suexec.*\.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 2 04:26:31 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Oct 2010 02:26:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[11127] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11127 http://gar.svn.sourceforge.net/gar/?rev=11127&view=rev Author: bdwalton Date: 2010-10-02 02:26:31 +0000 (Sat, 02 Oct 2010) Log Message: ----------- apache2: correct typo in POSTMSG for ap2_worker Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 02:17:45 UTC (rev 11126) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 02:26:31 UTC (rev 11127) @@ -108,7 +108,7 @@ INITSMF = /etc/opt/csw/init.d/cswapache2 POSTMSG = /opt/csw/share/doc/apache2/README.CSW -POSTMSG += /opt/csw/share/docs/ap2_worker/README.CSW +POSTMSG += /opt/csw/share/doc/ap2_worker/README.CSW AP2_MODS = 1 AP2_MODFILES = /opt/csw/apache2/libexec/.*suexec.*\.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 2 15:01:08 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Oct 2010 13:01:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11128] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11128 http://gar.svn.sourceforge.net/gar/?rev=11128&view=rev Author: bdwalton Date: 2010-10-02 13:01:08 +0000 (Sat, 02 Oct 2010) Log Message: ----------- apache2: no need for a special template mpm file now Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/httpd-mpm.conf.CSW Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 02:26:31 UTC (rev 11127) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 13:01:08 UTC (rev 11128) @@ -40,7 +40,6 @@ DISTFILES += CSWapache2.preinstall CSWapache2.postinstall # Configuration templates -DISTFILES += httpd-mpm.conf.CSW DISTFILES += httpd-ssl.conf.CSW DISTFILES += update20to22 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork @@ -219,7 +218,6 @@ copy-local-files: @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m0644 $(WORKDIR)/httpd-mpm.conf.CSW $(APACHE_ROOT)/etc/extra @ginstall -m0644 $(WORKDIR)/httpd-ssl.conf.CSW $(APACHE_ROOT)/etc/extra @ginstall $(WORKDIR)/update20to22 $(APACHE_ROOT)/sbin @$(MAKECOOKIE) @@ -234,6 +232,7 @@ template_list += etc/extra/httpd-multilang-errordoc.conf template_list += etc/extra/httpd-userdir.conf template_list += etc/extra/httpd-vhosts.conf +template_list += etc/extra/httpd-mpm.conf template_list += etc/magic template_list += etc/mime.types Deleted: csw/mgar/pkg/apache2/trunk/files/httpd-mpm.conf.CSW =================================================================== --- csw/mgar/pkg/apache2/trunk/files/httpd-mpm.conf.CSW 2010-10-02 02:26:31 UTC (rev 11127) +++ csw/mgar/pkg/apache2/trunk/files/httpd-mpm.conf.CSW 2010-10-02 13:01:08 UTC (rev 11128) @@ -1,101 +0,0 @@ -# -# Server-Pool Management (MPM specific) -# - -# -# PidFile: The file in which the server should record its process -# identification number when it starts. -# -# Note that this is the default PidFile for most MPMs. -# - - PidFile var/run/httpd.pid - - -# -# The accept serialization lock file MUST BE STORED ON A LOCAL DISK. -# - - -LockFile var/log/accept.lock - - - -# -# Only one of the below sections will be relevant on your -# installed httpd. Use "apachectl -l" to find out the -# active mpm. -# - -# prefork MPM -# StartServers: number of server processes to start -# MinSpareServers: minimum number of server processes which are kept spare -# MaxSpareServers: maximum number of server processes which are kept spare -# MaxClients: maximum number of server processes allowed to start -# MaxRequestsPerChild: maximum number of requests a server process serves - - StartServers 5 - MinSpareServers 5 - MaxSpareServers 10 - MaxClients 150 - MaxRequestsPerChild 0 - - -# worker MPM -# StartServers: initial number of server processes to start -# MaxClients: maximum number of simultaneous client connections -# MinSpareThreads: minimum number of worker threads which are kept spare -# MaxSpareThreads: maximum number of worker threads which are kept spare -# ThreadsPerChild: constant number of worker threads in each server process -# MaxRequestsPerChild: maximum number of requests a server process serves - - StartServers 2 - MaxClients 150 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadsPerChild 25 - MaxRequestsPerChild 0 - - -# BeOS MPM -# StartThreads: how many threads do we initially spawn? -# MaxClients: max number of threads we can have (1 thread == 1 client) -# MaxRequestsPerThread: maximum number of requests each thread will process - - StartThreads 10 - MaxClients 50 - MaxRequestsPerThread 10000 - - -# NetWare MPM -# ThreadStackSize: Stack size allocated for each worker thread -# StartThreads: Number of worker threads launched at server startup -# MinSpareThreads: Minimum number of idle threads, to handle request spikes -# MaxSpareThreads: Maximum number of idle threads -# MaxThreads: Maximum number of worker threads alive at the same time -# MaxRequestsPerChild: Maximum number of requests a thread serves. It is -# recommended that the default value of 0 be set for this -# directive on NetWare. This will allow the thread to -# continue to service requests indefinitely. - - ThreadStackSize 65536 - StartThreads 250 - MinSpareThreads 25 - MaxSpareThreads 250 - MaxThreads 1000 - MaxRequestsPerChild 0 - MaxMemFree 100 - - -# OS/2 MPM -# StartServers: Number of server processes to maintain -# MinSpareThreads: Minimum number of idle threads per process, -# to handle request spikes -# MaxSpareThreads: Maximum number of idle threads per process -# MaxRequestsPerChild: Maximum number of connections per server process - - StartServers 2 - MinSpareThreads 5 - MaxSpareThreads 10 - MaxRequestsPerChild 0 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 2 15:05:36 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Oct 2010 13:05:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[11129] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11129 http://gar.svn.sourceforge.net/gar/?rev=11129&view=rev Author: bdwalton Date: 2010-10-02 13:05:36 +0000 (Sat, 02 Oct 2010) Log Message: ----------- apache2: template httpd-ssl.conf automatically too, drop template we carried Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/httpd-ssl.conf.CSW Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 13:01:08 UTC (rev 11128) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-02 13:05:36 UTC (rev 11129) @@ -40,7 +40,6 @@ DISTFILES += CSWapache2.preinstall CSWapache2.postinstall # Configuration templates -DISTFILES += httpd-ssl.conf.CSW DISTFILES += update20to22 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork DISTFILES += README.CSW.apache2rt @@ -218,7 +217,6 @@ copy-local-files: @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m0644 $(WORKDIR)/httpd-ssl.conf.CSW $(APACHE_ROOT)/etc/extra @ginstall $(WORKDIR)/update20to22 $(APACHE_ROOT)/sbin @$(MAKECOOKIE) @@ -247,7 +245,9 @@ post-merge: @(cd $(PKGROOT)/$(prefix)/apache2/etc/; \ - perl -pi -e 's/User.*daemon.*/User \@USER\@/; s/Group.*daemon.*/Group \@GROUP\@/; s/#ServerName www.example.com:80/ServerName \@HOSTNAME\@:80/; s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; s/^(LoadModule.*suexec.*)/#$$1/' httpd.conf; \ - mv httpd.conf httpd.conf.CSW ) + for f in httpd.conf extra/httpd-ssl.conf; do \ + perl -pi -e 's/User.*daemon.*/User \@USER\@/; s/Group.*daemon.*/Group \@GROUP\@/; s/#ServerName www.example.com:80/ServerName \@HOSTNAME\@:80/; s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; s/^(LoadModule.*suexec.*)/#$$1/' $$f; \ + mv $$f $$f.CSW; \ + done ) @$(MAKECOOKIE) Deleted: csw/mgar/pkg/apache2/trunk/files/httpd-ssl.conf.CSW =================================================================== --- csw/mgar/pkg/apache2/trunk/files/httpd-ssl.conf.CSW 2010-10-02 13:01:08 UTC (rev 11128) +++ csw/mgar/pkg/apache2/trunk/files/httpd-ssl.conf.CSW 2010-10-02 13:05:36 UTC (rev 11129) @@ -1,231 +0,0 @@ -# -# This is the Apache server configuration file providing SSL support. -# It contains the configuration directives to instruct the server how to -# serve pages over an https connection. For detailing information about these -# directives see -# -# Do NOT simply read the instructions in here without understanding -# what they do. They're here only as hints or reminders. If you are unsure -# consult the online docs. You have been warned. -# - -# -# Pseudo Random Number Generator (PRNG): -# Configure one or more sources to seed the PRNG of the SSL library. -# The seed data should be of good random quality. -# WARNING! On some platforms /dev/random blocks if not enough entropy -# is available. This means you then cannot use the /dev/random device -# because it would lead to very long connection times (as long as -# it requires to make more entropy available). But usually those -# platforms additionally provide a /dev/urandom device which doesn't -# block. So, if available, use this one instead. Read the mod_ssl User -# Manual for more details. -# -#SSLRandomSeed startup file:/dev/random 512 -#SSLRandomSeed startup file:/dev/urandom 512 -#SSLRandomSeed connect file:/dev/random 512 -#SSLRandomSeed connect file:/dev/urandom 512 - - -# -# When we also provide SSL we have to listen to the -# standard HTTP port (see above) and to the HTTPS port -# -# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two -# Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443" -# -Listen 443 - -## -## SSL Global Context -## -## All SSL configuration in this context applies both to -## the main server and all SSL-enabled virtual hosts. -## - -# -# Some MIME-types for downloading Certificates and CRLs -# -AddType application/x-x509-ca-cert .crt -AddType application/x-pkcs7-crl .crl - -# Pass Phrase Dialog: -# Configure the pass phrase gathering process. -# The filtering dialog program (`builtin' is a internal -# terminal dialog) has to provide the pass phrase on stdout. -SSLPassPhraseDialog builtin - -# Inter-Process Session Cache: -# Configure the SSL Session Cache: First the mechanism -# to use and second the expiring timeout (in seconds). -#SSLSessionCache dbm:/var/run/ssl_scache -SSLSessionCache shmcb:/var/run/ssl_scache(512000) -SSLSessionCacheTimeout 300 - -# Semaphore: -# Configure the path to the mutual exclusion semaphore the -# SSL engine uses internally for inter-process synchronization. -SSLMutex file:/var/run/ssl_mutex - -## -## SSL Virtual Host Context -## - - - -# General setup for the virtual host -DocumentRoot "/opt/csw/apache2/share/htdocs" -ServerName @HOSTNAME@:443 -ServerAdmin @ADMIN@ -ErrorLog /opt/csw/apache2/var/log/error_log -TransferLog /opt/csw/apache2/var/log/access_log - -# SSL Engine Switch: -# Enable/Disable SSL for this virtual host. -SSLEngine on - -# SSL Cipher Suite: -# List the ciphers that the client is permitted to negotiate. -# See the mod_ssl documentation for a complete list. -SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL - -# Server Certificate: -# Point SSLCertificateFile at a PEM encoded certificate. If -# the certificate is encrypted, then you will be prompted for a -# pass phrase. Note that a kill -HUP will prompt again. Keep -# in mind that if you have both an RSA and a DSA certificate you -# can configure both in parallel (to also allow the use of DSA -# ciphers, etc.) -SSLCertificateFile /opt/csw/apache2/etc/server.crt -#SSLCertificateFile /opt/csw/apache2/etc/server-dsa.crt - -# Server Private Key: -# If the key is not combined with the certificate, use this -# directive to point at the key file. Keep in mind that if -# you've both a RSA and a DSA private key you can configure -# both in parallel (to also allow the use of DSA ciphers, etc.) -SSLCertificateKeyFile /opt/csw/apache2/etc/server.key -#SSLCertificateKeyFile /opt/csw/apache2/etc/server-dsa.key - -# Server Certificate Chain: -# Point SSLCertificateChainFile at a file containing the -# concatenation of PEM encoded CA certificates which form the -# certificate chain for the server certificate. Alternatively -# the referenced file can be the same as SSLCertificateFile -# when the CA certificates are directly appended to the server -# certificate for convinience. -#SSLCertificateChainFile /opt/csw/apache2/etc/server-ca.crt - -# Certificate Authority (CA): -# Set the CA certificate verification path where to find CA -# certificates for client authentication or alternatively one -# huge file containing all of them (file must be PEM encoded) -# Note: Inside SSLCACertificatePath you need hash symlinks -# to point to the certificate files. Use the provided -# Makefile to update the hash symlinks after changes. -#SSLCACertificatePath /opt/csw/apache2/etc/ssl.crt -#SSLCACertificateFile /opt/csw/apache2/etc/ssl.crt/ca-bundle.crt - -# Certificate Revocation Lists (CRL): -# Set the CA revocation path where to find CA CRLs for client -# authentication or alternatively one huge file containing all -# of them (file must be PEM encoded) -# Note: Inside SSLCARevocationPath you need hash symlinks -# to point to the certificate files. Use the provided -# Makefile to update the hash symlinks after changes. -#SSLCARevocationPath /opt/csw/apache2/etc/ssl.crl -#SSLCARevocationFile /opt/csw/apache2/etc/ssl.crl/ca-bundle.crl - -# Client Authentication (Type): -# Client certificate verification type and depth. Types are -# none, optional, require and optional_no_ca. Depth is a -# number which specifies how deeply to verify the certificate -# issuer chain before deciding the certificate is not valid. -#SSLVerifyClient require -#SSLVerifyDepth 10 - -# Access Control: -# With SSLRequire you can do per-directory access control based -# on arbitrary complex boolean expressions containing server -# variable checks and other lookup directives. The syntax is a -# mixture between C and Perl. See the mod_ssl documentation -# for more details. -# -#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \ -# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \ -# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \ -# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \ -# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \ -# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/ -# - -# SSL Engine Options: -# Set various options for the SSL engine. -# o FakeBasicAuth: -# Translate the client X.509 into a Basic Authorisation. This means that -# the standard Auth/DBMAuth methods can be used for access control. The -# user name is the `one line' version of the client's X.509 certificate. -# Note that no password is obtained from the user. Every entry in the user -# file needs this password: `xxj31ZMTZzkVA'. -# o ExportCertData: -# This exports two additional environment variables: SSL_CLIENT_CERT and -# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the -# server (always existing) and the client (only existing when client -# authentication is used). This can be used to import the certificates -# into CGI scripts. -# o StdEnvVars: -# This exports the standard SSL/TLS related `SSL_*' environment variables. -# Per default this exportation is switched off for performance reasons, -# because the extraction step is an expensive operation and is usually -# useless for serving static content. So one usually enables the -# exportation for CGI and SSI requests only. -# o StrictRequire: -# This denies access when "SSLRequireSSL" or "SSLRequire" applied even -# under a "Satisfy any" situation, i.e. when it applies access is denied -# and no other module can change it. -# o OptRenegotiate: -# This enables optimized SSL connection renegotiation handling when SSL -# directives are used in per-directory context. -#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - -# SSL Protocol Adjustments: -# The safe and default but still SSL/TLS standard compliant shutdown -# approach is that mod_ssl sends the close notify alert but doesn't wait for -# the close notify alert from client. When you need a different shutdown -# approach you can use one of the following variables: -# o ssl-unclean-shutdown: -# This forces an unclean shutdown when the connection is closed, i.e. no -# SSL close notify alert is send or allowed to received. This violates -# the SSL/TLS standard but is needed for some brain-dead browsers. Use -# this when you receive I/O errors because of the standard approach where -# mod_ssl sends the close notify alert. -# o ssl-accurate-shutdown: -# This forces an accurate shutdown when the connection is closed, i.e. a -# SSL close notify alert is send and mod_ssl waits for the close notify -# alert of the client. This is 100% SSL/TLS standard compliant, but in -# practice often causes hanging connections with brain-dead browsers. Use -# this only for browsers where you know that their SSL implementation -# works correctly. -# Notice: Most problems of broken clients are also related to the HTTP -# keep-alive facility, so you usually additionally want to disable -# keep-alive for those clients, too. Use variable "nokeepalive" for this. -# Similarly, one has to force some clients to use HTTP/1.0 to workaround -# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and -# "force-response-1.0" for this. -BrowserMatch ".*MSIE.*" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - -# Per-Server Logging: -# The home of a custom SSL log file. Use this when you want a -# compact non-error SSL logfile on a virtual host basis. -CustomLog /opt/csw/apache2/var/log/ssl_request_log \ - "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sat Oct 2 17:33:30 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sat, 02 Oct 2010 15:33:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[11130] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswpreserveconf Message-ID: Revision: 11130 http://gar.svn.sourceforge.net/gar/?rev=11130&view=rev Author: theferret Date: 2010-10-02 15:33:29 +0000 (Sat, 02 Oct 2010) Log Message: ----------- i.cswpreservconf: fixed syntax err Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2010-10-02 13:05:36 UTC (rev 11129) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2010-10-02 15:33:29 UTC (rev 11130) @@ -88,7 +88,7 @@ echo "You may have to manually run this script ( $0 )" echo "and pass it the name of the config files in the package." echo "Or, copy over the appropriate config files by hand yourself," - echo "to their proper destinations . + echo "to their proper destinations ." fi echo "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 2 18:20:43 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Oct 2010 16:20:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11131] csw/mgar/pkg/apache2/trunk/files/CSWap2worker. postinstall Message-ID: Revision: 11131 http://gar.svn.sourceforge.net/gar/?rev=11131&view=rev Author: bdwalton Date: 2010-10-02 16:20:43 +0000 (Sat, 02 Oct 2010) Log Message: ----------- apache2: correct typo in ap2worker.postinstall Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall Modified: csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall 2010-10-02 15:33:29 UTC (rev 11130) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall 2010-10-02 16:20:43 UTC (rev 11131) @@ -9,4 +9,4 @@ # alternatives set httpd symlink. -exec chroot $PKG_INSTALL_ROOT /opt/csw/sbin/altneratives --set httpd /opt/csw/apache2/sbin/httpd.worker +exec chroot $PKG_INSTALL_ROOT /opt/csw/sbin/alternatives --set httpd /opt/csw/apache2/sbin/httpd.worker This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sat Oct 2 19:57:10 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sat, 02 Oct 2010 17:57:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11132] csw/mgar/pkg/alternatives/trunk Message-ID: Revision: 11132 http://gar.svn.sourceforge.net/gar/?rev=11132&view=rev Author: theferret Date: 2010-10-02 17:57:09 +0000 (Sat, 02 Oct 2010) Log Message: ----------- alternatives: Added --config and --list. Fixed a bug about manual setting Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/alternatives csw/mgar/pkg/alternatives/trunk/pkginfo Added Paths: ----------- csw/mgar/pkg/alternatives/trunk/README Added: csw/mgar/pkg/alternatives/trunk/README =================================================================== --- csw/mgar/pkg/alternatives/trunk/README (rev 0) +++ csw/mgar/pkg/alternatives/trunk/README 2010-10-02 17:57:09 UTC (rev 11132) @@ -0,0 +1,7 @@ +A quickie readme for the future, about this "alternatives" implementation: + +Phil decided that a from-scratch, CSW-custom implementation was needed, +because the debian one was hugely bloated, and the redhat smaller one, +did not play nicely with NFS-shared /opt/csw +So pleaes dont go getting ideas that we can migrated back to redhat,etc +in the future! :) we tried, and it failed. Modified: csw/mgar/pkg/alternatives/trunk/alternatives =================================================================== --- csw/mgar/pkg/alternatives/trunk/alternatives 2010-10-02 16:20:43 UTC (rev 11131) +++ csw/mgar/pkg/alternatives/trunk/alternatives 2010-10-02 17:57:09 UTC (rev 11132) @@ -5,7 +5,7 @@ # @(#) alternatives 1.8@(#) PRIORITIESDIR=/opt/csw/share/alternatives -MANUALDIR=/etc/opt/etc/alternatives #manual override location +MANUALDIR=/etc/opt/csw/alternatives #manual override location AWK=nawk DEBUG=${DEBUG:-/bin/true} @@ -18,7 +18,8 @@ print " $prog --display {name}" print " $prog --auto {name}" print " $prog --set {name} {/full/path}" - # --config interactive chooser, not implemented at this time + print " $prog --config {name}" + print " $prog --list" print " " print " The following are provided for compatibility, but do not work" print " in exactly the same way as linux variants" @@ -86,13 +87,24 @@ # Start of subroutine area # Usage: print_alternatives shortname -# This prints only the INSTALLED alternatives lines, not manual settings +# This prints only the INSTALLED alternatives lines for named software. +# Does not display whether or not any have been manually chosen. # Prints in priority-sorted order +# This is used both as a user-facing display, and also internally +# function print_alternatives { if [[ $# != 1 ]] ; then print ERROR print_alternatives needs an arg; fi cat $PRIORITIESDIR/* 2>/dev/null| nawk '$2 == "'$1'" {print}' | sort -nr +3 } + +# User facing function. +# enables "alternatives --list" +function list_alternatives { + print "List of installed software that uses the alternatives system:" + cat $PRIORITIESDIR/* 2>/dev/null| nawk '{print $2}' | sort -u +} + # prints ONLY the manually set alternatives line, if present function print_manual_set { if [[ $# != 1 ]] ; then print ERROR print_manual_set needs an arg; fi @@ -294,6 +306,13 @@ ;; esac + if [[ ! -d $MANUALDIR ]] ; then + mkdir $MANUALDIR 2>/dev/null + fi + if [[ ! -d $MANUALDIR ]] ; then + print Error: $MANUALDIR does not exist. Cannot continue + exit 1 + fi check=`egrep -l "^[^ ]* $1 $2 " $PRIORITIESDIR/*` if [[ "$check" == "" ]] ; then print Error: no installed match found for $1 $2 @@ -327,7 +346,39 @@ print_alternatives $1 } +function config_alternative { + case $1 in + */*) + print Error: need short name as arg for --config + exit 1 + ;; + "") + print Error: Need a name for --config + exit 1 + ;; + esac + print "Chooser for software '$1'" + print_alternatives $1 |nawk '{print $4,$1,$3}' + print "Input the priority number for your desired choice, or 0 to quit" + read prio + case $prio in + 0|Q|q) + print Quitting without change + exit 0 + ;; + esac + fullpath=`cat $PRIORITIESDIR/* | + nawk '$2 == "'$1'" && $4 == "'$prio'" {print $3}'` + + if [[ "$fullpath" = "" ]] ; then + print Error: no match for priority $prio + exit 1 + fi + + set_manual_prio $1 $fullpath +} + ############################################################ # Return to "main" area below @@ -365,10 +416,17 @@ shift revert_to_auto $1 ;; + --list) + list_alternatives + ;; --display) shift display_choices $1 ;; + --config) + shift + config_alternative $1 + ;; --set) shift set_manual_prio $1 $2 Modified: csw/mgar/pkg/alternatives/trunk/pkginfo =================================================================== --- csw/mgar/pkg/alternatives/trunk/pkginfo 2010-10-02 16:20:43 UTC (rev 11131) +++ csw/mgar/pkg/alternatives/trunk/pkginfo 2010-10-02 17:57:09 UTC (rev 11132) @@ -1,9 +1,9 @@ PKG=CSWalternatives ARCH=all NAME=alternatives - an implementation of linux-style alternatives choice mgr -VERSION=1.0,REV=2010.05.21 +VERSION=1.1,REV=YYYY.MM.DD CATEGORY=system VENDOR=http://www.opencsw.org written and packaged for CSW by Philip Brown EMAIL=phil at opencsw.org HOTLINE=http://www.opencsw.org/bugtrack/ -PSTAMP=cswalternatives v1.0 +PSTAMP=cswalternatives v1.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 3 04:10:31 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 03 Oct 2010 02:10:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[11133] csw/mgar/pkg/apache2/trunk/files/CSWap2worker. postinstall Message-ID: Revision: 11133 http://gar.svn.sourceforge.net/gar/?rev=11133&view=rev Author: bdwalton Date: 2010-10-03 02:10:30 +0000 (Sun, 03 Oct 2010) Log Message: ----------- apache2: set default pkg_install_root in ap2worker postinstall so the chroot will always be passed a dir Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall Modified: csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall 2010-10-02 17:57:09 UTC (rev 11132) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall 2010-10-03 02:10:30 UTC (rev 11133) @@ -9,4 +9,4 @@ # alternatives set httpd symlink. -exec chroot $PKG_INSTALL_ROOT /opt/csw/sbin/alternatives --set httpd /opt/csw/apache2/sbin/httpd.worker +exec chroot ${PKG_INSTALL_ROOT:-/} /opt/csw/sbin/alternatives --set httpd /opt/csw/apache2/sbin/httpd.worker This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sun Oct 3 08:12:36 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sun, 03 Oct 2010 06:12:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[11134] csw/mgar/pkg/alternatives/trunk/alternatives Message-ID: Revision: 11134 http://gar.svn.sourceforge.net/gar/?rev=11134&view=rev Author: theferret Date: 2010-10-03 06:12:35 +0000 (Sun, 03 Oct 2010) Log Message: ----------- alternatives: checkpoint for source Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/alternatives Modified: csw/mgar/pkg/alternatives/trunk/alternatives =================================================================== --- csw/mgar/pkg/alternatives/trunk/alternatives 2010-10-03 02:10:30 UTC (rev 11133) +++ csw/mgar/pkg/alternatives/trunk/alternatives 2010-10-03 06:12:35 UTC (rev 11134) @@ -101,7 +101,7 @@ # User facing function. # enables "alternatives --list" function list_alternatives { - print "List of installed software that uses the alternatives system:" + echo "List of installed software that uses the alternatives system:" cat $PRIORITIESDIR/* 2>/dev/null| nawk '{print $2}' | sort -u } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 3 17:16:21 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 03 Oct 2010 15:16:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[11135] csw/mgar/pkg/cpan/CPANPLUS/trunk Message-ID: Revision: 11135 http://gar.svn.sourceforge.net/gar/?rev=11135&view=rev Author: bonivart Date: 2010-10-03 15:16:20 +0000 (Sun, 03 Oct 2010) Log Message: ----------- pm_cpanplus: update to 0.9007 (takeover from Cory Modified Paths: -------------- csw/mgar/pkg/cpan/CPANPLUS/trunk/Makefile csw/mgar/pkg/cpan/CPANPLUS/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/CPANPLUS/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/CPANPLUS/trunk/files/CSWpmcpanplus.depend csw/mgar/pkg/cpan/CPANPLUS/trunk/files/CSWpmcpanplus.gspec csw/mgar/pkg/cpan/CPANPLUS/trunk/files/CSWpmcpanplus.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/CPANPLUS/trunk/ Property changes on: csw/mgar/pkg/cpan/CPANPLUS/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/CPANPLUS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/CPANPLUS/trunk/Makefile 2010-10-03 06:12:35 UTC (rev 11134) +++ csw/mgar/pkg/cpan/CPANPLUS/trunk/Makefile 2010-10-03 15:16:20 UTC (rev 11135) @@ -1,7 +1,7 @@ GARNAME = CPANPLUS -GARVERSION = 0.076 +GARVERSION = 0.9007 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS DESCRIPTION = API and CLI access to the CPAN mirrors define BLURB @@ -9,21 +9,21 @@ interactive shells, commandline programs, etc, that use this API. endef -DISTFILES += $(call admfiles,CSWpmcpanplus,depend prototype) +DISTFILES += COPYING -DEPENDS += cpan/Archive-Extract -DEPENDS += cpan/File-Fetch -DEPENDS += cpan/IPC-Cmd -DEPENDS += cpan/Locale-Maketext-Simple -DEPENDS += cpan/Log-Message -DEPENDS += cpan/Module-CoreList -DEPENDS += cpan/Module-Load -DEPENDS += cpan/Module-Load-Conditional -DEPENDS += cpan/Module-Loaded -DEPENDS += cpan/Module-Pluggable -DEPENDS += cpan/Object-Accessor -DEPENDS += cpan/Package-Constants -DEPENDS += cpan/Params-Check -DEPENDS += cpan/Term-UI +PACKAGES = CSWpmcpanplus +CATALOGNAME = pm_cpanplus +RUNTIME_DEP_PKGS += CSWpmarchiveextract CSWpmfilefetch CSWpmipccmd +RUNTIME_DEP_PKGS += CSWpmlclemktxtsimple CSWpmlogmessage CSWpmmodcorelist +RUNTIME_DEP_PKGS += CSWpmmodload CSWpmmodloadcond CSWpmmodloaded +RUNTIME_DEP_PKGS += CSWpmmoduleplug CSWpmobjaccessor CSWpmpkgconst +RUNTIME_DEP_PKGS += CSWpmprmscheck CSWpmtermui + +ARCHALL = 1 + +SKIPTEST = 1 + +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3\/.* .*\/man\/man1\/.* + include gar/category.mk Modified: csw/mgar/pkg/cpan/CPANPLUS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/CPANPLUS/trunk/checksums 2010-10-03 06:12:35 UTC (rev 11134) +++ csw/mgar/pkg/cpan/CPANPLUS/trunk/checksums 2010-10-03 15:16:20 UTC (rev 11135) @@ -1,4 +1 @@ -ac47a2ac8e6f8732326f14ba1e4c7da5 download/CSWpmcpanplus.gspec -839348d00ca2776f90a2be37cc7df494 download/CSWpmcpanplus.depend -3b7ad92354a00e000480e0bc4b47a403 download/CSWpmcpanplus.prototype -a301bb6240ded8eea9f33ce7c8f969fb download/CPANPLUS-0.076.tar.gz +827e238ecce6801081ceb67ad88dff41 CPANPLUS-0.9007.tar.gz Added: csw/mgar/pkg/cpan/CPANPLUS/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/CPANPLUS/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/CPANPLUS/trunk/files/COPYING 2010-10-03 15:16:20 UTC (rev 11135) @@ -0,0 +1,6 @@ +Copyright 2001-2006 by Jos Boumans . + +All rights reserved. You can redistribute and/or modify +this bundle under the same terms as Perl itself. + +See . Deleted: csw/mgar/pkg/cpan/CPANPLUS/trunk/files/CSWpmcpanplus.depend =================================================================== --- csw/mgar/pkg/cpan/CPANPLUS/trunk/files/CSWpmcpanplus.depend 2010-10-03 06:12:35 UTC (rev 11134) +++ csw/mgar/pkg/cpan/CPANPLUS/trunk/files/CSWpmcpanplus.depend 2010-10-03 15:16:20 UTC (rev 11135) @@ -1,14 +0,0 @@ -P CSWpmarchiveextract pm_archiveextract - A generic archive extracting mechanism -P CSWpmfilefetch pm_filefetch - A generic file fetching mechanism -P CSWpmipccmd pm_ipccmd - Finding and running system commands made easy -P CSWpmlclemktxtsimple pm_lclemktxtsimple - simple interface to Locale::Maketext::Lexicon -P CSWpmlogmessage pm_logmessage - Generic message storage mechanism. -P CSWpmmodcorelist pm_modcorelist - What modules shipped with versions of Perl -P CSWpmmodload pm_modload - Runtime require of both modules and files -P CSWpmmodloadcond pm_modloadcond - Query module information and load at runtime -P CSWpmmodloaded pm_modloaded - Mark modules as loaded or unloaded -P CSWpmmoduleplug pm_moduleplug - automatically give your module the ability to have plugins -P CSWpmobjaccessor pm_objaccessor - An interface to create per object accessors -P CSWpmpkgconst pm_pkgconst - List all constants declared in a package -P CSWpmprmscheck pm_prmscheck - A generic input parsing/checking mechanism. -P CSWpmtermui pm_termui - Term::ReadLine UI made easy Deleted: csw/mgar/pkg/cpan/CPANPLUS/trunk/files/CSWpmcpanplus.gspec =================================================================== --- csw/mgar/pkg/cpan/CPANPLUS/trunk/files/CSWpmcpanplus.gspec 2010-10-03 06:12:35 UTC (rev 11134) +++ csw/mgar/pkg/cpan/CPANPLUS/trunk/files/CSWpmcpanplus.gspec 2010-10-03 15:16:20 UTC (rev 11135) @@ -1,7 +0,0 @@ -%var bitname pm_cpanplus -%var pkgname CSWpmcpanplus -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This library is free software; you may redistribute it and/or modify it -under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/CPANPLUS/trunk/files/CSWpmcpanplus.prototype =================================================================== --- csw/mgar/pkg/cpan/CPANPLUS/trunk/files/CSWpmcpanplus.prototype 2010-10-03 06:12:35 UTC (rev 11134) +++ csw/mgar/pkg/cpan/CPANPLUS/trunk/files/CSWpmcpanplus.prototype 2010-10-03 15:16:20 UTC (rev 11135) @@ -1,97 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/cpan2dist 0555 root bin -f none /opt/csw/bin/cpanp 0555 root bin -f none /opt/csw/bin/cpanp-boxed 0555 root bin -f none /opt/csw/bin/cpanp-run-perl 0555 root bin -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/CPANPLUS 0755 root bin -f none /opt/csw/lib/perl/csw/auto/CPANPLUS/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/cpan2dist.1 0444 root bin -f none /opt/csw/share/man/man1/cpanp.1 0444 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/CPANPLUS.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Backend.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Backend::RV.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Configure.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Dist.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Dist::Base.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Dist::MM.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Dist::Sample.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Error.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::FAQ.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Hacking.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Internals.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Internals::Extract.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Internals::Fetch.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Internals::Report.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Internals::Search.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Internals::Source.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Internals::Utils.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Module.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Module::Author.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Module::Author::Fake.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Module::Checksums.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Module::Fake.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Shell.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Shell::Classic.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Shell::Default.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Shell::Default::Plugins::HOWTO.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Shell::Default::Plugins::Remote.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::Shell::Default::Plugins::Source.3perl 0444 root bin -f none /opt/csw/share/man/man3/CPANPLUS::inc.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/CPANPLUS 0755 root bin -f none /opt/csw/share/perl/csw/CPANPLUS.pm 0444 root bin -d none /opt/csw/share/perl/csw/CPANPLUS/Backend 0755 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Backend.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Backend/RV.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Config.pm 0444 root bin -d none /opt/csw/share/perl/csw/CPANPLUS/Configure 0755 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Configure.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Configure/Setup.pm 0444 root bin -d none /opt/csw/share/perl/csw/CPANPLUS/Dist 0755 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Dist.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Dist/Base.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Dist/MM.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Dist/Sample.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Error.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/FAQ.pod 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Hacking.pod 0444 root bin -d none /opt/csw/share/perl/csw/CPANPLUS/Internals 0755 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Internals.pm 0444 root bin -d none /opt/csw/share/perl/csw/CPANPLUS/Internals/Constants 0755 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Internals/Constants.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Internals/Constants/Report.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Internals/Extract.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Internals/Fetch.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Internals/Report.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Internals/Search.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Internals/Source.pm 0444 root bin -d none /opt/csw/share/perl/csw/CPANPLUS/Internals/Utils 0755 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Internals/Utils.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Internals/Utils/Autoflush.pm 0444 root bin -d none /opt/csw/share/perl/csw/CPANPLUS/Module 0755 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Module.pm 0444 root bin -d none /opt/csw/share/perl/csw/CPANPLUS/Module/Author 0755 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Module/Author.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Module/Author/Fake.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Module/Checksums.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Module/Fake.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Module/Signature.pm 0444 root bin -d none /opt/csw/share/perl/csw/CPANPLUS/Shell 0755 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Shell.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Shell/Classic.pm 0444 root bin -d none /opt/csw/share/perl/csw/CPANPLUS/Shell/Default 0755 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Shell/Default.pm 0444 root bin -d none /opt/csw/share/perl/csw/CPANPLUS/Shell/Default/Plugins 0755 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Shell/Default/Plugins/HOWTO.pod 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Shell/Default/Plugins/Remote.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/Shell/Default/Plugins/Source.pm 0444 root bin -f none /opt/csw/share/perl/csw/CPANPLUS/inc.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sun Oct 3 18:42:47 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sun, 03 Oct 2010 16:42:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[11136] csw/mgar/pkg/alternatives/trunk/alternatives Message-ID: Revision: 11136 http://gar.svn.sourceforge.net/gar/?rev=11136&view=rev Author: theferret Date: 2010-10-03 16:42:47 +0000 (Sun, 03 Oct 2010) Log Message: ----------- alternatives: added comment, and minor optimization Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/alternatives Modified: csw/mgar/pkg/alternatives/trunk/alternatives =================================================================== --- csw/mgar/pkg/alternatives/trunk/alternatives 2010-10-03 15:16:20 UTC (rev 11135) +++ csw/mgar/pkg/alternatives/trunk/alternatives 2010-10-03 16:42:47 UTC (rev 11136) @@ -64,7 +64,7 @@ return fi # I hate using cat, but its the only way to avoid nawk throwing a fit. - cat $PRIORITIESDIR/* $MANUALDIR/* 2>/dev/null | + cat $PRIORITIESDIR/* $MANUALDIR/$1 2>/dev/null | $AWK ' BEGIN {save=""} $2 == "'$1'" {if($4 > highest){ save=$0; @@ -205,6 +205,8 @@ } # set_alternatives: mostly internal function. +# It "sets" only in the sense of making the symlink for the binary(s) +# # Usage: set_alternative {shortname} [ignore-path] # # Goes and checks both standard configs, and manual config, for best fit. @@ -323,6 +325,9 @@ $DEBUG found match for $1: $check rm -f $MANUALDIR/$1 ln -s $check $MANUALDIR/$1 + # I use a symlink, so that way, the manual set does not take + # effect if the package has been removed.. but it is remembered + # if the package is coming right back, hopefully. set_alternative $1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 4 03:23:42 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Oct 2010 01:23:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11137] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11137 http://gar.svn.sourceforge.net/gar/?rev=11137&view=rev Author: bdwalton Date: 2010-10-04 01:23:41 +0000 (Mon, 04 Oct 2010) Log Message: ----------- apache2: work around bug in alternatives, put httpd.worker in separate package again Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-03 16:42:47 UTC (rev 11136) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-04 01:23:41 UTC (rev 11137) @@ -43,7 +43,6 @@ DISTFILES += update20to22 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork DISTFILES += README.CSW.apache2rt -DISTFILES += README.CSW.ap2_worker CSWap2worker.postinstall DISTFILES += i.cswap2mod r.cswap2mod @@ -58,7 +57,6 @@ ARCHALL_CSWapache2-manual = 1 ARCHALL_CSWap2prefork = 1 ARCHALL_CSWapache2rt = 1 -ARCHALL_CSWap2worker = 1 CATALOGNAME_CSWapache2 = apache2 CATALOGNAME_CSWapache2-devel = apache2_devel @@ -72,9 +70,9 @@ SPKG_DESC_CSWapache2-devel = The development files for Apache2. SPKG_DESC_CSWapache2-manual = The Apache2 manual files. SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2. -SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package -SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package -SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package +SPKG_DESC_CSWap2worker = The apache worker mpm. +SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package. +SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package. INCOMPATIBLE_PKGS_CSWapache2 = CSWapache2c @@ -85,7 +83,8 @@ RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2 RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 +RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWosslrt CSWapr CSWexpat +RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 CHECKPKG_OVERRIDES_CSWap2suexec += surplus-dependency|CSWapache2 @@ -94,6 +93,7 @@ CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 # We need this to get bdb48/lib into the runpath @@ -106,14 +106,14 @@ INITSMF = /etc/opt/csw/init.d/cswapache2 POSTMSG = /opt/csw/share/doc/apache2/README.CSW -POSTMSG += /opt/csw/share/doc/ap2_worker/README.CSW AP2_MODS = 1 AP2_MODFILES = /opt/csw/apache2/libexec/.*suexec.*\.so -ALTERNATIVES_CSWapache2 = prefork worker -ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 100 -ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.worker 50 +ALTERNATIVES_CSWapache2 = prefork +ALTERNATIVES_CSWap2worker = worker +ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 50 +ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.worker 100 # Build Configuration CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config @@ -170,7 +170,7 @@ PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL) PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.* -PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* +PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }' Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall 2010-10-03 16:42:47 UTC (rev 11136) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall 2010-10-04 01:23:41 UTC (rev 11137) @@ -1,12 +0,0 @@ -#!/bin/sh - -# Although CSWap2worker is a dummy package, shipping no real files -# now, we still need to use it to trigger a call to alternatives at -# install time to mimick the behaviour of the old packages...mostly, -# this will allow us to preserve the proper httpd upon upgrades. At -# some point in the future, we can drop this package again with the -# assumption that everyone will have upgraded and thus have an -# alternatives set httpd symlink. - - -exec chroot ${PKG_INSTALL_ROOT:-/} /opt/csw/sbin/alternatives --set httpd /opt/csw/apache2/sbin/httpd.worker Deleted: csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker =================================================================== --- csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker 2010-10-03 16:42:47 UTC (rev 11136) +++ csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker 2010-10-04 01:23:41 UTC (rev 11137) @@ -1,21 +0,0 @@ -Hello CSW User/Sysadmin, - -This package (CSWap2worker) is only a stub package now. The httpd -worker mpm is now delivered via the CSWapache2 package. - -The purpose of this package going forward is to do nothing other -deliver a postinstall script that triggers a call to: - -alternatives --set httpd /opt/csw/apache2/sbin/httpd.worker - -This allows us to preserve the behaviour of the old packages. - -Once you've installed it (presumably during an update from the -previous packages), it is safe to remove completely. There is no -*remove script, and as httpd.worker is in CSWapache2, you still have -the worker mpm installed and activated. See: - -/opt/csw/sbin/altneratives --display httpd - -Thanks --The OpenCSW apache2 team. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 4 03:55:30 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Oct 2010 01:55:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[11138] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11138 http://gar.svn.sourceforge.net/gar/?rev=11138&view=rev Author: bdwalton Date: 2010-10-04 01:55:30 +0000 (Mon, 04 Oct 2010) Log Message: ----------- apache2: explicitly disable some modules during non-preform mpm Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-04 01:23:41 UTC (rev 11137) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-04 01:55:30 UTC (rev 11138) @@ -128,6 +128,11 @@ ifneq ($(MPM),prefork) CONFIGURE_ARGS += --enable-modules=none +CONFIGURE_ARGS += --disable-authn-file +CONFIGURE_ARGS += --disable-authn-default +CONFIGURE_ARGS += --disable-authz-host +CONFIGURE_ARGS += --disable-authz-user +CONFIGURE_ARGS += --disable-auth-basic else CONFIGURE_ARGS += --enable-suexec CONFIGURE_ARGS += --with-suexec-caller=nobody This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 4 11:45:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Oct 2010 09:45:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11139] csw/mgar/pkg/bison/trunk Message-ID: Revision: 11139 http://gar.svn.sourceforge.net/gar/?rev=11139&view=rev Author: dmichelsen Date: 2010-10-04 09:45:17 +0000 (Mon, 04 Oct 2010) Log Message: ----------- bison: Update to 2.4.3 Modified Paths: -------------- csw/mgar/pkg/bison/trunk/Makefile csw/mgar/pkg/bison/trunk/checksums Modified: csw/mgar/pkg/bison/trunk/Makefile =================================================================== --- csw/mgar/pkg/bison/trunk/Makefile 2010-10-04 01:55:30 UTC (rev 11138) +++ csw/mgar/pkg/bison/trunk/Makefile 2010-10-04 09:45:17 UTC (rev 11139) @@ -1,5 +1,6 @@ GARNAME = bison -GARVERSION = 2.4.1 +# GARVERSION = 2.4.2.8-cb76 +GARVERSION = 2.4.3 CATEGORIES = devel DESCRIPTION = GNU Project parser generator (yacc replacement) @@ -9,8 +10,10 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# MASTER_SITES += http://alpha.gnu.org/gnu/bison/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + BUILD_DEP_PKGS = CSWgnulinks RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWgm4 @@ -19,8 +22,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -TAR_ARGS = -OPT_FLAGS_SOS = -xO1 +# TAR_ARGS = +# OPT_FLAGS_SOS = -xO1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check @@ -32,9 +35,9 @@ # Must use GNU grep during test PATH := /opt/csw/gnu:$(PATH) -post-install-modulated: - (cd $(DESTDIR)$(prefix)/bin; \ - /usr/ccs/bin/strip bison; \ - /usr/ccs/bin/mcs -d bison; \ - mv yacc gyacc) - @$(MAKECOOKIE) +#post-install-modulated: +# (cd $(DESTDIR)$(prefix)/bin; \ +# /usr/ccs/bin/strip bison; \ +# /usr/ccs/bin/mcs -d bison; \ +# mv yacc gyacc) +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/bison/trunk/checksums =================================================================== --- csw/mgar/pkg/bison/trunk/checksums 2010-10-04 01:55:30 UTC (rev 11138) +++ csw/mgar/pkg/bison/trunk/checksums 2010-10-04 09:45:17 UTC (rev 11139) @@ -1 +1 @@ -84e80a2a192c1a4c02d43fbf2bcc4ca4 download/bison-2.4.1.tar.bz2 +ea45c778b36bdc7a720096819e292a73 bison-2.4.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 4 12:11:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Oct 2010 10:11:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[11140] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 11140 http://gar.svn.sourceforge.net/gar/?rev=11140&view=rev Author: dmichelsen Date: 2010-10-04 10:11:46 +0000 (Mon, 04 Oct 2010) Log Message: ----------- mGAR v2: Revert --docdir as too many packages are incompatible with it Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-10-04 09:45:17 UTC (rev 11139) +++ csw/mgar/gar/v2/gar.lib.mk 2010-10-04 10:11:46 UTC (rev 11140) @@ -539,7 +539,7 @@ #################### CONFIGURE RULES #################### -TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconfdir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstatedir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir=$(includedir) --mandir=$(mandir) --docdir=$(docdir) +TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconfdir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstatedir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir=$(includedir) --mandir=$(mandir) NODIRPATHS += --lispdir This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 4 13:13:42 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Oct 2010 11:13:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11141] csw/mgar/pkg/bison/trunk/Makefile Message-ID: Revision: 11141 http://gar.svn.sourceforge.net/gar/?rev=11141&view=rev Author: dmichelsen Date: 2010-10-04 11:13:41 +0000 (Mon, 04 Oct 2010) Log Message: ----------- bison: Add overrides Modified Paths: -------------- csw/mgar/pkg/bison/trunk/Makefile Modified: csw/mgar/pkg/bison/trunk/Makefile =================================================================== --- csw/mgar/pkg/bison/trunk/Makefile 2010-10-04 10:11:46 UTC (rev 11140) +++ csw/mgar/pkg/bison/trunk/Makefile 2010-10-04 11:13:41 UTC (rev 11141) @@ -22,22 +22,23 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -# TAR_ARGS = -# OPT_FLAGS_SOS = -xO1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset\.alias +# I guess we really need these +CHECKPKG_OVERRIDES_CSWbison += surplus-dependency|CSWgm4 +CHECKPKG_OVERRIDES_CSWbison += surplus-dependency|CSWiconv + include gar/category.mk # Must use GNU grep during test PATH := /opt/csw/gnu:$(PATH) -#post-install-modulated: -# (cd $(DESTDIR)$(prefix)/bin; \ -# /usr/ccs/bin/strip bison; \ -# /usr/ccs/bin/mcs -d bison; \ -# mv yacc gyacc) -# @$(MAKECOOKIE) +post-install-modulated: + mv $(DESTDIR)$(bindir)/yacc $(DESTDIR)$(bindir)/gyacc + ginstall -d $(DESTDIR)$(prefix)/gnu + ln -s ../bin/gyacc $(DESTDIR)$(prefix)/gnu/yacc + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 4 13:21:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Oct 2010 11:21:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[11142] csw/mgar/pkg Message-ID: Revision: 11142 http://gar.svn.sourceforge.net/gar/?rev=11142&view=rev Author: dmichelsen Date: 2010-10-04 11:20:59 +0000 (Mon, 04 Oct 2010) Log Message: ----------- tcpstat: Initial commit Added Paths: ----------- csw/mgar/pkg/tcpstat/ csw/mgar/pkg/tcpstat/branches/ csw/mgar/pkg/tcpstat/tags/ csw/mgar/pkg/tcpstat/trunk/ csw/mgar/pkg/tcpstat/trunk/Makefile csw/mgar/pkg/tcpstat/trunk/checksums csw/mgar/pkg/tcpstat/trunk/files/ Property changes on: csw/mgar/pkg/tcpstat/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/tcpstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpstat/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tcpstat/trunk/Makefile 2010-10-04 11:20:59 UTC (rev 11142) @@ -0,0 +1,36 @@ +# $Id$ +GARNAME = tcpstat +GARVERSION = 1.5 +CATEGORIES = utils + +DESCRIPTION = Report network interface statistics +define BLURB + tcpstat reports certain network interface statistics much like vmstat does for system statistics. + tcpstat gets its information by either monitoring a specific interface, or by reading previously + saved tcpdump data from a file. +endef + +MASTER_SITES = http://www.frenchfries.net/paul/tcpstat/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = LICENSE + +BUILD_DEP_PKGS = CSWlibpcap CSWlibpcapdevel +RUNTIME_DEP_PKGS = CSWlibpcap + +# EXTRA_INC = $(prefix)/bdb48/include +# EXTRA_LIB = $(prefix)/bdb48/lib + +# Otherwise inet_ntop(3socket) is not correctly detected +EXTRA_LINKER_FLAGS = -lsocket -lnsl + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +EXTRA_MERGE_EXCLUDE_FILES = .*/tcpprof\.1 + +include gar/category.mk Property changes on: csw/mgar/pkg/tcpstat/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tcpstat/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpstat/trunk/checksums (rev 0) +++ csw/mgar/pkg/tcpstat/trunk/checksums 2010-10-04 11:20:59 UTC (rev 11142) @@ -0,0 +1 @@ +93ca0ffb8f319ecf2e42ff925a7e6854 tcpstat-1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 4 13:38:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Oct 2010 11:38:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11143] csw/mgar/pkg/neon/trunk Message-ID: Revision: 11143 http://gar.svn.sourceforge.net/gar/?rev=11143&view=rev Author: dmichelsen Date: 2010-10-04 11:38:33 +0000 (Mon, 04 Oct 2010) Log Message: ----------- neon: Update to 0.29.4, AUX stub still needs to be done Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile csw/mgar/pkg/neon/trunk/checksums Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2010-10-04 11:20:59 UTC (rev 11142) +++ csw/mgar/pkg/neon/trunk/Makefile 2010-10-04 11:38:33 UTC (rev 11143) @@ -1,9 +1,9 @@ GARNAME = neon -GARVERSION = 0.29.3 +GARVERSION = 0.29.4 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION FEATURES -MODULATIONS_GARVERSION = 0.26.4 0.29.3 +MODULATIONS_GARVERSION = 0.26.4 0.29.4 MODULATIONS_FEATURES = minimal full DESCRIPTION = Neon HTTP and WebDAV client library @@ -44,7 +44,7 @@ CONFIGURE_ARGS_features-full = --with-libproxy --with-packchois CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-shared +CONFIGURE_ARGS += --enable-shared --enable-static CONFIGURE_ARGS += --with-ssl=openssl CONFIGURE_ARGS += --with-expat CONFIGURE_ARGS += $(CONFIGURE_ARGS_features-$(FEATURES)) @@ -56,7 +56,7 @@ INSTALL_OVERRIDE_VARS = docdir INSTALL_OVERRIDE_VAR_docdir = $(datadir)/doc/neon -# isa-sparcv8-garversion-0.26.4-features-minimal isa-sparcv8-garversion-0.26.4-features-full isa-sparcv8-garversion-0.29.3-features-minimal isa-sparcv8-garversion-0.29.3-features-full isa-sparcv9-garversion-0.26.4-features-minimal isa-sparcv9-garversion-0.26.4-features-full isa-sparcv9-garversion-0.29.3-features-minimal isa-sparcv9-garversion-0.29.3-features-full +# isa-sparcv8-garversion-0.26.4-features-minimal isa-sparcv8-garversion-0.26.4-features-full isa-sparcv8-garversion-0.29.4-features-minimal isa-sparcv8-garversion-0.29.4-features-full isa-sparcv9-garversion-0.26.4-features-minimal isa-sparcv9-garversion-0.26.4-features-full isa-sparcv9-garversion-0.29.4-features-minimal isa-sparcv9-garversion-0.29.4-features-full # We select pkgconfig for minimal library bindings. As libneon is self-contained (links # to all necessary libs directly) the full version can simly be linked in. @@ -78,13 +78,13 @@ MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-full = copy-relocated-only MERGE_DIRS_isa-default64-garversion-0.26.4-features-full = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.29.3-features-minimal = copy-all -MERGE_SCRIPTS_isa-default64-garversion-0.29.3-features-minimal = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.29.3-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.29.3-features-full = copy-only -MERGE_DIRS_isa-default-garversion-0.29.3-features-full = $(libdir) -MERGE_SCRIPTS_isa-default64-garversion-0.29.3-features-full = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.29.3-features-full = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-0.29.4-features-minimal = copy-all +MERGE_SCRIPTS_isa-default64-garversion-0.29.4-features-minimal = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.29.4-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-0.29.4-features-full = copy-only +MERGE_DIRS_isa-default-garversion-0.29.4-features-full = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-0.29.4-features-full = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.29.4-features-full = $(libdir) EXTRA_LINKER_FLAGS = -lintl @@ -141,20 +141,23 @@ # 32/64 bit detection is done by looking at the last directory component and # guessing by ISA if it is 32 or 64 bit -post-merge: _LDFLAGS-32= -post-merge: _LDFLAGS-64=-64 -post-merge: -post-merge: - cd $(WORKDIR); touch empty.c; $(CC) -G -c empty.c - cd $(WORKDIR); touch empty64.c; $(CC) -m64 -G -c empty64.c - $(foreach L,$(FEATURE_LIBRARIES),\ - ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \ - -G -h $(word 2,$(FEATURES_$L)) -o $(WORKDIR)/stub-$(notdir $(firstword $(FEATURES_$L))) $(WORKDIR)/empty$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L)))))).o;\ - ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \ - -R $(patsubst %/,%,$(dir $(firstword $(FEATURES_$L)))) \ - -G -h `/usr/ccs/bin/dump -Lv $(dir $(firstword $(FEATURES_$L)))/$(word 2,$(FEATURES_$L)) | awk '$$2 == "SONAME" { print $$3 }'` \ - -o $(PKGROOT)$(firstword $(FEATURES_$L)) \ - $(foreach F,$(wordlist 3,$(words $(FEATURES_$L)),$(FEATURES_$L)),-f $F) \ - $(WORKDIR)/stub-$(notdir $(firstword $(FEATURES_$L))); \ - ) - @$(MAKECOOKIE) +#post-merge: _LDFLAGS-32= +#post-merge: _LDFLAGS-64=-64 +#post-merge: +#post-merge: +# cd $(WORKDIR); touch empty.c; $(CC) -G -c empty.c +# cd $(WORKDIR); touch empty64.c; $(CC) -m64 -G -c empty64.c +# $(foreach L,$(FEATURE_LIBRARIES),\ +# ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \ +# -G -h $(word 2,$(FEATURES_$L)) -o $(WORKDIR)/stub-$(notdir $(firstword $(FEATURES_$L))) $(WORKDIR)/empty$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L)))))).o;\ +# ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \ +# -R $(patsubst %/,%,$(dir $(firstword $(FEATURES_$L)))) \ +# -G -h `/usr/ccs/bin/dump -Lv $(dir $(firstword $(FEATURES_$L)))/$(word 2,$(FEATURES_$L)) | awk '$$2 == "SONAME" { print $$3 }'` \ +# -o $(PKGROOT)$(firstword $(FEATURES_$L)) \ +# $(foreach F,$(wordlist 3,$(words $(FEATURES_$L)),$(FEATURES_$L)),-F $F) \ +# $(WORKDIR)/stub-$(notdir $(firstword $(FEATURES_$L))); \ +# ) +# @$(MAKECOOKIE) + +# ld -G -o ~/libtidy-minimal.so -z allextract -h libtidy.so.26 -F libtidy-full.so.26 /opt/csw/lib/libtidy.a + Modified: csw/mgar/pkg/neon/trunk/checksums =================================================================== --- csw/mgar/pkg/neon/trunk/checksums 2010-10-04 11:20:59 UTC (rev 11142) +++ csw/mgar/pkg/neon/trunk/checksums 2010-10-04 11:38:33 UTC (rev 11143) @@ -1,3 +1,2 @@ -4ef5552e8930ef82b1f56c2712f8ed1e COPYING 2d11fff51ffa856fc6b5d4bd801d6cc4 neon-0.26.4.tar.gz -ba1015b59c112d44d7797b62fe7bee51 neon-0.29.3.tar.gz +29438dbdaee84db2d7fbc73248a92d93 neon-0.29.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From driodeiros at users.sourceforge.net Mon Oct 4 14:41:40 2010 From: driodeiros at users.sourceforge.net (driodeiros at users.sourceforge.net) Date: Mon, 04 Oct 2010 12:41:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11144] csw/mgar/pkg/lighttpd/tags Message-ID: Revision: 11144 http://gar.svn.sourceforge.net/gar/?rev=11144&view=rev Author: driodeiros Date: 2010-10-04 12:41:40 +0000 (Mon, 04 Oct 2010) Log Message: ----------- Legacy scripts for lighttpd added. Added Paths: ----------- csw/mgar/pkg/lighttpd/tags/legacy/ csw/mgar/pkg/lighttpd/tags/legacy/build_lighttpd.sh csw/mgar/pkg/lighttpd/tags/legacy/checkinstall csw/mgar/pkg/lighttpd/tags/legacy/copy_to.sh csw/mgar/pkg/lighttpd/tags/legacy/cswlighttpd csw/mgar/pkg/lighttpd/tags/legacy/i.smfno csw/mgar/pkg/lighttpd/tags/legacy/i.smfyes csw/mgar/pkg/lighttpd/tags/legacy/lighttpd.conf csw/mgar/pkg/lighttpd/tags/legacy/lighttpd.xml csw/mgar/pkg/lighttpd/tags/legacy/postinstall csw/mgar/pkg/lighttpd/tags/legacy/preremove csw/mgar/pkg/lighttpd/tags/legacy/space Added: csw/mgar/pkg/lighttpd/tags/legacy/build_lighttpd.sh =================================================================== --- csw/mgar/pkg/lighttpd/tags/legacy/build_lighttpd.sh (rev 0) +++ csw/mgar/pkg/lighttpd/tags/legacy/build_lighttpd.sh 2010-10-04 12:41:40 UTC (rev 11144) @@ -0,0 +1,139 @@ +#!/usr/bin/bash +set -e + +# NOTE: if creatpkg -r fails: rm -rf /var/spool/pkg/CSWlighttpd + +VERSION="1.4.28" +TARBALL="lighttpd-$VERSION.tar.gz" +ROOT_TB="lighttpd-$VERSION" +PKG_NAME="lighttpd" +REV=",REV=`date +%Y.%m.%d`" +CURRENT="$HOME/opencsw/lighttpd" + +#export PATH="/usr/ccs/bin:/usr/bin:/opt/csw/bin:/opt/sfw/bin:/opt/local/bin:$PATH" +#export PATH="$PATH:/opt/studio/SOS11/SUNWspro/bin:/opt/studio/SOS11/SUNWspro/lib" +# For Studio +#export PATH="/opt/studio/SOS11/SUNWspro/bin:/opt/studio/SOS11/SUNWspro/lib:$PATH:/opt/csw/bin:/usr/ccs/bin" +# For gcc +export PATH="/opt/csw/gcc4/bin:/opt/csw/gcc4/lib:$PATH:/opt/csw/bin:/usr/ccs/bin" + +rm -rf /var/spool/pkg/CSWlighttpd + +# 1. prepare metadata +rm -rf $HOME/pkgs/$PKG_NAME +mkdir -p $HOME/pkgs/$PKG_NAME +# Stuff for smf support +cp checkinstall preremove postinstall i.smfno i.smfyes space $HOME/pkgs/$PKG_NAME +cd $HOME/pkgs/$PKG_NAME +rm -rf $HOME/build/$ROOT_TB +mkdir -p $HOME/build + +( +cat <<-EOF +PKG=CSWlighttpd +NAME=lighttpd - Security, speed, compliance, and flexibility http server +VERSION=$VERSION$REV +CATEGORY=application +VENDOR=http://www.lighttpd.net/ packaged for CSW by David Rio Deiros +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=drio at opencsw.org +EOF +) > ./pkginfo + +# 2. compile source code +cd $HOME/build +rm -rf $ROOT_TB +echo "Untaring..." +gtar zxvf $HOME/src/$TARBALL > /dev/null +cp $HOME/patches/lighttpd.drio.patch . +# Not needed anymore +#gpatch -p0 < ./lighttpd.drio.patch +cd $ROOT_TB +cp COPYING $HOME/pkgs/$PKG_NAME/copyright + +#export CFLAGS="-xarch=386" +#./configure --prefix=/opt/csw --with-openssl --with-pcre +./configure --prefix=/opt/csw --with-openssl-includes=/opt/csw/include --with-openssl-libs=/opt/csw/lib --disable-ipv6 +#make +gmake -j4 + +stagepkg +cd cswstage + +# 3. create start/stop scrip (for smf also) +mkdir -p ./etc/init.d/ +cp $CURRENT/cswlighttpd ./etc/init.d +for i in 0 1 2 3 'S'; do + mkdir ./etc/rc$i.d + ln -s ./etc/init.d/cswlighttpd ./etc/rc$i.d/cswlighttpd +done +mkdir -p ./opt/csw/var/svc/manifest/network +cp $CURRENT/lighttpd.xml ./opt/csw/var/svc/manifest/network +mkdir -p ./opt/csw/lib/svc/method +cp $CURRENT/cswlighttpd ./opt/csw/lib/svc/method + +# log/config/rootdir +mkdir -p ./opt/csw/share/lighttpd-root +echo "Lighttpd works!" >> ./opt/csw/share/lighttpd-root/index.html +chmod 755 ./opt/csw/share/lighttpd-root +chmod 755 ./opt/csw/share/lighttpd-root/index.html +mkdir -p ./opt/csw/var/lighttpd/ + +mkdir ./opt/csw/etc +cp $CURRENT/lighttpd.conf ./opt/csw/etc/lighttpd.conf.CSW +chmod 644 ./opt/csw/etc/lighttpd.conf.CSW + +( +cat <<-EOF +d none /opt/csw/var/lighttpd 0755 nobody nobody +d none /opt/csw/share/lighttpd-root 0755 nobody nobody +f none /opt/csw/share/lighttpd-root/index.html 0755 nobody nobody +f none /opt/csw/etc/lighttpd.conf.CSW 0644 root bin +f smfno /etc/init.d/cswlighttpd=cswlighttpd 0755 root bin +l smfno /etc/rc0.d/K15cswlighttpd=/etc/init.d/cswlighttpd +l smfno /etc/rc1.d/K15cswlighttpd=/etc/init.d/cswlighttpd +l smfno /etc/rc2.d/K15cswlighttpd=/etc/init.d/cswlighttpd +l smfno /etc/rc3.d/S40cswlighttpd=/etc/init.d/cswlighttpd +l smfno /etc/rcS.d/K15cswlighttpd=/etc/init.d/cswlighttpd +d smfyes /opt/csw/var/svc 0755 root bin +d smfyes /opt/csw/var/svc/manifest 0755 root bin +d smfyes /opt/csw/var/svc/manifest/network 0755 root bin +f smfyes /opt/csw/var/svc/manifest/network/lighttpd.xml=/lighttpd.xml 0644 root bin +d smfyes /opt/csw/lib/svc 0755 root bin +d smfyes /opt/csw/lib/svc/method 0755 root bin +f smfyes /opt/csw/lib/svc/method/cswlighttpd=cswlighttpd 0755 root bin +EOF +) >> ./lastpart + +grep "^i" ./prototype > ./head +for i in checkinstall preremove postinstall i.smfno i.smfyes space;do + echo "i $i" >> ./head +done +grep -v "^i" ./prototype > realfiles +cat ./head ./realfiles ./lastpart > ./prototype +rm -f ./head ./lastpart ./realfiles + +#cp $CURRENT/lighttpd.xml $HOME/pkgs/$PKG_NAME +#cp $CURRENT/cswlighttpd $HOME/pkgs/$PKG_NAME +#cp $CURRENT/index.html $HOME/build/$ROOT_TB/cswstage +cp $CURRENT/lighttpd.xml $HOME/build/$ROOT_TB/cswstage +cp $CURRENT/cswlighttpd $HOME/build/$ROOT_TB/cswstage +cp prototype $HOME/pkgs/$PKG_NAME +cd $HOME/pkgs/$PKG_NAME +rm -f *.pkg* +touch ./depend +#DPS=`createpkg -r $HOME/build/$ROOT_TB/cswstage 2>&1 | grep "^>" | grep -v SUNW | grep -v SPRO | sed 's/> //g'` +DPS="CSWexpat CSWfconfig CSWftype2 CSWgcc4g++rt CSWiconv CSWlibxft2 CSWlibxrender CSWxpm CSWzlib CSWbzip2 CSWosslrt CSWpcrert" + +rm -f ./depend +for i in $DPS;do + echo -e "P\t$i" >> ./depend +done +#echo "i depend" >> prototype +rm -f *.g + +rm -f $HOME/pkgs/$PKG_NAME/*.gz +createpkg -r $HOME/build/$ROOT_TB/cswstage + +mv *.pkg.gz $HOME/ready +gls -lach $HOME/ready Property changes on: csw/mgar/pkg/lighttpd/tags/legacy/build_lighttpd.sh ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/lighttpd/tags/legacy/checkinstall =================================================================== --- csw/mgar/pkg/lighttpd/tags/legacy/checkinstall (rev 0) +++ csw/mgar/pkg/lighttpd/tags/legacy/checkinstall 2010-10-04 12:41:40 UTC (rev 11144) @@ -0,0 +1,18 @@ +trap `exit 3` 15 +# Assign Solaris release class to install release specific files +smf=no +if [ -f $PKG_INSTALL_ROOT/usr/sbin/svccfg -a -f $PKG_INSTALL_ROOT/usr/sbin/svcadm ] ; then smf=yes ; fi +if [ $smf = yes ] +then + CLASSES='none smfyes' +else + CLASSES='none smfno' +fi + +# Make env variables available to other packaging scripts + +cat >$1 < /opt/csw/share/lighttpd-root/index.html Property changes on: csw/mgar/pkg/lighttpd/tags/legacy/copy_to.sh ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/lighttpd/tags/legacy/cswlighttpd =================================================================== --- csw/mgar/pkg/lighttpd/tags/legacy/cswlighttpd (rev 0) +++ csw/mgar/pkg/lighttpd/tags/legacy/cswlighttpd 2010-10-04 12:41:40 UTC (rev 11144) @@ -0,0 +1,43 @@ +#!/bin/sh +# +# Copyright 2005 Sergiusz Pawlowicz All rights reserved. +# Use is subject to license terms. +# Modified for lighttpd +# +# + +LIGHTTPD_HOME=/opt/csw +CONF_FILE=/opt/csw/etc/lighttpd.conf +PIDFILE=/var/run/lighttpd.pid +HTTPD="${LIGHTTPD_HOME}/sbin/lighttpd" + +[ ! -f ${CONF_FILE} ] && exit $CONF_FILE + +case "$1" in +start) + /bin/rm -f ${PIDFILE} +# Enable NCA: + NCAKMODCONF=/etc/nca/ncakmod.conf + if [ -f $NCAKMODCONF ]; then + . $NCAKMODCONF + if [ "x$status" = "xenabled" ]; then + HTTPD="env LD_PRELOAD=/usr/lib/ncad_addr.so $HTTPD" + fi + fi + exec $HTTPD -f ${CONF_FILE} 2>&1 + ;; +refresh) + if [ -f "$PIDFILE" ]; then + /usr/bin/kill -HUP `/usr/bin/cat $PIDFILE` + fi + ;; +stop) + if [ -f "$PIDFILE" ]; then + /usr/bin/kill -QUIT `/usr/bin/cat $PIDFILE` + fi + ;; +*) + echo "Usage: $0 {start|stop|refresh}" + exit 1 + ;; +esac Property changes on: csw/mgar/pkg/lighttpd/tags/legacy/cswlighttpd ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/lighttpd/tags/legacy/i.smfno =================================================================== --- csw/mgar/pkg/lighttpd/tags/legacy/i.smfno (rev 0) +++ csw/mgar/pkg/lighttpd/tags/legacy/i.smfno 2010-10-04 12:41:40 UTC (rev 11144) @@ -0,0 +1,17 @@ +# Copy the non-SMF specific files to the base directory. +# The files to copy are: +# /etc/init.d/cswmysql5=cswmysql5 +# /etc/rc0.d/K15cswmysql5=/etc/init.d/cswmysql5 +# /etc/rc1.d/K15cswmysql5=/etc/init.d/cswmysql5 +# /etc/rc2.d/K15cswmysql5=/etc/init.d/cswmysql5 +# /etc/rc3.d/S40cswmysql5=/etc/init.d/cswmysql5 +# /etc/rcS.d/K15cswmysql5=/etc/init.d/cswmysql5 +# +echo "Installing class ." +while read src dest +do + # Do copy + /bin/cp $src $dest || exit 2 + echo $dest +done +exit 0 Added: csw/mgar/pkg/lighttpd/tags/legacy/i.smfyes =================================================================== --- csw/mgar/pkg/lighttpd/tags/legacy/i.smfyes (rev 0) +++ csw/mgar/pkg/lighttpd/tags/legacy/i.smfyes 2010-10-04 12:41:40 UTC (rev 11144) @@ -0,0 +1,19 @@ +# PKGINST parameter provided by installation services +# Copy the SMF specific files to the base directory. +# The files specific to SMF are: +# /opt/csw/var/svc +# /opt/csw/var/svc/manifest +# /opt/csw/var/svc/manifest/network +# /opt/csw/var/svc/manifest/network/mysql5.xml=/mysql5.xml +# /opt/csw/lib/svc +# /opt/csw/lib/svc/method +# /opt/csw/lib/svc/method/svc-mysql5 +# +echo "Installing class ." +while read src dest +do + # Do copy + /bin/cp $src $dest || exit 2 + echo $dest +done +exit 0 Added: csw/mgar/pkg/lighttpd/tags/legacy/lighttpd.conf =================================================================== --- csw/mgar/pkg/lighttpd/tags/legacy/lighttpd.conf (rev 0) +++ csw/mgar/pkg/lighttpd/tags/legacy/lighttpd.conf 2010-10-04 12:41:40 UTC (rev 11144) @@ -0,0 +1,322 @@ +# lighttpd configuration file +# +# use it as a base for lighttpd 1.0.0 and above +# +# $Id: lighttpd.conf,v 1.7 2004/11/03 22:26:05 weigon Exp $ + +############ Options you really have to take care of #################### + +## modules to load +# at least mod_access and mod_accesslog should be loaded +# all other module should only be loaded if really neccesary +# - saves some time +# - saves memory +server.modules = ( +# "mod_rewrite", +# "mod_redirect", +# "mod_alias", + "mod_access", +# "mod_cml", +# "mod_trigger_b4_dl", +# "mod_auth", +# "mod_status", +# "mod_setenv", +# "mod_fastcgi", +# "mod_proxy", +# "mod_simple_vhost", +# "mod_evhost", +# "mod_userdir", +# "mod_cgi", +# "mod_compress", +# "mod_ssi", +# "mod_usertrack", +# "mod_expire", +# "mod_secdownload", +# "mod_rrdtool", + "mod_accesslog" ) + +## a static document-root, for virtual-hosting take look at the +## server.virtual-* options +server.document-root = "/opt/csw/share/lighttpd-root" + +## where to send error-messages to +server.errorlog = "/opt/csw/var/lighttpd/error.log" + +# files to check for if .../ is requested +index-file.names = ( "index.php", "index.html", + "index.htm", "default.htm" ) + +## set the event-handler (read the performance section in the manual) +# server.event-handler = "freebsd-kqueue" # needed on OS X + +# mimetype mapping +mimetype.assign = ( + ".pdf" => "application/pdf", + ".sig" => "application/pgp-signature", + ".spl" => "application/futuresplash", + ".class" => "application/octet-stream", + ".ps" => "application/postscript", + ".torrent" => "application/x-bittorrent", + ".dvi" => "application/x-dvi", + ".gz" => "application/x-gzip", + ".pac" => "application/x-ns-proxy-autoconfig", + ".swf" => "application/x-shockwave-flash", + ".tar.gz" => "application/x-tgz", + ".tgz" => "application/x-tgz", + ".tar" => "application/x-tar", + ".zip" => "application/zip", + ".mp3" => "audio/mpeg", + ".m3u" => "audio/x-mpegurl", + ".wma" => "audio/x-ms-wma", + ".wax" => "audio/x-ms-wax", + ".ogg" => "application/ogg", + ".wav" => "audio/x-wav", + ".gif" => "image/gif", + ".jpg" => "image/jpeg", + ".jpeg" => "image/jpeg", + ".png" => "image/png", + ".xbm" => "image/x-xbitmap", + ".xpm" => "image/x-xpixmap", + ".xwd" => "image/x-xwindowdump", + ".css" => "text/css", + ".html" => "text/html", + ".htm" => "text/html", + ".js" => "text/javascript", + ".asc" => "text/plain", + ".c" => "text/plain", + ".cpp" => "text/plain", + ".log" => "text/plain", + ".conf" => "text/plain", + ".text" => "text/plain", + ".txt" => "text/plain", + ".dtd" => "text/xml", + ".xml" => "text/xml", + ".mpeg" => "video/mpeg", + ".mpg" => "video/mpeg", + ".mov" => "video/quicktime", + ".qt" => "video/quicktime", + ".avi" => "video/x-msvideo", + ".asf" => "video/x-ms-asf", + ".asx" => "video/x-ms-asf", + ".wmv" => "video/x-ms-wmv", + ".bz2" => "application/x-bzip", + ".tbz" => "application/x-bzip-compressed-tar", + ".tar.bz2" => "application/x-bzip-compressed-tar" + ) + +# Use the "Content-Type" extended attribute to obtain mime type if possible +#mimetype.use-xattr = "enable" + + +## send a different Server: header +## be nice and keep it at lighttpd +# server.tag = "lighttpd" + +#### accesslog module +accesslog.filename = "/opt/csw/var/lighttpd/access.log" + +## deny access the file-extensions +# +# ~ is for backupfiles from vi, emacs, joe, ... +# .inc is often used for code includes which should in general not be part +# of the document-root +url.access-deny = ( "~", ".inc" ) + +$HTTP["url"] =~ "\.pdf$" { + server.range-requests = "disable" +} + +## +# which extensions should not be handle via static-file transfer +# +# .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi +static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) + +######### Options that are good to be but not neccesary to be changed ####### + +## bind to port (default: 80) +#server.port = 81 + +## bind to localhost (default: all interfaces) +#server.bind = "grisu.home.kneschke.de" + +## error-handler for status 404 +#server.error-handler-404 = "/error-handler.html" +#server.error-handler-404 = "/error-handler.php" + +## to help the rc.scripts +server.pid-file = "/var/run/lighttpd.pid" + + +###### virtual hosts +## +## If you want name-based virtual hosting add the next three settings and load +## mod_simple_vhost +## +## document-root = +## virtual-server-root + virtual-server-default-host + virtual-server-docroot +## or +## virtual-server-root + http-host + virtual-server-docroot +## +#simple-vhost.server-root = "/home/weigon/wwwroot/servers/" +#simple-vhost.default-host = "grisu.home.kneschke.de" +#simple-vhost.document-root = "/pages/" + + +## +## Format: .html +## -> ..../status-404.html for 'File not found' +#server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-" + +## virtual directory listings +#dir-listing.activate = "enable" + +## enable debugging +#debug.log-request-header = "enable" +#debug.log-response-header = "enable" +#debug.log-request-handling = "enable" +#debug.log-file-not-found = "enable" + +### only root can use these options +# +# chroot() to directory (default: no chroot() ) +#server.chroot = "/" + +## change uid to (default: don't care) +server.username = "nobody" + +## change uid to (default: don't care) +server.groupname = "nobody" + +#### compress module +#compress.cache-dir = "/tmp/lighttpd/cache/compress/" +#compress.filetype = ("text/plain", "text/html") + +#### proxy module +## read proxy.txt for more info +#proxy.server = ( ".php" => +# ( "localhost" => +# ( +# "host" => "192.168.0.101", +# "port" => 80 +# ) +# ) +# ) + +#### fastcgi module +## read fastcgi.txt for more info +## for PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini +#fastcgi.server = ( ".php" => +# ( "localhost" => +# ( +# "socket" => "/tmp/php-fastcgi.socket", +# "bin-path" => "/usr/local/bin/php" +# ) +# ) +# ) + +#### CGI module +#cgi.assign = ( ".pl" => "/usr/bin/perl", +# ".cgi" => "/usr/bin/perl" ) +# + +#### SSL engine +#ssl.engine = "enable" +#ssl.pemfile = "server.pem" + +#### status module +#status.status-url = "/server-status" +#status.config-url = "/server-config" + +#### auth module +## read authentication.txt for more info +#auth.backend = "plain" +#auth.backend.plain.userfile = "lighttpd.user" +#auth.backend.plain.groupfile = "lighttpd.group" + +#auth.backend.ldap.hostname = "localhost" +#auth.backend.ldap.base-dn = "dc=my-domain,dc=com" +#auth.backend.ldap.filter = "(uid=$)" + +#auth.require = ( "/server-status" => +# ( +# "method" => "digest", +# "realm" => "download archiv", +# "require" => "user=jan" +# ), +# "/server-config" => +# ( +# "method" => "digest", +# "realm" => "download archiv", +# "require" => "valid-user" +# ) +# ) + +#### url handling modules (rewrite, redirect, access) +#url.rewrite = ( "^/$" => "/server-status" ) +#url.redirect = ( "^/wishlist/(.+)" => "http://www.123.org/$1" ) +#### both rewrite/redirect support back reference to regex conditional using %n +#$HTTP["host"] =~ "^www\.(.*)" { +# url.redirect = ( "^/(.*)" => "http://%1/$1" ) +#} + +# +# define a pattern for the host url finding +# %% => % sign +# %0 => domain name + tld +# %1 => tld +# %2 => domain name without tld +# %3 => subdomain 1 name +# %4 => subdomain 2 name +# +#evhost.path-pattern = "/home/storage/dev/www/%3/htdocs/" + +#### expire module +#expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes") + +#### ssi +#ssi.extension = ( ".shtml" ) + +#### rrdtool +#rrdtool.binary = "/usr/bin/rrdtool" +#rrdtool.db-name = "/var/www/lighttpd.rrd" + +#### setenv +#setenv.add-request-header = ( "TRAV_ENV" => "mysql://user at host/db" ) +#setenv.add-response-header = ( "X-Secret-Message" => "42" ) + +## for mod_trigger_b4_dl +# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db" +# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" ) +# trigger-before-download.trigger-url = "^/trigger/" +# trigger-before-download.download-url = "^/download/" +# trigger-before-download.deny-url = "http://127.0.0.1/index.html" +# trigger-before-download.trigger-timeout = 10 + +## for mod_cml +## don't forget to add index.cml to server.indexfiles +# cml.extension = ".cml" +# cml.memcache-hosts = ( "127.0.0.1:11211" ) + +#### variable usage: +## variable name without "." is auto prefixed by "var." and becomes "var.bar" +#bar = 1 +#var.mystring = "foo" + +## integer add +#bar += 1 +## string concat, with integer cast as string, result: "www.foo1.com" +#server.name = "www." + mystring + var.bar + ".com" +## array merge +#index-file.names = (foo + ".php") + index-file.names +#index-file.names += (foo + ".php") + +#### include +#include /etc/lighttpd/lighttpd-inc.conf +## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf" +#include "lighttpd-inc.conf" + +#### include_shell +#include_shell "echo var.a=1" +## the above is same as: +#var.a=1 Added: csw/mgar/pkg/lighttpd/tags/legacy/lighttpd.xml =================================================================== --- csw/mgar/pkg/lighttpd/tags/legacy/lighttpd.xml (rev 0) +++ csw/mgar/pkg/lighttpd/tags/legacy/lighttpd.xml 2010-10-04 12:41:40 UTC (rev 11144) @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: csw/mgar/pkg/lighttpd/tags/legacy/postinstall =================================================================== --- csw/mgar/pkg/lighttpd/tags/legacy/postinstall (rev 0) +++ csw/mgar/pkg/lighttpd/tags/legacy/postinstall 2010-10-04 12:41:40 UTC (rev 11144) @@ -0,0 +1,68 @@ +# lighttpd - postinstall script +# +if [ "$PKG_INSTALL_ROOT" = "" ] +then + PKG_INSTALL_ROOT=/ + CONFDIR="/opt/csw/etc" +else + CONFDIR="$PKG_INSTALL_ROOT/opt/csw/etc" +fi + +# daemons are started by default +enable_daemon=yes + +# Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +# If defined, autoenable for the specific daemon name takes precedence +if [ "$autoenable_lighttpd" = "no" ] ; then + enable_daemon=no +elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_lighttpd" ] ; then + enable_daemon=no +fi + +# We don't want to overwrite the lighttpd.conf the user may have already installed +case "$autoenable_demons" in + ""|"yes") + if [ ! -f $CONFDIR/lighttpd.conf ]; then + echo copying default template lighttpd.conf.CSW to lighttpd.conf + cp -p $CONFDIR/lighttpd.conf.CSW $CONFDIR/lighttpd.conf + else + echo lighttpd.conf already exists. Not copying lighttpd.conf.CSW + fi + ;; +esac + +# Set variable smf depending on the availability of SMF binaries +smf=no +if [ -f $PKG_INSTALL_ROOT/usr/sbin/svccfg -a -f $PKG_INSTALL_ROOT/usr/sbin/svcadm ]; then + smf=yes +fi + +# let's add lighttpd to the smf framework if necessary (we won't enable it yet) +if [ $smf = yes ]; then + echo "Configuring service in SMF" + /usr/sbin/svccfg import /opt/csw/var/svc/manifest/network/lighttpd.xml >/dev/null 2>&1 + /usr/sbin/svcadm disable svc:network/lighttpd >/dev/null 2>&1 + echo "Lighttpd is using Service Management Facility." + echo " The FMRI is: svc:network/lighttpd" +fi + +if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi + +# Let's enable the daemon (if necessary) +if [ "$enable_daemon" = "yes" -a "$PKG_INSTALL_ROOT" = "/" ]; then + echo "Starting lighttpd" + if [ $smf = no ]; then + /etc/init.d/cswlighttpd start >/dev/null 2>&1 + else + /usr/sbin/svcadm enable svc:network/lighttpd >/dev/null 2>&1 + fi +fi + +exit 0 Added: csw/mgar/pkg/lighttpd/tags/legacy/preremove =================================================================== --- csw/mgar/pkg/lighttpd/tags/legacy/preremove (rev 0) +++ csw/mgar/pkg/lighttpd/tags/legacy/preremove 2010-10-04 12:41:40 UTC (rev 11144) @@ -0,0 +1,29 @@ +# lighttpd - preremove script +# Stop lighttpd if it is running. +CONFFILE=$CONFDIR/lighttpd.conf +if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi + +smf=no +if [ -f $PKG_ROOT_DIR/usr/sbin/svccfg -a -f $PKG_ROOT_DIR/usr/sbin/svcadm ] ; then smf=yes ; fi + +if [ $smf = yes ] +then + /usr/sbin/svcadm disable -s svc:network/lighttpd >/dev/null 2>&1 + /usr/sbin/svccfg delete svc:network/lighttpd >/dev/null 2>&1 +else + case "$PKG_ROOT_DIR" in + "/") + test -x /etc/init.d/cswlighttpd && /etc/init.d/cswlighttpd stop + ;; + esac +fi + +# Remove lighttpd.conf if necessary +if cmp $CONFFILE $CONFFILE.CSW >/dev/null ; then + echo "$CONFFILE unchanged from default. Removing it." + rm $CONFFILE +else + echo "$CONFFILE has been modified. Leaving it as-is." +fi + +exit 0 Added: csw/mgar/pkg/lighttpd/tags/legacy/space =================================================================== --- csw/mgar/pkg/lighttpd/tags/legacy/space (rev 0) +++ csw/mgar/pkg/lighttpd/tags/legacy/space 2010-10-04 12:41:40 UTC (rev 11144) @@ -0,0 +1,4 @@ + +# No additional space is actually needed. +# In fact, only one set of the Solaris release specific files are installed. +# So the space required for this package is less than what is in pkgmap. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 4 15:07:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Oct 2010 13:07:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11145] csw/mgar/pkg/libsexy/trunk/Makefile Message-ID: Revision: 11145 http://gar.svn.sourceforge.net/gar/?rev=11145&view=rev Author: dmichelsen Date: 2010-10-04 13:07:10 +0000 (Mon, 04 Oct 2010) Log Message: ----------- libsexy: Move back from CSW X11 to SUNW X11 Modified Paths: -------------- csw/mgar/pkg/libsexy/trunk/Makefile Modified: csw/mgar/pkg/libsexy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsexy/trunk/Makefile 2010-10-04 12:41:40 UTC (rev 11144) +++ csw/mgar/pkg/libsexy/trunk/Makefile 2010-10-04 13:07:10 UTC (rev 11145) @@ -4,7 +4,9 @@ DESCRIPTION = Sexy URLs define BLURB - Long description + libsexy is a collection of GTK+ widgets that extend the functionality of + such standard widgets as GtkEntry and GtkLabel by subclassing them and + working around the limitations of the widgets. endef MASTER_SITES = http://releases.chipx86.com/libsexy/libsexy/ @@ -28,15 +30,6 @@ VENDOR_URL = http://www.chipx86.com/blog/tag/libsexy/ -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib - -# Remove when move towards csw x11 has been finished -LARCH_sparcv9 = sparcv9 -LARCH_amd64 = amd64 -EXTRA_LINKER_FLAGS = /usr/openwin/lib/$(LARCH_$(ISA))/libXext.so - BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -45,4 +38,6 @@ PKGFILES_CSWlibsexydevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibsexydevel += $(sharedstatedir)/gtk-doc/.* +CHECKPKG_OVERRIDES_CSWlibsexydevel += surplus-dependency|CSWlibsexy + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Oct 4 21:58:51 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 04 Oct 2010 19:58:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[11146] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 11146 http://gar.svn.sourceforge.net/gar/?rev=11146&view=rev Author: rthurner Date: 2010-10-04 19:58:51 +0000 (Mon, 04 Oct 2010) Log Message: ----------- openldap - upgrade to 2.4.23 Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/checksums Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-10-04 13:07:10 UTC (rev 11145) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-10-04 19:58:51 UTC (rev 11146) @@ -1,8 +1,8 @@ GARNAME = openldap -GARVERSION = 2.4.22 +GARVERSION = 2.4.23 CATEGORIES = server EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 2.3.43 2.4.22 +MODULATIONS_GARVERSION = 2.3.43 2.4.23 DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol define BLURB @@ -20,10 +20,10 @@ DISTFILES += README.CSW openldaprc DISTFILES += cswopenldap openldap.xml svc-openldap -PATCHFILES_isa-sparcv8-garversion-2.4.22 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-sparcv9-garversion-2.4.22 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-i386-garversion-2.4.22 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-amd64-garversion-2.4.22 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-sparcv8-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-sparcv9-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-i386-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-amd64-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff PATCHFILES += patch-libtool-64bit.diff DISTFILES += patch-oldap-2.4.16-ntlm.diff @@ -58,8 +58,8 @@ EXTRA_LIB_garversion-2.3.43 = $(prefix)/bdb44/lib EXTRA_INC_garversion-2.3.43 = $(prefix)/bdb44/include -EXTRA_LIB_garversion-2.4.22 = $(prefix)/bdb48/lib -EXTRA_INC_garversion-2.4.22 = $(prefix)/bdb48/include +EXTRA_LIB_garversion-2.4.23 = $(prefix)/bdb48/lib +EXTRA_INC_garversion-2.4.23 = $(prefix)/bdb48/include EXTRA_LIB = $(EXTRA_LIB_garversion-$(GARVERSION)) EXTRA_INC = $(EXTRA_INC_garversion-$(GARVERSION)) @@ -115,9 +115,9 @@ MERGE_SCRIPTS_isa-default64-garversion-2.3.43 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-2.3.43 = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-2.4.22 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-2.4.22 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-2.4.22 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-2.4.23 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-2.4.23 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-2.4.23 = $(bindir) $(sbindir) $(libexecdir) $(libdir) # Perl backend is built, although it has been told not to. EXTRA_PAX_ARGS = -s,.*/opt/csw/libexec/sparcv9/openldap/back_perl.*,, Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2010-10-04 13:07:10 UTC (rev 11145) +++ csw/mgar/pkg/openldap/trunk/checksums 2010-10-04 19:58:51 UTC (rev 11146) @@ -1,10 +1,2 @@ -c62a0bda87bc939e3c254edc8b7b546b CSWoldap.postinstall -892dba5f625755be024c30ea0055fd55 README.CSW -c50f5c4040139b6cf57fcc08abffbee7 cswopenldap 1b25281086eb146b8e11ebd33de086dc openldap-2.3.43.tgz -ef01b52255ce8e3fbf8aa34f6fe7598b openldap-2.4.22.tgz -0e57547ad2b5fedca9f0bd4beaddfe39 openldap.xml -ab2ac7519b092ce8d16124c5270bfec0 openldaprc -93dc2a04fd943c198ad00edd4d88ce65 patch-libtool-64bit.diff -d3dee9018137c39f357859b652e3a67c patch-oldap-2.4.16-ntlm.diff -e15c2020566e56f02118e75c89111f15 svc-openldap +90150b8c0d0192e10b30157e68844ddf openldap-2.4.23.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Oct 4 22:07:11 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 04 Oct 2010 20:07:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[11147] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 11147 http://gar.svn.sourceforge.net/gar/?rev=11147&view=rev Author: rthurner Date: 2010-10-04 20:07:11 +0000 (Mon, 04 Oct 2010) Log Message: ----------- mercurial - upgrade to hg-1.6.4 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-10-04 19:58:51 UTC (rev 11146) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-10-04 20:07:11 UTC (rev 11147) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.6.3 +GARVERSION = 1.6.4 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-10-04 19:58:51 UTC (rev 11146) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-10-04 20:07:11 UTC (rev 11147) @@ -1 +1 @@ -fcd61edc488d1b9aa831dde6f14d9a13 mercurial-1.6.3.tar.gz +657dd6aff80aa9a3b187652a635544d0 mercurial-1.6.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 5 02:15:41 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 05 Oct 2010 00:15:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[11148] csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 Message-ID: Revision: 11148 http://gar.svn.sourceforge.net/gar/?rev=11148&view=rev Author: bdwalton Date: 2010-10-05 00:15:41 +0000 (Tue, 05 Oct 2010) Log Message: ----------- apache2: tweak postmsg readme Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 Modified: csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 =================================================================== --- csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 2010-10-04 20:07:11 UTC (rev 11147) +++ csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 2010-10-05 00:15:41 UTC (rev 11148) @@ -4,12 +4,13 @@ you're used to working with the CSW apache2 packages. In the past, CSWap2prefork and CSWap2worker delivered a specific mpm -module for use with apache2. We now ship both mpm modules as part of -CSWapache2 and allow you to toggle between them using the alternatives -support that recently materialized. The default mpm is prefork. +module for use with apache2. We now ship the prefork mpm as part of +CSWapache2 while the worker mpm remains in CSWap2worker. -We still provide CSWap2prefork and CSWap2worker for the time being, -but they're dummy packages used only to fill dependencies. +Each httpd mpm is installed using the new alternatives framework. +When CSWap2worker is installed, it registers a higher priority httpd, +thus it is activated as httpd. You can change this at any time using +the alternatives command. Thanks -The OpenCSW apache2 team. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 5 02:21:17 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 05 Oct 2010 00:21:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11149] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11149 http://gar.svn.sourceforge.net/gar/?rev=11149&view=rev Author: bdwalton Date: 2010-10-05 00:21:17 +0000 (Tue, 05 Oct 2010) Log Message: ----------- apache2: clarify status of ap2worker package by moving it out of dummy group Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-05 00:15:41 UTC (rev 11148) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-05 00:21:17 UTC (rev 11149) @@ -50,9 +50,10 @@ # The PACKAGES variable tell GAR which packages to build PACKAGES = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2suexec +PACKAGES += CSWap2worker # These packages are dummy versions to make dependencies nicer # as various things depend on CSWap2prefork currently -PACKAGES += CSWap2prefork CSWapache2rt CSWap2worker +PACKAGES += CSWap2prefork CSWapache2rt ARCHALL_CSWapache2-manual = 1 ARCHALL_CSWap2prefork = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 5 02:54:29 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Oct 2010 00:54:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[11150] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11150 http://gar.svn.sourceforge.net/gar/?rev=11150&view=rev Author: wahwah Date: 2010-10-05 00:54:29 +0000 (Tue, 05 Oct 2010) Log Message: ----------- mGAR v2: Added a check for e-mail addresses. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-05 00:21:17 UTC (rev 11149) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-05 00:54:29 UTC (rev 11150) @@ -50,6 +50,7 @@ }, } ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") +EMAIL_RE = re.compile(r"^.*@opencsw.org$") MAX_CATALOGNAME_LENGTH = 20 MAX_PKGNAME_LENGTH = 20 ARCH_LIST = opencsw.ARCHITECTURES @@ -621,6 +622,16 @@ "known architectures: %s" % ARCH_LIST) +def CheckEmail(pkg_data, error_mgr, logger, messenger): + """Checks the e-mail address.""" + catalogname = pkg_data["basic_stats"]["catalogname"] + pkgname = pkg_data["basic_stats"]["pkgname"] + pkginfo = pkg_data["pkginfo"] + if not re.match(EMAIL_RE, pkginfo["EMAIL"]): + error_mgr.ReportError("pkginfo-email-not-opencsw-org", + "email=%s" % pkginfo["EMAIL"]) + + def CheckPstamp(pkg_data, error_mgr, logger, messenger): pkginfo = pkg_data["pkginfo"] if "PSTAMP" in pkginfo: Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-05 00:21:17 UTC (rev 11149) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-05 00:54:29 UTC (rev 11150) @@ -81,7 +81,19 @@ self.error_mgr_mock.ReportError('pkginfo-description-not-starting-with-uppercase', 'lowercase') +class TestCheckEmailGood(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckEmail' + def CheckpkgTest(self): + self.pkg_data["pkginfo"]["EMAIL"] = 'somebody at opencsw.org' + +class TestCheckEmailBadDomain(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckEmail' + def CheckpkgTest(self): + self.pkg_data["pkginfo"]["EMAIL"] = 'somebody at opencsw.com' + self.error_mgr_mock.ReportError('pkginfo-email-not-opencsw-org', 'email=somebody at opencsw.com') + + class TestCheckCatalogname_1(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckCatalogname' def CheckpkgTest(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 5 03:40:25 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 05 Oct 2010 01:40:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[11151] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11151 http://gar.svn.sourceforge.net/gar/?rev=11151&view=rev Author: bdwalton Date: 2010-10-05 01:40:25 +0000 (Tue, 05 Oct 2010) Log Message: ----------- apache2: disable more modules that are on by default in the non-prefork mpm builds Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-05 00:54:29 UTC (rev 11150) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-05 01:40:25 UTC (rev 11151) @@ -129,11 +129,34 @@ ifneq ($(MPM),prefork) CONFIGURE_ARGS += --enable-modules=none +CONFIGURE_ARGS += --disable-actions +CONFIGURE_ARGS += --disable-alias CONFIGURE_ARGS += --disable-authn-file CONFIGURE_ARGS += --disable-authn-default CONFIGURE_ARGS += --disable-authz-host CONFIGURE_ARGS += --disable-authz-user +CONFIGURE_ARGS += --disable-authz-groupfile +CONFIGURE_ARGS += --disable-authz-default CONFIGURE_ARGS += --disable-auth-basic +CONFIGURE_ARGS += --disable-asis +CONFIGURE_ARGS += --disable-auth +CONFIGURE_ARGS += --disable-autoindex +CONFIGURE_ARGS += --disable-cgi +CONFIGURE_ARGS += --disable-cgid +CONFIGURE_ARGS += --disable-charset-lite +CONFIGURE_ARGS += --disable-dir +CONFIGURE_ARGS += --disable-env +CONFIGURE_ARGS += --disable-filter +CONFIGURE_ARGS += --disable-imap +CONFIGURE_ARGS += --disable-include +CONFIGURE_ARGS += --disable-log-config +CONFIGURE_ARGS += --disable-mime +CONFIGURE_ARGS += --disable-negotiation +CONFIGURE_ARGS += --disable-setenvif +CONFIGURE_ARGS += --disable-ssl +CONFIGURE_ARGS += --disable-status +CONFIGURE_ARGS += --disable-userdir +CONFIGURE_ARGS += --disable-version else CONFIGURE_ARGS += --enable-suexec CONFIGURE_ARGS += --with-suexec-caller=nobody This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 5 03:48:55 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 05 Oct 2010 01:48:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[11152] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11152 http://gar.svn.sourceforge.net/gar/?rev=11152&view=rev Author: bdwalton Date: 2010-10-05 01:48:55 +0000 (Tue, 05 Oct 2010) Log Message: ----------- apache2: drop ssl dep from ap2worker now that module build is cleaned up Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-05 01:40:25 UTC (rev 11151) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-05 01:48:55 UTC (rev 11152) @@ -84,7 +84,7 @@ RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2 RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWosslrt CSWapr CSWexpat +RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWapr CSWexpat RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 5 04:35:10 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 05 Oct 2010 02:35:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11153] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11153 http://gar.svn.sourceforge.net/gar/?rev=11153&view=rev Author: bdwalton Date: 2010-10-05 02:35:10 +0000 (Tue, 05 Oct 2010) Log Message: ----------- apache2: correct pkgfiles for devel package Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-05 01:48:55 UTC (rev 11152) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-05 02:35:10 UTC (rev 11153) @@ -196,7 +196,7 @@ STRIP_DIRS = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* -PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWapache2-devel = .*include/.* .*\.(a|la) .*share/build/.* PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.* PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 5 09:42:42 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Oct 2010 07:42:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11154] csw/mgar/pkg/dbus-glib/trunk/Makefile Message-ID: Revision: 11154 http://gar.svn.sourceforge.net/gar/?rev=11154&view=rev Author: dmichelsen Date: 2010-10-05 07:42:41 +0000 (Tue, 05 Oct 2010) Log Message: ----------- dbus-glib: Enable 64 bit, no other significant changes Modified Paths: -------------- csw/mgar/pkg/dbus-glib/trunk/Makefile Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/Makefile 2010-10-05 02:35:10 UTC (rev 11153) +++ csw/mgar/pkg/dbus-glib/trunk/Makefile 2010-10-05 07:42:41 UTC (rev 11154) @@ -4,9 +4,11 @@ DESCRIPTION = DBus GLib Bindings define BLURB -This package provides the bindings between GLib and DBus - -D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a "single instance" application or daemon, and to launch applications and daemons on demand when their services are needed. + This package provides the bindings between GLib and DBus. + D-Bus is a message bus system, a simple way for applications to talk to one another. + In addition to interprocess communication, D-Bus helps coordinate process lifecycle; + it makes it simple and reliable to code a "single instance" application or daemon, + and to launch applications and daemons on demand when their services are needed. endef MASTER_SITES = http://dbus.freedesktop.org/releases/dbus-glib/ @@ -24,20 +26,21 @@ CATALOGNAME_CSWdbusglib = dbus_glib CATALOGNAME_CSWdbusglibdev = dbus_glibdev +BUILD_DEP_PKGS = CSWglib2devel CSWlibdbusdev RUNTIME_DEP_PKGS_CSWdbusglib = CSWexpat CSWggettextrt CSWglib2 CSWlibdbus +RUNTIME_DEP_PKGS_CSWdbusglibdev = CSWdbusglib CSWglib2devel CSWlibdbusdev PKGFILES_CSWdbusglibdev = $(PKGFILES_DEVEL) -# PKGFILES_CSWdbusglibdev += $(prefix)/include/.* -# PKGFILES_CSWdbusglibdev += $(prefix)/lib/.*\.a -# PKGFILES_CSWdbusglibdev += $(prefix)/lib/pkgconfig/.* -#CPPFLAGS += -I$(DESTDIR)/opt/csw/include/dbus-1.0 -#CPPFLAGS += -I$(DESTDIR)/opt/csw/lib/dbus-1.0/include - +NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-tests -# BUILD64 = 1 +BUILD64 = 1 +# These development dependencies are needed +CHECKPKG_OVERRIDES_CSWdbusglibdev += surplus-dependency|CSWdbusglib +CHECKPKG_OVERRIDES_CSWdbusglibdev += surplus-dependency|CSWlibdbusdev +CHECKPKG_OVERRIDES_CSWdbusglibdev += surplus-dependency|CSWglib2devel + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 5 10:18:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Oct 2010 08:18:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[11155] csw/mgar/pkg/libwnck/trunk Message-ID: Revision: 11155 http://gar.svn.sourceforge.net/gar/?rev=11155&view=rev Author: dmichelsen Date: 2010-10-05 08:18:26 +0000 (Tue, 05 Oct 2010) Log Message: ----------- libwnck: Revert back to last upstream delivering .so.18, use SUNW X11 again Modified Paths: -------------- csw/mgar/pkg/libwnck/trunk/Makefile csw/mgar/pkg/libwnck/trunk/checksums Modified: csw/mgar/pkg/libwnck/trunk/Makefile =================================================================== --- csw/mgar/pkg/libwnck/trunk/Makefile 2010-10-05 07:42:41 UTC (rev 11154) +++ csw/mgar/pkg/libwnck/trunk/Makefile 2010-10-05 08:18:26 UTC (rev 11155) @@ -1,5 +1,10 @@ GARNAME = libwnck -GARVERSION = 2.29.92 +GARVERSION = 2.18.3 +# 2.18.3 = .so.18 +# 2.19.92 = so.22 +# 2.20.3 = .so.22 +# 2.24.2 = .so.22 +# 2.28.0 = .so.22 CATEGORIES = lib DESCRIPTION = Library used for writing pagers and tasks lists @@ -25,13 +30,9 @@ BUILD_DEP_PKGS = CSWgtk2devel CSWglib2devel RUNTIME_DEP_PKGS_CSWlibwnck = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibwnck += CSWlibatk CSWlibcairo CSWlibx11 CSWlibxres CSWpango CSWstartupnotif +RUNTIME_DEP_PKGS_CSWlibwnck += CSWlibatk CSWlibcairo CSWpango CSWstartupnotif RUNTIME_DEP_PKGS_CSWlibwnckdevel = CSWlibwnck $(BUILD_DEP_PKGS) -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib - # For cos(3m) EXTRA_LINKER_FLAGS = -lm @@ -46,6 +47,11 @@ PKGFILES_CSWlibwnckdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibwnckdevel += $(sharedstatedir)/gtk-doc/.* +# This is okay +CHECKPKG_OVERRIDES_CSWlibwnckdevel += surplus-dependency|CSWlibwnck +CHECKPKG_OVERRIDES_CSWlibwnckdevel += surplus-dependency|CSWglib2devel +CHECKPKG_OVERRIDES_CSWlibwnckdevel += surplus-dependency|CSWgtk2devel + include gar/category.mk # Needed for GNU gettext Modified: csw/mgar/pkg/libwnck/trunk/checksums =================================================================== --- csw/mgar/pkg/libwnck/trunk/checksums 2010-10-05 07:42:41 UTC (rev 11154) +++ csw/mgar/pkg/libwnck/trunk/checksums 2010-10-05 08:18:26 UTC (rev 11155) @@ -1 +1 @@ -414c377da1e38be06848875937cb2218 libwnck-2.29.92.tar.bz2 +1badcbb50e7bc59865f72ec270c15125 libwnck-2.18.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 5 10:36:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Oct 2010 08:36:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11156] csw/mgar/pkg/libnotify/trunk/Makefile Message-ID: Revision: 11156 http://gar.svn.sourceforge.net/gar/?rev=11156&view=rev Author: dmichelsen Date: 2010-10-05 08:36:15 +0000 (Tue, 05 Oct 2010) Log Message: ----------- libnotify: Final tweaks, add 64 bit Modified Paths: -------------- csw/mgar/pkg/libnotify/trunk/Makefile Modified: csw/mgar/pkg/libnotify/trunk/Makefile =================================================================== --- csw/mgar/pkg/libnotify/trunk/Makefile 2010-10-05 08:18:26 UTC (rev 11155) +++ csw/mgar/pkg/libnotify/trunk/Makefile 2010-10-05 08:36:15 UTC (rev 11156) @@ -27,15 +27,13 @@ RUNTIME_DEP_PKGS_CSWlibnotify = CSWdbusglib CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 RUNTIME_DEP_PKGS_CSWlibnotify += CSWlibatk CSWlibcairo CSWlibdbus CSWpango -RUNTIME_DEP_PKGS_CSWlibnotifydevel = CSWlibnotify +RUNTIME_DEP_PKGS_CSWlibnotifydevel = CSWlibnotify CSWglib2devel CSWgtk2devel CSWpangodevel -# Remove when move towards csw x11 has been finished -LARCH_sparcv9 = sparcv9 -LARCH_amd64 = amd64 -EXTRA_LINKER_FLAGS = /usr/openwin/lib/$(LARCH_$(ISA))/libXext.so +EXTRA_INC = $(libdir_install)/dbus-1.0/include -# Enable when libdbus is done in 64 bit -# BUILD64 = 1 +# Enable when CSWdbusglib is done in 64 bit +BUILD64 = 1 +NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check @@ -43,4 +41,13 @@ PKGFILES_CSWlibnotifydevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibnotifydevel += $(sharedstatedir)/gtk-doc/.* +CHECKPKG_OVERRIDES_CSWlibnotifydevel += surplus-dependency|CSWlibnotify +CHECKPKG_OVERRIDES_CSWlibnotifydevel += surplus-dependency|CSWglib2devel +CHECKPKG_OVERRIDES_CSWlibnotifydevel += surplus-dependency|CSWgtk2devel +CHECKPKG_OVERRIDES_CSWlibnotifydevel += surplus-dependency|CSWpangodevel + +CHECKPKG_OVERRIDES_CSWlibnotify += soname-not-found|libmlib.so.2|is|needed|by|opt/csw/lib/amd64/libnotify.so.1.1.3 +CHECKPKG_OVERRIDES_CSWlibnotify += soname-not-found|libmlib.so.2|is|needed|by|opt/csw/bin/amd64/notify-send + + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 5 12:33:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Oct 2010 10:33:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11157] csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/ Makefile Message-ID: Revision: 11157 http://gar.svn.sourceforge.net/gar/?rev=11157&view=rev Author: dmichelsen Date: 2010-10-05 10:33:39 +0000 (Tue, 05 Oct 2010) Log Message: ----------- openssh-5.6p1+lpk: Add build time dependencies Modified Paths: -------------- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile Modified: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile =================================================================== --- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile 2010-10-05 08:36:15 UTC (rev 11156) +++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile 2010-10-05 10:33:39 UTC (rev 11157) @@ -33,6 +33,7 @@ and supports all SSH protocol versions. endef +BUILD_DEP_PKGS = CSWkrb5libdev CSWoldapdevel PACKAGES = CSWossh CSWosshlpk CSWosshclient This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 5 12:56:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Oct 2010 10:56:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[11158] csw/mgar/pkg/libunique/trunk/Makefile Message-ID: Revision: 11158 http://gar.svn.sourceforge.net/gar/?rev=11158&view=rev Author: dmichelsen Date: 2010-10-05 10:56:48 +0000 (Tue, 05 Oct 2010) Log Message: ----------- libunique: Remove doc-package and go back to SUNW X11 Modified Paths: -------------- csw/mgar/pkg/libunique/trunk/Makefile Modified: csw/mgar/pkg/libunique/trunk/Makefile =================================================================== --- csw/mgar/pkg/libunique/trunk/Makefile 2010-10-05 10:33:39 UTC (rev 11157) +++ csw/mgar/pkg/libunique/trunk/Makefile 2010-10-05 10:56:48 UTC (rev 11158) @@ -17,55 +17,55 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTNAME = $(GARNAME)-$(GARVERSION) -PACKAGES = CSWlibunique CSWlibuniquedevel CSWlibuniquedoc +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +PACKAGES = CSWlibunique CSWlibuniquedevel CATALOGNAME_CSWlibunique = libunique CATALOGNAME_CSWlibuniquedevel = libunique_devel -CATALOGNAME_CSWlibuniquedoc = libunique_doc SPKG_DESC_CSWlibunique += Library for writing single instance application SPKG_DESC_CSWlibuniquedevel += Library for writing single instance application - developer package -SPKG_DESC_CSWlibuniquedoc += Library for writing single instance application - documentation RUNTIME_DEP_PKGS_CSWlibunique += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 -RUNTIME_DEP_PKGS_CSWlibunique += CSWgtk2 CSWlibatk CSWlibcairo CSWlibx11 CSWpango -RUNTIME_DEP_PKGS_CSWlibunique += CSWdbusglib CSWlibdbus CSWlibxext -RUNTIME_DEP_PKGS_CSWlibuniquedevel += CSWlibunique -RUNTIME_DEP_PKGS_CSWlibuniquedoc += CSWlibunique +RUNTIME_DEP_PKGS_CSWlibunique += CSWgtk2 CSWlibatk CSWlibcairo CSWpango +RUNTIME_DEP_PKGS_CSWlibunique += CSWdbusglib CSWlibdbus +RUNTIME_DEP_PKGS_CSWlibuniquedevel += CSWlibunique CSWglib2devel CSWgtk2devel CSWlibatkdevel CSWlibcairodevel CSWpangodevel BUILD_DEP_PKGS += CSWdbusglibdev -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - SPKG_SOURCEURL = http://live.gnome.org/LibUnique -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +NOISAEXEC = 1 +NOISALIST = 1 -#NOISAEXEC = 1 -#NOISALIST = 1 -# libdbus not 64-bit yet +# This needs to be fixed first before we can build 64 bit: +# https://www.opencsw.org/mantis/view.php?id=4565 #BUILD64 = 1 -PKGFILES_CSWlibuniquedevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibuniquedoc = $(sharedstatedir)/gtk-doc/.* +EXTRA_LINKER_FLAGS = -lsocket -lnsl -ARCHALL_CSWlibuniquedoc = 1 - -LIBS = -lsocket -lnsl -export LIBS - STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-static=no CONFIGURE_ARGS += --enable-gtk-doc -CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +# This needs a newer GTK, 2.18.x does not have it, reenable when GTK has been updated +CONFIGURE_ARGS += --enable-introspection=no TEST_TARGET = check +ARCHALL_CSWlibuniquedoc = 1 + +PKGFILES_CSWlibuniquedevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibuniquedevel += $(sharedstatedir)/gtk-doc/.* + +CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWlibunique +CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWlibcairodevel +CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWpangodevel +CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWlibatkdevel +CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWglib2devel +CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWgtk2devel + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 5 13:31:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Oct 2010 11:31:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11159] csw/mgar/pkg/alarm-clock/trunk Message-ID: Revision: 11159 http://gar.svn.sourceforge.net/gar/?rev=11159&view=rev Author: dmichelsen Date: 2010-10-05 11:31:09 +0000 (Tue, 05 Oct 2010) Log Message: ----------- alarm-clock: Update to 1.4.1 Modified Paths: -------------- csw/mgar/pkg/alarm-clock/trunk/Makefile csw/mgar/pkg/alarm-clock/trunk/checksums Modified: csw/mgar/pkg/alarm-clock/trunk/Makefile =================================================================== --- csw/mgar/pkg/alarm-clock/trunk/Makefile 2010-10-05 10:56:48 UTC (rev 11158) +++ csw/mgar/pkg/alarm-clock/trunk/Makefile 2010-10-05 11:31:09 UTC (rev 11159) @@ -1,5 +1,5 @@ GARNAME = alarm-clock -GARVERSION = 1.3 +GARVERSION = 1.4.1 CATEGORIES = gnome DESCRIPTION = A simple interface for reminding about birthdays, appointments and important dates @@ -9,7 +9,7 @@ very easily even by a non-power user and fits perfectly into the GNOME Desktop. endef -MASTER_SITES = http://alarm-clock.pl/media/distfiles/ +MASTER_SITES = http://alarm-clock.pl/downloads/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release @@ -19,7 +19,7 @@ CATALOGNAME = alarmclock RUNTIME_DEP_PKGS = CSWdbusglib CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgstreamer CSWgtk2 -RUNTIME_DEP_PKGS += CSWlibatk CSWlibcairo CSWlibdbus CSWlibnotify CSWlibxml2 CSWpango +RUNTIME_DEP_PKGS += CSWlibatk CSWlibcairo CSWlibdbus CSWlibnotify CSWlibxml2 CSWpango CSWlibunique CONFIGURE_ARGS = $(DIRPATHS) @@ -34,6 +34,9 @@ TEST_TARGET = check +INSTALL_OVERRIDE_VARS = alarmclockdocdir +INSTALL_OVERRIDE_VAR_alarmclockdocdir = $(docdir)/$(CATALOGNAME) + include gar/category.mk #For GNU xgettext Modified: csw/mgar/pkg/alarm-clock/trunk/checksums =================================================================== --- csw/mgar/pkg/alarm-clock/trunk/checksums 2010-10-05 10:56:48 UTC (rev 11158) +++ csw/mgar/pkg/alarm-clock/trunk/checksums 2010-10-05 11:31:09 UTC (rev 11159) @@ -1 +1 @@ -a5decf49808ce99b386032dac9165971 alarm-clock-1.3.tar.bz2 +eaee342a07dd1d84c9ab4f5f427c1bea alarm-clock-1.4.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 5 15:50:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Oct 2010 13:50:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[11160] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2 Message-ID: Revision: 11160 http://gar.svn.sourceforge.net/gar/?rev=11160&view=rev Author: dmichelsen Date: 2010-10-05 13:50:48 +0000 (Tue, 05 Oct 2010) Log Message: ----------- sasl-2.1.23-mGARv2: Update to 2.1.24rc1 and fix includes Modified Paths: -------------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2010-10-05 11:31:09 UTC (rev 11159) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2010-10-05 13:50:48 UTC (rev 11160) @@ -1,5 +1,6 @@ GARNAME = sasl -GARVERSION = 2.1.23 +GARVERSION = 2.1.24 +FILEVERSION = $(GARVERSION)rc1 CATEGORIES = lib DESCRIPTION = Simple Authentication and Security Layer @@ -13,11 +14,11 @@ MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ DISTNAME = cyrus-$(GARNAME)-$(GARVERSION) -DISTFILES = $(DISTNAME).tar.gz +DISTFILES = cyrus-$(GARNAME)-$(FILEVERSION).tar.gz DISTFILES += cswsaslauthd.init saslauthd.init.CSW DISTFILES += README.sasl README.saslauthd -PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff +# PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff PACKAGES = CSWsasl CSWsaslauthd CSWsaslgssapi CSWsaslsql @@ -50,7 +51,8 @@ EXTRA_LIB = $(prefix)/bdb47/lib -EXTRA_INC = /opt/csw/mysql5/include/mysql +EXTRA_INC = /opt/csw/include/gssapi +EXTRA_INC += /opt/csw/mysql5/include/mysql EXTRA_INC += /opt/csw/postgresql/include sysconfdir = /etc/opt/csw Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums 2010-10-05 11:31:09 UTC (rev 11159) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums 2010-10-05 13:50:48 UTC (rev 11160) @@ -1,8 +1 @@ -0ae8b5fe39e9b2ce940284fb85de9303 README.sasl -95b3cae3de944bf6602ad83cb04f3f32 README.saslauthd -62cc0bee2337e4937fcfa847f7bdf26a cswsaslauthd.init -2eb0e48106f0e9cd8001e654f267ecbc cyrus-sasl-2.1.23.tar.gz -48af784184961368ce250c7b33d207b8 ltmain.diff -40b526754554c46d5b134f5ca21fe371 saslauthd-doc.diff -21cbef68d9f2dc2447326cbda8bf842e saslauthd-groff.diff -b190992e18cc7add35a6934d896a1130 saslauthd.init.CSW +8b5a26d973523b0676026ad4f45e5e6d cyrus-sasl-2.1.24rc1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Oct 5 16:45:55 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 05 Oct 2010 14:45:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[11161] csw/mgar/pkg/squid/trunk Message-ID: Revision: 11161 http://gar.svn.sourceforge.net/gar/?rev=11161&view=rev Author: idogan23 Date: 2010-10-05 14:45:55 +0000 (Tue, 05 Oct 2010) Log Message: ----------- squid: bump version to 2.7 stable 9, removed not needed dependency Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squid/trunk/checksums Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2010-10-05 13:50:48 UTC (rev 11160) +++ csw/mgar/pkg/squid/trunk/Makefile 2010-10-05 14:45:55 UTC (rev 11161) @@ -1,7 +1,7 @@ GARNAME = squid GARVERSION = 2.7 CATEGORIES = server -RELEASE = STABLE6 +RELEASE = STABLE9 DISTVERSION = $(GARVERSION).$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) RELVER = $(shell echo $(GARVERSION) |gsed 's/\(^[0-9]\).*\.[0-9]*/\1/') @@ -17,7 +17,7 @@ CATALOGNAME_CSWsquid = squid SPKG_DESC_CSWsquid = $(DESCRIPTION) SPKG_CLASSES_CSWsquid = none cswinitsmf -RUNTIME_DEP_PKGS_CSWsquid = CSWoldaprt CSWosslrt CSWsasl CSWcswclassutils +RUNTIME_DEP_PKGS_CSWsquid = CSWoldaprt CSWosslrt CSWsasl PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswsquid$$$$/ { $$$$2 = "cswinitsmf" } { print }' MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(GARVERSION)/ Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2010-10-05 13:50:48 UTC (rev 11160) +++ csw/mgar/pkg/squid/trunk/checksums 2010-10-05 14:45:55 UTC (rev 11161) @@ -1,5 +1 @@ -257a1bb82830125d2e63e5ff6103992f download/CSWsquid.postinstall -f97bf395c3d2d73a876f9091707126bc download/CSWsquid.preremove -7ba941342c3a7e73269443162e21e3b4 download/cswsquid -6de3a6a7a56a7ecae092f2d31a04f039 download/squid-2.7.STABLE6.tar.bz2 -8548ba784b9e7a8920afcfcb4c05ea0a download/squid.conf.CSW +3c6642c85470b1079207d43bba25a819 squid-2.7.STABLE9.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 5 20:13:09 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Oct 2010 18:13:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[11162] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11162 http://gar.svn.sourceforge.net/gar/?rev=11162&view=rev Author: wahwah Date: 2010-10-05 18:13:09 +0000 (Tue, 05 Oct 2010) Log Message: ----------- mGAR v2: Adding compare_pkgs.py from the other repo. Added Paths: ----------- csw/mgar/gar/v2/lib/python/compare_pkgs.py csw/mgar/gar/v2/lib/python/compare_pkgs_test.py Added: csw/mgar/gar/v2/lib/python/compare_pkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/compare_pkgs.py (rev 0) +++ csw/mgar/gar/v2/lib/python/compare_pkgs.py 2010-10-05 18:13:09 UTC (rev 11162) @@ -0,0 +1,69 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# Copyright (c) 2009 Maciej Blizi?ski +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by the +# Free Software Foundation. + +"""Compares the contents of two svr4 packages. + +The needed opencsw.py library is now at: +https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2/lib/python/ + +$Id: compare_pkgs.py 124 2010-02-18 07:28:10Z wahwah $ +""" + +import logging +import optparse +import opencsw + +USAGE = """Compares two packages with the same catalogname. + +To use, place packages (say, foo-1.0,REV=1898.09.25-SunOS5.9-sparc-CSW.pkg.gz +and foo-1.0.1,REV=2010.09.25-SunOS5.9-sparc-CSW.pkg.gz) in two directories +(say, /a and /b), and issue: + + comparepkg --package-dir-a /a --package-dir-b /b --catalog-name foo +""" + +def main(): + parser = optparse.OptionParser(USAGE) + parser.add_option("-d", "--debug", dest="debug", + default=False, action="store_true") + parser.add_option("-a", "--package-dir-a", dest="package_dir_a", + help="Package directory A") + parser.add_option("-b", "--package-dir-b", dest="package_dir_b", + help="Package directory B") + parser.add_option("-c", "--catalog-name", dest="catalog_name", + help="Catalog name, for example 'cups'") + parser.add_option("-p", "--permissions", dest="permissions", + help="Whether to analyze permission bits", + default=False, action="store_true") + parser.add_option("", "--strip-a", dest="strip_a", + help="Strip from paths in a") + parser.add_option("", "--strip-b", dest="strip_b", + help="Strip from paths in b") + (options, args) = parser.parse_args() + if options.debug: + current_logging_level = logging.DEBUG + else: + current_logging_level = logging.INFO + logging.basicConfig(level=current_logging_level) + pkg_dir_a = opencsw.StagingDir(options.package_dir_a) + pkg_dir_b = opencsw.StagingDir(options.package_dir_b) + pkg_path_a = pkg_dir_a.GetLatest(options.catalog_name)[-1] + pkg_path_b = pkg_dir_b.GetLatest(options.catalog_name)[-1] + pc = opencsw.PackageComparator( + pkg_path_a, + pkg_path_b, + permissions=options.permissions, + strip_a=options.strip_a, + strip_b=options.strip_b) + pc.Run() + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/lib/python/compare_pkgs.py ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/gar/v2/lib/python/compare_pkgs_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/compare_pkgs_test.py (rev 0) +++ csw/mgar/gar/v2/lib/python/compare_pkgs_test.py 2010-10-05 18:13:09 UTC (rev 11162) @@ -0,0 +1,66 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# vim:set sw=2 ts=2 sts=2 expandtab: + +""" +The needed opencsw.py library is now at: +https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2/lib/python/ + +$Id: compare_pkgs_test.py 124 2010-02-18 07:28:10Z wahwah $ +""" + +import unittest +import compare_pkgs as cpkg +import opencsw + +PKGMAP_1 = """: 1 4407 +1 f none /etc/init.d/cswvncserver 0744 root sys 1152 21257 1048192898 +1 s none /etc/rc0.d/K36cswvncserver=../init.d/cswvncserver +1 s none /etc/rc1.d/K36cswvncserver=../init.d/cswvncserver +1 s none /etc/rc2.d/K36cswvncserver=../init.d/cswvncserver +1 s none /etc/rc3.d/S92cswvncserver=../init.d/cswvncserver +1 s none /etc/rcS.d/K36cswvncserver=../init.d/cswvncserver +1 d none /opt/csw/bin 0755 root bin +1 f none /opt/csw/bin/Xvnc 0755 root bin 1723040 56599 1048192381 +1 f none /opt/csw/bin/vncconnect 0755 root bin 5692 56567 1048192381 +1 f none /opt/csw/bin/vncpasswd 0755 root bin 15828 10990 1048192381 +1 d none /opt/csw/etc 0755 root bin +1 d none /opt/csw/share 0755 root bin +1 d none /opt/csw/share/man 0755 root bin +1 d none /opt/csw/share/man/man1 0755 root bin +1 f none /opt/csw/share/man/man1/Xvnc.1 0644 root bin 6000 15243 1028731374 +1 f none /opt/csw/share/man/man1/vncconnect.1 0644 root bin 1082 26168 1028731541 +1 f none /opt/csw/share/man/man1/vncpasswd.1 0644 root bin 2812 53713 1042812886 +1 f none /opt/csw/share/man/man1/vncserver.1 0644 root bin 3070 7365 1028731541 +1 d none /opt/csw/share/vnc 0755 root bin +1 d none /opt/csw/share/vnc/classes 0755 root bin +1 f none /opt/csw/share/vnc/classes/AuthPanel.class 0644 root bin 2458 21987 1048192130 +1 f none /opt/csw/share/vnc/classes/ButtonPanel.class 0644 root bin 3044 1240 1048192130 +1 f none /opt/csw/share/vnc/classes/ClipboardFrame.class 0644 root bin 2595 24223 1048192130 +1 f none /opt/csw/share/vnc/classes/DesCipher.class 0644 root bin 12745 33616 1048192130 +1 f none /opt/csw/share/vnc/classes/OptionsFrame.class 0644 root bin 6908 39588 1048192130 +1 f none /opt/csw/share/vnc/classes/RecordingFrame.class 0644 root bin 6101 7175 1048192130 +1 f none /opt/csw/share/vnc/classes/ReloginPanel.class 0644 root bin 1405 22871 1048192130 +1 f none /opt/csw/share/vnc/classes/RfbProto.class 0644 root bin 14186 29040 1048192130 +1 f none /opt/csw/share/vnc/classes/SessionRecorder.class 0644 root bin 2654 62139 1048192130 +1 f none /opt/csw/share/vnc/classes/SocketFactory.class 0644 root bin 342 23575 1048192130 +1 f none /opt/csw/share/vnc/classes/VncCanvas.class 0644 root bin 20927 18690 1048192130 +1 f none /opt/csw/share/vnc/classes/VncViewer.class 0644 root bin 13795 52263 1048192130 +1 f none /opt/csw/share/vnc/classes/VncViewer.jar 0644 root bin 47606 63577 1048192130 +1 f none /opt/csw/share/vnc/classes/index.vnc 0644 root bin 846 592 1048192130 +1 f none /opt/csw/share/vnc/vncserver.bin 0755 root bin 15190 2021 1048192092 +1 f none /opt/csw/share/vnc/vncservers.etc 0644 root sys 698 58245 1048192098 +1 i copyright 18000 30145 1048191525 +1 i depend 454 38987 1051394941 +1 i pkginfo 363 30834 1219230102 +1 i postinstall 827 2423 1048191525 +""" + +class PkgmapTest(unittest.TestCase): + + def testPkgmap1(self): + lines = PKGMAP_1.splitlines() + p1 = opencsw.Pkgmap(lines) + +if __name__ == '__main__': + unittest.main() Property changes on: csw/mgar/gar/v2/lib/python/compare_pkgs_test.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 6 03:16:00 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Oct 2010 01:16:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[11163] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11163 http://gar.svn.sourceforge.net/gar/?rev=11163&view=rev Author: bdwalton Date: 2010-10-06 01:15:59 +0000 (Wed, 06 Oct 2010) Log Message: ----------- apache2: split out ap2_apxs The CAS cswap2mod needs apxs and apxs needs the build/config_vars.mk file, which was part of the _devel package. Instead of putting everything into apache2, split apxs and build/* into ap2_apxs. Now, the primary package, ap2_suexec apache2_devel all depend on having the apxs package available. Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-05 18:13:09 UTC (rev 11162) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-06 01:15:59 UTC (rev 11163) @@ -50,7 +50,7 @@ # The PACKAGES variable tell GAR which packages to build PACKAGES = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2suexec -PACKAGES += CSWap2worker +PACKAGES += CSWap2worker CSWap2apxs # These packages are dummy versions to make dependencies nicer # as various things depend on CSWap2prefork currently PACKAGES += CSWap2prefork CSWapache2rt @@ -66,6 +66,7 @@ CATALOGNAME_CSWap2prefork = ap2_prefork CATALOGNAME_CSWap2worker = ap2_worker CATALOGNAME_CSWapache2rt = apache2rt +CATALOGNAME_CSWap2apxs = ap2_apxs SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server. SPKG_DESC_CSWapache2-devel = The development files for Apache2. @@ -74,6 +75,7 @@ SPKG_DESC_CSWap2worker = The apache worker mpm. SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package. SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package. +SPKG_DESC_CSWap2apxs = The apxs configuration tool for Apache2. INCOMPATIBLE_PKGS_CSWapache2 = CSWapache2c @@ -81,12 +83,13 @@ RUNTIME_DEP_PKGS_CSWapache2 += CSWoldaprt CSWosslrt CSWzlib RUNTIME_DEP_PKGS_CSWapache2 += CSWapr CSWapr-util CSWbdb48 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 -RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 +RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2 CSWap2apxs +RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 CSWap2apxs RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWapr CSWexpat RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 +RUNTIME_DEP_PKGS_CSWap2apxs = CSWperl CSWapache2 CHECKPKG_OVERRIDES_CSWap2suexec += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2 @@ -96,7 +99,12 @@ CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2apxs += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWap2apxs += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2suexec += surplus-dependency|CSWap2apxs +CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWap2apxs + # We need this to get bdb48/lib into the runpath EXTRA_LIB = $(prefix)/bdb48/lib @@ -196,11 +204,12 @@ STRIP_DIRS = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* -PKGFILES_CSWapache2-devel = .*include/.* .*\.(a|la) .*share/build/.* +PKGFILES_CSWapache2-devel = .*include/.* .*\.(a|la) PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.* PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* +PKGFILES_CSWap2apxs = .*share/build/.* .*/sbin/apxs PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 6 03:30:43 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Oct 2010 01:30:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11164] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11164 http://gar.svn.sourceforge.net/gar/?rev=11164&view=rev Author: bdwalton Date: 2010-10-06 01:30:42 +0000 (Wed, 06 Oct 2010) Log Message: ----------- apache2: rework deps wrt apxs package Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-06 01:15:59 UTC (rev 11163) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-06 01:30:42 UTC (rev 11164) @@ -82,14 +82,15 @@ RUNTIME_DEP_PKGS_CSWapache2 += CSWexpat CSWiconv RUNTIME_DEP_PKGS_CSWapache2 += CSWoldaprt CSWosslrt CSWzlib RUNTIME_DEP_PKGS_CSWapache2 += CSWapr CSWapr-util CSWbdb48 +RUNTIME_DEP_PKGS_CSWapache2 += CSWap2apxs RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2 CSWap2apxs -RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 CSWap2apxs +RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWapr CSWexpat RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2apxs = CSWperl CSWapache2 +RUNTIME_DEP_PKGS_CSWap2apxs = CSWperl CHECKPKG_OVERRIDES_CSWap2suexec += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2 @@ -100,11 +101,8 @@ CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2apxs += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWap2apxs += surplus-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWap2suexec += surplus-dependency|CSWap2apxs CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWap2apxs - # We need this to get bdb48/lib into the runpath EXTRA_LIB = $(prefix)/bdb48/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 6 03:35:41 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Oct 2010 01:35:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[11165] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11165 http://gar.svn.sourceforge.net/gar/?rev=11165&view=rev Author: bdwalton Date: 2010-10-06 01:35:41 +0000 (Wed, 06 Oct 2010) Log Message: ----------- apache2: another checkpkg override due to apxs dep change Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-06 01:30:42 UTC (rev 11164) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-06 01:35:41 UTC (rev 11165) @@ -96,6 +96,7 @@ CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWap2apxs CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 6 04:00:49 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Oct 2010 02:00:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[11166] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11166 http://gar.svn.sourceforge.net/gar/?rev=11166&view=rev Author: bdwalton Date: 2010-10-06 02:00:49 +0000 (Wed, 06 Oct 2010) Log Message: ----------- apache2: change file inclusion instead of making ap2_apxs If we simply leave the build/* files out of the -devel package we can have everything required for apxs to function in the primary apache2 package. This is simpler dependency wise. Having apache2 depend on apxs meant that apxs didn't function when apache2 was removed...apxs required httpd. Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-06 01:35:41 UTC (rev 11165) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-06 02:00:49 UTC (rev 11166) @@ -50,7 +50,7 @@ # The PACKAGES variable tell GAR which packages to build PACKAGES = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2suexec -PACKAGES += CSWap2worker CSWap2apxs +PACKAGES += CSWap2worker # These packages are dummy versions to make dependencies nicer # as various things depend on CSWap2prefork currently PACKAGES += CSWap2prefork CSWapache2rt @@ -66,7 +66,6 @@ CATALOGNAME_CSWap2prefork = ap2_prefork CATALOGNAME_CSWap2worker = ap2_worker CATALOGNAME_CSWapache2rt = apache2rt -CATALOGNAME_CSWap2apxs = ap2_apxs SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server. SPKG_DESC_CSWapache2-devel = The development files for Apache2. @@ -75,34 +74,28 @@ SPKG_DESC_CSWap2worker = The apache worker mpm. SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package. SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package. -SPKG_DESC_CSWap2apxs = The apxs configuration tool for Apache2. INCOMPATIBLE_PKGS_CSWapache2 = CSWapache2c RUNTIME_DEP_PKGS_CSWapache2 += CSWexpat CSWiconv RUNTIME_DEP_PKGS_CSWapache2 += CSWoldaprt CSWosslrt CSWzlib RUNTIME_DEP_PKGS_CSWapache2 += CSWapr CSWapr-util CSWbdb48 -RUNTIME_DEP_PKGS_CSWapache2 += CSWap2apxs RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 -RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2 CSWap2apxs +RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2 RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWapr CSWexpat RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2apxs = CSWperl CHECKPKG_OVERRIDES_CSWap2suexec += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWap2apxs CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWap2apxs += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWap2apxs # We need this to get bdb48/lib into the runpath EXTRA_LIB = $(prefix)/bdb48/lib @@ -208,7 +201,6 @@ PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.* PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PKGFILES_CSWap2apxs = .*share/build/.* .*/sbin/apxs PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 6 04:22:56 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Oct 2010 02:22:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[11167] csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 Message-ID: Revision: 11167 http://gar.svn.sourceforge.net/gar/?rev=11167&view=rev Author: bdwalton Date: 2010-10-06 02:22:56 +0000 (Wed, 06 Oct 2010) Log Message: ----------- apache2: tweak language used in README for apache2 Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 Modified: csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 =================================================================== --- csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 2010-10-06 02:00:49 UTC (rev 11166) +++ csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 2010-10-06 02:22:56 UTC (rev 11167) @@ -1,7 +1,7 @@ Hello CSW User/Sysadmin, -Please note that some recent changes to packages may affect the way -you're used to working with the CSW apache2 packages. +Please note that recent changes may affect the way you're used to +working with the CSW apache2 packages. In the past, CSWap2prefork and CSWap2worker delivered a specific mpm module for use with apache2. We now ship the prefork mpm as part of @@ -9,8 +9,8 @@ Each httpd mpm is installed using the new alternatives framework. When CSWap2worker is installed, it registers a higher priority httpd, -thus it is activated as httpd. You can change this at any time using -the alternatives command. +thus it is activated as httpd (manual restart required). You can +change this at any time using the alternatives command. Thanks -The OpenCSW apache2 team. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 6 04:25:56 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Oct 2010 02:25:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[11168] csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 Message-ID: Revision: 11168 http://gar.svn.sourceforge.net/gar/?rev=11168&view=rev Author: bdwalton Date: 2010-10-06 02:25:56 +0000 (Wed, 06 Oct 2010) Log Message: ----------- apache2: readme: note alternatives --help (no man page) Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 Modified: csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 =================================================================== --- csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 2010-10-06 02:22:56 UTC (rev 11167) +++ csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 2010-10-06 02:25:56 UTC (rev 11168) @@ -10,7 +10,9 @@ Each httpd mpm is installed using the new alternatives framework. When CSWap2worker is installed, it registers a higher priority httpd, thus it is activated as httpd (manual restart required). You can -change this at any time using the alternatives command. +change this at any time using the alternatives command. See +/opt/csw/sbin/alternatives --help for information on how you can do +this. Thanks -The OpenCSW apache2 team. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 6 14:33:09 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Oct 2010 12:33:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[11169] csw/mgar/pkg/cpan/Module-Load/trunk/Makefile Message-ID: Revision: 11169 http://gar.svn.sourceforge.net/gar/?rev=11169&view=rev Author: bonivart Date: 2010-10-06 12:33:09 +0000 (Wed, 06 Oct 2010) Log Message: ----------- pm_modload: remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load/trunk/Makefile Modified: csw/mgar/pkg/cpan/Module-Load/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/Makefile 2010-10-06 02:25:56 UTC (rev 11168) +++ csw/mgar/pkg/cpan/Module-Load/trunk/Makefile 2010-10-06 12:33:09 UTC (rev 11169) @@ -16,6 +16,6 @@ ARCHALL = 1 -EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*\/man\/man3.* .*\/man\/man1.* include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 6 14:40:42 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Oct 2010 12:40:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11170] csw/mgar/pkg/cpan/Module-Load-Conditional/trunk Message-ID: Revision: 11170 http://gar.svn.sourceforge.net/gar/?rev=11170&view=rev Author: bonivart Date: 2010-10-06 12:40:42 +0000 (Wed, 06 Oct 2010) Log Message: ----------- pm_modloadcond: update to 0.38, remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2010-10-06 12:33:09 UTC (rev 11169) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2010-10-06 12:40:42 UTC (rev 11170) @@ -1,5 +1,5 @@ GARNAME = Module-Load-Conditional -GARVERSION = 0.36 +GARVERSION = 0.38 CATEGORIES = cpan AUTHOR = BINGOS @@ -17,13 +17,6 @@ RUNTIME_DEP_PKGS = CSWpmprmscheck CSWpmmodload CSWpmlclemktxtsimple -CHECKPKG_OVERRIDES_CSWpmmodloadcond += surplus-dependency|CSWpmprmscheck -CHECKPKG_OVERRIDES_CSWpmmodloadcond += surplus-dependency|CSWpmmodload -CHECKPKG_OVERRIDES_CSWpmmodloadcond += surplus-dependency|CSWpmlclemktxtsimple +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* -DEPENDS += cpan/Params-Check -DEPENDS += cpan/Module-Load -DEPENDS += cpan/Locale-Maketext-Simple -DEPENDS += cpan/version - include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2010-10-06 12:33:09 UTC (rev 11169) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2010-10-06 12:40:42 UTC (rev 11170) @@ -1,2 +1 @@ -2a16d727d63d609f1c4aa4b6db4707c8 COPYING -aef549c57ce295f2c5ae826db645a9de Module-Load-Conditional-0.36.tar.gz +ddc4284f922b525a6c14769694498cf4 Module-Load-Conditional-0.38.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 6 15:01:34 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Oct 2010 13:01:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[11171] csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk Message-ID: Revision: 11171 http://gar.svn.sourceforge.net/gar/?rev=11171&view=rev Author: bonivart Date: 2010-10-06 13:01:33 +0000 (Wed, 06 Oct 2010) Log Message: ----------- pm_extutilsmft: update to 1.58, remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/Makefile csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/files/CSWpmextutilsmft.gspec csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/files/CSWpmextutilsmft.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/ Property changes on: csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/Makefile 2010-10-06 12:40:42 UTC (rev 11170) +++ csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/Makefile 2010-10-06 13:01:33 UTC (rev 11171) @@ -1,5 +1,5 @@ GARNAME = ExtUtils-Manifest -GARVERSION = 1.51 +GARVERSION = 1.58 CATEGORIES = cpan AUTHOR = RKOBES @@ -8,7 +8,13 @@ Utilities to write and check a MANIFEST file. endef -DISTFILES += $(call admfiles,CSWpmextutilsmft,prototype) +DISTFILES += COPYING +PACKAGES = CSWpmextutilsmft +CATALOGNAME = pm_extutilsmft + +ARCHALL = 1 + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*\/man\/man3.* .*\/man\/man1.* + include gar/category.mk - Modified: csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/checksums 2010-10-06 12:40:42 UTC (rev 11170) +++ csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/checksums 2010-10-06 13:01:33 UTC (rev 11171) @@ -1,3 +1 @@ -15273a20bb61fd95ee56c7fa06c32203 download/CSWpmextutilsmft.gspec -e3671e72e7d9019b6b9d4d777231ddf9 download/CSWpmextutilsmft.prototype -989f5be7280397c94e37bd566e84d422 download/ExtUtils-Manifest-1.51.tar.gz +1644112b9ac75822d820b047c968edd9 ExtUtils-Manifest-1.58.tar.gz Added: csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/files/COPYING 2010-10-06 13:01:33 UTC (rev 11171) @@ -0,0 +1,2 @@ +This library is free software; you may redistribute it and/or modify it +under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/files/CSWpmextutilsmft.gspec =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/files/CSWpmextutilsmft.gspec 2010-10-06 12:40:42 UTC (rev 11170) +++ csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/files/CSWpmextutilsmft.gspec 2010-10-06 13:01:33 UTC (rev 11171) @@ -1,7 +0,0 @@ -%var bitname pm_extutilsmft -%var pkgname CSWpmextutilsmft -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This library is free software; you may redistribute it and/or modify it -under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/files/CSWpmextutilsmft.prototype =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/files/CSWpmextutilsmft.prototype 2010-10-06 12:40:42 UTC (rev 11170) +++ csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/files/CSWpmextutilsmft.prototype 2010-10-06 13:01:33 UTC (rev 11171) @@ -1,16 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/ExtUtils 0755 root bin -d none /opt/csw/lib/perl/csw/auto/ExtUtils/Manifest 0755 root bin -f none /opt/csw/lib/perl/csw/auto/ExtUtils/Manifest/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/ExtUtils::Manifest.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/ExtUtils 0755 root bin -f none /opt/csw/share/perl/csw/ExtUtils/MANIFEST.SKIP 0444 root bin -f none /opt/csw/share/perl/csw/ExtUtils/Manifest.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 6 16:06:26 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Oct 2010 14:06:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[11172] csw/mgar/pkg/cpan/File-Fetch/trunk Message-ID: Revision: 11172 http://gar.svn.sourceforge.net/gar/?rev=11172&view=rev Author: bonivart Date: 2010-10-06 14:06:26 +0000 (Wed, 06 Oct 2010) Log Message: ----------- pm_filefetch: update to 0.24, remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile csw/mgar/pkg/cpan/File-Fetch/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/File-Fetch/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/File-Fetch/trunk/files/CSWpmfilefetch.depend csw/mgar/pkg/cpan/File-Fetch/trunk/files/CSWpmfilefetch.gspec csw/mgar/pkg/cpan/File-Fetch/trunk/files/CSWpmfilefetch.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/File-Fetch/trunk/ Property changes on: csw/mgar/pkg/cpan/File-Fetch/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile 2010-10-06 13:01:33 UTC (rev 11171) +++ csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile 2010-10-06 14:06:26 UTC (rev 11172) @@ -1,7 +1,7 @@ GARNAME = File-Fetch -GARVERSION = 0.10 +GARVERSION = 0.24 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS DESCRIPTION = A generic file fetching mechanism define BLURB @@ -10,11 +10,17 @@ different means. endef -DISTFILES += $(call admfiles,CSWpmfilefetch,depend prototype) +DISTFILES += COPYING -DEPENDS += cpan/IPC-Cmd -DEPENDS += cpan/Params-Check -DEPENDS += cpan/Module-Load-Conditional -DEPENDS += cpan/Locale-Maketext-Simple +PACKAGES = CSWpmfilefetch +CATALOGNAME = pm_filefetch +ARCHALL = 1 + +RUNTIME_DEP_PKGS += CSWpmipccmd CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck + +SKIPTEST = 1 + +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* + include gar/category.mk Modified: csw/mgar/pkg/cpan/File-Fetch/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-Fetch/trunk/checksums 2010-10-06 13:01:33 UTC (rev 11171) +++ csw/mgar/pkg/cpan/File-Fetch/trunk/checksums 2010-10-06 14:06:26 UTC (rev 11172) @@ -1,4 +1 @@ -c7c7d2f360f49892da0a1435a5bac17c download/CSWpmfilefetch.gspec -7cd4a916ca7f866a53ae312d53f25694 download/CSWpmfilefetch.depend -6952d8ba5745b542f16f9f36d369d1a1 download/CSWpmfilefetch.prototype -515746879e2ef1aa780e24c1e7b7f04f download/File-Fetch-0.10.tar.gz +4c1dadfc0f7428414b247a5ef55a6778 File-Fetch-0.24.tar.gz Added: csw/mgar/pkg/cpan/File-Fetch/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/File-Fetch/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/File-Fetch/trunk/files/COPYING 2010-10-06 14:06:26 UTC (rev 11172) @@ -0,0 +1,5 @@ + This module is copyright (c) 2002 Jos Boumans . All + rights reserved. + + This library is free software; you may redistribute and/or modify it + under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/File-Fetch/trunk/files/CSWpmfilefetch.depend =================================================================== --- csw/mgar/pkg/cpan/File-Fetch/trunk/files/CSWpmfilefetch.depend 2010-10-06 13:01:33 UTC (rev 11171) +++ csw/mgar/pkg/cpan/File-Fetch/trunk/files/CSWpmfilefetch.depend 2010-10-06 14:06:26 UTC (rev 11172) @@ -1,4 +0,0 @@ -P CSWpmipccmd pm_ipccmd - Finding and running system commands made easy -P CSWpmlclemktxtsimple pm_lclemktxtsimple - simple interface to Locale::Maketext::Lexicon -P CSWpmmodloadcond pm_modloadcond - Query module information and load at runtime -P CSWpmprmscheck pm_prmscheck - A generic input parsing/checking mechanism. Deleted: csw/mgar/pkg/cpan/File-Fetch/trunk/files/CSWpmfilefetch.gspec =================================================================== --- csw/mgar/pkg/cpan/File-Fetch/trunk/files/CSWpmfilefetch.gspec 2010-10-06 13:01:33 UTC (rev 11171) +++ csw/mgar/pkg/cpan/File-Fetch/trunk/files/CSWpmfilefetch.gspec 2010-10-06 14:06:26 UTC (rev 11172) @@ -1,10 +0,0 @@ -%var bitname pm_filefetch -%var pkgname CSWpmfilefetch -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This module is copyright (c) 2002 Jos Boumans . All -rights reserved. - -This library is free software; you may redistribute and/or modify it -under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/File-Fetch/trunk/files/CSWpmfilefetch.prototype =================================================================== --- csw/mgar/pkg/cpan/File-Fetch/trunk/files/CSWpmfilefetch.prototype 2010-10-06 13:01:33 UTC (rev 11171) +++ csw/mgar/pkg/cpan/File-Fetch/trunk/files/CSWpmfilefetch.prototype 2010-10-06 14:06:26 UTC (rev 11172) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/File 0755 root bin -d none /opt/csw/lib/perl/csw/auto/File/Fetch 0755 root bin -f none /opt/csw/lib/perl/csw/auto/File/Fetch/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/File::Fetch.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/File 0755 root bin -f none /opt/csw/share/perl/csw/File/Fetch.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 6 16:20:25 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Oct 2010 14:20:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[11173] csw/mgar/pkg/cpan/IPC-Cmd/trunk Message-ID: Revision: 11173 http://gar.svn.sourceforge.net/gar/?rev=11173&view=rev Author: bonivart Date: 2010-10-06 14:20:25 +0000 (Wed, 06 Oct 2010) Log Message: ----------- pm_ipccmd: update to 0.60, remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile csw/mgar/pkg/cpan/IPC-Cmd/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/IPC-Cmd/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/IPC-Cmd/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile 2010-10-06 14:06:26 UTC (rev 11172) +++ csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile 2010-10-06 14:20:25 UTC (rev 11173) @@ -1,7 +1,7 @@ GARNAME = IPC-Cmd -GARVERSION = 0.46 +GARVERSION = 0.60 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS DESCRIPTION = Finding and running system commands made easy define BLURB @@ -9,16 +9,14 @@ independent but have them still work. endef +DISTFILES += COPYING + PACKAGES = CSWpmipccmd CATALOGNAME = pm_ipccmd ARCHALL = 1 RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck -include gar/category.mk +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) -post-install-modulated: - @ginstall -d $(DOCDEST) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) - @$(MAKECOOKIE) +include gar/category.mk Modified: csw/mgar/pkg/cpan/IPC-Cmd/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IPC-Cmd/trunk/checksums 2010-10-06 14:06:26 UTC (rev 11172) +++ csw/mgar/pkg/cpan/IPC-Cmd/trunk/checksums 2010-10-06 14:20:25 UTC (rev 11173) @@ -1 +1 @@ -0e35c075e6a4a4d097ead72e7c3b96f0 download/IPC-Cmd-0.46.tar.gz +dcb4282e413f89afa4b4fcba75ebf283 IPC-Cmd-0.60.tar.gz Added: csw/mgar/pkg/cpan/IPC-Cmd/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/IPC-Cmd/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/IPC-Cmd/trunk/files/COPYING 2010-10-06 14:20:25 UTC (rev 11173) @@ -0,0 +1,5 @@ + This module is copyright (c) 2002 Jos Boumans . All + rights reserved. + + This library is free software; you may redistribute and/or modify it + under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/IPC-Cmd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cpan/IPC-Cmd/trunk/files/changelog.CSW 2010-10-06 14:06:26 UTC (rev 11172) +++ csw/mgar/pkg/cpan/IPC-Cmd/trunk/files/changelog.CSW 2010-10-06 14:20:25 UTC (rev 11173) @@ -1,5 +0,0 @@ -pm_ipccmd (0.46,REV=2009.08.08) - - * Adopted and updated to 0.46 - - -- Sebastian Kayser Sat, 8 Aug 2009 03:14:26 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 6 16:30:38 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Oct 2010 14:30:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[11174] csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk Message-ID: Revision: 11174 http://gar.svn.sourceforge.net/gar/?rev=11174&view=rev Author: bonivart Date: 2010-10-06 14:30:37 +0000 (Wed, 06 Oct 2010) Log Message: ----------- pm_lclemktxtsimple: update to 0.21, remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile 2010-10-06 14:20:25 UTC (rev 11173) +++ csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile 2010-10-06 14:30:37 UTC (rev 11174) @@ -1,14 +1,7 @@ -# Locale-Maketext-Simple 0.19 lacks Makefile.PL -# Locale-Maketext-Simple 0.20 requires higher MakeMaker rev than we have -# Warning: prerequisite ExtUtils::MakeMaker 6.42 not found. We have 6.30. -# GARNAME = Locale-Maketext-Simple -GARVERSION = 0.18 +GARVERSION = 0.21 CATEGORIES = cpan -AUTHOR = $(AUTHOR_$(GARVERSION)) -AUTHOR_0.18 = AUDREYT -AUTHOR_0.19 = JESSE -AUTHOR_0.20 = JESSE +AUTHOR = JESSE DESCRIPTION = Simple interface to Locale::Maketext::Lexicon define BLURB @@ -16,16 +9,14 @@ to alleviate the need of creating Language Classes for module authors. endef +DISTFILES += COPYING + PACKAGES = CSWpmlclemktxtsimple CATALOGNAME = pm_lclemktxtsimple ARCHALL = 1 RUNTIME_DEP_PKGS = CSWpmlclemktxtlex -include gar/category.mk +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) -post-install-modulated: - @ginstall -d $(DOCDEST) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) - @$(MAKECOOKIE) +include gar/category.mk Modified: csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/checksums 2010-10-06 14:20:25 UTC (rev 11173) +++ csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/checksums 2010-10-06 14:30:37 UTC (rev 11174) @@ -1 +1 @@ -51cc6dc109bf49cca063f3baa2cfd9e6 download/Locale-Maketext-Simple-0.18.tar.gz +0a7c5c3b18cf31d764e1631eb9a3d367 Locale-Maketext-Simple-0.21.tar.gz Added: csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/files/COPYING 2010-10-06 14:30:37 UTC (rev 11174) @@ -0,0 +1,27 @@ +* COPYRIGHT + +Copyright 2002, 2003, 2004, 2005, 2006 by Audrey Tang . + +This software is released under the MIT license cited below. Additionally, +when this software is distributed with B, you may also +redistribute it and/or modify it under the same terms as Perl itself. + +* The "MIT" License + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. Deleted: csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/files/changelog.CSW 2010-10-06 14:20:25 UTC (rev 11173) +++ csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/files/changelog.CSW 2010-10-06 14:30:37 UTC (rev 11174) @@ -1,5 +0,0 @@ -pm_lclemktxtsimple (0.20,REV=2009.08.08) - - * Adopted and updated to 0.18 - - -- Sebastian Kayser Sat, 8 Aug 2009 02:17:02 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 6 16:38:37 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Oct 2010 14:38:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[11175] csw/mgar/pkg/cpan/Log-Message-Simple/trunk Message-ID: Revision: 11175 http://gar.svn.sourceforge.net/gar/?rev=11175&view=rev Author: bonivart Date: 2010-10-06 14:38:37 +0000 (Wed, 06 Oct 2010) Log Message: ----------- pm_logmsgsimple: update to 0.06, remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile csw/mgar/pkg/cpan/Log-Message-Simple/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile 2010-10-06 14:30:37 UTC (rev 11174) +++ csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile 2010-10-06 14:38:37 UTC (rev 11175) @@ -1,24 +1,22 @@ GARNAME = Log-Message-Simple -GARVERSION = 0.04 +GARVERSION = 0.06 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS -DESCRIPTION = Standardized logging facilities using the Log::Message module +DESCRIPTION = Simplified interface to Log::Message define BLURB This module provides standardized logging facilities using the Log::Message module. endef +DISTFILES += COPYING + PACKAGES = CSWpmlogmsgsimple CATALOGNAME = pm_logmsgsimple ARCHALL = 1 RUNTIME_DEP_PKGS = CSWpmlogmessage -include gar/category.mk +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) -post-install-modulated: - @ginstall -d $(DOCDEST) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) - @$(MAKECOOKIE) +include gar/category.mk Modified: csw/mgar/pkg/cpan/Log-Message-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/checksums 2010-10-06 14:30:37 UTC (rev 11174) +++ csw/mgar/pkg/cpan/Log-Message-Simple/trunk/checksums 2010-10-06 14:38:37 UTC (rev 11175) @@ -1 +1 @@ -29e42e6f2f43592a74fed779bd11c1e6 download/Log-Message-Simple-0.04.tar.gz +bee9416fae39f8cf034ad9da512a6f62 Log-Message-Simple-0.06.tar.gz Added: csw/mgar/pkg/cpan/Log-Message-Simple/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Log-Message-Simple/trunk/files/COPYING 2010-10-06 14:38:37 UTC (rev 11175) @@ -0,0 +1,5 @@ + This module is copyright (c) 2002 Jos Boumans . All + rights reserved. + + This library is free software; you may redistribute and/or modify it + under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Log-Message-Simple/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/files/changelog.CSW 2010-10-06 14:30:37 UTC (rev 11174) +++ csw/mgar/pkg/cpan/Log-Message-Simple/trunk/files/changelog.CSW 2010-10-06 14:38:37 UTC (rev 11175) @@ -1,5 +0,0 @@ -pm_logmsgsimple (0.04,REV=2009.08.08) - - * Adopted and updated to 0.04 - - -- Sebastian Kayser Sat, 8 Aug 2009 04:28:48 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 6 16:44:22 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Oct 2010 14:44:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11176] csw/mgar/pkg/cpan/Module-Loaded/trunk Message-ID: Revision: 11176 http://gar.svn.sourceforge.net/gar/?rev=11176&view=rev Author: bonivart Date: 2010-10-06 14:44:21 +0000 (Wed, 06 Oct 2010) Log Message: ----------- pm_modloaded: update to 0.06, remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Loaded/trunk/Makefile csw/mgar/pkg/cpan/Module-Loaded/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Module-Loaded/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Module-Loaded/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cpan/Module-Loaded/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Loaded/trunk/Makefile 2010-10-06 14:38:37 UTC (rev 11175) +++ csw/mgar/pkg/cpan/Module-Loaded/trunk/Makefile 2010-10-06 14:44:21 UTC (rev 11176) @@ -1,7 +1,7 @@ GARNAME = Module-Loaded -GARVERSION = 0.02 +GARVERSION = 0.06 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS DESCRIPTION = Mark modules as loaded or unloaded define BLURB @@ -13,14 +13,12 @@ unloaded. endef +DISTFILES += COPYING + PACKAGES = CSWpmmodloaded CATALOGNAME = pm_modloaded ARCHALL = 1 -include gar/category.mk +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) -post-install-modulated: - @ginstall -d $(DOCDEST) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) - @$(MAKECOOKIE) +include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Loaded/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Loaded/trunk/checksums 2010-10-06 14:38:37 UTC (rev 11175) +++ csw/mgar/pkg/cpan/Module-Loaded/trunk/checksums 2010-10-06 14:44:21 UTC (rev 11176) @@ -1 +1,2 @@ -cbd3a9721287cdfc630f6db650a74469 download/Module-Loaded-0.02.tar.gz +608826974d5644ee7967a713fa72cf36 COPYING +0a0bb1915828b73bb07f9b5239c5b976 Module-Loaded-0.06.tar.gz Added: csw/mgar/pkg/cpan/Module-Loaded/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Module-Loaded/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Module-Loaded/trunk/files/COPYING 2010-10-06 14:44:21 UTC (rev 11176) @@ -0,0 +1,5 @@ + This module is copyright (c) 2005 Jos Boumans . All + rights reserved. + + This library is free software; you may redistribute and/or modify it + under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Module-Loaded/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cpan/Module-Loaded/trunk/files/changelog.CSW 2010-10-06 14:38:37 UTC (rev 11175) +++ csw/mgar/pkg/cpan/Module-Loaded/trunk/files/changelog.CSW 2010-10-06 14:44:21 UTC (rev 11176) @@ -1,5 +0,0 @@ -pm_modloaded (0.02,REV=2009.08.08) - - * Adopted and updated to 0.02. - - -- Sebastian Kayser Sat, 8 Aug 2009 02:00:38 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 6 16:51:33 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Oct 2010 14:51:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11177] csw/mgar/pkg/cpan/Params-Check/trunk Message-ID: Revision: 11177 http://gar.svn.sourceforge.net/gar/?rev=11177&view=rev Author: bonivart Date: 2010-10-06 14:51:33 +0000 (Wed, 06 Oct 2010) Log Message: ----------- pm_prmscheck: remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/Params-Check/trunk/Makefile csw/mgar/pkg/cpan/Params-Check/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Params-Check/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Params-Check/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cpan/Params-Check/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Params-Check/trunk/Makefile 2010-10-06 14:44:21 UTC (rev 11176) +++ csw/mgar/pkg/cpan/Params-Check/trunk/Makefile 2010-10-06 14:51:33 UTC (rev 11177) @@ -10,16 +10,14 @@ must be named. endef +DISTFILES += COPYING + PACKAGES = CSWpmprmscheck CATALOGNAME = pm_prmscheck ARCHALL = 1 RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple -include gar/category.mk +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) -post-install-modulated: - @ginstall -d $(DOCDEST) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) - @$(MAKECOOKIE) +include gar/category.mk Modified: csw/mgar/pkg/cpan/Params-Check/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Params-Check/trunk/checksums 2010-10-06 14:44:21 UTC (rev 11176) +++ csw/mgar/pkg/cpan/Params-Check/trunk/checksums 2010-10-06 14:51:33 UTC (rev 11177) @@ -1,4 +1 @@ -358c69c5fa43bfa15860b2a16ea945e9 download/CSWpmprmscheck.gspec -4753b218e7605f868fb8832a46d0efe2 download/CSWpmprmscheck.depend -ac8a1b5a0b7350a7b83e2be670fec21e download/CSWpmprmscheck.prototype -d740a81f3078dcae83d8b6b4859885c7 download/Params-Check-0.26.tar.gz +d740a81f3078dcae83d8b6b4859885c7 Params-Check-0.26.tar.gz Added: csw/mgar/pkg/cpan/Params-Check/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Params-Check/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Params-Check/trunk/files/COPYING 2010-10-06 14:51:33 UTC (rev 11177) @@ -0,0 +1,5 @@ + This module is copyright (c) 2002 Jos Boumans . All + rights reserved. + + This library is free software; you may redistribute and/or modify it + under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Params-Check/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cpan/Params-Check/trunk/files/changelog.CSW 2010-10-06 14:44:21 UTC (rev 11176) +++ csw/mgar/pkg/cpan/Params-Check/trunk/files/changelog.CSW 2010-10-06 14:51:33 UTC (rev 11177) @@ -1,5 +0,0 @@ -pm_prmscheck (0.26,REV=2009.08.08) - - * Adopted and rebuilt using mGAR v2. - - -- Sebastian Kayser Sat, 8 Aug 2009 03:05:22 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 6 17:01:37 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Oct 2010 15:01:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[11178] csw/mgar/pkg/cpan/Term-UI/trunk Message-ID: Revision: 11178 http://gar.svn.sourceforge.net/gar/?rev=11178&view=rev Author: bonivart Date: 2010-10-06 15:01:37 +0000 (Wed, 06 Oct 2010) Log Message: ----------- pm_termui: update to 0.20, remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/Term-UI/trunk/Makefile csw/mgar/pkg/cpan/Term-UI/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Term-UI/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Term-UI/trunk/files/CSWpmtermui.depend csw/mgar/pkg/cpan/Term-UI/trunk/files/CSWpmtermui.gspec csw/mgar/pkg/cpan/Term-UI/trunk/files/CSWpmtermui.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Term-UI/trunk/ Property changes on: csw/mgar/pkg/cpan/Term-UI/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Term-UI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Term-UI/trunk/Makefile 2010-10-06 14:51:33 UTC (rev 11177) +++ csw/mgar/pkg/cpan/Term-UI/trunk/Makefile 2010-10-06 15:01:37 UTC (rev 11178) @@ -1,5 +1,5 @@ GARNAME = Term-UI -GARVERSION = 0.14 +GARVERSION = 0.20 CATEGORIES = cpan AUTHOR = KANE @@ -10,10 +10,14 @@ answer was not proper and re-issuing the question. endef -DISTFILES = $(call admfiles,CSWpmtermui,depend prototype) +DISTFILES += COPYING -DEPENDS += cpan/Params-Check -DEPENDS += cpan/Locale-Maketext-Simple -DEPENDS += cpan/Log-Message-Simple +PACKAGES = CSWpmtermui +CATALOGNAME = pm_termui +ARCHALL = 1 +RUNTIME_DEP_PKGS += CSWpmlclemktxtsimple CSWpmlogmsgsimple CSWpmprmscheck + +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* + include gar/category.mk Modified: csw/mgar/pkg/cpan/Term-UI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Term-UI/trunk/checksums 2010-10-06 14:51:33 UTC (rev 11177) +++ csw/mgar/pkg/cpan/Term-UI/trunk/checksums 2010-10-06 15:01:37 UTC (rev 11178) @@ -1,4 +1 @@ -5129b3f2634a6a417e5f42457deb75c3 download/CSWpmtermui.gspec -089745073ec03c152364d7645b0bba1b download/CSWpmtermui.depend -ccb462fe2561a7e0dd0d6d58c805f2b4 download/CSWpmtermui.prototype -a929235d67c718af3d1d431987796cd8 download/Term-UI-0.14.tar.gz +7da07b14b0b6565e879aefd3abf15cde Term-UI-0.20.tar.gz Added: csw/mgar/pkg/cpan/Term-UI/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Term-UI/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Term-UI/trunk/files/COPYING 2010-10-06 15:01:37 UTC (rev 11178) @@ -0,0 +1,6 @@ +COPYRIGHT + This module is copyright (c) 2002 Jos Boumans . All + rights reserved. + + This library is free software; you may redistribute and/or modify it + under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Term-UI/trunk/files/CSWpmtermui.depend =================================================================== --- csw/mgar/pkg/cpan/Term-UI/trunk/files/CSWpmtermui.depend 2010-10-06 14:51:33 UTC (rev 11177) +++ csw/mgar/pkg/cpan/Term-UI/trunk/files/CSWpmtermui.depend 2010-10-06 15:01:37 UTC (rev 11178) @@ -1,3 +0,0 @@ -P CSWpmlclemktxtsimple pm_lclemktxtsimple - simple interface to Locale::Maketext -P CSWpmlogmsgsimple pm_logmsgsimple - Standardized logging facilities using the Log::Message module. -P CSWpmprmscheck pm_prmscheck - A generic input parsing/checking mechanism. Deleted: csw/mgar/pkg/cpan/Term-UI/trunk/files/CSWpmtermui.gspec =================================================================== --- csw/mgar/pkg/cpan/Term-UI/trunk/files/CSWpmtermui.gspec 2010-10-06 14:51:33 UTC (rev 11177) +++ csw/mgar/pkg/cpan/Term-UI/trunk/files/CSWpmtermui.gspec 2010-10-06 15:01:37 UTC (rev 11178) @@ -1,10 +0,0 @@ -%var bitname pm_termui -%var pkgname CSWpmtermui -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This module is copyright (c) 2004 Jos Boumans . All -rights reserved. - -This library is free software; you may redistribute and/or modify it -under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Term-UI/trunk/files/CSWpmtermui.prototype =================================================================== --- csw/mgar/pkg/cpan/Term-UI/trunk/files/CSWpmtermui.prototype 2010-10-06 14:51:33 UTC (rev 11177) +++ csw/mgar/pkg/cpan/Term-UI/trunk/files/CSWpmtermui.prototype 2010-10-06 15:01:37 UTC (rev 11178) @@ -1,18 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Term 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Term/UI 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Term/UI/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Term::UI.3perl 0444 root bin -f none /opt/csw/share/man/man3/Term::UI::History.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Term 0755 root bin -d none /opt/csw/share/perl/csw/Term/UI 0755 root bin -f none /opt/csw/share/perl/csw/Term/UI.pm 0444 root bin -f none /opt/csw/share/perl/csw/Term/UI/History.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Oct 6 18:04:31 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 06 Oct 2010 16:04:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[11179] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 11179 http://gar.svn.sourceforge.net/gar/?rev=11179&view=rev Author: idogan23 Date: 2010-10-06 16:04:30 +0000 (Wed, 06 Oct 2010) Log Message: ----------- jdk6: bump version to 1.6.0_21 Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/Makefile csw/mgar/pkg/jdk6/trunk/checksums Modified: csw/mgar/pkg/jdk6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2010-10-06 15:01:37 UTC (rev 11178) +++ csw/mgar/pkg/jdk6/trunk/Makefile 2010-10-06 16:04:30 UTC (rev 11179) @@ -1,6 +1,6 @@ GARNAME = jdk6 -SPKG_VERSION = 1.6.0_16 -GARVERSION = 6u16 +SPKG_VERSION = 1.6.0_21 +GARVERSION = 6u21 CATEGORIES = lang DESCRIPTION = Java Development Kit 6 @@ -31,7 +31,7 @@ ARCHALL_CSWjdk = 1 ARCHALL_CSWjre = 1 -LICENSE = LICENSE +LICENSE = COPYRIGHT SPKG_DESC_CSWjdk6 = Java Development Kit 6 SPKG_DESC_CSWjre6 = Java Runtime Environment 6 Modified: csw/mgar/pkg/jdk6/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk6/trunk/checksums 2010-10-06 15:01:37 UTC (rev 11178) +++ csw/mgar/pkg/jdk6/trunk/checksums 2010-10-06 16:04:30 UTC (rev 11179) @@ -1,8 +1,4 @@ -49e3f19f300f9634301324c66e9c538f download/CSWjdk.gspec -e97f304567b9a3504ed23ab5203b1d6a download/CSWjdk6.gspec -e8c5435c1ec2ee4b55bc64a7e43092f5 download/CSWjre.gspec -db63838ec6ecabef9af5dbaeece93854 download/CSWjre6.gspec -3b3403d0b8a5bba0f681f2bca66a2294 download/jdk-6u16-solaris-i586.sh -d1ac0843e934663fa0d6b64fc6482bad download/jdk-6u16-solaris-sparc.sh -ac9da8dfdde3ae213d4dd0d8867b00a1 download/jdk-6u16-solaris-sparcv9.sh -3b80a03228161bc58ae96e2399a3b939 download/jdk-6u16-solaris-x64.sh +6e35025369e5f9bbcaa138f272d1d6da jdk-6u21-solaris-i586.sh +7af288faca89565c710c7c6210cfe066 jdk-6u21-solaris-sparc.sh +95b97a9ae3de3a08a21d6d6a304fd579 jdk-6u21-solaris-sparcv9.sh +af040a249aff4ad41ccc4f0abd3830a7 jdk-6u21-solaris-x64.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 6 19:16:52 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Oct 2010 17:16:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[11180] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 11180 http://gar.svn.sourceforge.net/gar/?rev=11180&view=rev Author: bonivart Date: 2010-10-06 17:16:52 +0000 (Wed, 06 Oct 2010) Log Message: ----------- pkgutil: update to 2.2 beta 1 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2010-10-06 16:04:30 UTC (rev 11179) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2010-10-06 17:16:52 UTC (rev 11180) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 2.1 +GARVERSION = 2.2b1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -13,9 +13,17 @@ # Disable inclusion of CSWcommon by default. COMMON_PKG_DEPENDS = -MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).zip + DISTFILES += $(call admfiles,CSWpkgutil,prototype preremove postinstall) +#DISTFILES += $(call admfiles,CSWpkgutil,preremove postinstall) +#ifeq ($(shell uname -p), sparc) +# DISTFILES += CSWpkgutilsparc.prototype +#else +# DISTFILES += CSWpkgutili386.prototype +#endif + DISTFILES += build_sun_catalog.py DISTFILES += opencsw.py DISTFILES += cswcatalog @@ -78,6 +86,7 @@ @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc @ginstall -m 644 $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/opt/csw/etc/$(GARNAME).conf.CSW @ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) +# @ginstall -m 755 $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/ @ginstall -m 755 $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget @ginstall -m 755 $(FILEDIR)/build_sun_catalog.py $(FILEDIR)/opencsw.py $(DESTDIR)/opt/csw/libexec/$(GARNAME) @ln -s ../libexec/pkgutil/build_sun_catalog.py $(DESTDIR)$(bindir)/build_sun_catalog Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2010-10-06 16:04:30 UTC (rev 11179) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2010-10-06 17:16:52 UTC (rev 11180) @@ -5,4 +5,4 @@ b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -8ed6eab5fbcd2e2f5c4d961c32c00e25 pkgutil-2.1.zip +9d03686fec9eac71e6169e88c45ea078 pkgutil-2.2b1.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Oct 6 19:29:09 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Oct 2010 17:29:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[11181] csw/mgar/pkg/pkgutil/trunk/checksums Message-ID: Revision: 11181 http://gar.svn.sourceforge.net/gar/?rev=11181&view=rev Author: bonivart Date: 2010-10-06 17:29:09 +0000 (Wed, 06 Oct 2010) Log Message: ----------- pkgutil: update source Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2010-10-06 17:16:52 UTC (rev 11180) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2010-10-06 17:29:09 UTC (rev 11181) @@ -5,4 +5,4 @@ b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -9d03686fec9eac71e6169e88c45ea078 pkgutil-2.2b1.zip +7507e51c7e928fa769442f2427b53fda pkgutil-2.2b1.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 6 21:37:28 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Oct 2010 19:37:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[11182] csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk Message-ID: Revision: 11182 http://gar.svn.sourceforge.net/gar/?rev=11182&view=rev Author: dmichelsen Date: 2010-10-06 19:37:28 +0000 (Wed, 06 Oct 2010) Log Message: ----------- cpan/ExtUtils-CBuilder: Update to 0.2703 and fix #4572 Modified Paths: -------------- csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/Makefile csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/Makefile 2010-10-06 17:29:09 UTC (rev 11181) +++ csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/Makefile 2010-10-06 19:37:28 UTC (rev 11182) @@ -1,5 +1,5 @@ GARNAME = ExtUtils-CBuilder -GARVERSION = 0.2603 +GARVERSION = 0.2703 CATEGORIES = cpan AUTHOR = DAGOLDEN @@ -13,11 +13,15 @@ goal! endef +DISTFILES = COPYING + PACKAGES = CSWpmextutcbuilder CATALOGNAME = pm_extutcbuilder ARCHALL = 1 -SPKG_VERSION = 0.26.03 +# Skip manpages as they are also in CSWperldoc. See +# https://www.opencsw.org/mantis/view.php?id=4572 +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3\/.* .*\/man\/man1\/.* include gar/category.mk Modified: csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/checksums 2010-10-06 17:29:09 UTC (rev 11181) +++ csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/checksums 2010-10-06 19:37:28 UTC (rev 11182) @@ -1 +1 @@ -1da23b2771380f66033a233a9503f247 download/ExtUtils-CBuilder-0.2603.tar.gz +52bd8ec45491625a3501bda2713eac24 ExtUtils-CBuilder-0.2703.tar.gz Added: csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/files/COPYING 2010-10-06 19:37:28 UTC (rev 11182) @@ -0,0 +1,5 @@ + Copyright (c) 2003-2005 Ken Williams. All rights reserved. + + This library is free software; you can redistribute it and/or modify it + under the same terms as Perl itself. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 6 21:37:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Oct 2010 19:37:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[11183] csw/mgar/pkg/cpan/Test-Simple/trunk Message-ID: Revision: 11183 http://gar.svn.sourceforge.net/gar/?rev=11183&view=rev Author: dmichelsen Date: 2010-10-06 19:37:51 +0000 (Wed, 06 Oct 2010) Log Message: ----------- cpan/Test-Simple: Update to 0.96 and fix #4567 Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile csw/mgar/pkg/cpan/Test-Simple/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Test-Simple/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile 2010-10-06 19:37:28 UTC (rev 11182) +++ csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile 2010-10-06 19:37:51 UTC (rev 11183) @@ -1,5 +1,5 @@ GARNAME = Test-Simple -GARVERSION = 0.94 +GARVERSION = 0.96 CATEGORIES = cpan AUTHOR = MSCHWERN @@ -11,9 +11,15 @@ (a drop-in replacement for this one). endef +DISTFILES = COPYING + PACKAGES = CSWpmtestsimple CATALOGNAME = pm_testsimple ARCHALL = 1 +# Skip manpages as they are also in CSWperldoc. See +# https://www.opencsw.org/mantis/view.php?id=4567 +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3\/.* .*\/man\/man1\/.* + include gar/category.mk Modified: csw/mgar/pkg/cpan/Test-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Simple/trunk/checksums 2010-10-06 19:37:28 UTC (rev 11182) +++ csw/mgar/pkg/cpan/Test-Simple/trunk/checksums 2010-10-06 19:37:51 UTC (rev 11183) @@ -1 +1 @@ -e4e09d8bf2cc73124152ba2c45c95b5b Test-Simple-0.94.tar.gz +fbc734a7bb5b3fc3e2bc706e19d08b26 Test-Simple-0.96.tar.gz Added: csw/mgar/pkg/cpan/Test-Simple/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Test-Simple/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Test-Simple/trunk/files/COPYING 2010-10-06 19:37:51 UTC (rev 11183) @@ -0,0 +1,6 @@ +Copyright 2001-2008 by Michael G Schwern Eschwern at pobox.comE. + +This program is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. + +See F This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 6 21:52:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Oct 2010 19:52:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[11184] csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk Message-ID: Revision: 11184 http://gar.svn.sourceforge.net/gar/?rev=11184&view=rev Author: dmichelsen Date: 2010-10-06 19:52:06 +0000 (Wed, 06 Oct 2010) Log Message: ----------- cpan/ExtUtils-ParseXS: Update to 2.2206 and fix #4571 Modified Paths: -------------- csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile 2010-10-06 19:37:51 UTC (rev 11183) +++ csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile 2010-10-06 19:52:06 UTC (rev 11184) @@ -1,5 +1,5 @@ GARNAME = ExtUtils-ParseXS -GARVERSION = 2.2002 +GARVERSION = 2.2206 CATEGORIES = cpan AUTHOR = DAGOLDEN @@ -12,6 +12,8 @@ values. endef +DISTFILES = COPYING + PACKAGES = CSWpmextutparsexs CATALOGNAME = pm_extutparsexs @@ -19,6 +21,8 @@ RUNTIME_DEP_PKGS = CSWpmextutcbuilder -SPKG_VERSION = 2.20.02 +# Skip manpages as they are also in CSWperldoc. See +# https://www.opencsw.org/mantis/view.php?id=4571 +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3\/.* .*\/man\/man1\/.* include gar/category.mk Modified: csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/checksums 2010-10-06 19:37:51 UTC (rev 11183) +++ csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/checksums 2010-10-06 19:52:06 UTC (rev 11184) @@ -1 +1 @@ -96446b90880defc2200a8acfb9a6dfb8 download/ExtUtils-ParseXS-2.2002.tar.gz +5a78d0c4654c6b50e7c87da8b671e8a6 ExtUtils-ParseXS-2.2206.tar.gz Added: csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/files/COPYING 2010-10-06 19:52:06 UTC (rev 11184) @@ -0,0 +1,9 @@ + Copyright 2002-2009 by Ken Williams, David Golden and other + contributors. All rights reserved. + + This library is free software; you can redistribute it and/or modify it + under the same terms as Perl itself. + + Based on the ExtUtils::xsubpp code by Larry Wall and the Perl 5 Porters, + which was released under the same license terms. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 6 21:52:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Oct 2010 19:52:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[11185] csw/mgar/pkg/cpan/Module-Pluggable/trunk Message-ID: Revision: 11185 http://gar.svn.sourceforge.net/gar/?rev=11185&view=rev Author: dmichelsen Date: 2010-10-06 19:52:21 +0000 (Wed, 06 Oct 2010) Log Message: ----------- cpan/Module-Pluggable: Fix #4573 Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Pluggable/trunk/Makefile csw/mgar/pkg/cpan/Module-Pluggable/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Module-Pluggable/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Module-Pluggable/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Pluggable/trunk/Makefile 2010-10-06 19:52:06 UTC (rev 11184) +++ csw/mgar/pkg/cpan/Module-Pluggable/trunk/Makefile 2010-10-06 19:52:21 UTC (rev 11185) @@ -12,9 +12,15 @@ those into class names. Optionally it instantiates those classes for you. endef +DISTFILES = COPYING + PACKAGES = CSWpmmoduleplug CATALOGNAME = pm_moduleplug ARCHALL = 1 +# Skip manpages as they are also in CSWperldoc. See +# https://www.opencsw.org/mantis/view.php?id=4573 +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3\/.* .*\/man\/man1\/.* + include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Pluggable/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Pluggable/trunk/checksums 2010-10-06 19:52:06 UTC (rev 11184) +++ csw/mgar/pkg/cpan/Module-Pluggable/trunk/checksums 2010-10-06 19:52:21 UTC (rev 11185) @@ -1 +1 @@ -e2410a59c917f44c1de9a816f0492985 download/Module-Pluggable-3.9.tar.gz +e2410a59c917f44c1de9a816f0492985 Module-Pluggable-3.9.tar.gz Added: csw/mgar/pkg/cpan/Module-Pluggable/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Module-Pluggable/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Module-Pluggable/trunk/files/COPYING 2010-10-06 19:52:21 UTC (rev 11185) @@ -0,0 +1,4 @@ + Copyright, 2006 Simon Wistow + + Distributed under the same terms as Perl itself. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 7 03:35:28 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Oct 2010 01:35:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[11186] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11186 http://gar.svn.sourceforge.net/gar/?rev=11186&view=rev Author: bdwalton Date: 2010-10-07 01:35:27 +0000 (Thu, 07 Oct 2010) Log Message: ----------- apache2: clean up httpd.conf processing; enable 2 includes to match previous package version defaults Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-06 19:52:21 UTC (rev 11185) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-07 01:35:27 UTC (rev 11186) @@ -275,8 +275,14 @@ post-merge: @(cd $(PKGROOT)/$(prefix)/apache2/etc/; \ for f in httpd.conf extra/httpd-ssl.conf; do \ - perl -pi -e 's/User.*daemon.*/User \@USER\@/; s/Group.*daemon.*/Group \@GROUP\@/; s/#ServerName www.example.com:80/ServerName \@HOSTNAME\@:80/; s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; s/^(LoadModule.*suexec.*)/#$$1/' $$f; \ - mv $$f $$f.CSW; \ + perl -pi -e 's/User.*daemon.*/User \@USER\@/; \ + s/Group.*daemon.*/Group \@GROUP\@/; \ + s/#ServerName www.example.com:80/ServerName \@HOSTNAME\@:80/; \ + s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; \ + s/^(LoadModule.*suexec.*)/#$$1/; \ + s/^#(Include.*httpd-mpm.conf)/$$1/; \ + s/^#(Include.*httpd-ssl.conf)/$$1/' $$f; \ + mv $$f $$f.CSW; \ done ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 7 04:27:33 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Oct 2010 02:27:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11187] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11187 http://gar.svn.sourceforge.net/gar/?rev=11187&view=rev Author: bdwalton Date: 2010-10-07 02:27:33 +0000 (Thu, 07 Oct 2010) Log Message: ----------- apache2: make config processing generic enough to handle ssl.conf too Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-07 01:35:27 UTC (rev 11186) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-07 02:27:33 UTC (rev 11187) @@ -277,7 +277,7 @@ for f in httpd.conf extra/httpd-ssl.conf; do \ perl -pi -e 's/User.*daemon.*/User \@USER\@/; \ s/Group.*daemon.*/Group \@GROUP\@/; \ - s/#ServerName www.example.com:80/ServerName \@HOSTNAME\@:80/; \ + s/#*ServerName www.example.com/ServerName \@HOSTNAME\@/; \ s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; \ s/^(LoadModule.*suexec.*)/#$$1/; \ s/^#(Include.*httpd-mpm.conf)/$$1/; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 7 05:16:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 07 Oct 2010 03:16:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11188] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11188 http://gar.svn.sourceforge.net/gar/?rev=11188&view=rev Author: wahwah Date: 2010-10-07 03:16:32 +0000 (Thu, 07 Oct 2010) Log Message: ----------- mGAR v2: submitpkg, fixed a bug in the interaction of ParseVersionString and submitpkg, where submitpkg expected hashable elements only, and ParseVersionString would return a extra_strings as a list. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-07 02:27:33 UTC (rev 11187) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-07 03:16:32 UTC (rev 11188) @@ -150,6 +150,7 @@ } return data + def ParseVersionString(s): version_bits = re.split("_|,", s) version_str = version_bits[0] @@ -170,6 +171,10 @@ if not "extra_strings" in revision_info: revision_info["extra_strings"] = [] revision_info["extra_strings"].append(version_bit) + # Bits of parsed version must be hashable; especially extra_strings in + # revision_info. + if "extra_strings" in revision_info: + revision_info["extra_strings"] = tuple(revision_info["extra_strings"]) return version_str, version_info, revision_info Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-10-07 02:27:33 UTC (rev 11187) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-10-07 03:16:32 UTC (rev 11188) @@ -174,11 +174,28 @@ def test_Empty(self): data = "" - opencsw.ParseVersionString(data) expected = ('', {'major version': ''}, {}) self.assertEqual(expected, opencsw.ParseVersionString(data)) + def testExtraStringsHashable(self): + data = "2.7,REV=2009.06.18_STABLE6" + expected = ( + '2.7', + { + 'minor version': '7', + 'major version': '2'}, + { + # Here's the important bit: all parts of the parsed version + # must be hashable for submitpkg to work. + 'extra_strings': ('STABLE6',), + 'REV': '2009.06.18', + } + ) + result = opencsw.ParseVersionString(data) + hash(result[2]['extra_strings']) + self.assertEqual(expected, opencsw.ParseVersionString(data)) + class UpgradeTypeTest(unittest.TestCase): def testUpgradeType_1(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 7 11:08:08 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 Oct 2010 09:08:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11189] csw/mgar/pkg/cpan/version/trunk Message-ID: Revision: 11189 http://gar.svn.sourceforge.net/gar/?rev=11189&view=rev Author: bonivart Date: 2010-10-07 09:08:08 +0000 (Thu, 07 Oct 2010) Log Message: ----------- pm_version: update to 0.82, remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/version/trunk/Makefile csw/mgar/pkg/cpan/version/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/version/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/version/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/version/trunk/Makefile 2010-10-07 03:16:32 UTC (rev 11188) +++ csw/mgar/pkg/cpan/version/trunk/Makefile 2010-10-07 09:08:08 UTC (rev 11189) @@ -1,5 +1,5 @@ GARNAME = version -GARVERSION = 0.80 +GARVERSION = 0.82 CATEGORIES = cpan AUTHOR = JPEACOCK @@ -10,7 +10,11 @@ 5.10.0. endef +DISTFILES += COPYING + PACKAGES = CSWpmversion CATALOGNAME = pm_version +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* + include gar/category.mk Modified: csw/mgar/pkg/cpan/version/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/version/trunk/checksums 2010-10-07 03:16:32 UTC (rev 11188) +++ csw/mgar/pkg/cpan/version/trunk/checksums 2010-10-07 09:08:08 UTC (rev 11189) @@ -1 +1 @@ -0add2a0132d582ad81d62b4e38fd3f92 version-0.80.tar.gz +c073f079557297003d805b535711c5d1 version-0.82.tar.gz Added: csw/mgar/pkg/cpan/version/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/version/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/version/trunk/files/COPYING 2010-10-07 09:08:08 UTC (rev 11189) @@ -0,0 +1,5 @@ +COPYRIGHT AND LICENCE + +This module can be distributed under the same terms as Perl. + +Copyright (C) 2004-2009 John Peacock This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 7 11:24:14 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 Oct 2010 09:24:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[11190] csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk Message-ID: Revision: 11190 http://gar.svn.sourceforge.net/gar/?rev=11190&view=rev Author: bonivart Date: 2010-10-07 09:24:14 +0000 (Thu, 07 Oct 2010) Log Message: ----------- pm_compressrawbz2: update to 2.031, remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile 2010-10-07 09:08:08 UTC (rev 11189) +++ csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile 2010-10-07 09:24:14 UTC (rev 11190) @@ -1,15 +1,19 @@ GARNAME = Compress-Raw-Bzip2 -GARVERSION = 2.024 +GARVERSION = 2.031 CATEGORIES = cpan AUTHOR = PMQS -DESCRIPTION = Provides the interface to the bzip2 library +DESCRIPTION = Low-Level Interface to bzip2 compression library define BLURB Compress-Raw-Bzip2 provides the interface to the bzip2 library for the modules IO::Compress::Bzip2 and IO::Compress::Bunzip2. endef +DISTFILES += COPYING + PACKAGES = CSWpmcompressrawbz2 CATALOGNAME = pm_compressrawbz2 +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* + include gar/category.mk Modified: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums 2010-10-07 09:08:08 UTC (rev 11189) +++ csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums 2010-10-07 09:24:14 UTC (rev 11190) @@ -1 +1 @@ -b95582de2ed635e7f44de302accc879a Compress-Raw-Bzip2-2.024.tar.gz +40d5c14d43e5615a820d054af55f4d25 Compress-Raw-Bzip2-2.031.tar.gz Added: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/files/COPYING 2010-10-07 09:24:14 UTC (rev 11190) @@ -0,0 +1,3 @@ + Copyright (c) 2005-2010 Paul Marquess. All rights reserved. + This program is free software; you can redistribute it + and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 7 14:30:12 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 Oct 2010 12:30:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[11191] csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk Message-ID: Revision: 11191 http://gar.svn.sourceforge.net/gar/?rev=11191&view=rev Author: bonivart Date: 2010-10-07 12:30:11 +0000 (Thu, 07 Oct 2010) Log Message: ----------- pm_compressrawzlib: update to 2.030, remove man pages Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2010-10-07 09:24:14 UTC (rev 11190) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2010-10-07 12:30:11 UTC (rev 11191) @@ -1,5 +1,5 @@ GARNAME = Compress-Raw-Zlib -GARVERSION = 2.024 +GARVERSION = 2.030 CATEGORIES = cpan AUTHOR = PMQS @@ -9,9 +9,13 @@ compression library. endef -RUNTIME_DEP_PKGS = CSWzlib +DISTFILES += COPYING CATALOGNAME = pm_compressrawzlib PACKAGES = CSWpmcompressrawzlib +RUNTIME_DEP_PKGS += CSWzlib + +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* + include gar/category.mk Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums 2010-10-07 09:24:14 UTC (rev 11190) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums 2010-10-07 12:30:11 UTC (rev 11191) @@ -1 +1 @@ -5b637dbb36955b13db261f049fe529d9 Compress-Raw-Zlib-2.024.tar.gz +35111348ee481deef95aaf804b8fbd4b Compress-Raw-Zlib-2.030.tar.gz Added: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/COPYING 2010-10-07 12:30:11 UTC (rev 11191) @@ -0,0 +1,3 @@ + Copyright (c) 2005-2010 Paul Marquess. All rights reserved. + This program is free software; you can redistribute it + and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Oct 7 16:22:27 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 07 Oct 2010 14:22:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[11192] csw/mgar/pkg/tomcat6/branches/ihsan/ Message-ID: Revision: 11192 http://gar.svn.sourceforge.net/gar/?rev=11192&view=rev Author: idogan23 Date: 2010-10-07 14:22:27 +0000 (Thu, 07 Oct 2010) Log Message: ----------- tomcat6: new branch Added Paths: ----------- csw/mgar/pkg/tomcat6/branches/ihsan/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 7 17:16:11 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 Oct 2010 15:16:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[11193] csw/mgar/pkg/pkgutil/trunk/Makefile Message-ID: Revision: 11193 http://gar.svn.sourceforge.net/gar/?rev=11193&view=rev Author: bonivart Date: 2010-10-07 15:16:10 +0000 (Thu, 07 Oct 2010) Log Message: ----------- pkgutil: revert to older gar to support solaris 8 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2010-10-07 14:22:27 UTC (rev 11192) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2010-10-07 15:16:10 UTC (rev 11193) @@ -1,3 +1,6 @@ +# Do not update gar, new gar doesn't work on sol8! If removed, recreate with: +# svn co -r 9999 https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 gar + GARNAME = pkgutil GARVERSION = 2.2b1 CATEGORIES = utils This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 8 03:59:43 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 08 Oct 2010 01:59:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11194] csw/mgar/pkg/apache2/trunk/files/CSWapache2. postinstall Message-ID: Revision: 11194 http://gar.svn.sourceforge.net/gar/?rev=11194&view=rev Author: bdwalton Date: 2010-10-08 01:59:42 +0000 (Fri, 08 Oct 2010) Log Message: ----------- apache2: generate a dummy ssl cert if required so that mod_ssl doesn't prevent startup in fresh install Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-10-07 15:16:10 UTC (rev 11193) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-10-08 01:59:42 UTC (rev 11194) @@ -1,6 +1,7 @@ #!/bin/sh -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +ROOT=${PKG_INSTALL_ROOT:-/} +CSW_PREFIX=${ROOT}/opt/csw AP2_PREFIX=$CSW_PREFIX/apache2 AP2_BINDIR=$AP2_PREFIX/sbin AP2_LIBEXEC=$AP2_PREFIX/libexec @@ -72,4 +73,9 @@ fi done +if [ ! -f $AP2_CONFDIR/server.crt -a ! -f $AP2_CONFDIR/server.key ]; then + echo Generating dummy ssl key and certificate... + chroot ${ROOT} perl -e 'print "TS\nWestfarthing\nHobbiton\n\n\nBilbo Baggins\nbilbo at example.net\n\n\n";' | chroot ${ROOT} openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -keyout /opt/csw/apache2/etc/server.key -out /opt/csw/apache2/etc/server.crt >/dev/null 2>&1 +fi + exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 8 04:09:51 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 08 Oct 2010 02:09:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[11195] csw/mgar/pkg/apache2/trunk/files/CSWapache2. postinstall Message-ID: Revision: 11195 http://gar.svn.sourceforge.net/gar/?rev=11195&view=rev Author: bdwalton Date: 2010-10-08 02:09:51 +0000 (Fri, 08 Oct 2010) Log Message: ----------- apache2: set a tight umask before creating dummy ssl cert in apache2 postinstall Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-10-08 01:59:42 UTC (rev 11194) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-10-08 02:09:51 UTC (rev 11195) @@ -75,6 +75,8 @@ if [ ! -f $AP2_CONFDIR/server.crt -a ! -f $AP2_CONFDIR/server.key ]; then echo Generating dummy ssl key and certificate... + # this is likely overkill for a dummy cert, but why not + umask 0077 chroot ${ROOT} perl -e 'print "TS\nWestfarthing\nHobbiton\n\n\nBilbo Baggins\nbilbo at example.net\n\n\n";' | chroot ${ROOT} openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -keyout /opt/csw/apache2/etc/server.key -out /opt/csw/apache2/etc/server.crt >/dev/null 2>&1 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Oct 8 10:07:31 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 08 Oct 2010 08:07:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[11196] csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile Message-ID: Revision: 11196 http://gar.svn.sourceforge.net/gar/?rev=11196&view=rev Author: bonivart Date: 2010-10-08 08:07:31 +0000 (Fri, 08 Oct 2010) Log Message: ----------- pm_logmsgsimple: remove pm_logmessage as dep Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile Modified: csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile 2010-10-08 02:09:51 UTC (rev 11195) +++ csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile 2010-10-08 08:07:31 UTC (rev 11196) @@ -15,8 +15,6 @@ CATALOGNAME = pm_logmsgsimple ARCHALL = 1 -RUNTIME_DEP_PKGS = CSWpmlogmessage - EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 9 00:09:59 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 08 Oct 2010 22:09:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11197] csw/mgar/pkg/apache2/trunk/files/CSWapache2. postinstall Message-ID: Revision: 11197 http://gar.svn.sourceforge.net/gar/?rev=11197&view=rev Author: bdwalton Date: 2010-10-08 22:09:58 +0000 (Fri, 08 Oct 2010) Log Message: ----------- apache2: tweak the way we drive openssl for cert generation; use bin instead of sbin for openssl Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-10-08 08:07:31 UTC (rev 11196) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-10-08 22:09:58 UTC (rev 11197) @@ -77,7 +77,18 @@ echo Generating dummy ssl key and certificate... # this is likely overkill for a dummy cert, but why not umask 0077 - chroot ${ROOT} perl -e 'print "TS\nWestfarthing\nHobbiton\n\n\nBilbo Baggins\nbilbo at example.net\n\n\n";' | chroot ${ROOT} openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -keyout /opt/csw/apache2/etc/server.key -out /opt/csw/apache2/etc/server.crt >/dev/null 2>&1 + set -x + cat </dev/null +TS +Westfarthing +Hobbiton + + +Bilbo Baggins +bilbo at example.net + + +EOF fi exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 9 00:43:01 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 08 Oct 2010 22:43:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[11198] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11198 http://gar.svn.sourceforge.net/gar/?rev=11198&view=rev Author: bdwalton Date: 2010-10-08 22:43:01 +0000 (Fri, 08 Oct 2010) Log Message: ----------- apache2: depend on openssl utils (for openssl cert gen in postinstall) Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-08 22:09:58 UTC (rev 11197) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-08 22:43:01 UTC (rev 11198) @@ -77,7 +77,7 @@ INCOMPATIBLE_PKGS_CSWapache2 = CSWapache2c -RUNTIME_DEP_PKGS_CSWapache2 += CSWexpat CSWiconv +RUNTIME_DEP_PKGS_CSWapache2 += CSWexpat CSWiconv CSWosslutils RUNTIME_DEP_PKGS_CSWapache2 += CSWoldaprt CSWosslrt CSWzlib RUNTIME_DEP_PKGS_CSWapache2 += CSWapr CSWapr-util CSWbdb48 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 9 01:03:08 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 08 Oct 2010 23:03:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11199] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11199 http://gar.svn.sourceforge.net/gar/?rev=11199&view=rev Author: bdwalton Date: 2010-10-08 23:03:07 +0000 (Fri, 08 Oct 2010) Log Message: ----------- apache2: forgot to checkpkg override openssl_utils deps Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-08 22:43:01 UTC (rev 11198) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-08 23:03:07 UTC (rev 11199) @@ -92,6 +92,7 @@ CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 9 02:49:26 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Oct 2010 00:49:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[11200] csw/mgar/pkg/apache2/trunk/files/CSWapache2. postinstall Message-ID: Revision: 11200 http://gar.svn.sourceforge.net/gar/?rev=11200&view=rev Author: bdwalton Date: 2010-10-09 00:49:26 +0000 (Sat, 09 Oct 2010) Log Message: ----------- apache2: postinstall: disable debug; use hostname in cert Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-10-08 23:03:07 UTC (rev 11199) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-10-09 00:49:26 UTC (rev 11200) @@ -8,6 +8,8 @@ AP2_CONFDIR=$AP2_PREFIX/etc AP2_EXTRADIR=$AP2_CONFDIR/extra + + UPGRADE_CONFIGS="\ httpd.conf \ ssl.conf \ @@ -16,6 +18,8 @@ " # Don't overwrite config if it exists warn_update=0 +# For use in config files and certificate generation +hostname=`hostname` echo "Checking configuration files:" for file in $UPGRADE_CONFIGS; do config=$AP2_CONFDIR/$file @@ -29,7 +33,6 @@ perl -i -plne 's#PidFile /var#PidFile var#' elif [ -f "$config.CSW" ]; then echo "Creating $config from template" - hostname=`hostname` sed -e s, at HOSTNAME@,$hostname,g \ -e s, at USER@,nobody,g \ -e s, at GROUP@,nobody,g \ @@ -77,14 +80,13 @@ echo Generating dummy ssl key and certificate... # this is likely overkill for a dummy cert, but why not umask 0077 - set -x - cat </dev/null + cat </dev/null 2>&1 TS Westfarthing Hobbiton -Bilbo Baggins +$hostname bilbo at example.net This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 9 04:34:21 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Oct 2010 02:34:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[11201] csw/mgar/pkg/libxslt/trunk Message-ID: Revision: 11201 http://gar.svn.sourceforge.net/gar/?rev=11201&view=rev Author: bdwalton Date: 2010-10-09 02:34:21 +0000 (Sat, 09 Oct 2010) Log Message: ----------- libxslt: forcefully disable symbol versioning until i can make the symbol map work Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2010-10-09 00:49:26 UTC (rev 11200) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2010-10-09 02:34:21 UTC (rev 11201) @@ -10,6 +10,7 @@ MASTER_SITES = ftp://xmlsoft.org/libxslt/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES += 0001-Forcefully-disable-version-script-use.patch PACKAGES = CSWlibxslt CSWlibxsltdevel CSWpylibxslt Added: csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch =================================================================== --- csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch (rev 0) +++ csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch 2010-10-09 02:34:21 UTC (rev 11201) @@ -0,0 +1,28 @@ +From ab7627feedff611e438f7a31fa27c7b0a8a3be96 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 9 Oct 2010 03:56:15 +0200 +Subject: [PATCH] Forcefully disable version script use. + +Signed-off-by: Ben Walton +--- + libxslt/Makefile.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libxslt/Makefile.in b/libxslt/Makefile.in +index 8cba338..c163255 100644 +--- a/libxslt/Makefile.in ++++ b/libxslt/Makefile.in +@@ -327,8 +327,8 @@ libxslt_la_SOURCES = \ + xsltwin32config.h.in \ + libxslt.h + +- at USE_VERSION_SCRIPT_FALSE@LIBXSLT_VERSION_SCRIPT = +- at USE_VERSION_SCRIPT_TRUE@LIBXSLT_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxslt.syms ++LIBXSLT_VERSION_SCRIPT = ++ + libxslt_la_LIBADD = $(EXTRA_LIBS) + libxslt_la_LDFLAGS = \ + $(WIN32_EXTRA_LDFLAGS) \ +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 9 14:49:45 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Oct 2010 12:49:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[11202] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 11202 http://gar.svn.sourceforge.net/gar/?rev=11202&view=rev Author: bdwalton Date: 2010-10-09 12:49:45 +0000 (Sat, 09 Oct 2010) Log Message: ----------- libxslt: add more deps for py_libxslt (thanks checkpkg!) Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2010-10-09 02:34:21 UTC (rev 11201) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2010-10-09 12:49:45 UTC (rev 11202) @@ -43,8 +43,15 @@ RUNTIME_DEP_PKGS_CSWlibxslt = CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib RUNTIME_DEP_PKGS_CSWlibxsltdevel = CSWlibxslt -RUNTIME_DEP_PKGS_CSWpylibxslt = CSWpython CSWlibxslt +RUNTIME_DEP_PKGS_CSWpylibxslt = CSWpython +RUNTIME_DEP_PKGS_CSWpylibxslt += CSWlibxslt +RUNTIME_DEP_PKGS_CSWpylibxslt += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpylibxslt += CSWzlib +RUNTIME_DEP_PKGS_CSWpylibxslt += CSWgpgerr +RUNTIME_DEP_PKGS_CSWpylibxslt += CSWgcrypt +RUNTIME_DEP_PKGS_CSWpylibxslt += CSWiconv + PKGFILES_CSWlibxsltdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibxsltdevel += $(docdir)/libxslt-$(GARVERSION)/.* PKGFILES_CSWlibxsltdevel += $(libdir)/xsltConf.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 9 17:42:59 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Oct 2010 15:42:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11203] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 11203 http://gar.svn.sourceforge.net/gar/?rev=11203&view=rev Author: bdwalton Date: 2010-10-09 15:42:58 +0000 (Sat, 09 Oct 2010) Log Message: ----------- libxslt: rename CSWpylibxslt -> CSWpy-libxslt to conform to standards Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2010-10-09 12:49:45 UTC (rev 11202) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2010-10-09 15:42:58 UTC (rev 11203) @@ -12,16 +12,18 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES += 0001-Forcefully-disable-version-script-use.patch -PACKAGES = CSWlibxslt CSWlibxsltdevel CSWpylibxslt +PACKAGES = CSWlibxslt CSWlibxsltdevel CSWpy-libxslt +INCOMPATIBLE_PKGS_CSWpy-libxslt = CSWpylibxslt + CATALOGNAME_CSWlibxsltdevel = libxslt_devel -CATALOGNAME_CSWpylibxslt = py_libxslt +CATALOGNAME_CSWpy-libxslt = py_libxslt BUILD_DEP_PKGS = CSWlibxml2 CSWlibxml2devel SPKG_DESC_CSWlibxslt = XSLT engine runtime package SPKG_DESC_CSWlibxsltdevel = XSLT engine development package -SPKG_DESC_CSWpylibxslt = XSLT engine python package +SPKG_DESC_CSWpy-libxslt = XSLT engine python package SPKG_SOURCEURL = http://xmlsoft.org/XSLT/ TEST_TARGET = check @@ -43,22 +45,22 @@ RUNTIME_DEP_PKGS_CSWlibxslt = CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib RUNTIME_DEP_PKGS_CSWlibxsltdevel = CSWlibxslt -RUNTIME_DEP_PKGS_CSWpylibxslt = CSWpython -RUNTIME_DEP_PKGS_CSWpylibxslt += CSWlibxslt -RUNTIME_DEP_PKGS_CSWpylibxslt += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWpylibxslt += CSWzlib -RUNTIME_DEP_PKGS_CSWpylibxslt += CSWgpgerr -RUNTIME_DEP_PKGS_CSWpylibxslt += CSWgcrypt -RUNTIME_DEP_PKGS_CSWpylibxslt += CSWiconv +RUNTIME_DEP_PKGS_CSWpy-libxslt = CSWpython +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWzlib +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgpgerr +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgcrypt +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWiconv PKGFILES_CSWlibxsltdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibxsltdevel += $(docdir)/libxslt-$(GARVERSION)/.* PKGFILES_CSWlibxsltdevel += $(libdir)/xsltConf.sh PKGFILES_CSWlibxsltdevel += $(call isadirs,$(libdir),xsltConf.sh) -PKGFILES_CSWpylibxslt = $(libdir)/python.* -PKGFILES_CSWpylibxslt += $(docdir)/libxslt-python-$(GARVERSION)/.* +PKGFILES_CSWpy-libxslt = $(libdir)/python.* +PKGFILES_CSWpy-libxslt += $(docdir)/libxslt-python-$(GARVERSION)/.* -CHECKPKG_OVERRIDES = symbol-not-found|libxsltmod.so +CHECKPKG_OVERRIDES_CSWlibxsltdevel += surplus-dependency|CSWlibxslt include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Oct 9 17:51:44 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Oct 2010 15:51:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[11204] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 11204 http://gar.svn.sourceforge.net/gar/?rev=11204&view=rev Author: bdwalton Date: 2010-10-09 15:51:43 +0000 (Sat, 09 Oct 2010) Log Message: ----------- libxslt: better make top package I with pylibxslt to force people to notice and update to proper name Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2010-10-09 15:42:58 UTC (rev 11203) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2010-10-09 15:51:43 UTC (rev 11204) @@ -15,6 +15,7 @@ PACKAGES = CSWlibxslt CSWlibxsltdevel CSWpy-libxslt INCOMPATIBLE_PKGS_CSWpy-libxslt = CSWpylibxslt +INCOMPATIBLE_PKGS_CSWlibxslt = CSWpylibxslt CATALOGNAME_CSWlibxsltdevel = libxslt_devel CATALOGNAME_CSWpy-libxslt = py_libxslt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 10 00:26:20 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Oct 2010 22:26:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[11205] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 11205 http://gar.svn.sourceforge.net/gar/?rev=11205&view=rev Author: bdwalton Date: 2010-10-09 22:26:20 +0000 (Sat, 09 Oct 2010) Log Message: ----------- libxslt: turn on pycompile support Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2010-10-09 15:51:43 UTC (rev 11204) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2010-10-09 22:26:20 UTC (rev 11205) @@ -43,6 +43,7 @@ BUILD64 = 1 NOISAEXEC = 1 STRIP_LIBTOOL = 1 +PYCOMPILE = 1 RUNTIME_DEP_PKGS_CSWlibxslt = CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib RUNTIME_DEP_PKGS_CSWlibxsltdevel = CSWlibxslt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 10 01:29:10 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Oct 2010 23:29:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11206] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 11206 http://gar.svn.sourceforge.net/gar/?rev=11206&view=rev Author: bdwalton Date: 2010-10-09 23:29:10 +0000 (Sat, 09 Oct 2010) Log Message: ----------- gar/v2: update default _PYCOMPILE_FILES for new python dir Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-10-09 22:26:20 UTC (rev 11205) +++ csw/mgar/gar/v2/gar.mk 2010-10-09 23:29:10 UTC (rev 11206) @@ -738,7 +738,7 @@ # Support for cswpycompile, skip pre-compiled python files (.pyc, .pyo) # during the merge phase. -_PYCOMPILE_FILES = /opt/csw/lib/python/site-packages/.*\.py +_PYCOMPILE_FILES = /opt/csw/lib/python2.6/site-packages/.*\.py MERGE_EXCLUDE_PYCOMPILE ?= $(if $(PYCOMPILE), $(addsuffix c,$(_PYCOMPILE_FILES)) $(addsuffix o,$(_PYCOMPILE_FILES))) MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From larstobi at users.sourceforge.net Sun Oct 10 02:33:45 2010 From: larstobi at users.sourceforge.net (larstobi at users.sourceforge.net) Date: Sun, 10 Oct 2010 00:33:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[11207] csw/mgar/pkg/puppet/branches/puppet-2.6.x/trunk/ Message-ID: Revision: 11207 http://gar.svn.sourceforge.net/gar/?rev=11207&view=rev Author: larstobi Date: 2010-10-10 00:33:45 +0000 (Sun, 10 Oct 2010) Log Message: ----------- Create branch 2.6.x Added Paths: ----------- csw/mgar/pkg/puppet/branches/puppet-2.6.x/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From larstobi at users.sourceforge.net Sun Oct 10 02:51:08 2010 From: larstobi at users.sourceforge.net (larstobi at users.sourceforge.net) Date: Sun, 10 Oct 2010 00:51:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11208] csw/mgar/pkg/puppet/branches/puppet-2.6.x/trunk/ Message-ID: Revision: 11208 http://gar.svn.sourceforge.net/gar/?rev=11208&view=rev Author: larstobi Date: 2010-10-10 00:51:08 +0000 (Sun, 10 Oct 2010) Log Message: ----------- Branch puppet-2.6.x already existed. Removed Paths: ------------- csw/mgar/pkg/puppet/branches/puppet-2.6.x/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:31:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:31:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[11209] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11209 http://gar.svn.sourceforge.net/gar/?rev=11209&view=rev Author: wahwah Date: 2010-10-10 20:31:00 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: Added a check for packages with shared libraries. The message still needs some work. Here's the original discussion: http://lists.opencsw.org/pipermail/maintainers/2010-September/012752.html Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 00:51:08 UTC (rev 11208) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:31:00 UTC (rev 11209) @@ -21,6 +21,7 @@ import textwrap import dependency_checks as depchecks import configuration as c +import sharedlib_utils as su from Cheetah import Template PATHS_ALLOWED_ONLY_IN = { @@ -737,7 +738,7 @@ "or is not allowed for other reasons." % pkgname) -def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger, messenger): +def GetSharedLibs(pkg_data): # Finding all shared libraries shared_libs = [] for metadata in pkg_data["files_metadata"]: @@ -745,7 +746,11 @@ # TODO: Find out where mime_type is missing and why if "sharedlib" in metadata["mime_type"]: shared_libs.append(metadata["path"]) - shared_libs = set(shared_libs) + return shared_libs + + +def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger, messenger): + shared_libs = set(GetSharedLibs(pkg_data)) for binary_info in pkg_data["binaries_dump_info"]: for soname in binary_info["needed sonames"]: if (binary_info["path"] in shared_libs @@ -996,3 +1001,30 @@ file_metadata["path"], pkginfo_arch, machine["type"])) + + +def CheckSharedLibraryNamingPolicy(pkg_data, error_mgr, logger, messenger): + placement_re = re.compile("/opt/csw/lib") + pkgname = pkg_data["basic_stats"]["pkgname"] + shared_libs = set(GetSharedLibs(pkg_data)) + for binary_info in pkg_data["binaries_dump_info"]: + if binary_info["path"] in shared_libs: + if su.IsLibraryLinkable(binary_info["path"]): + # It is a shared library and other projects might link to it. + if "soname" in binary_info and binary_info["soname"]: + soname = binary_info["soname"] + else: + soname = os.path.split(binary_info["path"])[1] + tmp = su.MakePackageNameBySoname(soname) + policy_pkgname_list, policy_catalogname_list = tmp + if pkgname not in policy_pkgname_list: + error_mgr.ReportError( + "shared-lib-wrong-pkgname", + "file=%s pkgname=%s expected=%s" + % (binary_info["path"], pkgname, policy_pkgname_list)) + messenger.OneTimeMessage( + soname, + "Shared libraries that other software might link " + "to, need to be separated out into own packages. " + "In this case, the suggested package names are %s." + % policy_pkgname_list) Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 00:51:08 UTC (rev 11208) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:31:00 UTC (rev 11209) @@ -1314,5 +1314,27 @@ 'file=opt/csw/lib/sparcv9/libneon.so.26.0.4 pkginfo-says=i386 actual-binary=sparc') +class TestCheckSharedLibraryNamingPolicy(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckSharedLibraryNamingPolicy' + def CheckpkgTest(self): + self.pkg_data = neon_stats[0] + self.error_mgr_mock.ReportError( + 'shared-lib-wrong-pkgname', + "file=opt/csw/lib/libneon.so.26.0.4 pkgname=CSWneon " + "expected=['CSWlibneon26', 'CSWlibneon-26']") + self.error_mgr_mock.ReportError( + 'shared-lib-wrong-pkgname', + "file=opt/csw/lib/libneon.so.27.2.0 pkgname=CSWneon " + "expected=['CSWlibneon27', 'CSWlibneon-27']") + self.error_mgr_mock.ReportError( + 'shared-lib-wrong-pkgname', + "file=opt/csw/lib/sparcv9/libneon.so.26.0.4 pkgname=CSWneon " + "expected=['CSWlibneon26', 'CSWlibneon-26']") + self.error_mgr_mock.ReportError( + 'shared-lib-wrong-pkgname', + "file=opt/csw/lib/sparcv9/libneon.so.27.2.0 pkgname=CSWneon " + "expected=['CSWlibneon27', 'CSWlibneon-27']") + + if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py (rev 0) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:31:00 UTC (rev 11209) @@ -0,0 +1,25 @@ +import re +import os.path + +def IsLibraryLinkable(file_path): + linkable_re = re.compile(r"^opt/csw(/[\w\.]+)*/lib(/[\w\+]+)?$") + file_dir, file_basename = os.path.split(file_path) + return bool(linkable_re.match(file_dir)) + +def MakePackageNameBySoname(soname): + """Find the package name based on the soname. + + Returns a pair of pkgname, catalogname. + """ + soname_re = re.compile(r"(?P[\w-]+)\.so\.(?P\d+)(\..*)?$") + m = soname_re.match(soname) + keywords = m.groupdict() + pkgname_list = [ + "CSW%(basename)s%(version)s" % keywords, + "CSW%(basename)s-%(version)s" % keywords, + ] + catalogname_list = [ + "%(basename)s%(version)s" % keywords, + "%(basename)s-%(version)s" % keywords, + ] + return pkgname_list, catalogname_list Added: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py (rev 0) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:31:00 UTC (rev 11209) @@ -0,0 +1,62 @@ +#!opt/csw/bin/python2.6 +# $Id$ + +import re +import unittest +import mox +import sharedlib_utils as su + +class UtilitiesUnitTest(unittest.TestCase): + + def testIsLibraryLinkableTrue(self): + p = "opt/csw/lib/libfoo.so.0.2" + self.assertTrue(su.IsLibraryLinkable(p)) + + def testIsLibraryLinkableNeonTrue(self): + p = "opt/csw/lib/libneon.so.26.0.4" + self.assertTrue(su.IsLibraryLinkable(p)) + + def testIsLibraryLinkableSparc(self): + p = "opt/csw/lib/sparcv9/libfoo.so.0.2" + self.assertEqual(True, su.IsLibraryLinkable(p)) + + def testIsLibraryLinkableSparcPlusVis(self): + p = "opt/csw/lib/sparcv9+vis/libfoo.so.0.2" + self.assertEqual(True, su.IsLibraryLinkable(p)) + + def testIsLibraryLinkableAmd64(self): + p = "opt/csw/lib/amd64/libfoo.so.0.2" + self.assertTrue(su.IsLibraryLinkable(p)) + + def testIsLibraryLinkablePrefix(self): + p = "opt/csw/customprefix/lib/libfoo.so.0.2" + self.assertTrue(su.IsLibraryLinkable(p)) + + def testIsLibraryLinkableLibexecFalse(self): + p = "opt/csw/libexec/bar" + self.assertEqual(False, su.IsLibraryLinkable(p)) + + def testIsLibraryLinkableFalse(self): + p = "opt/csw/share/bar" + self.assertEqual(False, su.IsLibraryLinkable(p)) + + def testMakePackageNameBySonameSimple(self): + soname = "libfoo.so.0" + expected = ( + ["CSWlibfoo0", "CSWlibfoo-0"], + ["libfoo0", "libfoo-0"], + ) + self.assertEqual(expected, su.MakePackageNameBySoname(soname)) + + def testMakePackageNameBySonameApr(self): + soname = "libapr-1.so.0" + expected = ( + ['CSWlibapr-10', 'CSWlibapr-1-0'], + ['libapr-10', 'libapr-1-0'] + ) + self.assertEqual(expected, + su.MakePackageNameBySoname(soname)) + + +if __name__ == '__main__': + unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:31:29 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:31:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[11210] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11210 http://gar.svn.sourceforge.net/gar/?rev=11210&view=rev Author: wahwah Date: 2010-10-10 20:31:29 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: Refactoring, moving a function from one module to another. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/sharedlib_utils.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:31:00 UTC (rev 11209) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:31:29 UTC (rev 11210) @@ -738,19 +738,8 @@ "or is not allowed for other reasons." % pkgname) -def GetSharedLibs(pkg_data): - # Finding all shared libraries - shared_libs = [] - for metadata in pkg_data["files_metadata"]: - if "mime_type" in metadata and metadata["mime_type"]: - # TODO: Find out where mime_type is missing and why - if "sharedlib" in metadata["mime_type"]: - shared_libs.append(metadata["path"]) - return shared_libs - - def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger, messenger): - shared_libs = set(GetSharedLibs(pkg_data)) + shared_libs = set(su.GetSharedLibs(pkg_data)) for binary_info in pkg_data["binaries_dump_info"]: for soname in binary_info["needed sonames"]: if (binary_info["path"] in shared_libs @@ -1006,7 +995,7 @@ def CheckSharedLibraryNamingPolicy(pkg_data, error_mgr, logger, messenger): placement_re = re.compile("/opt/csw/lib") pkgname = pkg_data["basic_stats"]["pkgname"] - shared_libs = set(GetSharedLibs(pkg_data)) + shared_libs = set(su.GetSharedLibs(pkg_data)) for binary_info in pkg_data["binaries_dump_info"]: if binary_info["path"] in shared_libs: if su.IsLibraryLinkable(binary_info["path"]): Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:31:00 UTC (rev 11209) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:31:29 UTC (rev 11210) @@ -1,3 +1,5 @@ +# $Id$ + import re import os.path @@ -23,3 +25,14 @@ "%(basename)s-%(version)s" % keywords, ] return pkgname_list, catalogname_list + + +def GetSharedLibs(pkg_data): + # Finding all shared libraries + shared_libs = [] + for metadata in pkg_data["files_metadata"]: + if "mime_type" in metadata and metadata["mime_type"]: + # TODO: Find out where mime_type is missing and why + if "sharedlib" in metadata["mime_type"]: + shared_libs.append(metadata["path"]) + return shared_libs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:31:59 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:31:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11211] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11211 http://gar.svn.sourceforge.net/gar/?rev=11211&view=rev Author: wahwah Date: 2010-10-10 20:31:59 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, added support for more soname cases, the new check can now process the whole catalog. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/sharedlib_utils.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Property Changed: ---------------- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:31:29 UTC (rev 11210) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:31:59 UTC (rev 11211) @@ -102,14 +102,6 @@ VENDORURL_RE = r"^(http|ftp)s?\://.+\..+$" BASE_BINARY_PATHS = ('bin', 'sbin', 'lib', 'libexec', 'cgi-bin') -SPARCV8_PATHS = ('sparcv8', 'sparcv8-fsmuld', - 'sparcv7', 'sparc') -SPARCV8PLUS_PATHS = ('sparcv8plus+vis2', 'sparcv8plus+vis', 'sparcv8plus') -SPARCV9_PATHS = ('sparcv9+vis2', 'sparcv9+vis', 'sparcv9') -INTEL_386_PATHS = ('pentium_pro+mmx', 'pentium_pro', - 'pentium+mmx', 'pentium', - 'i486', 'i386', 'i86') -AMD64_PATHS = ('amd64',) HACHOIR_MACHINES = { # id: (name, allowed_paths, disallowed_paths) -1: {"name": "Unknown", @@ -117,33 +109,33 @@ "type": "unknown"}, 2: {"name": "sparcv8", "type": opencsw.ARCH_SPARC, - "allowed": BASE_BINARY_PATHS + SPARCV8_PATHS, - "disallowed": SPARCV9_PATHS + INTEL_386_PATHS + AMD64_PATHS, + "allowed": BASE_BINARY_PATHS + su.SPARCV8_PATHS, + "disallowed": su.SPARCV9_PATHS + su.INTEL_386_PATHS + su.AMD64_PATHS, }, 3: {"name": "i386", "type": opencsw.ARCH_i386, - "allowed": BASE_BINARY_PATHS + INTEL_386_PATHS, - "disallowed": SPARCV8_PATHS + SPARCV8PLUS_PATHS + SPARCV9_PATHS + AMD64_PATHS, + "allowed": BASE_BINARY_PATHS + su.INTEL_386_PATHS, + "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + su.SPARCV9_PATHS + su.AMD64_PATHS, }, 6: {"name": "i486", "type": opencsw.ARCH_i386, - "allowed": INTEL_386_PATHS, - "disallowed": SPARCV8_PATHS + SPARCV8PLUS_PATHS + SPARCV9_PATHS + AMD64_PATHS, + "allowed": su.INTEL_386_PATHS, + "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + su.SPARCV9_PATHS + su.AMD64_PATHS, }, 18: {"name": "sparcv8+", "type": opencsw.ARCH_SPARC, - "allowed": SPARCV8PLUS_PATHS, - "disallowed": SPARCV8_PATHS + SPARCV9_PATHS + AMD64_PATHS + INTEL_386_PATHS, + "allowed": su.SPARCV8PLUS_PATHS, + "disallowed": su.SPARCV8_PATHS + su.SPARCV9_PATHS + su.AMD64_PATHS + su.INTEL_386_PATHS, }, 43: {"name": "sparcv9", "type": opencsw.ARCH_SPARC, - "allowed": SPARCV9_PATHS, - "disallowed": INTEL_386_PATHS + AMD64_PATHS, + "allowed": su.SPARCV9_PATHS, + "disallowed": su.INTEL_386_PATHS + su.AMD64_PATHS, }, 62: {"name": "amd64", "type": opencsw.ARCH_i386, - "allowed": AMD64_PATHS, - "disallowed": SPARCV8_PATHS + SPARCV8PLUS_PATHS + SPARCV9_PATHS, + "allowed": su.AMD64_PATHS, + "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + su.SPARCV9_PATHS, }, } @@ -1017,3 +1009,21 @@ "to, need to be separated out into own packages. " "In this case, the suggested package names are %s." % policy_pkgname_list) + +def CheckSharedLibraryPkgDoesNotHaveTheSoFile(pkg_data, error_mgr, logger, messenger): + """If it's a package with shared libraries, it should not contain the .so file. + + For example, libfoo.so.1 should not be in the same package as libfoo.so, + because the latter is used for linking during compilation, and the former is + a shared object that needs to be phased out at some point. + """ + placement_re = re.compile("/opt/csw/lib") + pkgname = pkg_data["basic_stats"]["pkgname"] + shared_libs = set(su.GetSharedLibs(pkg_data)) + if shared_libs: + # If the package contains shared libraries, it must not contain + # corrersponding .so files, which are used during linking. + pass + +def CheckPackagesWithHeaderFilesMustContainTheSoFile(pkg_data, error_mgr, logger, messenger): + pass Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:31:29 UTC (rev 11210) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:31:59 UTC (rev 11211) @@ -3,27 +3,78 @@ import re import os.path +SPARCV8_PATHS = ('sparcv8', 'sparcv8-fsmuld', + 'sparcv7', 'sparc') +SPARCV8PLUS_PATHS = ('sparcv8plus+vis2', 'sparcv8plus+vis', 'sparcv8plus') +SPARCV9_PATHS = ('sparcv9+vis2', 'sparcv9+vis', 'sparcv9') +INTEL_386_PATHS = ('pentium_pro+mmx', 'pentium_pro', + 'pentium+mmx', 'pentium', + 'i486', 'i386', 'i86') +AMD64_PATHS = ('amd64',) +LEGIT_CHAR_RE = re.compile(r"[a-zA-Z0-9\+]+") + +class SonameParsingException(Exception): + pass + def IsLibraryLinkable(file_path): - linkable_re = re.compile(r"^opt/csw(/[\w\.]+)*/lib(/[\w\+]+)?$") + arch_subdirs = (SPARCV8_PATHS + SPARCV8PLUS_PATHS + SPARCV9_PATHS + + INTEL_386_PATHS + AMD64_PATHS) + # Need to escape the plus signs because of the regex usage below. + arch_subdirs = [x.replace(r"+", r"\+") for x in arch_subdirs] + linkable_re = re.compile(r"^opt/csw(/[^\/]+)*/lib(/(%s))?$" + % "|".join(arch_subdirs)) file_dir, file_basename = os.path.split(file_path) return bool(linkable_re.match(file_dir)) + +def SanitizeWithChar(s, c): + parts = LEGIT_CHAR_RE.findall(s) + if "so" in parts: + parts.remove("so") + return c.join(parts).lower() + + def MakePackageNameBySoname(soname): """Find the package name based on the soname. Returns a pair of pkgname, catalogname. """ - soname_re = re.compile(r"(?P[\w-]+)\.so\.(?P\d+)(\..*)?$") + soname_re = re.compile(r"(?P[\w\+]+([\.\-]+[\w\+]+)*)" + r"\.so" + r"(\.(?P\d+)(\..*)?)?" + r"$") m = soname_re.match(soname) - keywords = m.groupdict() + if not m: + # There was no ".so" component, so it's hardo to figure out which one is + # the name, but we'll try to figure out the numeric part of the soname. + digits = "".join(re.findall(r"[0-9]+", soname)) + alnum = "".join(re.findall(r"[a-zA-Z]+", soname)) + parsed = { + "basename": alnum, + "version": digits, + } + else: + parsed = m.groupdict() + keywords_pkgname = {} + keywords_catalogname = {} + for key in parsed: + if parsed[key]: + keywords_pkgname[key] = SanitizeWithChar(parsed[key], "-") + keywords_catalogname[key] = SanitizeWithChar(parsed[key], "_") + else: + keywords_pkgname[key] = "" + keywords_catalogname[key] = "" pkgname_list = [ - "CSW%(basename)s%(version)s" % keywords, - "CSW%(basename)s-%(version)s" % keywords, + "CSW%(basename)s%(version)s" % keywords_pkgname, ] catalogname_list = [ - "%(basename)s%(version)s" % keywords, - "%(basename)s-%(version)s" % keywords, + "%(basename)s%(version)s" % keywords_catalogname, ] + if keywords_pkgname["version"]: + catalogname_list.append( + "%(basename)s_%(version)s" % keywords_catalogname) + pkgname_list.append( + "CSW%(basename)s-%(version)s" % keywords_pkgname) return pkgname_list, catalogname_list Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:31:29 UTC (rev 11210) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:31:59 UTC (rev 11211) @@ -1,4 +1,4 @@ -#!opt/csw/bin/python2.6 +#!/opt/csw/bin/python2.6 # $Id$ import re @@ -9,8 +9,7 @@ class UtilitiesUnitTest(unittest.TestCase): def testIsLibraryLinkableTrue(self): - p = "opt/csw/lib/libfoo.so.0.2" - self.assertTrue(su.IsLibraryLinkable(p)) + self.assertTrue(su.IsLibraryLinkable("opt/csw/lib/libfoo.so.0.2")) def testIsLibraryLinkableNeonTrue(self): p = "opt/csw/lib/libneon.so.26.0.4" @@ -21,12 +20,11 @@ self.assertEqual(True, su.IsLibraryLinkable(p)) def testIsLibraryLinkableSparcPlusVis(self): - p = "opt/csw/lib/sparcv9+vis/libfoo.so.0.2" + p = "opt/csw/lib/sparcv8plus+vis/libfoo.so.0.2" self.assertEqual(True, su.IsLibraryLinkable(p)) def testIsLibraryLinkableAmd64(self): - p = "opt/csw/lib/amd64/libfoo.so.0.2" - self.assertTrue(su.IsLibraryLinkable(p)) + self.assertTrue(su.IsLibraryLinkable("opt/csw/lib/amd64/libfoo.so.0.2")) def testIsLibraryLinkablePrefix(self): p = "opt/csw/customprefix/lib/libfoo.so.0.2" @@ -40,11 +38,15 @@ p = "opt/csw/share/bar" self.assertEqual(False, su.IsLibraryLinkable(p)) + def testIsLibraryLinkableSubdir(self): + p = "opt/csw/lib/gnucash/libgncmod-stylesheets.so.0.0.0" + self.assertEqual(False, su.IsLibraryLinkable(p)) + def testMakePackageNameBySonameSimple(self): soname = "libfoo.so.0" expected = ( ["CSWlibfoo0", "CSWlibfoo-0"], - ["libfoo0", "libfoo-0"], + ["libfoo0", "libfoo_0"], ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) @@ -52,11 +54,68 @@ soname = "libapr-1.so.0" expected = ( ['CSWlibapr-10', 'CSWlibapr-1-0'], - ['libapr-10', 'libapr-1-0'] + ['libapr_10', 'libapr_1_0'] ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) + def testMakePackageNameBySonameDot(self): + soname = "libbabl-0.1.so.0" + expected = ( + ['CSWlibbabl-0-10', 'CSWlibbabl-0-1-0'], + ['libbabl_0_10', 'libbabl_0_1_0'] + ) + self.assertEqual(expected, + su.MakePackageNameBySoname(soname)) + def testMakePackageNameBySonameMoreDot(self): + soname = "libgettextlib-0.14.1.so" + expected = ( + ['CSWlibgettextlib-0-14-1'], + ['libgettextlib_0_14_1'], + ) + self.assertEqual(expected, + su.MakePackageNameBySoname(soname)) + + def testMakePackageNameBySonameComplexApr(self): + soname = "libapr-1.so.10.0.0" + expected = ( + ['CSWlibapr-110', 'CSWlibapr-1-10'], + ['libapr_110', 'libapr_1_10'] + ) + self.assertEqual(expected, + su.MakePackageNameBySoname(soname)) + + def testMakePackageNameBySonamePlus(self): + soname = "libstdc++.so.6" + expected = ( + ['CSWlibstdc++6', 'CSWlibstdc++-6'], + ['libstdc++6', 'libstdc++_6'] + ) + self.assertEqual(expected, + su.MakePackageNameBySoname(soname)) + + def testMakePackageNameBySonamePlus(self): + soname = "libdnet.1" + expected = ( + ['CSWlibdnet1', 'CSWlibdnet-1'], + ['libdnet1', 'libdnet_1'] + ) + self.assertEqual(expected, + su.MakePackageNameBySoname(soname)) + + def testMakePackageNameUppercase(self): + soname = "libUpperCase.so.1" + expected = ( + ['CSWlibuppercase1', 'CSWlibuppercase-1'], + ['libuppercase1', 'libuppercase_1'] + ) + self.assertEqual(expected, + su.MakePackageNameBySoname(soname)) + + def testSanitizeWithChar(self): + self.assertEqual("foo_0", su.SanitizeWithChar("foo-0", "_")) + + if __name__ == '__main__': unittest.main() Property changes on: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:32:28 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:32:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[11212] csw/mgar/gar/v2/tests/run_tests.py Message-ID: Revision: 11212 http://gar.svn.sourceforge.net/gar/?rev=11212&view=rev Author: wahwah Date: 2010-10-10 20:32:28 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: Adding the shared lib utility module to the test set. Modified Paths: -------------- csw/mgar/gar/v2/tests/run_tests.py Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2010-10-10 20:31:59 UTC (rev 11211) +++ csw/mgar/gar/v2/tests/run_tests.py 2010-10-10 20:32:28 UTC (rev 11212) @@ -15,6 +15,7 @@ from tag_test import * from package_checks_test import * from dependency_checks_test import * +from sharedlib_utils_test import * # These are very slow GAR tests, which I'm disabling for now. # from example_test import * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:33:02 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:33:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[11213] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 11213 http://gar.svn.sourceforge.net/gar/?rev=11213&view=rev Author: wahwah Date: 2010-10-10 20:33:02 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: Added a check for packages with shared libraries. The message still needs some work. Here's the original discussion: http://lists.opencsw.org/pipermail/maintainers/2010-September/012752.html Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:32:28 UTC (rev 11212) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:33:02 UTC (rev 11213) @@ -1010,6 +1010,7 @@ "In this case, the suggested package names are %s." % policy_pkgname_list) + def CheckSharedLibraryPkgDoesNotHaveTheSoFile(pkg_data, error_mgr, logger, messenger): """If it's a package with shared libraries, it should not contain the .so file. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:33:30 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:33:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[11214] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11214 http://gar.svn.sourceforge.net/gar/?rev=11214&view=rev Author: wahwah Date: 2010-10-10 20:33:30 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, a better message about shared library package names. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:33:02 UTC (rev 11213) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:33:30 UTC (rev 11214) @@ -1000,17 +1000,23 @@ policy_pkgname_list, policy_catalogname_list = tmp if pkgname not in policy_pkgname_list: error_mgr.ReportError( - "shared-lib-wrong-pkgname", + "shared-lib-pkgname-mismatch", "file=%s pkgname=%s expected=%s" % (binary_info["path"], pkgname, policy_pkgname_list)) messenger.OneTimeMessage( soname, - "Shared libraries that other software might link " - "to, need to be separated out into own packages. " - "In this case, the suggested package names are %s." - % policy_pkgname_list) + "This shared library (%s) is in a directory indicating that it " + "is likely to be linked to by other programs. If this is the " + "case, the library is best packaged separately, in a package " + "with a library-specific name. Examples of such names include: " + "%s. If this library is not meant to be linked to by other " + "packages, it's best moved to a 'private' directory. " + "For example, instead of /opt/csw/lib/foo.so, " + "try /opt/csw/lib/projectname/foo.so." + % (binary_info["path"], policy_pkgname_list)) + def CheckSharedLibraryPkgDoesNotHaveTheSoFile(pkg_data, error_mgr, logger, messenger): """If it's a package with shared libraries, it should not contain the .so file. Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:33:02 UTC (rev 11213) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:33:30 UTC (rev 11214) @@ -1319,19 +1319,19 @@ def CheckpkgTest(self): self.pkg_data = neon_stats[0] self.error_mgr_mock.ReportError( - 'shared-lib-wrong-pkgname', + 'shared-lib-pkgname-mismatch', "file=opt/csw/lib/libneon.so.26.0.4 pkgname=CSWneon " "expected=['CSWlibneon26', 'CSWlibneon-26']") self.error_mgr_mock.ReportError( - 'shared-lib-wrong-pkgname', + 'shared-lib-pkgname-mismatch', "file=opt/csw/lib/libneon.so.27.2.0 pkgname=CSWneon " "expected=['CSWlibneon27', 'CSWlibneon-27']") self.error_mgr_mock.ReportError( - 'shared-lib-wrong-pkgname', + 'shared-lib-pkgname-mismatch', "file=opt/csw/lib/sparcv9/libneon.so.26.0.4 pkgname=CSWneon " "expected=['CSWlibneon26', 'CSWlibneon-26']") self.error_mgr_mock.ReportError( - 'shared-lib-wrong-pkgname', + 'shared-lib-pkgname-mismatch', "file=opt/csw/lib/sparcv9/libneon.so.27.2.0 pkgname=CSWneon " "expected=['CSWlibneon27', 'CSWlibneon-27']") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:34:01 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:34:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[11215] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11215 http://gar.svn.sourceforge.net/gar/?rev=11215&view=rev Author: wahwah Date: 2010-10-10 20:34:01 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: work towards the shared library separation policy. There's a failing unit test that requires more work. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/sharedlib_utils.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:33:30 UTC (rev 11214) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:34:01 UTC (rev 11215) @@ -985,7 +985,6 @@ def CheckSharedLibraryNamingPolicy(pkg_data, error_mgr, logger, messenger): - placement_re = re.compile("/opt/csw/lib") pkgname = pkg_data["basic_stats"]["pkgname"] shared_libs = set(su.GetSharedLibs(pkg_data)) for binary_info in pkg_data["binaries_dump_info"]: @@ -1024,13 +1023,34 @@ because the latter is used for linking during compilation, and the former is a shared object that needs to be phased out at some point. """ - placement_re = re.compile("/opt/csw/lib") pkgname = pkg_data["basic_stats"]["pkgname"] shared_libs = set(su.GetSharedLibs(pkg_data)) + shared_libs = filter(su.IsLibraryLinkable, shared_libs) if shared_libs: # If the package contains shared libraries, it must not contain # corrersponding .so files, which are used during linking. - pass + for entry in pkg_data["pkgmap"]: + if entry["path"]: + if entry["path"].endswith(".so") and entry["type"] == "s": + error_mgr.ReportError( + "shared-lib-package-contains-so-symlink", + "file=%s" % entry["path"]) + messenger.Message( + "The package contains shared libraries together with the " + "symlink of the form libfoo.so -> libfoo.so.1. " + "In this case: %s. " + "This kind of symlink should not be together with the shared " + "libraries; it is only used during compiling and linking. " + "The best practice " + "is to put the shared libraries into a separate package, and " + "the .so file together with the header files in the devel " + "package." % entry["path"]) + def CheckPackagesWithHeaderFilesMustContainTheSoFile(pkg_data, error_mgr, logger, messenger): + """Generated two kinds of messages: + + 1. Contains .h but not .so + 2. Contains .so but not .h + """ pass Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:33:30 UTC (rev 11214) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:34:01 UTC (rev 11215) @@ -1336,5 +1336,15 @@ "expected=['CSWlibneon27', 'CSWlibneon-27']") +class TestCheckSharedLibraryPkgDoesNotHaveTheSoFile(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckSharedLibraryPkgDoesNotHaveTheSoFile' + def CheckpkgTest(self): + self.pkg_data = neon_stats[0] + self.error_mgr_mock.ReportError( + 'shared-lib-package-contains-so-symlink', 'file=/opt/csw/lib/libneon.so') + self.error_mgr_mock.ReportError( + 'shared-lib-package-contains-so-symlink', 'file=/opt/csw/lib/sparcv9/libneon.so') + + if __name__ == '__main__': unittest.main() Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:33:30 UTC (rev 11214) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:34:01 UTC (rev 11215) @@ -21,7 +21,7 @@ + INTEL_386_PATHS + AMD64_PATHS) # Need to escape the plus signs because of the regex usage below. arch_subdirs = [x.replace(r"+", r"\+") for x in arch_subdirs] - linkable_re = re.compile(r"^opt/csw(/[^\/]+)*/lib(/(%s))?$" + linkable_re = re.compile(r"^opt/csw(/([^\/]+(?!lib)))*/lib(/(%s))?$" % "|".join(arch_subdirs)) file_dir, file_basename = os.path.split(file_path) return bool(linkable_re.match(file_dir)) Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:33:30 UTC (rev 11214) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:34:01 UTC (rev 11215) @@ -42,6 +42,11 @@ p = "opt/csw/lib/gnucash/libgncmod-stylesheets.so.0.0.0" self.assertEqual(False, su.IsLibraryLinkable(p)) + def testIsLibraryLinkablePrivateLib(self): + self.assertEqual(False, su.IsLibraryLinkable( + "opt/csw/lib/erlang/lib/megaco-3.6.0.1/priv/lib" + "/megaco_flex_scanner_drv_mt.so")) + def testMakePackageNameBySonameSimple(self): soname = "libfoo.so.0" expected = ( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:34:27 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:34:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[11216] csw/mgar/gar/v2/lib/python/opencsw.py Message-ID: Revision: 11216 http://gar.svn.sourceforge.net/gar/?rev=11216&view=rev Author: wahwah Date: 2010-10-10 20:34:27 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: A better error message when file has a wrong filename. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-10 20:34:01 UTC (rev 11215) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-10 20:34:27 UTC (rev 11216) @@ -488,7 +488,8 @@ self.gunzipped_path = self.pkg_path else: raise Error("The file name should end in either " - "%s or %s." % (gzip_suffix, pkg_suffix)) + "%s or %s, but it's %s." + % (gzip_suffix, pkg_suffix, repr(self.pkg_path))) return self.gunzipped_path def Pkgtrans(self, src_file, destdir, pkgname): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:34:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:34:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11217] csw/mgar/gar/v2/lib/python/sharedlib_utils.py Message-ID: Revision: 11217 http://gar.svn.sourceforge.net/gar/?rev=11217&view=rev Author: wahwah Date: 2010-10-10 20:34:52 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: Using blacklists to rule out some private shared objects. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:34:27 UTC (rev 11216) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:34:52 UTC (rev 11217) @@ -21,10 +21,19 @@ + INTEL_386_PATHS + AMD64_PATHS) # Need to escape the plus signs because of the regex usage below. arch_subdirs = [x.replace(r"+", r"\+") for x in arch_subdirs] - linkable_re = re.compile(r"^opt/csw(/([^\/]+(?!lib)))*/lib(/(%s))?$" + linkable_re = re.compile(r"^opt/csw(/([^\/]+))*/lib(/(%s))?$" % "|".join(arch_subdirs)) + blacklist = [ + # If it has two lib components, it's a private lib. + re.compile(r"^opt/csw/.*lib.*lib.*"), + ] file_dir, file_basename = os.path.split(file_path) - return bool(linkable_re.match(file_dir)) + if linkable_re.match(file_dir): + for regex in blacklist: + if regex.match(file_dir): + return False + return True + return False def SanitizeWithChar(s, c): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:35:20 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:35:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[11218] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11218 http://gar.svn.sourceforge.net/gar/?rev=11218&view=rev Author: wahwah Date: 2010-10-10 20:35:20 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, Libraries under /opt/csw/share are not linkable. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:34:52 UTC (rev 11217) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:35:20 UTC (rev 11218) @@ -26,6 +26,7 @@ blacklist = [ # If it has two lib components, it's a private lib. re.compile(r"^opt/csw/.*lib.*lib.*"), + re.compile(r"^opt/csw/share.*lib.*"), ] file_dir, file_basename = os.path.split(file_path) if linkable_re.match(file_dir): Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:34:52 UTC (rev 11217) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:35:20 UTC (rev 11218) @@ -47,6 +47,11 @@ "opt/csw/lib/erlang/lib/megaco-3.6.0.1/priv/lib" "/megaco_flex_scanner_drv_mt.so")) + def testIsLibraryLinkableInShared(self): + self.assertEqual(False, su.IsLibraryLinkable( + "opt/csw/share/Adobe/Reader8/Reader/sparcsolaris/lib" + "/libcrypto.so.0.9.6")) + def testMakePackageNameBySonameSimple(self): soname = "libfoo.so.0" expected = ( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:35:47 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:35:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[11219] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11219 http://gar.svn.sourceforge.net/gar/?rev=11219&view=rev Author: wahwah Date: 2010-10-10 20:35:47 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, shared lib policy, libraries under nonstandard (not /opt/csw/) prefixes are not considered linkable. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:35:20 UTC (rev 11218) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:35:47 UTC (rev 11219) @@ -21,7 +21,7 @@ + INTEL_386_PATHS + AMD64_PATHS) # Need to escape the plus signs because of the regex usage below. arch_subdirs = [x.replace(r"+", r"\+") for x in arch_subdirs] - linkable_re = re.compile(r"^opt/csw(/([^\/]+))*/lib(/(%s))?$" + linkable_re = re.compile(r"^opt/csw/lib(/(%s))?$" % "|".join(arch_subdirs)) blacklist = [ # If it has two lib components, it's a private lib. Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:35:20 UTC (rev 11218) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:35:47 UTC (rev 11219) @@ -27,8 +27,8 @@ self.assertTrue(su.IsLibraryLinkable("opt/csw/lib/amd64/libfoo.so.0.2")) def testIsLibraryLinkablePrefix(self): - p = "opt/csw/customprefix/lib/libfoo.so.0.2" - self.assertTrue(su.IsLibraryLinkable(p)) + self.assertFalse( + su.IsLibraryLinkable("opt/csw/customprefix/lib/libfoo.so.0.2")) def testIsLibraryLinkableLibexecFalse(self): p = "opt/csw/libexec/bar" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:37:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:37:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[11221] csw/mgar/gar/v2/lib/python/sharedlib_utils.py Message-ID: Revision: 11221 http://gar.svn.sourceforge.net/gar/?rev=11221&view=rev Author: wahwah Date: 2010-10-10 20:36:59 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, implemented MakePackageNameBySonameCollection Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:36:33 UTC (rev 11220) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:36:59 UTC (rev 11221) @@ -1,5 +1,6 @@ # $Id$ +import copy import re import os.path @@ -132,12 +133,19 @@ # to the pkgname and soname at the end of the function. if candidate.startswith("lib"): candidate = candidate[3:] - m = SONAME_VERSION_RE.search(candidate) + m = re.search("\.so", candidate) + candidate = re.sub("\.so.*$", "", candidate) common_substring_candidates.append(candidate) - lcs = CollectionLongestCommonSubstring(common_substring_candidates) - pkgname = "CSWlib%s.%s" % (SanitizeWithChar(lcs, "-"), common_version) - catalogname = "lib%s.%s" % (SanitizeWithChar(lcs, "_"), common_version) - return pkgname, catalogname + lcs = CollectionLongestCommonSubstring(copy.copy(common_substring_candidates)) + pkgnames = [ + "CSW" + SanitizeWithChar("lib%s%s" % (lcs, common_version), "-"), + "CSW" + SanitizeWithChar("lib%s-%s" % (lcs, common_version), "-"), + ] + catalognames = [ + SanitizeWithChar("lib%s%s" % (lcs, common_version), "_"), + SanitizeWithChar("lib%s_%s" % (lcs, common_version), "_"), + ] + return pkgnames, catalognames def LongestCommonSubstring(S, T): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:36:33 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:36:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11220] csw/mgar/gar/v2 Message-ID: Revision: 11220 http://gar.svn.sourceforge.net/gar/?rev=11220&view=rev Author: wahwah Date: 2010-10-10 20:36:33 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, refactoring: Split off of hachoir-dependent bits to a separate module. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/sharedlib_utils.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py csw/mgar/gar/v2/tests/run_tests.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/catalog.py csw/mgar/gar/v2/lib/python/catalog_test.py csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/package_test.py Added: csw/mgar/gar/v2/lib/python/catalog.py =================================================================== --- csw/mgar/gar/v2/lib/python/catalog.py (rev 0) +++ csw/mgar/gar/v2/lib/python/catalog.py 2010-10-10 20:36:33 UTC (rev 11220) @@ -0,0 +1,139 @@ +#!/usr/bin/env python2.6 + +import re + +class OpencswCatalogBuilder(object): + + def __init__(self, product_dir, catalog_dir): + self.product_dir = product_dir + self.catalog_dir = catalog_dir + + def Run(self): + pkg_dirs = os.listdir(self.product_dir) + for pkg_dir in pkg_dirs: + pkg_path = os.path.join(self.product_dir, pkg_dir) + pkginfo_path = os.path.join(pkg_path, "pkginfo") + if (os.path.isdir(pkg_path) + and + os.path.exists(pkginfo_path)): + if not self.Srv4Exists(pkg_path): + pkg = None + tmpdir = None + try: + tmpdir = tempfile.mkdtemp(prefix="sunw-pkg-") + logging.debug("Copying %s to %s", repr(pkg_path), repr(tmpdir)) + tmp_pkg_dir = os.path.join(tmpdir, pkg_dir) + shutil.copytree(pkg_path, tmp_pkg_dir, symlinks=True) + pkg = DirectoryFormatPackage(tmp_pkg_dir) + # Replacing NAME= in the pkginfo, setting it to the catalog name. + pkg.ResetNameProperty() + pkg.ToSrv4(self.catalog_dir) + except IOError, e: + logging.warn("%s has failed: %s", pkg_path, e) + finally: + if pkg: + del(pkg) + if os.path.exists(tmpdir): + shutil.rmtree(tmpdir) + else: + logging.warn("srv4 file for %s already exists, skipping", pkg_path) + else: + logging.warn("%s is not a directory.", pkg_path) + + + def Srv4Exists(self, pkg_dir): + pkg = DirectoryFormatPackage(pkg_dir) + srv4_name = pkg.GetSrv4FileName() + srv4_name += ".gz" + srv4_path = os.path.join(self.catalog_dir, srv4_name) + result = os.path.exists(srv4_path) + logging.debug("Srv4Exists(%s) => %s, %s", pkg_dir, repr(srv4_path), result) + return result + + +class OpencswCatalog(object): + """Represents a catalog file.""" + + def __init__(self, file_name): + self.file_name = file_name + self.by_basename = None + self.catalog_data = None + + def _ParseCatalogLine(self, line): + cline_re_str_list = [ + ( + r"^" + # tmux + r"(?P\S+)" + r"\s+" + # 1.2,REV=2010.05.17 + r"(?P\S+)" + r"\s+" + # CSWtmux + r"(?P\S+)" + r"\s+" + # tmux-1.2,REV=2010.05.17-SunOS5.9-sparc-CSW.pkg.gz + r"(?P\S+)" + r"\s+" + # 145351cf6186fdcadcd169b66387f72f + r"(?P\S+)" + r"\s+" + # 214091 + r"(?P\S+)" + r"\s+" + # CSWcommon|CSWlibevent + r"(?P\S+)" + r"\s+" + # none + r"(?P\S+)" + # An optional empty field. + r"(" + r"\s+" + # none\n' + r"(?P\S+)" + r")?" + r"$" + ), + ] + cline_re_list = [re.compile(x) for x in cline_re_str_list] + matched = False + d = None + for cline_re in cline_re_list: + m = cline_re.match(line) + if m: + d = m.groupdict() + matched = True + if not d: + raise CatalogLineParseError("Parsed %s data is empty" % repr(line)) + if not matched: + raise CatalogLineParseError("No regexes matched %s" % repr(line)) + return d + + def _GetCatalogData(self, fd): + catalog_data = [] + for line in fd: + try: + parsed = self._ParseCatalogLine(line) + catalog_data.append(parsed) + except CatalogLineParseError, e: + logging.debug("Could not parse %s, %s", repr(line), e) + return catalog_data + + def GetCatalogData(self): + if not self.catalog_data: + fd = open(self.file_name, "r") + self.catalog_data = self._GetCatalogData(fd) + return self.catalog_data + + def GetDataByBasename(self): + if not self.by_basename: + self.by_basename = {} + cd = self.GetCatalogData() + for d in cd: + if "file_basename" not in d: + logging.error("%s is missing the file_basename field", d) + self.by_basename[d["file_basename"]] = d + return self.by_basename + + + Added: csw/mgar/gar/v2/lib/python/catalog_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/catalog_test.py (rev 0) +++ csw/mgar/gar/v2/lib/python/catalog_test.py 2010-10-10 20:36:33 UTC (rev 11220) @@ -0,0 +1,29 @@ +#!/usr/bin/env python2.6 + +import unittest +import catalog + +class OpencswCatalogUnitTest(unittest.TestCase): + + def test_ParseCatalogLine_1(self): + line = ( + 'tmux 1.2,REV=2010.05.17 CSWtmux ' + 'tmux-1.2,REV=2010.05.17-SunOS5.9-sparc-CSW.pkg.gz ' + '145351cf6186fdcadcd169b66387f72f 214091 ' + 'CSWcommon|CSWlibevent none none\n') + oc = catalog.OpencswCatalog(None) + parsed = oc._ParseCatalogLine(line) + expected = {'catalogname': 'tmux', + 'deps': 'CSWcommon|CSWlibevent', + 'file_basename': 'tmux-1.2,REV=2010.05.17-SunOS5.9-sparc-CSW.pkg.gz', + 'md5sum': '145351cf6186fdcadcd169b66387f72f', + 'none_thing_1': 'none', + 'none_thing_2': 'none', + 'pkgname': 'CSWtmux', + 'size': '214091', + 'version': '1.2,REV=2010.05.17'} + self.assertEquals(expected, parsed) + + +if __name__ == '__main__': + unittest.main() Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-10 20:35:47 UTC (rev 11219) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-10 20:36:33 UTC (rev 11220) @@ -15,9 +15,7 @@ import copy import datetime import difflib -import hachoir_parser as hp import hashlib -import magic import logging import os import os.path @@ -30,12 +28,8 @@ import overrides import configuration as c from Cheetah import Template +import sharedlib_utils as su -# Suppress unhelpful warnings -# http://bitbucket.org/haypo/hachoir/issue/23 -import hachoir_core.config -hachoir_core.config.quiet = True - ARCH_SPARC = "sparc" ARCH_i386 = "i386" ARCH_ALL = "all" @@ -425,184 +419,6 @@ return editor -class ShellMixin(object): - - def ShellCommand(self, args, quiet=False): - logging.debug("Calling: %s", repr(args)) - if quiet: - process = subprocess.Popen(args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = process.communicate() - retcode = process.wait() - else: - retcode = subprocess.call(args) - if retcode: - raise Error("Running %s has failed." % repr(args)) - return retcode - - -class CswSrv4File(ShellMixin, object): - """Represents a package in the srv4 format (pkg).""" - - def __init__(self, pkg_path, debug=False): - self.pkg_path = pkg_path - self.workdir = None - self.gunzipped_path = None - self.transformed = False - self.dir_format_pkg = None - self.debug = debug - self.pkgname = None - self.md5sum = None - self.mtime = None - - def __repr__(self): - return u"CswSrv4File(%s)" % repr(self.pkg_path) - - def GetWorkDir(self): - if not self.workdir: - self.workdir = tempfile.mkdtemp(prefix="pkg_") - fd = open(os.path.join(self.workdir, "admin"), "w") - fd.write(ADMIN_FILE_CONTENT) - fd.close() - return self.workdir - - def GetAdminFilePath(self): - return os.path.join(self.GetWorkDir(), "admin") - - def GetGunzippedPath(self): - if not self.gunzipped_path: - gzip_suffix = ".gz" - pkg_suffix = ".pkg" - if self.pkg_path.endswith("%s%s" % (pkg_suffix, gzip_suffix)): - # Causing the class to stat the .gz file. This call throws away the - # result, but the result will be cached as a class instance member. - self.GetMtime() - base_name_gz = os.path.split(self.pkg_path)[1] - shutil.copy(self.pkg_path, self.GetWorkDir()) - self.pkg_path = os.path.join(self.GetWorkDir(), base_name_gz) - args = ["gunzip", "-f", self.pkg_path] - unused_retcode = self.ShellCommand(args) - self.gunzipped_path = self.pkg_path[:(-len(gzip_suffix))] - elif self.pkg_path.endswith(pkg_suffix): - self.gunzipped_path = self.pkg_path - else: - raise Error("The file name should end in either " - "%s or %s, but it's %s." - % (gzip_suffix, pkg_suffix, repr(self.pkg_path))) - return self.gunzipped_path - - def Pkgtrans(self, src_file, destdir, pkgname): - """A proxy for the pkgtrans command. - - This requires custom-pkgtrans to be available. - """ - if not os.path.isdir(destdir): - raise PackageError("%s doesn't exist or is not a directory" % destdir) - args = [os.path.join(os.path.dirname(__file__), "custom-pkgtrans"), - src_file, - destdir, - pkgname ] - pkgtrans_proc = subprocess.Popen(args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = pkgtrans_proc.communicate() - ret = pkgtrans_proc.wait() - if ret: - logging.error(stdout) - logging.error(stderr) - logging.error("% has failed" % args) - - def GetPkgname(self): - """It's necessary to figure out the pkgname from the .pkg file. - # nawk 'NR == 2 {print $1; exit;} $f - """ - if not self.pkgname: - gunzipped_path = self.GetGunzippedPath() - args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path] - nawk_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = nawk_proc.communicate() - ret_code = nawk_proc.wait() - self.pkgname = stdout.strip() - logging.debug("GetPkgname(): %s", repr(self.pkgname)) - return self.pkgname - - def GetMtime(self): - if not self.mtime: - # This fails if the file is not there. - s = os.stat(self.pkg_path) - t = time.gmtime(s.st_mtime) - self.mtime = datetime.datetime(*t[:6]) - return self.mtime - - def TransformToDir(self): - """Transforms the file to the directory format. - - This uses the Pkgtrans function at the top, because pkgtrans behaves - differently on Solaris 8 and 10. Having our own implementation helps - achieve consistent behavior. - """ - if not self.transformed: - gunzipped_path = self.GetGunzippedPath() - pkgname = self.GetPkgname() - args = [os.path.join(os.path.dirname(__file__), - "..", "..", "bin", "custom-pkgtrans"), - gunzipped_path, self.GetWorkDir(), pkgname] - logging.debug("transforming: %s", args) - unused_retcode = self.ShellCommand(args, quiet=(not self.debug)) - dirs = self.GetDirs() - if len(dirs) != 1: - raise Error("Need exactly one package in the package stream: " - "%s." % (dirs)) - self.dir_format_pkg = DirectoryFormatPackage(dirs[0]) - self.transformed = True - - def GetDirFormatPkg(self): - self.TransformToDir() - return self.dir_format_pkg - - def GetDirs(self): - paths = os.listdir(self.GetWorkDir()) - dirs = [] - for p in paths: - abspath = os.path.join(self.GetWorkDir(), p) - if os.path.isdir(abspath): - dirs.append(abspath) - return dirs - - def GetPkgmap(self, analyze_permissions, strip=None): - dir_format_pkg = self.GetDirFormatPkg() - return dir_format_pkg.GetPkgmap(analyze_permissions, strip) - - def GetMd5sum(self): - if not self.md5sum: - logging.debug("GetMd5sum() reading file %s", repr(self.pkg_path)) - fp = open(self.pkg_path) - hash = hashlib.md5() - hash.update(fp.read()) - fp.close() - self.md5sum = hash.hexdigest() - return self.md5sum - - def GetPkgchkOutput(self): - """Returns: (exit code, stdout, stderr).""" - args = ["pkgchk", "-d", self.GetGunzippedPath(), "all"] - pkgchk_proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = pkgchk_proc.communicate() - ret = pkgchk_proc.wait() - return ret, stdout, stderr - - def GetFileMtime(self): - if not self.mtime: - self.mtime = os.stat(self.pkg_path).st_mtime - return self.mtime - - def __del__(self): - if self.workdir: - logging.debug("Removing %s", repr(self.workdir)) - shutil.rmtree(self.workdir) - - def ParsePkginfo(lines): """Parses a pkginfo data.""" d = {} @@ -659,12 +475,13 @@ catalogname_list = copy.copy(catalogname_list) if len(catalogname_list) == 1: return catalogname_list[0] - current_substring = catalogname_list.pop() - while catalogname_list and current_substring: - substring_set = LongestCommonSubstring(current_substring, - catalogname_list.pop()) - if substring_set: - current_substring = list(substring_set)[0] + #current_substring = catalogname_list.pop() + #while catalogname_list and current_substring: + # substring_set = su.LongestCommonSubstring(current_substring, + # catalogname_list.pop()) + # if substring_set: + # current_substring = list(substring_set)[0] + current_substring = su.CollectionLongestCommonSubstring(catalogname_list) # If it's something like foo_, make it foo. while current_substring and not current_substring[-1].isalnum(): current_substring = current_substring[:-1] @@ -673,27 +490,6 @@ return "various packages" -def LongestCommonSubstring(S, T): - """Stolen from Wikibooks - - http://en.wikibooks.org/wiki/Algorithm_Implementation/Strings/Longest_common_substring#Python""" - m = len(S); n = len(T) - L = [[0] * (n+1) for i in xrange(m+1)] - LCS = set() - longest = 0 - for i in xrange(m): - for j in xrange(n): - if S[i] == T[j]: - v = L[i][j] + 1 - L[i+1][j+1] = v - if v > longest: - longest = v - LCS = set() - if v == longest: - LCS.add(S[i-v+1:i+1]) - return LCS - - def PkginfoToSrv4Name(pkginfo_dict): SRV4_FN_TMPL = "%(catalog_name)s-%(version)s-%(osver)s-%(arch)s-%(tag)s.pkg" fn_data = {} @@ -708,304 +504,6 @@ return SRV4_FN_TMPL % fn_data -class DirectoryFormatPackage(ShellMixin, object): - """Represents a package in the directory format. - - Allows some read-write operations. - """ - def __init__(self, directory): - self.directory = directory - self.pkgname = os.path.basename(directory) - self.pkgpath = self.directory - self.pkginfo_dict = None - self.binaries = None - self.file_paths = None - self.files_metadata = None - - def GetCatalogname(self): - """Returns the catalog name of the package. - - A bit hacky. Looks for the first word of the NAME field in the package. - """ - pkginfo = self.GetParsedPkginfo() - words = re.split(c.WS_RE, pkginfo["NAME"]) - return words[0] - - def GetParsedPkginfo(self): - if not self.pkginfo_dict: - pkginfo_fd = open(self.GetPkginfoFilename(), "r") - self.pkginfo_dict = ParsePkginfo(pkginfo_fd) - pkginfo_fd.close() - return self.pkginfo_dict - - def GetSrv4FileName(self): - """Guesses the Srv4FileName based on the package directory contents.""" - return PkginfoToSrv4Name(self.GetParsedPkginfo()) - - def ToSrv4(self, target_dir): - target_file_name = self.GetSrv4FileName() - target_path = os.path.join(target_dir, target_file_name) - if os.path.exists(target_path): - return target_path - pkg_container_dir, pkg_dir = os.path.split(self.directory) - if not os.path.isdir(target_dir): - os.makedirs(target_dir) - args = ["pkgtrans", "-s", pkg_container_dir, target_path, pkg_dir] - self.ShellCommand(args, quiet=True) - args = ["gzip", "-f", target_path] - self.ShellCommand(args, quiet=True) - return target_path - - def GetPkgmap(self, analyze_permissions=False, strip=None): - fd = open(os.path.join(self.directory, "pkgmap"), "r") - return Pkgmap(fd, analyze_permissions, strip) - - def SetPkginfoEntry(self, key, value): - pkginfo = self.GetParsedPkginfo() - logging.debug("Setting %s to %s", repr(key), repr(value)) - pkginfo[key] = value - self.WritePkginfo(pkginfo) - pkgmap_path = os.path.join(self.directory, "pkgmap") - pkgmap_fd = open(pkgmap_path, "r") - new_pkgmap_lines = [] - pkginfo_re = re.compile("1 i pkginfo") - ws_re = re.compile(r"\s+") - for line in pkgmap_fd: - if pkginfo_re.search(line): - fields = ws_re.split(line) - # 3: size - # 4: sum - pkginfo_path = os.path.join(self.directory, "pkginfo") - args = ["cksum", pkginfo_path] - cksum_process = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = cksum_process.communicate() - cksum_process.wait() - size = ws_re.split(stdout)[1] - args = ["sum", pkginfo_path] - sum_process = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = sum_process.communicate() - sum_process.wait() - sum_value = ws_re.split(stdout)[0] - fields[3] = size - fields[4] = sum_value - logging.debug("New pkgmap line: %s", fields) - line = " ".join(fields) - new_pkgmap_lines.append(line.strip()) - pkgmap_fd.close() - # Write that back - pkgmap_path_new = pkgmap_path + ".new" - logging.debug("Writing back to %s", pkgmap_path_new) - pkgmap_fd = open(pkgmap_path_new, "w") - pkgmap_fd.write("\n".join(new_pkgmap_lines)) - pkgmap_fd.close() - shutil.move(pkgmap_path_new, pkgmap_path) - - # TODO(maciej): Need to update the relevant line on pkgmap too - - def GetPkginfoFilename(self): - return os.path.join(self.directory, "pkginfo") - - def WritePkginfo(self, pkginfo_dict): - # Some packages extract read-only. To be sure, change them to be - # user-writable. - args = ["chmod", "-R", "u+w", self.directory] - self.ShellCommand(args) - pkginfo_filename = self.GetPkginfoFilename() - os.chmod(pkginfo_filename, 0644) - pkginfo_fd = open(pkginfo_filename, "w") - pkginfo_dict = self.GetParsedPkginfo() - for k, v in pkginfo_dict.items(): - pkginfo_fd.write("%s=%s\n" % (k, pkginfo_dict[k])) - pkginfo_fd.close() - - def ResetNameProperty(self): - """Sometimes, NAME= contains useless data. This method resets them.""" - pkginfo_dict = self.GetParsedPkginfo() - catalog_name = PkgnameToCatName(pkginfo_dict["PKG"]) - description = pkginfo_dict["DESC"] - pkginfo_name = "%s - %s" % (catalog_name, description) - self.SetPkginfoEntry("NAME", pkginfo_name) - - def GetDependencies(self): - depends = [] - depend_file_path = os.path.join(self.directory, "install", "depend") - if not os.path.exists(depend_file_path): - return depends - fd = open(os.path.join(self.directory, "install", "depend"), "r") - # It needs to be a list because there might be duplicates and it's - # necessary to carry that information. - for line in fd: - fields = re.split(c.WS_RE, line) - if fields[0] == "P": - pkgname = fields[1] - pkg_desc = " ".join(fields[1:]) - depends.append((pkgname, pkg_desc)) - fd.close() - return depends - - def CheckPkgpathExists(self): - if not os.path.isdir(self.directory): - raise PackageError("%s does not exist or is not a directory" - % self.directory) - - def GetFilesMetadata(self): - """Returns a data structure with all the files plus their metadata. - - [ - { - "path": ..., - "mime_type": ..., - }, - ] - """ - if not self.files_metadata: - self.CheckPkgpathExists() - self.files_metadata = [] - files_root = os.path.join(self.directory, "root") - if not os.path.exists(files_root): - return self.files_metadata - all_files = self.GetAllFilePaths() - def StripRe(x, strip_re): - return re.sub(strip_re, "", x) - root_re = re.compile(r"^root/") - file_magic = FileMagic() - for file_path in all_files: - full_path = unicode(self.MakeAbsolutePath(file_path)) - file_info = { - "path": StripRe(file_path, root_re), - "mime_type": file_magic.GetFileMimeType(full_path) - } - if not file_info["mime_type"]: - logging.error("Could not establish the mime type of %s", - full_path) - # We really don't want that, as it misses binaries. - raise PackageError("Could not establish the mime type of %s" - % full_path) - if IsBinary(file_info): - parser = hp.createParser(full_path) - if not parser: - logging.warning("Can't parse file %s", file_path) - else: - file_info["mime_type_by_hachoir"] = parser.mime_type - machine_id = parser["/header/machine"].value - file_info["machine_id"] = machine_id - file_info["endian"] = parser["/header/endian"].display - self.files_metadata.append(file_info) - return self.files_metadata - - def ListBinaries(self): - """Lists all the binaries from a given package. - - Original checkpkg code: - - ######################################### - # find all executables and dynamic libs,and list their filenames. - listbinaries() { - if [ ! -d $1 ] ; then - print errmsg $1 not a directory - rm -rf $EXTRACTDIR - exit 1 - fi - find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' - } - - Returns a list of absolute paths. - - Now that there are files_metadata, this function can safely go away, once - all its callers are modified to use files_metadata instead. - """ - if self.binaries is None: - self.CheckPkgpathExists() - files_metadata = self.GetFilesMetadata() - self.binaries = [] - # The nested for-loop looks inefficient. - for file_info in files_metadata: - if IsBinary(file_info): - self.binaries.append(file_info["path"]) - self.binaries.sort() - return self.binaries - - def GetAllFilePaths(self): - """Returns a list of all paths from the package.""" - if not self.file_paths: - self.CheckPkgpathExists() - remove_prefix = "%s/" % self.pkgpath - self.file_paths = [] - for root, dirs, files in os.walk(os.path.join(self.pkgpath, "root")): - full_paths = [os.path.join(root, f) for f in files] - self.file_paths.extend([f.replace(remove_prefix, "") for f in full_paths]) - return self.file_paths - - def _GetOverridesStream(self, file_path): - # This might potentially cause a file descriptor leak, but I'm not going to - # worry about that at this stage. - # NB, the whole catalog run doesn't seem to be suffering. (~2500 packages) - # - # There is a race condition here, but it's executing sequentially, I don't - # expect any concurrency problems. - if os.path.isfile(file_path): - logging.debug("Opening %s override file." % repr(file_path)) - return open(file_path, "r") - else: - logging.debug("Override file %s not found." % repr(file_path)) - return None - - def _ParseOverridesStream(self, stream): - override_list = [] - for line in stream: - if line.startswith("#"): - continue - override_list.append(overrides.ParseOverrideLine(line)) - return override_list - - def GetOverrides(self): - """Returns overrides, a list of overrides.Override instances.""" - overrides = [] - catalogname = self.GetCatalogname() - override_paths = ( - [self.directory, - "root", - "opt/csw/share/checkpkg/overrides", catalogname], - [self.directory, - "install", - "checkpkg_override"], - ) - for override_path in override_paths: - file_path = os.path.join(*override_path) - stream = self._GetOverridesStream(file_path) - if stream: - overrides.extend(self._ParseOverridesStream(stream)) - return overrides - - def GetFileContent(self, pkg_file_path): - if pkg_file_path.startswith("/"): - pkg_file_path = pkg_file_path[1:] - # TODO: Write a unit test for the right path - file_path = os.path.join(self.directory, "root", pkg_file_path) - try: - fd = open(file_path, "r") - content = fd.read() - fd.close() - return content - except IOError, e: - raise PackageError(e) - - def GetFilesContaining(self, regex_list): - full_paths = self.GetAllFilePaths() - files_by_pattern = {} - for full_path in full_paths: - content = open(self.MakeAbsolutePath(full_path), "rb").read() - for regex in regex_list: - if re.search(regex, content): - if regex not in files_by_pattern: - files_by_pattern[regex] = [] - files_by_pattern[regex].append(full_path) - return files_by_pattern - - def MakeAbsolutePath(self, p): - return os.path.join(self.pkgpath, p) - - class Pkgmap(object): """Represents the pkgmap of the package. @@ -1091,168 +589,6 @@ return self.classes -class PackageComparator(object): - - def __init__(self, file_name_a, file_name_b, - permissions=False, - strip_a=None, - strip_b=None): - self.analyze_permissions = permissions - self.pkg_a = CswSrv4File(file_name_a) - self.pkg_b = CswSrv4File(file_name_b) - self.strip_a = strip_a - self.strip_b = strip_b - - def Run(self): - pkgmap_a = self.pkg_a.GetPkgmap(self.analyze_permissions, strip=self.strip_a) - pkgmap_b = self.pkg_b.GetPkgmap(self.analyze_permissions, strip=self.strip_b) - diff_ab = difflib.unified_diff(sorted(pkgmap_a.paths), - sorted(pkgmap_b.paths), - fromfile=self.pkg_a.pkg_path, - tofile=self.pkg_b.pkg_path) - diff_text = "\n".join(diff_ab) - if diff_text: - less_proc = subprocess.Popen(["less"], stdin=subprocess.PIPE) - less_stdout, less_stderr = less_proc.communicate(input=diff_text) - less_proc.wait() - else: - print "No differences found." - - -class OpencswCatalogBuilder(object): - - def __init__(self, product_dir, catalog_dir): - self.product_dir = product_dir - self.catalog_dir = catalog_dir - - def Run(self): - pkg_dirs = os.listdir(self.product_dir) - for pkg_dir in pkg_dirs: - pkg_path = os.path.join(self.product_dir, pkg_dir) - pkginfo_path = os.path.join(pkg_path, "pkginfo") - if (os.path.isdir(pkg_path) - and - os.path.exists(pkginfo_path)): - if not self.Srv4Exists(pkg_path): - pkg = None - tmpdir = None - try: - tmpdir = tempfile.mkdtemp(prefix="sunw-pkg-") - logging.debug("Copying %s to %s", repr(pkg_path), repr(tmpdir)) - tmp_pkg_dir = os.path.join(tmpdir, pkg_dir) - shutil.copytree(pkg_path, tmp_pkg_dir, symlinks=True) - pkg = DirectoryFormatPackage(tmp_pkg_dir) - # Replacing NAME= in the pkginfo, setting it to the catalog name. - pkg.ResetNameProperty() - pkg.ToSrv4(self.catalog_dir) - except IOError, e: - logging.warn("%s has failed: %s", pkg_path, e) - finally: - if pkg: - del(pkg) - if os.path.exists(tmpdir): - shutil.rmtree(tmpdir) - else: - logging.warn("srv4 file for %s already exists, skipping", pkg_path) - else: - logging.warn("%s is not a directory.", pkg_path) - - - def Srv4Exists(self, pkg_dir): - pkg = DirectoryFormatPackage(pkg_dir) - srv4_name = pkg.GetSrv4FileName() - srv4_name += ".gz" - srv4_path = os.path.join(self.catalog_dir, srv4_name) - result = os.path.exists(srv4_path) - logging.debug("Srv4Exists(%s) => %s, %s", pkg_dir, repr(srv4_path), result) - return result - - -class OpencswCatalog(object): - """Represents a catalog file.""" - - def __init__(self, file_name): - self.file_name = file_name - self.by_basename = None - self.catalog_data = None - - def _ParseCatalogLine(self, line): - cline_re_str_list = [ - ( - r"^" - # tmux - r"(?P\S+)" - r"\s+" - # 1.2,REV=2010.05.17 - r"(?P\S+)" - r"\s+" - # CSWtmux - r"(?P\S+)" - r"\s+" - # tmux-1.2,REV=2010.05.17-SunOS5.9-sparc-CSW.pkg.gz - r"(?P\S+)" - r"\s+" - # 145351cf6186fdcadcd169b66387f72f - r"(?P\S+)" - r"\s+" - # 214091 - r"(?P\S+)" - r"\s+" - # CSWcommon|CSWlibevent - r"(?P\S+)" - r"\s+" - # none - r"(?P\S+)" - # An optional empty field. - r"(" - r"\s+" - # none\n' - r"(?P\S+)" - r")?" - r"$" - ), - ] - cline_re_list = [re.compile(x) for x in cline_re_str_list] - matched = False - d = None - for cline_re in cline_re_list: - m = cline_re.match(line) - if m: - d = m.groupdict() - matched = True - if not d: - raise CatalogLineParseError("Parsed %s data is empty" % repr(line)) - if not matched: - raise CatalogLineParseError("No regexes matched %s" % repr(line)) - return d - - def _GetCatalogData(self, fd): - catalog_data = [] - for line in fd: - try: - parsed = self._ParseCatalogLine(line) - catalog_data.append(parsed) - except CatalogLineParseError, e: - logging.debug("Could not parse %s, %s", repr(line), e) - return catalog_data - - def GetCatalogData(self): - if not self.catalog_data: - fd = open(self.file_name, "r") - self.catalog_data = self._GetCatalogData(fd) - return self.catalog_data - - def GetDataByBasename(self): - if not self.by_basename: - self.by_basename = {} - cd = self.GetCatalogData() - for d in cd: - if "file_basename" not in d: - logging.error("%s is missing the file_basename field", d) - self.by_basename[d["file_basename"]] = d - return self.by_basename - - def IsBinary(file_info): """Returns True or False depending on file metadata.""" is_a_binary = False @@ -1268,39 +604,3 @@ is_a_binary = True break return is_a_binary - - -class FileMagic(object): - """Libmagic sometimes returns None, which I think is a bug. - Trying to come up with a way to work around that. - """ - - def __init__(self): - self.cookie_count = 0 - self.magic_cookie = None - - def _GetCookie(self): - magic_cookie = magic.open(self.cookie_count) - self.cookie_count += 1 - magic_cookie.load() - magic_cookie.setflags(magic.MAGIC_MIME) - return magic_cookie - - def _LazyInit(self): - if not self.magic_cookie: - self.magic_cookie = self._GetCookie() - - def GetFileMimeType(self, full_path): - """Trying to run magic.file() a few times, not accepting None.""" - self._LazyInit() - mime = None - for i in xrange(10): - mime = self.magic_cookie.file(full_path) - if mime: - break; - else: - # Returned mime is null. Re-initializing the cookie and trying again. - logging.error("magic_cookie.file(%s) returned None. Retrying.", - full_path) - self.magic_cookie = self._GetCookie() - return mime Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-10-10 20:35:47 UTC (rev 11219) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-10-10 20:36:33 UTC (rev 11220) @@ -352,19 +352,7 @@ repr(expected_name), repr(result))) - def testLongestCommonSubstring_1(self): - self.assertEqual(set(["foo"]), opencsw.LongestCommonSubstring("foo", "foo")) - def testLongestCommonSubstring_2(self): - self.assertEqual(set([]), opencsw.LongestCommonSubstring("foo", "bar")) - - def testLongestCommonSubstring_3(self): - self.assertEqual(set(["bar"]), opencsw.LongestCommonSubstring("barfoobar", "bar")) - - def testLongestCommonSubstring_4(self): - self.assertEqual(set(['bcd', 'hij']), opencsw.LongestCommonSubstring("abcdefghijk", "bcdhij")) - - class PkgmapUnitTest(unittest.TestCase): def test_1(self): @@ -447,28 +435,6 @@ searchList=[submitpkg_data]) self.assertTrue(re.search(r"new package", unicode(t)), unicode(t)) -class OpencswCatalogUnitTest(unittest.TestCase): - def test_ParseCatalogLine_1(self): - line = ( - 'tmux 1.2,REV=2010.05.17 CSWtmux ' - 'tmux-1.2,REV=2010.05.17-SunOS5.9-sparc-CSW.pkg.gz ' - '145351cf6186fdcadcd169b66387f72f 214091 ' - 'CSWcommon|CSWlibevent none none\n') - oc = opencsw.OpencswCatalog(None) - parsed = oc._ParseCatalogLine(line) - expected = {'catalogname': 'tmux', - 'deps': 'CSWcommon|CSWlibevent', - 'file_basename': 'tmux-1.2,REV=2010.05.17-SunOS5.9-sparc-CSW.pkg.gz', - 'md5sum': '145351cf6186fdcadcd169b66387f72f', - 'none_thing_1': 'none', - 'none_thing_2': 'none', - 'pkgname': 'CSWtmux', - 'size': '214091', - 'version': '1.2,REV=2010.05.17'} - self.assertEquals(expected, parsed) - - - if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py (rev 0) +++ csw/mgar/gar/v2/lib/python/package.py 2010-10-10 20:36:33 UTC (rev 11220) @@ -0,0 +1,550 @@ +#!/usr/bin/env python2.6 + +import magic +import subprocess +import hachoir_parser as hp + +# Suppress unhelpful warnings +# http://bitbucket.org/haypo/hachoir/issue/23 +import hachoir_core.config +hachoir_core.config.quiet = True + + +class ShellMixin(object): + + def ShellCommand(self, args, quiet=False): + logging.debug("Calling: %s", repr(args)) + if quiet: + process = subprocess.Popen(args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = process.communicate() + retcode = process.wait() + else: + retcode = subprocess.call(args) + if retcode: + raise Error("Running %s has failed." % repr(args)) + return retcode + + +class CswSrv4File(ShellMixin, object): + """Represents a package in the srv4 format (pkg).""" + + def __init__(self, pkg_path, debug=False): + self.pkg_path = pkg_path + self.workdir = None + self.gunzipped_path = None + self.transformed = False + self.dir_format_pkg = None + self.debug = debug + self.pkgname = None + self.md5sum = None + self.mtime = None + + def __repr__(self): + return u"CswSrv4File(%s)" % repr(self.pkg_path) + + def GetWorkDir(self): + if not self.workdir: + self.workdir = tempfile.mkdtemp(prefix="pkg_") + fd = open(os.path.join(self.workdir, "admin"), "w") + fd.write(ADMIN_FILE_CONTENT) + fd.close() + return self.workdir + + def GetAdminFilePath(self): + return os.path.join(self.GetWorkDir(), "admin") + + def GetGunzippedPath(self): + if not self.gunzipped_path: + gzip_suffix = ".gz" + pkg_suffix = ".pkg" + if self.pkg_path.endswith("%s%s" % (pkg_suffix, gzip_suffix)): + # Causing the class to stat the .gz file. This call throws away the + # result, but the result will be cached as a class instance member. + self.GetMtime() + base_name_gz = os.path.split(self.pkg_path)[1] + shutil.copy(self.pkg_path, self.GetWorkDir()) + self.pkg_path = os.path.join(self.GetWorkDir(), base_name_gz) + args = ["gunzip", "-f", self.pkg_path] + unused_retcode = self.ShellCommand(args) + self.gunzipped_path = self.pkg_path[:(-len(gzip_suffix))] + elif self.pkg_path.endswith(pkg_suffix): + self.gunzipped_path = self.pkg_path + else: + raise Error("The file name should end in either " + "%s or %s, but it's %s." + % (gzip_suffix, pkg_suffix, repr(self.pkg_path))) + return self.gunzipped_path + + def Pkgtrans(self, src_file, destdir, pkgname): + """A proxy for the pkgtrans command. + + This requires custom-pkgtrans to be available. + """ + if not os.path.isdir(destdir): + raise PackageError("%s doesn't exist or is not a directory" % destdir) + args = [os.path.join(os.path.dirname(__file__), "custom-pkgtrans"), + src_file, + destdir, + pkgname ] + pkgtrans_proc = subprocess.Popen(args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = pkgtrans_proc.communicate() + ret = pkgtrans_proc.wait() + if ret: + logging.error(stdout) + logging.error(stderr) + logging.error("% has failed" % args) + + def GetPkgname(self): + """It's necessary to figure out the pkgname from the .pkg file. + # nawk 'NR == 2 {print $1; exit;} $f + """ + if not self.pkgname: + gunzipped_path = self.GetGunzippedPath() + args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path] + nawk_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = nawk_proc.communicate() + ret_code = nawk_proc.wait() + self.pkgname = stdout.strip() + logging.debug("GetPkgname(): %s", repr(self.pkgname)) + return self.pkgname + + def GetMtime(self): + if not self.mtime: + # This fails if the file is not there. + s = os.stat(self.pkg_path) + t = time.gmtime(s.st_mtime) + self.mtime = datetime.datetime(*t[:6]) + return self.mtime + + def TransformToDir(self): + """Transforms the file to the directory format. + + This uses the Pkgtrans function at the top, because pkgtrans behaves + differently on Solaris 8 and 10. Having our own implementation helps + achieve consistent behavior. + """ + if not self.transformed: + gunzipped_path = self.GetGunzippedPath() + pkgname = self.GetPkgname() + args = [os.path.join(os.path.dirname(__file__), + "..", "..", "bin", "custom-pkgtrans"), + gunzipped_path, self.GetWorkDir(), pkgname] + logging.debug("transforming: %s", args) + unused_retcode = self.ShellCommand(args, quiet=(not self.debug)) + dirs = self.GetDirs() + if len(dirs) != 1: + raise Error("Need exactly one package in the package stream: " + "%s." % (dirs)) + self.dir_format_pkg = DirectoryFormatPackage(dirs[0]) + self.transformed = True + + def GetDirFormatPkg(self): + self.TransformToDir() + return self.dir_format_pkg + + def GetDirs(self): + paths = os.listdir(self.GetWorkDir()) + dirs = [] + for p in paths: + abspath = os.path.join(self.GetWorkDir(), p) + if os.path.isdir(abspath): + dirs.append(abspath) + return dirs + + def GetPkgmap(self, analyze_permissions, strip=None): + dir_format_pkg = self.GetDirFormatPkg() + return dir_format_pkg.GetPkgmap(analyze_permissions, strip) + + def GetMd5sum(self): + if not self.md5sum: + logging.debug("GetMd5sum() reading file %s", repr(self.pkg_path)) + fp = open(self.pkg_path) + hash = hashlib.md5() + hash.update(fp.read()) + fp.close() + self.md5sum = hash.hexdigest() + return self.md5sum + + def GetPkgchkOutput(self): + """Returns: (exit code, stdout, stderr).""" + args = ["pkgchk", "-d", self.GetGunzippedPath(), "all"] + pkgchk_proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = pkgchk_proc.communicate() + ret = pkgchk_proc.wait() + return ret, stdout, stderr + + def GetFileMtime(self): + if not self.mtime: + self.mtime = os.stat(self.pkg_path).st_mtime + return self.mtime + + def __del__(self): + if self.workdir: + logging.debug("Removing %s", repr(self.workdir)) + shutil.rmtree(self.workdir) + + +class DirectoryFormatPackage(ShellMixin, object): + """Represents a package in the directory format. + + Allows some read-write operations. + """ + def __init__(self, directory): + self.directory = directory + self.pkgname = os.path.basename(directory) + self.pkgpath = self.directory + self.pkginfo_dict = None + self.binaries = None + self.file_paths = None + self.files_metadata = None + + def GetCatalogname(self): + """Returns the catalog name of the package. + + A bit hacky. Looks for the first word of the NAME field in the package. + """ + pkginfo = self.GetParsedPkginfo() + words = re.split(c.WS_RE, pkginfo["NAME"]) + return words[0] + + def GetParsedPkginfo(self): + if not self.pkginfo_dict: + pkginfo_fd = open(self.GetPkginfoFilename(), "r") + self.pkginfo_dict = ParsePkginfo(pkginfo_fd) + pkginfo_fd.close() + return self.pkginfo_dict + + def GetSrv4FileName(self): + """Guesses the Srv4FileName based on the package directory contents.""" + return PkginfoToSrv4Name(self.GetParsedPkginfo()) + + def ToSrv4(self, target_dir): + target_file_name = self.GetSrv4FileName() + target_path = os.path.join(target_dir, target_file_name) + if os.path.exists(target_path): + return target_path + pkg_container_dir, pkg_dir = os.path.split(self.directory) + if not os.path.isdir(target_dir): + os.makedirs(target_dir) + args = ["pkgtrans", "-s", pkg_container_dir, target_path, pkg_dir] + self.ShellCommand(args, quiet=True) + args = ["gzip", "-f", target_path] + self.ShellCommand(args, quiet=True) + return target_path + + def GetPkgmap(self, analyze_permissions=False, strip=None): + fd = open(os.path.join(self.directory, "pkgmap"), "r") + return Pkgmap(fd, analyze_permissions, strip) + + def SetPkginfoEntry(self, key, value): + pkginfo = self.GetParsedPkginfo() + logging.debug("Setting %s to %s", repr(key), repr(value)) + pkginfo[key] = value + self.WritePkginfo(pkginfo) + pkgmap_path = os.path.join(self.directory, "pkgmap") + pkgmap_fd = open(pkgmap_path, "r") + new_pkgmap_lines = [] + pkginfo_re = re.compile("1 i pkginfo") + ws_re = re.compile(r"\s+") + for line in pkgmap_fd: + if pkginfo_re.search(line): + fields = ws_re.split(line) + # 3: size + # 4: sum + pkginfo_path = os.path.join(self.directory, "pkginfo") + args = ["cksum", pkginfo_path] + cksum_process = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = cksum_process.communicate() + cksum_process.wait() + size = ws_re.split(stdout)[1] + args = ["sum", pkginfo_path] + sum_process = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = sum_process.communicate() + sum_process.wait() + sum_value = ws_re.split(stdout)[0] + fields[3] = size + fields[4] = sum_value + logging.debug("New pkgmap line: %s", fields) + line = " ".join(fields) + new_pkgmap_lines.append(line.strip()) + pkgmap_fd.close() + # Write that back + pkgmap_path_new = pkgmap_path + ".new" + logging.debug("Writing back to %s", pkgmap_path_new) + pkgmap_fd = open(pkgmap_path_new, "w") + pkgmap_fd.write("\n".join(new_pkgmap_lines)) + pkgmap_fd.close() + shutil.move(pkgmap_path_new, pkgmap_path) + + # TODO(maciej): Need to update the relevant line on pkgmap too + + def GetPkginfoFilename(self): + return os.path.join(self.directory, "pkginfo") + + def WritePkginfo(self, pkginfo_dict): + # Some packages extract read-only. To be sure, change them to be + # user-writable. + args = ["chmod", "-R", "u+w", self.directory] + self.ShellCommand(args) + pkginfo_filename = self.GetPkginfoFilename() + os.chmod(pkginfo_filename, 0644) + pkginfo_fd = open(pkginfo_filename, "w") + pkginfo_dict = self.GetParsedPkginfo() + for k, v in pkginfo_dict.items(): + pkginfo_fd.write("%s=%s\n" % (k, pkginfo_dict[k])) + pkginfo_fd.close() + + def ResetNameProperty(self): + """Sometimes, NAME= contains useless data. This method resets them.""" + pkginfo_dict = self.GetParsedPkginfo() + catalog_name = PkgnameToCatName(pkginfo_dict["PKG"]) + description = pkginfo_dict["DESC"] + pkginfo_name = "%s - %s" % (catalog_name, description) + self.SetPkginfoEntry("NAME", pkginfo_name) + + def GetDependencies(self): + depends = [] + depend_file_path = os.path.join(self.directory, "install", "depend") + if not os.path.exists(depend_file_path): + return depends + fd = open(os.path.join(self.directory, "install", "depend"), "r") + # It needs to be a list because there might be duplicates and it's + # necessary to carry that information. + for line in fd: + fields = re.split(c.WS_RE, line) + if fields[0] == "P": + pkgname = fields[1] + pkg_desc = " ".join(fields[1:]) + depends.append((pkgname, pkg_desc)) + fd.close() + return depends + + def CheckPkgpathExists(self): + if not os.path.isdir(self.directory): + raise PackageError("%s does not exist or is not a directory" + % self.directory) + + def GetFilesMetadata(self): + """Returns a data structure with all the files plus their metadata. + + [ + { + "path": ..., + "mime_type": ..., + }, + ] + """ + if not self.files_metadata: + self.CheckPkgpathExists() + self.files_metadata = [] + files_root = os.path.join(self.directory, "root") + if not os.path.exists(files_root): + return self.files_metadata + all_files = self.GetAllFilePaths() + def StripRe(x, strip_re): + return re.sub(strip_re, "", x) + root_re = re.compile(r"^root/") + file_magic = FileMagic() + for file_path in all_files: + full_path = unicode(self.MakeAbsolutePath(file_path)) + file_info = { + "path": StripRe(file_path, root_re), + "mime_type": file_magic.GetFileMimeType(full_path) + } + if not file_info["mime_type"]: + logging.error("Could not establish the mime type of %s", + full_path) + # We really don't want that, as it misses binaries. + raise PackageError("Could not establish the mime type of %s" + % full_path) + if IsBinary(file_info): + parser = hp.createParser(full_path) + if not parser: + logging.warning("Can't parse file %s", file_path) + else: + file_info["mime_type_by_hachoir"] = parser.mime_type + machine_id = parser["/header/machine"].value + file_info["machine_id"] = machine_id + file_info["endian"] = parser["/header/endian"].display + self.files_metadata.append(file_info) + return self.files_metadata + + def ListBinaries(self): + """Lists all the binaries from a given package. + + Original checkpkg code: + + ######################################### + # find all executables and dynamic libs,and list their filenames. + listbinaries() { + if [ ! -d $1 ] ; then + print errmsg $1 not a directory + rm -rf $EXTRACTDIR + exit 1 + fi + find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' + } + + Returns a list of absolute paths. + + Now that there are files_metadata, this function can safely go away, once + all its callers are modified to use files_metadata instead. + """ + if self.binaries is None: + self.CheckPkgpathExists() + files_metadata = self.GetFilesMetadata() + self.binaries = [] + # The nested for-loop looks inefficient. + for file_info in files_metadata: + if IsBinary(file_info): + self.binaries.append(file_info["path"]) + self.binaries.sort() + return self.binaries + + def GetAllFilePaths(self): + """Returns a list of all paths from the package.""" + if not self.file_paths: + self.CheckPkgpathExists() + remove_prefix = "%s/" % self.pkgpath + self.file_paths = [] + for root, dirs, files in os.walk(os.path.join(self.pkgpath, "root")): + full_paths = [os.path.join(root, f) for f in files] + self.file_paths.extend([f.replace(remove_prefix, "") for f in full_paths]) + return self.file_paths + + def _GetOverridesStream(self, file_path): + # This might potentially cause a file descriptor leak, but I'm not going to + # worry about that at this stage. + # NB, the whole catalog run doesn't seem to be suffering. (~2500 packages) + # + # There is a race condition here, but it's executing sequentially, I don't + # expect any concurrency problems. + if os.path.isfile(file_path): + logging.debug("Opening %s override file." % repr(file_path)) + return open(file_path, "r") + else: + logging.debug("Override file %s not found." % repr(file_path)) + return None + + def _ParseOverridesStream(self, stream): + override_list = [] + for line in stream: + if line.startswith("#"): + continue + override_list.append(overrides.ParseOverrideLine(line)) + return override_list + + def GetOverrides(self): + """Returns overrides, a list of overrides.Override instances.""" + overrides = [] + catalogname = self.GetCatalogname() + override_paths = ( + [self.directory, + "root", + "opt/csw/share/checkpkg/overrides", catalogname], + [self.directory, + "install", + "checkpkg_override"], + ) + for override_path in override_paths: + file_path = os.path.join(*override_path) + stream = self._GetOverridesStream(file_path) + if stream: + overrides.extend(self._ParseOverridesStream(stream)) + return overrides + + def GetFileContent(self, pkg_file_path): + if pkg_file_path.startswith("/"): + pkg_file_path = pkg_file_path[1:] + # TODO: Write a unit test for the right path + file_path = os.path.join(self.directory, "root", pkg_file_path) + try: + fd = open(file_path, "r") + content = fd.read() + fd.close() + return content + except IOError, e: + raise PackageError(e) + + def GetFilesContaining(self, regex_list): + full_paths = self.GetAllFilePaths() + files_by_pattern = {} + for full_path in full_paths: + content = open(self.MakeAbsolutePath(full_path), "rb").read() + for regex in regex_list: + if re.search(regex, content): + if regex not in files_by_pattern: + files_by_pattern[regex] = [] + files_by_pattern[regex].append(full_path) + return files_by_pattern + + def MakeAbsolutePath(self, p): + return os.path.join(self.pkgpath, p) + + +class FileMagic(object): + """Libmagic sometimes returns None, which I think is a bug. + Trying to come up with a way to work around that. + """ + + def __init__(self): + self.cookie_count = 0 + self.magic_cookie = None + + def _GetCookie(self): + magic_cookie = magic.open(self.cookie_count) + self.cookie_count += 1 + magic_cookie.load() + magic_cookie.setflags(magic.MAGIC_MIME) + return magic_cookie + + def _LazyInit(self): + if not self.magic_cookie: + self.magic_cookie = self._GetCookie() + + def GetFileMimeType(self, full_path): + """Trying to run magic.file() a few times, not accepting None.""" + self._LazyInit() + mime = None + for i in xrange(10): + mime = self.magic_cookie.file(full_path) + if mime: + break; + else: + # Returned mime is null. Re-initializing the cookie and trying again. + logging.error("magic_cookie.file(%s) returned None. Retrying.", + full_path) + self.magic_cookie = self._GetCookie() + return mime + + +class PackageComparator(object): + + def __init__(self, file_name_a, file_name_b, + permissions=False, + strip_a=None, + strip_b=None): + self.analyze_permissions = permissions + self.pkg_a = CswSrv4File(file_name_a) + self.pkg_b = CswSrv4File(file_name_b) + self.strip_a = strip_a + self.strip_b = strip_b + + def Run(self): + pkgmap_a = self.pkg_a.GetPkgmap(self.analyze_permissions, strip=self.strip_a) + pkgmap_b = self.pkg_b.GetPkgmap(self.analyze_permissions, strip=self.strip_b) + diff_ab = difflib.unified_diff(sorted(pkgmap_a.paths), + sorted(pkgmap_b.paths), + fromfile=self.pkg_a.pkg_path, + tofile=self.pkg_b.pkg_path) + diff_text = "\n".join(diff_ab) + if diff_text: + less_proc = subprocess.Popen(["less"], stdin=subprocess.PIPE) + less_stdout, less_stderr = less_proc.communicate(input=diff_text) + less_proc.wait() + else: + print "No differences found." Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:35:47 UTC (rev 11219) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:36:33 UTC (rev 11220) @@ -1000,8 +1000,11 @@ if pkgname not in policy_pkgname_list: error_mgr.ReportError( "shared-lib-pkgname-mismatch", - "file=%s pkgname=%s expected=%s" - % (binary_info["path"], pkgname, policy_pkgname_list)) + "file=%s " + "soname=%s " + "pkgname=%s " + "expected=%s" + % (binary_info["path"], soname, pkgname, policy_pkgname_list)) messenger.OneTimeMessage( soname, "This shared library (%s) is in a directory indicating that it " Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:35:47 UTC (rev 11219) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:36:33 UTC (rev 11220) @@ -1320,19 +1320,27 @@ self.pkg_data = neon_stats[0] self.error_mgr_mock.ReportError( 'shared-lib-pkgname-mismatch', - "file=opt/csw/lib/libneon.so.26.0.4 pkgname=CSWneon " + "file=opt/csw/lib/libneon.so.26.0.4 " + "soname=libneon.so.26 " + "pkgname=CSWneon " "expected=['CSWlibneon26', 'CSWlibneon-26']") self.error_mgr_mock.ReportError( 'shared-lib-pkgname-mismatch', - "file=opt/csw/lib/libneon.so.27.2.0 pkgname=CSWneon " + "file=opt/csw/lib/libneon.so.27.2.0 " + "soname=libneon.so.27 " + "pkgname=CSWneon " "expected=['CSWlibneon27', 'CSWlibneon-27']") self.error_mgr_mock.ReportError( 'shared-lib-pkgname-mismatch', - "file=opt/csw/lib/sparcv9/libneon.so.26.0.4 pkgname=CSWneon " + "file=opt/csw/lib/sparcv9/libneon.so.26.0.4 " + "soname=libneon.so.26 " + "pkgname=CSWneon " "expected=['CSWlibneon26', 'CSWlibneon-26']") self.error_mgr_mock.ReportError( 'shared-lib-pkgname-mismatch', - "file=opt/csw/lib/sparcv9/libneon.so.27.2.0 pkgname=CSWneon " + "file=opt/csw/lib/sparcv9/libneon.so.27.2.0 " + "soname=libneon.so.27 " + "pkgname=CSWneon " "expected=['CSWlibneon27', 'CSWlibneon-27']") Added: csw/mgar/gar/v2/lib/python/package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_test.py (rev 0) +++ csw/mgar/gar/v2/lib/python/package_test.py 2010-10-10 20:36:33 UTC (rev 11220) @@ -0,0 +1,7 @@ +#!/usr/bin/env python2.6 + +import unittest + +if __name__ == '__main__': + unittest.main() + Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:35:47 UTC (rev 11219) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-10 20:36:33 UTC (rev 11220) @@ -12,6 +12,7 @@ 'i486', 'i386', 'i86') AMD64_PATHS = ('amd64',) LEGIT_CHAR_RE = re.compile(r"[a-zA-Z0-9\+]+") +SONAME_VERSION_RE = re.compile("^(?P.*)\.so\.(?P[\d\.]+)$") class SonameParsingException(Exception): pass @@ -51,7 +52,7 @@ """ soname_re = re.compile(r"(?P[\w\+]+([\.\-]+[\w\+]+)*)" r"\.so" - r"(\.(?P\d+)(\..*)?)?" + r"(\.(?P[\d\.]+))?" r"$") m = soname_re.match(soname) if not m: @@ -97,3 +98,74 @@ if "sharedlib" in metadata["mime_type"]: shared_libs.append(metadata["path"]) return shared_libs + + +def GetCommonVersion(sonames): + versions = [] + for soname in sonames: + m = SONAME_VERSION_RE.search(soname) + if m: + versions.append(m.groupdict()["version"]) + versions_set = set(versions) + if len(versions_set) > 1 or not versions_set: + return None + else: + return versions_set.pop() + + +def MakePackageNameBySonameCollection(sonames): + """Finds a name for a collection of sonames. + + Try to find the largest common prefix in the sonames, and establish + whether there is a common version to them. + """ + common_version = GetCommonVersion(sonames) + if not common_version: + # If the sonames don't have a common version, they shouldn't be together + # in one package. + return None + common_substring_candidates = [] + for soname in sonames: + candidate = soname + # We always want such package to start with the prefix "lib". Therefore, + # we're stripping the prefix "lib" if it exists, and we're adding it back + # to the pkgname and soname at the end of the function. + if candidate.startswith("lib"): + candidate = candidate[3:] + m = SONAME_VERSION_RE.search(candidate) + common_substring_candidates.append(candidate) + lcs = CollectionLongestCommonSubstring(common_substring_candidates) + pkgname = "CSWlib%s.%s" % (SanitizeWithChar(lcs, "-"), common_version) + catalogname = "lib%s.%s" % (SanitizeWithChar(lcs, "_"), common_version) + return pkgname, catalogname + + +def LongestCommonSubstring(S, T): + """Stolen from Wikibooks + + http://en.wikibooks.org/wiki/Algorithm_Implementation/Strings/Longest_common_substring#Python""" + m = len(S); n = len(T) + L = [[0] * (n+1) for i in xrange(m+1)] + LCS = set() + longest = 0 + for i in xrange(m): + for j in xrange(n): + if S[i] == T[j]: + v = L[i][j] + 1 + L[i+1][j+1] = v + if v > longest: + longest = v + LCS = set() + if v == longest: + LCS.add(S[i-v+1:i+1]) + return LCS + + +def CollectionLongestCommonSubstring(collection): + current_substring = collection.pop() + while collection and current_substring: + substring_set = LongestCommonSubstring(current_substring, + collection.pop()) + if substring_set: + current_substring = list(substring_set)[0] + return current_substring Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:35:47 UTC (rev 11219) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:36:33 UTC (rev 11220) @@ -1,4 +1,4 @@ -#!/opt/csw/bin/python2.6 +#!/usr/bin/env python2.6 # $Id$ import re @@ -60,6 +60,14 @@ ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) + def testMakePackageNameBySonameMinorVersion(self): + soname = "libfoo.so.0.1" + expected = ( + ["CSWlibfoo0-1", "CSWlibfoo-0-1"], + ["libfoo0_1", "libfoo_0_1"], + ) + self.assertEqual(expected, su.MakePackageNameBySoname(soname)) + def testMakePackageNameBySonameApr(self): soname = "libapr-1.so.0" expected = ( @@ -88,7 +96,7 @@ su.MakePackageNameBySoname(soname)) def testMakePackageNameBySonameComplexApr(self): - soname = "libapr-1.so.10.0.0" + soname = "libapr-1.so.10" expected = ( ['CSWlibapr-110', 'CSWlibapr-1-10'], ['libapr_110', 'libapr_1_10'] @@ -127,5 +135,58 @@ self.assertEqual("foo_0", su.SanitizeWithChar("foo-0", "_")) +class GetCommonVersionUnitTest(unittest.TestCase): + + def testGetCommonVersionSimple(self): + sonames = ["libfoo.so.0", "libfoo_util.so.0"] + self.assertEqual("0", su.GetCommonVersion(sonames)) + + def testGetCommonVersionMore(self): + sonames = ["libfoo.so.0.2.1", "libfoo_util.so.0.2.1"] + self.assertEqual("0.2.1", su.GetCommonVersion(sonames)) + + def testGetCommonVersionInvalid(self): + sonames = ["libfoo.so.0.2.1", "libfoo_util.so.0.2.3"] + self.assertEqual(None, su.GetCommonVersion(sonames)) + + +class MakePackageNameBySonameCollectionUnitTest(unittest.TestCase): + + def testMakePackageNameBySonameCollectionTwo(self): + sonames = ["libfoo.so.0", "libfoo_util.so.0"] + expected = ( + ["CSWlibfoo0", "CSWlibfoo-0"], + ["libfoo0", "libfoo_0"], + ) + self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames)) + + def testMakePackageNameBySonameCollectionBdb(self): + sonames = ["libfoo.so.0", "libfoo_util.so.0"] + expected = ( + ["CSWlibfoo0", "CSWlibfoo-0"], + ["libfoo0", "libfoo_0"], + ) + self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames)) + + def testMakePackageNameBySonameCollectionNoCommonVersion(self): + sonames = ["libfoo.so.0", "libfoo_util.so.1"] + self.assertEqual(None, su.MakePackageNameBySonameCollection(sonames)) + + +class CommomSubstringTest(unittest.TestCase): + + def testLongestCommonSubstring_1(self): + self.assertEqual(set(["foo"]), su.LongestCommonSubstring("foo", "foo")) + + def testLongestCommonSubstring_2(self): + self.assertEqual(set([]), su.LongestCommonSubstring("foo", "bar")) + + def testLongestCommonSubstring_3(self): + self.assertEqual(set(["bar"]), su.LongestCommonSubstring("barfoobar", "bar")) + + def testLongestCommonSubstring_4(self): + self.assertEqual(set(['bcd', 'hij']), su.LongestCommonSubstring("abcdefghijk", "bcdhij")) + + if __name__ == '__main__': unittest.main() Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2010-10-10 20:35:47 UTC (rev 11219) +++ csw/mgar/gar/v2/tests/run_tests.py 2010-10-10 20:36:33 UTC (rev 11220) @@ -1,4 +1,4 @@ -#!/opt/csw/bin/python2.6 +#!/usr/bin/env python2.6 # $Id$ import unittest @@ -16,6 +16,8 @@ from package_checks_test import * from dependency_checks_test import * from sharedlib_utils_test import * +from catalog_test import * +from package_test import * # These are very slow GAR tests, which I'm disabling for now. # from example_test import * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:37:31 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:37:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[11222] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11222 http://gar.svn.sourceforge.net/gar/?rev=11222&view=rev Author: wahwah Date: 2010-10-10 20:37:31 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: Added the non-uniform-lib-versions-in-package error tag. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/catalog.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/package_test.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/catalog.py =================================================================== --- csw/mgar/gar/v2/lib/python/catalog.py 2010-10-10 20:36:59 UTC (rev 11221) +++ csw/mgar/gar/v2/lib/python/catalog.py 2010-10-10 20:37:31 UTC (rev 11222) @@ -134,6 +134,3 @@ logging.error("%s is missing the file_basename field", d) self.by_basename[d["file_basename"]] = d return self.by_basename - - - Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:36:59 UTC (rev 11221) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:37:31 UTC (rev 11222) @@ -987,6 +987,7 @@ def CheckSharedLibraryNamingPolicy(pkg_data, error_mgr, logger, messenger): pkgname = pkg_data["basic_stats"]["pkgname"] shared_libs = set(su.GetSharedLibs(pkg_data)) + linkable_shared_libs = [] for binary_info in pkg_data["binaries_dump_info"]: if binary_info["path"] in shared_libs: if su.IsLibraryLinkable(binary_info["path"]): @@ -995,27 +996,49 @@ soname = binary_info["soname"] else: soname = os.path.split(binary_info["path"])[1] - tmp = su.MakePackageNameBySoname(soname) - policy_pkgname_list, policy_catalogname_list = tmp - if pkgname not in policy_pkgname_list: - error_mgr.ReportError( - "shared-lib-pkgname-mismatch", - "file=%s " - "soname=%s " - "pkgname=%s " - "expected=%s" - % (binary_info["path"], soname, pkgname, policy_pkgname_list)) - messenger.OneTimeMessage( - soname, - "This shared library (%s) is in a directory indicating that it " - "is likely to be linked to by other programs. If this is the " - "case, the library is best packaged separately, in a package " - "with a library-specific name. Examples of such names include: " - "%s. If this library is not meant to be linked to by other " - "packages, it's best moved to a 'private' directory. " - "For example, instead of /opt/csw/lib/foo.so, " - "try /opt/csw/lib/projectname/foo.so." - % (binary_info["path"], policy_pkgname_list)) + linkable_shared_libs.append((soname, binary_info)) + check_names = True + if len(linkable_shared_libs) > 1: + sonames = [x[0] for x in linkable_shared_libs] + multilib_pkgname = su.MakePackageNameBySonameCollection(sonames) + if not multilib_pkgname: + error_mgr.ReportError( + "non-uniform-lib-versions-in-package", + "sonames=%s" + % sorted(set(sonames))) + messenger.Message( + "Package %s contains shared libraries with sonames that " + "don't have compatible versions: %s. This means that " + "they are best placed in own packages, with each package " + "named after library name and version. " + % (pkgname, sonames)) + # If the sonames aren't uniform, there's no point in trying to match + # sonames versus pkgname. + check_names = False + if check_names: + for soname, binary_info in linkable_shared_libs: + tmp = su.MakePackageNameBySoname(soname) + policy_pkgname_list, policy_catalogname_list = tmp + if pkgname not in policy_pkgname_list: + error_mgr.ReportError( + "shared-lib-pkgname-mismatch", + "file=%s " + "soname=%s " + "pkgname=%s " + "expected=%s" + % (binary_info["path"], soname, pkgname, policy_pkgname_list)) + messenger.OneTimeMessage( + soname, + "This shared library (%s) is in a directory indicating that it " + "is likely to be linked to by other programs. If this is the " + "case, the library is best packaged separately, in a package " + "with a library-specific name. Examples of such names include: " + "%s. If this library is not meant to be linked to by other " + "packages, it's best moved to a 'private' directory. " + "For example, instead of /opt/csw/lib/foo.so, " + "try /opt/csw/lib/projectname/foo.so. " + "More information: http://wiki.opencsw.org/checkpkg-error-tags" + % (binary_info["path"], policy_pkgname_list)) Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:36:59 UTC (rev 11221) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:37:31 UTC (rev 11222) @@ -1,4 +1,4 @@ -#!/opt/csw/bin/python2.6 +#!/usr/bin/env python2.6 # coding=utf-8 # $Id$ @@ -1319,29 +1319,8 @@ def CheckpkgTest(self): self.pkg_data = neon_stats[0] self.error_mgr_mock.ReportError( - 'shared-lib-pkgname-mismatch', - "file=opt/csw/lib/libneon.so.26.0.4 " - "soname=libneon.so.26 " - "pkgname=CSWneon " - "expected=['CSWlibneon26', 'CSWlibneon-26']") - self.error_mgr_mock.ReportError( - 'shared-lib-pkgname-mismatch', - "file=opt/csw/lib/libneon.so.27.2.0 " - "soname=libneon.so.27 " - "pkgname=CSWneon " - "expected=['CSWlibneon27', 'CSWlibneon-27']") - self.error_mgr_mock.ReportError( - 'shared-lib-pkgname-mismatch', - "file=opt/csw/lib/sparcv9/libneon.so.26.0.4 " - "soname=libneon.so.26 " - "pkgname=CSWneon " - "expected=['CSWlibneon26', 'CSWlibneon-26']") - self.error_mgr_mock.ReportError( - 'shared-lib-pkgname-mismatch', - "file=opt/csw/lib/sparcv9/libneon.so.27.2.0 " - "soname=libneon.so.27 " - "pkgname=CSWneon " - "expected=['CSWlibneon27', 'CSWlibneon-27']") + 'non-uniform-lib-versions-in-package', + "sonames=['libneon.so.26', 'libneon.so.27']") class TestCheckSharedLibraryPkgDoesNotHaveTheSoFile(CheckpkgUnitTestHelper, unittest.TestCase): Modified: csw/mgar/gar/v2/lib/python/package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_test.py 2010-10-10 20:36:59 UTC (rev 11221) +++ csw/mgar/gar/v2/lib/python/package_test.py 2010-10-10 20:37:31 UTC (rev 11222) @@ -4,4 +4,3 @@ if __name__ == '__main__': unittest.main() - Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:36:59 UTC (rev 11221) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:37:31 UTC (rev 11222) @@ -160,6 +160,14 @@ ) self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames)) + def testMakePackageNameBySonameCollectionRepeated(self): + sonames = ["libfoo.so.0", "libfoo.so.0"] + expected = ( + ["CSWlibfoo0", "CSWlibfoo-0"], + ["libfoo0", "libfoo_0"], + ) + self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames)) + def testMakePackageNameBySonameCollectionBdb(self): sonames = ["libfoo.so.0", "libfoo_util.so.0"] expected = ( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:37:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:37:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[11223] csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Message-ID: Revision: 11223 http://gar.svn.sourceforge.net/gar/?rev=11223&view=rev Author: wahwah Date: 2010-10-10 20:37:57 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, small changes in unit tests. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:37:31 UTC (rev 11222) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-10 20:37:57 UTC (rev 11223) @@ -1,6 +1,18 @@ #!/usr/bin/env python2.6 # $Id$ +"""Tests for the shared library utilities. + +TODO: Implement infering library names in context, for example: + +opt/csw/lib/libboinc.so.6.7.4 +opt/csw/lib/libboinc_api.so.6.7.4 +opt/csw/lib/libboinc_graphics2.so.6.7.4 +opt/csw/lib/libboinc_zip.so.6.7.4 +""" + +__author__ = "Maciej Blizinski " + import re import unittest import mox @@ -52,6 +64,9 @@ "opt/csw/share/Adobe/Reader8/Reader/sparcsolaris/lib" "/libcrypto.so.0.9.6")) + +class MakePackageNameBySonameUnitTest(unittest.TestCase): + def testMakePackageNameBySonameSimple(self): soname = "libfoo.so.0" expected = ( @@ -131,6 +146,9 @@ self.assertEqual(expected, su.MakePackageNameBySoname(soname)) + +class MakePackageNameBySonameUnitTest(unittest.TestCase): + def testSanitizeWithChar(self): self.assertEqual("foo_0", su.SanitizeWithChar("foo-0", "_")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:39:10 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:39:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11225] csw/mgar/gar/v2/lib/python/package_stats_test.py Message-ID: Revision: 11225 http://gar.svn.sourceforge.net/gar/?rev=11225&view=rev Author: wahwah Date: 2010-10-10 20:39:10 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: New file. Added Paths: ----------- csw/mgar/gar/v2/lib/python/package_stats_test.py Added: csw/mgar/gar/v2/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py (rev 0) +++ csw/mgar/gar/v2/lib/python/package_stats_test.py 2010-10-10 20:39:10 UTC (rev 11225) @@ -0,0 +1,128 @@ +#!/usr/bin/env python2.6 + +import unittest +import package_stats + +LDD_R_OUTPUT_1 = """\tlibc.so.1 => /lib/libc.so.1 +\tsymbol not found: check_encoding_conversion_args (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) +\tsymbol not found: LocalToUtf (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) +\tsymbol not found: UtfToLocal (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) +\tlibm.so.2 => /lib/libm.so.2 +\t/usr/lib/secure/s8_preload.so.1 +\tlibXext.so.0 (SUNW_1.1) =>\t (version not found) +\trelocation R_SPARC_COPY symbol: ASN1_OCTET_STRING_it: file /opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8: relocation bound to a symbol with STV_PROTECTED visibility +\trelocation R_SPARC_COPY sizes differ: _ZTI7QWidget +\t\t(file /tmp/pkg_GqCk0P/CSWkdeartworkgcc/root/opt/csw/kde-gcc/bin/kslideshow.kss size=0x28; file /opt/csw/kde-gcc/lib/libqt-mt.so.3 size=0x20) +""" + +class PackageStatsUnitTest(unittest.TestCase): + + def setUp(self): + self.pkgstats = package_stats.PackageStats(None) + + def test_ParseNmSymLineGoodLine(self): + line = '0000097616 T aliases_lookup' + expected = { + 'address': '0000097616', + 'type': 'T', + 'name': 'aliases_lookup', + } + self.assertEqual(expected, self.pkgstats._ParseNmSymLine(line)) + + def test_ParseNmSymLineBadLine(self): + line = 'foo' + self.assertEqual(None, self.pkgstats._ParseNmSymLine(line)) + + def test_ParseLddDashRlineFound(self): + line = '\tlibc.so.1 => /lib/libc.so.1' + expected = { + 'state': 'OK', + 'soname': 'libc.so.1', + 'path': '/lib/libc.so.1', + 'symbol': None, + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + + def test_ParseLddDashRlineSymbolMissing(self): + line = ('\tsymbol not found: check_encoding_conversion_args ' + '(/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so)') + expected = { + 'state': 'symbol-not-found', + 'soname': None, + 'path': '/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so', + 'symbol': 'check_encoding_conversion_args', + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + + def test_ParseLddDashRlineFound(self): + line = '\t/usr/lib/secure/s8_preload.so.1' + expected = { + 'state': 'OK', + 'soname': None, + 'path': '/usr/lib/secure/s8_preload.so.1', + 'symbol': None, + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + + def test_ParseLdd_VersionNotFound(self): + line = '\tlibXext.so.0 (SUNW_1.1) =>\t (version not found)' + expected = { + 'symbol': None, + 'soname': 'libXext.so.0', + 'path': None, + 'state': 'version-not-found', + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + + def test_ParseLdd_StvProtectedVisibility(self): + line = ('\trelocation R_SPARC_COPY symbol: ASN1_OCTET_STRING_it: ' + 'file /opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8: ' + 'relocation bound to a symbol with STV_PROTECTED visibility') + expected = { + 'symbol': 'ASN1_OCTET_STRING_it', + 'soname': None, + 'path': '/opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8', + 'state': 'relocation-bound-to-a-symbol-with-STV_PROTECTED-visibility', + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + + def test_ParseLdd_SizesDiffer(self): + line = '\trelocation R_SPARC_COPY sizes differ: _ZTI7QWidget' + expected = { + 'symbol': '_ZTI7QWidget', + 'soname': None, + 'path': None, + 'state': 'sizes-differ', + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + + def test_ParseLdd_SizesDifferInfo(self): + line = ('\t\t(file /tmp/pkg_GqCk0P/CSWkdeartworkgcc/root/opt/csw/kde-gcc/bin/' + 'kslideshow.kss size=0x28; ' + 'file /opt/csw/kde-gcc/lib/libqt-mt.so.3 size=0x20)') + expected = { + 'symbol': None, + 'path': ('/tmp/pkg_GqCk0P/CSWkdeartworkgcc/root/opt/csw/kde-gcc/' + 'bin/kslideshow.kss /opt/csw/kde-gcc/lib/libqt-mt.so.3'), + 'state': 'sizes-diff-info', + 'soname': None, + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + + def test_ParseLdd_SizesDifferOneUsed(self): + line = ('\t\t/opt/csw/kde-gcc/lib/libqt-mt.so.3 size used; ' + 'possible insufficient data copied') + expected = { + 'symbol': None, + 'path': '/opt/csw/kde-gcc/lib/libqt-mt.so.3', + 'state': 'sizes-diff-one-used', + 'soname': None, + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + + def test_ParseLddDashRlineManyLines(self): + for line in LDD_R_OUTPUT_1.splitlines(): + parsed = self.pkgstats._ParseLddDashRline(line) + + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:38:42 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:38:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11224] csw/mgar/gar/v2 Message-ID: Revision: 11224 http://gar.svn.sourceforge.net/gar/?rev=11224&view=rev Author: wahwah Date: 2010-10-10 20:38:42 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: More refactoring, needs testing and pychecker. Modified Paths: -------------- csw/mgar/gar/v2/bin/analyze_module_results.py csw/mgar/gar/v2/bin/checkpkg_collect_stats.py csw/mgar/gar/v2/lib/python/catalog.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/tests/run_tests.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/database.py csw/mgar/gar/v2/lib/python/package_stats.py Modified: csw/mgar/gar/v2/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2/bin/analyze_module_results.py 2010-10-10 20:37:57 UTC (rev 11223) +++ csw/mgar/gar/v2/bin/analyze_module_results.py 2010-10-10 20:38:42 UTC (rev 11224) @@ -17,6 +17,7 @@ sys.path.append(os.path.join(*path_list)) import checkpkg import overrides +import package_stats BEFORE_OVERRIDES = """If any of the reported errors were false positives, you can override them pasting the lines below to the GAR recipe.""" @@ -48,7 +49,7 @@ # It might be a good idea to store the error tags in the database and # eliminate the need to access the directory with the error tag files. - pkgstats = checkpkg.StatsListFromCatalog(filenames, options.catalog) + pkgstats = package_stats.StatsListFromCatalog(filenames, options.catalog) overrides_list = [pkg.GetSavedOverrides() for pkg in pkgstats] override_list = reduce(operator.add, overrides_list) error_tags = reduce(operator.add, [stat.GetSavedErrorTags() for stat in pkgstats]) Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-10-10 20:37:57 UTC (rev 11223) +++ csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-10-10 20:38:42 UTC (rev 11224) @@ -21,6 +21,7 @@ sys.path.append(os.path.join(*path_list)) import checkpkg import opencsw +import package_stats def main(): parser = optparse.OptionParser() @@ -43,7 +44,7 @@ args_display = args_display[:5] + ["...more..."] file_list = args logging.debug("Processing: %s, please be patient", args_display) - stats_list = checkpkg.StatsListFromCatalog( + stats_list = package_stats.StatsListFromCatalog( file_list, options.catalog, options.debug) # Reversing the item order in the list, so that the pop() method can be used # to get packages, and the order of processing still matches the one in the Modified: csw/mgar/gar/v2/lib/python/catalog.py =================================================================== --- csw/mgar/gar/v2/lib/python/catalog.py 2010-10-10 20:37:57 UTC (rev 11223) +++ csw/mgar/gar/v2/lib/python/catalog.py 2010-10-10 20:38:42 UTC (rev 11224) @@ -1,7 +1,18 @@ #!/usr/bin/env python2.6 +import os import re +import logging + +class Error(Exception): + pass + + +class CatalogLineParseError(Error): + pass + + class OpencswCatalogBuilder(object): def __init__(self, product_dir, catalog_dir): Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-10-10 20:37:57 UTC (rev 11223) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-10-10 20:38:42 UTC (rev 11224) @@ -24,16 +24,18 @@ import textwrap import yaml from Cheetah import Template +import database + import opencsw import overrides import package_checks +import package_stats import models as m import configuration as c import tag + DEBUG_BREAK_PKGMAP_AFTER = False -DB_SCHEMA_VERSION = 5L -PACKAGE_STATS_VERSION = 9L SYSTEM_PKGMAP = "/var/sadm/install/contents" NEEDED_SONAMES = "needed sonames" RUNPATH = "runpath" @@ -194,58 +196,7 @@ return m.group("username") if m else None -class DatabaseClient(object): - - CHECKPKG_DIR = ".checkpkg" - SQLITE3_DBNAME_TMPL = "checkpkg-db-%(fqdn)s" - TABLES_THAT_NEED_UPDATES = (m.CswFile,) - TABLES = TABLES_THAT_NEED_UPDATES + ( - m.Pkginst, - m.CswConfig, - m.Srv4FileStats, - m.CheckpkgOverride, - m.CheckpkgErrorTag, - m.Architecture, - m.OsRelease, - m.Maintainer) - sqo_conn = None - db_path = None - - def __init__(self, debug=False): - self.debug = debug - - @classmethod - def GetDatabasePath(cls): - if not cls.db_path: - dbname_dict = {'fqdn': socket.getfqdn()} - db_filename = cls.SQLITE3_DBNAME_TMPL % dbname_dict - home_dir = os.environ["HOME"] - cls.db_path = os.path.join(home_dir, cls.CHECKPKG_DIR, db_filename) - return cls.db_path - - @classmethod - def InitializeSqlobject(cls): - """Establishes a database connection and stores it as a class member. - - The idea is to share the database connection between instances. It would - be solved even better if the connection was passed to the class - constructor. - """ - if not cls.sqo_conn: - db_path = cls.GetDatabasePath() - cls.sqo_conn = sqlobject.connectionForURI('sqlite:%s' % db_path) - sqlobject.sqlhub.processConnection = cls.sqo_conn - - def CreateTables(self): - for table in self.TABLES: - table.createTable(ifNotExists=True) - - def IsDatabaseGoodSchema(self): - good_version = self.GetDatabaseSchemaVersion() >= DB_SCHEMA_VERSION - return good_version - - -class SystemPkgmap(DatabaseClient): +class SystemPkgmap(database.DatabaseClient): """A class to hold and manipulate the /var/sadm/install/contents file.""" STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] @@ -457,7 +408,7 @@ try: config_option = m.CswConfig.select( m.CswConfig.q.option_key==CONFIG_DB_SCHEMA).getOne() - config_option.int_value = DB_SCHEMA_VERSION + config_option.int_value = database.DB_SCHEMA_VERSION except sqlobject.main.SQLObjectNotFound, e: version = m.CswConfig(option_key=CONFIG_DB_SCHEMA, int_value=DB_SCHEMA_VERSION) @@ -578,7 +529,7 @@ # subsequent checkpkg runs won't pick up the last change. # I don't expect pkgadd to run under 1s. fresh = f_mtime <= d_mtime - good_version = self.GetDatabaseSchemaVersion() >= DB_SCHEMA_VERSION + good_version = self.GetDatabaseSchemaVersion() >= database.DB_SCHEMA_VERSION logging.debug("IsDatabaseUpToDate: good_version=%s, fresh=%s", repr(good_version), repr(fresh)) return fresh and good_version @@ -775,7 +726,8 @@ self.packages = [] def GetPackageStatsList(self): - return [PackageStats(None, self.stats_basedir, x) for x in self.md5sum_list] + return [package_stats.PackageStats(None, self.stats_basedir, x) + for x in self.md5sum_list] def FormatReports(self, errors, messages, gar_lines): namespace = { @@ -802,7 +754,7 @@ else: if "package-set" not in errors: errors["package-set"] = [] - errors["package-set"].append(error) + errors["package-set"].append(tag) return errors def GetOptimizedAllStats(self, stats_obj_list): @@ -1083,425 +1035,6 @@ return tuple(isalist) -class PackageStats(DatabaseClient): - """Collects stats about a package and saves it. - - TODO: Maintain a global database connection instead of creating one for each - instantiated object. - TODO: Store overrides in a separate table for performance. - """ - - def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None, debug=False): - super(PackageStats, self).__init__(debug=debug) - self.srv4_pkg = srv4_pkg - self.md5sum = md5sum - self.dir_format_pkg = None - self.all_stats = {} - self.stats_basedir = stats_basedir - self.db_pkg_stats = None - if not self.stats_basedir: - home = os.environ["HOME"] - parts = [home, ".checkpkg", "stats"] - self.stats_basedir = os.path.join(*parts) - self.InitializeSqlobject() - - def GetPkgchkData(self): - ret, stdout, stderr = self.srv4_pkg.GetPkgchkOutput() - data = { - 'return_code': ret, - 'stdout_lines': stdout.splitlines(), - 'stderr_lines': stderr.splitlines(), - } - return data - - def GetMd5sum(self): - if not self.md5sum: - self.md5sum = self.srv4_pkg.GetMd5sum() - return self.md5sum - - def GetDbObject(self): - if not self.db_pkg_stats: - md5_sum = self.GetMd5sum() - res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum) - if not res.count(): - # TODO: Change this bit to throw an exception if the object is not - # found. - return None - else: - self.db_pkg_stats = res.getOne() - return self.db_pkg_stats - - - def StatsExist(self): - """Checks if statistics of a package exist. - - Returns: - bool - """ - pkg_stats = self.GetDbObject() - if not pkg_stats: - return False - if pkg_stats.stats_version != PACKAGE_STATS_VERSION: - pkg_stats.destroySelf() - else: - return True - return False - - def GetDirFormatPkg(self): - if not self.dir_format_pkg: - self.dir_format_pkg = self.srv4_pkg.GetDirFormatPkg() - return self.dir_format_pkg - - def GetMtime(self): - return self.srv4_pkg.GetMtime() - - def _MakeDirP(self, dir_path): - """mkdir -p equivalent. - - http://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python - """ - try: - os.makedirs(dir_path) - except OSError, e: - if e.errno == errno.EEXIST: - pass - else: - raise - - def GetBinaryDumpInfo(self): - dir_pkg = self.GetDirFormatPkg() - # Binaries. This could be split off to a separate function. - # man ld.so.1 for more info on this hack - env = copy.copy(os.environ) - env["LD_NOAUXFLTR"] = "1" - binaries_dump_info = [] - for binary in dir_pkg.ListBinaries(): - binary_abs_path = os.path.join(dir_pkg.directory, "root", binary) - binary_base_name = os.path.basename(binary) - args = [DUMP_BIN, "-Lv", binary_abs_path] - dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) - stdout, stderr = dump_proc.communicate() - ret = dump_proc.wait() - binary_data = ParseDumpOutput(stdout) - binary_data["path"] = binary - binary_data["base_name"] = binary_base_name - binaries_dump_info.append(binary_data) - return binaries_dump_info - - def GetBasicStats(self): - dir_pkg = self.GetDirFormatPkg() - basic_stats = {} - basic_stats["stats_version"] = PACKAGE_STATS_VERSION - basic_stats["pkg_path"] = self.srv4_pkg.pkg_path - basic_stats["pkg_basename"] = os.path.basename(self.srv4_pkg.pkg_path) - basic_stats["parsed_basename"] = opencsw.ParsePackageFileName( - basic_stats["pkg_basename"]) - basic_stats["pkgname"] = dir_pkg.pkgname - basic_stats["catalogname"] = dir_pkg.GetCatalogname() - basic_stats["md5_sum"] = self.GetMd5sum() - return basic_stats - - def GetOverrides(self): - dir_pkg = self.GetDirFormatPkg() - override_list = dir_pkg.GetOverrides() - def OverrideToDict(override): - return { - "pkgname": override.pkgname, - "tag_name": override.tag_name, - "tag_info": override.tag_info, - } - overrides_simple = [OverrideToDict(x) for x in override_list] - return overrides_simple - - def GetLddMinusRlines(self): - """Returns ldd -r output.""" - dir_pkg = self.GetDirFormatPkg() - binaries = dir_pkg.ListBinaries() - ldd_output = {} - for binary in binaries: - binary_abspath = os.path.join(dir_pkg.directory, "root", binary) - # this could be potentially moved into the DirectoryFormatPackage class. - # ldd needs the binary to be executable - os.chmod(binary_abspath, 0755) - args = ["ldd", "-r", binary_abspath] - ldd_proc = subprocess.Popen( - args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = ldd_proc.communicate() - retcode = ldd_proc.wait() - if retcode: - logging.error("%s returned an error: %s", args, stderr) - ldd_info = [] - for line in stdout.splitlines(): - ldd_info.append(self._ParseLddDashRline(line)) - ldd_output[binary] = ldd_info - return ldd_output - - def GetDefinedSymbols(self): - """Returns text symbols (i.e. defined functions) for packaged ELF objects - - To do this we parse output lines from nm similar to the following. "T"s are - the definitions which we are after. - - 0000104000 D _lib_version - 0000986980 D _libiconv_version - 0000000000 U abort - 0000097616 T aliases_lookup - """ - dir_pkg = self.GetDirFormatPkg() - binaries = dir_pkg.ListBinaries() - defined_symbols = {} - - for binary in binaries: - binary_abspath = os.path.join(dir_pkg.directory, "root", binary) - # Get parsable, ld.so.1 relevant SHT_DYNSYM symbol information - args = ["/usr/ccs/bin/nm", "-p", "-D", binary_abspath] - nm_proc = subprocess.Popen( - args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = nm_proc.communicate() - retcode = nm_proc.wait() - if retcode: - logging.error("%s returned an error: %s", args, stderr) - continue - nm_out = stdout.splitlines() - - defined_symbols[binary] = [] - for line in nm_out: - sym = self._ParseNmSymLine(line) - if not sym: - continue - if sym['type'] not in ("T", "D", "B"): - continue - defined_symbols[binary].append(sym['name']) - - return defined_symbols - - def _ParseNmSymLine(self, line): - re_defined_symbol = re.compile('[0-9]+ [ABDFNSTU] \S+') - m = re_defined_symbol.match(line) - if not m: - return None - fields = line.split() - sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } - return sym - - def CollectStats(self, force=False): - """Lazy stats collection.""" - if force or not self.StatsExist(): - return self._CollectStats() - return self.ReadSavedStats() - - def _CollectStats(self): - """The list of variables needs to be synchronized with the one - at the top of this class. - """ - dir_pkg = self.GetDirFormatPkg() - logging.debug("Collecting %s package statistics.", repr(dir_pkg.pkgname)) - override_dicts = self.GetOverrides() - pkg_stats = { - "binaries": dir_pkg.ListBinaries(), - "binaries_dump_info": self.GetBinaryDumpInfo(), - "depends": dir_pkg.GetDependencies(), - "isalist": GetIsalist(), - "overrides": override_dicts, - "pkgchk": self.GetPkgchkData(), - "pkginfo": dir_pkg.GetParsedPkginfo(), - "pkgmap": dir_pkg.GetPkgmap().entries, - "bad_paths": dir_pkg.GetFilesContaining(BAD_CONTENT_REGEXES), - "basic_stats": self.GetBasicStats(), - "files_metadata": dir_pkg.GetFilesMetadata(), - "mtime": self.GetMtime(), - } - pkgname = pkg_stats["basic_stats"]["pkgname"] - # Getting sqlobject representations. - try: - pkginst = m.Pkginst.select(m.Pkginst.q.pkgname==pkgname).getOne() - except sqlobject.main.SQLObjectNotFound, e: - logging.debug(e) - pkginst = m.Pkginst(pkgname=pkgname) - try: - res = m.Architecture.select( - m.Architecture.q.name==pkg_stats["pkginfo"]["ARCH"]) - arch = res.getOne() - except sqlobject.main.SQLObjectNotFound, e: - logging.debug(e) - arch = m.Architecture(name=pkg_stats["pkginfo"]["ARCH"]) - parsed_basename = pkg_stats["basic_stats"]["parsed_basename"] - os_rel_name = parsed_basename["osrel"] - try: - os_rel = m.OsRelease.select( - m.OsRelease.q.short_name==os_rel_name).getOne() - except sqlobject.main.SQLObjectNotFound, e: - logging.debug(e) - os_rel = m.OsRelease(short_name=os_rel_name, full_name=os_rel_name) - try: - maint_email = pkg_stats["pkginfo"]["EMAIL"] - maintainer = m.Maintainer.select( - m.Maintainer.q.email==maint_email).getOne() - except sqlobject.main.SQLObjectNotFound, e: - logging.debug(e) - maintainer = m.Maintainer(email=maint_email) - - # If there are any previous records of the same pkginst, arch and os_rel, - # we're marking them as not-latest. - # This assumes that the packages are examined in a chronological order. - res = m.Srv4FileStats.select(sqlobject.AND( - m.Srv4FileStats.q.pkginst==pkginst, - m.Srv4FileStats.q.arch==arch, - m.Srv4FileStats.q.os_rel==os_rel)) - for obj in res: - obj.latest = False - - rev=None - if "revision_info" in parsed_basename: - if "REV" in parsed_basename["revision_info"]: - rev = parsed_basename["revision_info"]["REV"] - # Creating the object in the database. - db_pkg_stats = m.Srv4FileStats( - md5_sum=self.GetMd5sum(), - pkginst=pkginst, - catalogname=pkg_stats["basic_stats"]["catalogname"], - stats_version=PACKAGE_STATS_VERSION, - os_rel=os_rel, - arch=arch, - basename=pkg_stats["basic_stats"]["pkg_basename"], - maintainer=maintainer, - latest=True, - version_string=parsed_basename["full_version_string"], - rev=rev, - mtime=self.GetMtime(), - data=cPickle.dumps(pkg_stats)) - # Inserting overrides as rows into the database - for override_dict in override_dicts: - o = m.CheckpkgOverride(srv4_file=db_pkg_stats, - **override_dict) - - # The ldd -r reporting breaks on bigger packages during yaml saving. - # It might work when yaml is disabled - # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") - # This check is currently disabled, let's save time by not collecting - # these data. - # self.DumpObject(self.GetDefinedSymbols(), "defined_symbols") - # This one should be last, so that if the collection is interrupted - # in one of the previous runs, the basic_stats.pickle file is not there - # or not updated, and the collection is started again. - - logging.debug("Statistics of %s have been collected.", repr(dir_pkg.pkgname)) - return pkg_stats - - def GetAllStats(self): - if not self.all_stats and self.StatsExist(): - self.all_stats = self.ReadSavedStats() - elif not self.all_stats: - self.all_stats = self.CollectStats() - return self.all_stats - - def GetSavedOverrides(self): - if not self.StatsExist(): - raise PackageError("Package stats not ready.") - pkg_stats = self.GetDbObject() - res = m.CheckpkgOverride.select(m.CheckpkgOverride.q.srv4_file==pkg_stats) - override_list = [] - for db_override in res: - d = { - 'pkgname': db_override.pkgname, - 'tag_name': db_override.tag_name, - 'tag_info': db_override.tag_info, - } - override_list.append(overrides.Override(**d)) - return override_list - - def GetSavedErrorTags(self): - pkg_stats = self.GetDbObject() - res = m.CheckpkgErrorTag.select(m.CheckpkgErrorTag.q.srv4_file==pkg_stats) - tag_list = [tag.CheckpkgTag(x.pkgname, x.tag_name, x.tag_info, x.msg) - for x in res] - return tag_list - - def ReadSavedStats(self): - if not self.all_stats: - md5_sum = self.GetMd5sum() - res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum) - self.all_stats = cPickle.loads(str(res.getOne().data)) - return self.all_stats - - def _ParseLddDashRline(self, line): - found_re = r"^\t(?P\S+)\s+=>\s+(?P\S+)" - symbol_not_found_re = (r"^\tsymbol not found:\s(?P\S+)\s+" - r"\((?P\S+)\)") - only_so = r"^\t(?P\S+)$" - version_so = (r'^\t(?P\S+) ' - r'\((?P\S+)\) =>\t \(version not found\)') - stv_protected = (r'^\trelocation \S+ symbol: (?P\S+): ' - r'file (?P\S+): ' - r'relocation bound to a symbol ' - r'with STV_PROTECTED visibility$') - sizes_differ = (r'^\trelocation \S+ sizes differ: ' - r'(?P\S+)$') - sizes_info = (r'^\t\t\(file (?P\S+) size=(?P0x\w+); ' - r'file (?P\S+) size=(?P0x\w+)\)$') - sizes_one_used = (r'^\t\t(?P\S+) size used; ' - r'possible insufficient data copied$') - common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s)" - % (found_re, symbol_not_found_re, only_so, version_so, - stv_protected, sizes_differ, sizes_info, sizes_one_used)) - m = re.match(common_re, line) - response = {} - if m: - d = m.groupdict() - if "soname" in d and d["soname"]: - # it was found - response["state"] = "OK" - response["soname"] = d["soname"] - response["path"] = d["path_found"] - response["symbol"] = None - elif "symbol" in d and d["symbol"]: - response["state"] = "symbol-not-found" - response["soname"] = None - response["path"] = d["path_not_found"] - response["symbol"] = d["symbol"] - elif d["path_only"]: - response["state"] = "OK" - response["soname"] = None - response["path"] = d["path_only"] - response["symbol"] = None - elif d["soname_version_not_found"]: - response["state"] = "version-not-found" - response["soname"] = d["soname_version_not_found"] - response["path"] = None - response["symbol"] = None - elif d["relocation_symbol"]: - response["state"] = 'relocation-bound-to-a-symbol-with-STV_PROTECTED-visibility' - response["soname"] = None - response["path"] = d["relocation_path"] - response["symbol"] = d["relocation_symbol"] - elif d["sizes_differ_symbol"]: - response["state"] = 'sizes-differ' - response["soname"] = None - response["path"] = None - response["symbol"] = d["sizes_differ_symbol"] - elif d["sizediff_file1"]: - response["state"] = 'sizes-diff-info' - response["soname"] = None - response["path"] = "%s %s" % (d["sizediff_file1"], d["sizediff_file2"]) - response["symbol"] = None - elif d["sizediffused_file"]: - response["state"] = 'sizes-diff-one-used' - response["soname"] = None - response["path"] = "%s" % (d["sizediffused_file"]) - response["symbol"] = None - else: - raise StdoutSyntaxError("Could not parse %s with %s" - % (repr(line), common_re)) - else: - raise StdoutSyntaxError("Could not parse %s with %s" - % (repr(line), common_re)) - return response - - def ErrorTagsFromFile(file_name): fd = open(file_name) error_tags = [] @@ -1513,20 +1046,6 @@ return error_tags -def StatsListFromCatalog(file_name_list, catalog_file_name=None, debug=False): - packages = [opencsw.CswSrv4File(x, debug) for x in file_name_list] - if catalog_file_name: - catalog = opencsw.OpencswCatalog(catalog_file_name) - md5s_by_basename = catalog.GetDataByBasename() - for pkg in packages: - basename = os.path.basename(pkg.pkg_path) - # It might be the case that a file is present on disk, but missing from - # the catalog file. - if basename in md5s_by_basename: - pkg.md5sum = md5s_by_basename[basename]["md5sum"] - stats_list = [PackageStats(pkg) for pkg in packages] - return stats_list - def SliceList(l, size): """Trasforms a list into a list of lists.""" idxes = xrange(0, len(l), size) @@ -1546,14 +1065,14 @@ md5s.append(arg) else: filenames.append(arg) - srv4_pkgs = [opencsw.CswSrv4File(x) for x in filenames] + srv4_pkgs = [package.CswSrv4File(x) for x in filenames] pkgstat_objs = [] bar = progressbar.ProgressBar() bar.maxval = len(md5s) + len(srv4_pkgs) bar.start() counter = itertools.count() for pkg in srv4_pkgs: - pkgstat_objs.append(PackageStats(pkg, debug=debug)) + pkgstat_objs.append(package_stats.PackageStats(pkg, debug=debug)) bar.update(counter.next()) for md5 in md5s: pkgstat_objs.append(PackageStats(None, md5sum=md5, debug=debug)) Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-10-10 20:37:57 UTC (rev 11223) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-10-10 20:38:42 UTC (rev 11224) @@ -23,18 +23,6 @@ SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; """ -LDD_R_OUTPUT_1 = """\tlibc.so.1 => /lib/libc.so.1 -\tsymbol not found: check_encoding_conversion_args (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) -\tsymbol not found: LocalToUtf (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) -\tsymbol not found: UtfToLocal (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) -\tlibm.so.2 => /lib/libm.so.2 -\t/usr/lib/secure/s8_preload.so.1 -\tlibXext.so.0 (SUNW_1.1) =>\t (version not found) -\trelocation R_SPARC_COPY symbol: ASN1_OCTET_STRING_it: file /opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8: relocation bound to a symbol with STV_PROTECTED visibility -\trelocation R_SPARC_COPY sizes differ: _ZTI7QWidget -\t\t(file /tmp/pkg_GqCk0P/CSWkdeartworkgcc/root/opt/csw/kde-gcc/bin/kslideshow.kss size=0x28; file /opt/csw/kde-gcc/lib/libqt-mt.so.3 size=0x20) -""" - class GetLinesBySonameUnitTest(unittest.TestCase): def setUp(self): @@ -279,116 +267,6 @@ self.assertEqual(expected, spkgmap._InferPackagesFromPkgmapLine(line)) -class PackageStatsUnitTest(unittest.TestCase): - - def setUp(self): - self.pkgstats = checkpkg.PackageStats(None) - - def test_ParseNmSymLineGoodLine(self): - line = '0000097616 T aliases_lookup' - expected = { - 'address': '0000097616', - 'type': 'T', - 'name': 'aliases_lookup', - } - self.assertEqual(expected, self.pkgstats._ParseNmSymLine(line)) - - def test_ParseNmSymLineBadLine(self): - line = 'foo' - self.assertEqual(None, self.pkgstats._ParseNmSymLine(line)) - - def test_ParseLddDashRlineFound(self): - line = '\tlibc.so.1 => /lib/libc.so.1' - expected = { - 'state': 'OK', - 'soname': 'libc.so.1', - 'path': '/lib/libc.so.1', - 'symbol': None, - } - self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) - - def test_ParseLddDashRlineSymbolMissing(self): - line = ('\tsymbol not found: check_encoding_conversion_args ' - '(/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so)') - expected = { - 'state': 'symbol-not-found', - 'soname': None, - 'path': '/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so', - 'symbol': 'check_encoding_conversion_args', - } - self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) - - def test_ParseLddDashRlineFound(self): - line = '\t/usr/lib/secure/s8_preload.so.1' - expected = { - 'state': 'OK', - 'soname': None, - 'path': '/usr/lib/secure/s8_preload.so.1', - 'symbol': None, - } - self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) - - def test_ParseLdd_VersionNotFound(self): - line = '\tlibXext.so.0 (SUNW_1.1) =>\t (version not found)' - expected = { - 'symbol': None, - 'soname': 'libXext.so.0', - 'path': None, - 'state': 'version-not-found', - } - self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) - - def test_ParseLdd_StvProtectedVisibility(self): - line = ('\trelocation R_SPARC_COPY symbol: ASN1_OCTET_STRING_it: ' - 'file /opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8: ' - 'relocation bound to a symbol with STV_PROTECTED visibility') - expected = { - 'symbol': 'ASN1_OCTET_STRING_it', - 'soname': None, - 'path': '/opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8', - 'state': 'relocation-bound-to-a-symbol-with-STV_PROTECTED-visibility', - } - self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) - - def test_ParseLdd_SizesDiffer(self): - line = '\trelocation R_SPARC_COPY sizes differ: _ZTI7QWidget' - expected = { - 'symbol': '_ZTI7QWidget', - 'soname': None, - 'path': None, - 'state': 'sizes-differ', - } - self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) - - def test_ParseLdd_SizesDifferInfo(self): - line = ('\t\t(file /tmp/pkg_GqCk0P/CSWkdeartworkgcc/root/opt/csw/kde-gcc/bin/' - 'kslideshow.kss size=0x28; ' - 'file /opt/csw/kde-gcc/lib/libqt-mt.so.3 size=0x20)') - expected = { - 'symbol': None, - 'path': ('/tmp/pkg_GqCk0P/CSWkdeartworkgcc/root/opt/csw/kde-gcc/' - 'bin/kslideshow.kss /opt/csw/kde-gcc/lib/libqt-mt.so.3'), - 'state': 'sizes-diff-info', - 'soname': None, - } - self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) - - def test_ParseLdd_SizesDifferOneUsed(self): - line = ('\t\t/opt/csw/kde-gcc/lib/libqt-mt.so.3 size used; ' - 'possible insufficient data copied') - expected = { - 'symbol': None, - 'path': '/opt/csw/kde-gcc/lib/libqt-mt.so.3', - 'state': 'sizes-diff-one-used', - 'soname': None, - } - self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) - - def test_ParseLddDashRlineManyLines(self): - for line in LDD_R_OUTPUT_1.splitlines(): - parsed = self.pkgstats._ParseLddDashRline(line) - - class ExtractorsUnitTest(unittest.TestCase): def testExtractDescriptionFromGoodData(self): Added: csw/mgar/gar/v2/lib/python/database.py =================================================================== --- csw/mgar/gar/v2/lib/python/database.py (rev 0) +++ csw/mgar/gar/v2/lib/python/database.py 2010-10-10 20:38:42 UTC (rev 11224) @@ -0,0 +1,57 @@ +import socket +import os +import sqlobject +import models as m + +DB_SCHEMA_VERSION = 5L + + +class DatabaseClient(object): + + CHECKPKG_DIR = ".checkpkg" + SQLITE3_DBNAME_TMPL = "checkpkg-db-%(fqdn)s" + TABLES_THAT_NEED_UPDATES = (m.CswFile,) + TABLES = TABLES_THAT_NEED_UPDATES + ( + m.Pkginst, + m.CswConfig, + m.Srv4FileStats, + m.CheckpkgOverride, + m.CheckpkgErrorTag, + m.Architecture, + m.OsRelease, + m.Maintainer) + sqo_conn = None + db_path = None + + def __init__(self, debug=False): + self.debug = debug + + @classmethod + def GetDatabasePath(cls): + if not cls.db_path: + dbname_dict = {'fqdn': socket.getfqdn()} + db_filename = cls.SQLITE3_DBNAME_TMPL % dbname_dict + home_dir = os.environ["HOME"] + cls.db_path = os.path.join(home_dir, cls.CHECKPKG_DIR, db_filename) + return cls.db_path + + @classmethod + def InitializeSqlobject(cls): + """Establishes a database connection and stores it as a class member. + + The idea is to share the database connection between instances. It would + be solved even better if the connection was passed to the class + constructor. + """ + if not cls.sqo_conn: + db_path = cls.GetDatabasePath() + cls.sqo_conn = sqlobject.connectionForURI('sqlite:%s' % db_path) + sqlobject.sqlhub.processConnection = cls.sqo_conn + + def CreateTables(self): + for table in self.TABLES: + table.createTable(ifNotExists=True) + + def IsDatabaseGoodSchema(self): + good_version = self.GetDatabaseSchemaVersion() >= DB_SCHEMA_VERSION + return good_version Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-10 20:37:57 UTC (rev 11223) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-10 20:38:42 UTC (rev 11224) @@ -102,10 +102,6 @@ pass -class CatalogLineParseError(Error): - pass - - def ParsePackageFileName(p): if p.endswith(".gz"): p = p[:-3] Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2010-10-10 20:37:57 UTC (rev 11223) +++ csw/mgar/gar/v2/lib/python/package.py 2010-10-10 20:38:42 UTC (rev 11224) @@ -1,7 +1,10 @@ #!/usr/bin/env python2.6 +import hashlib +import logging +import subprocess + import magic -import subprocess import hachoir_parser as hp # Suppress unhelpful warnings Added: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py (rev 0) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2010-10-10 20:38:42 UTC (rev 11224) @@ -0,0 +1,446 @@ +#!/usr/bin/env python2.6 + +import cPickle +import os +import re + +import catalog +import database +import package +import models as m +import tag + +PACKAGE_STATS_VERSION = 9L + +class PackageStats(database.DatabaseClient): + """Collects stats about a package and saves it. + + TODO: Maintain a global database connection instead of creating one for each + instantiated object. + TODO: Store overrides in a separate table for performance. + """ + + def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None, debug=False): + super(PackageStats, self).__init__(debug=debug) + self.srv4_pkg = srv4_pkg + self.md5sum = md5sum + self.dir_format_pkg = None + self.all_stats = {} + self.stats_basedir = stats_basedir + self.db_pkg_stats = None + if not self.stats_basedir: + home = os.environ["HOME"] + parts = [home, ".checkpkg", "stats"] + self.stats_basedir = os.path.join(*parts) + self.InitializeSqlobject() + + def GetPkgchkData(self): + ret, stdout, stderr = self.srv4_pkg.GetPkgchkOutput() + data = { + 'return_code': ret, + 'stdout_lines': stdout.splitlines(), + 'stderr_lines': stderr.splitlines(), + } + return data + + def GetMd5sum(self): + if not self.md5sum: + self.md5sum = self.srv4_pkg.GetMd5sum() + return self.md5sum + + def GetDbObject(self): + if not self.db_pkg_stats: + md5_sum = self.GetMd5sum() + res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum) + if not res.count(): + # TODO: Change this bit to throw an exception if the object is not + # found. + return None + else: + self.db_pkg_stats = res.getOne() + return self.db_pkg_stats + + + def StatsExist(self): + """Checks if statistics of a package exist. + + Returns: + bool + """ + pkg_stats = self.GetDbObject() + if not pkg_stats: + return False + if pkg_stats.stats_version != PACKAGE_STATS_VERSION: + pkg_stats.destroySelf() + else: + return True + return False + + def GetDirFormatPkg(self): + if not self.dir_format_pkg: + self.dir_format_pkg = self.srv4_pkg.GetDirFormatPkg() + return self.dir_format_pkg + + def GetMtime(self): + return self.srv4_pkg.GetMtime() + + def _MakeDirP(self, dir_path): + """mkdir -p equivalent. + + http://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python + """ + try: + os.makedirs(dir_path) + except OSError, e: + if e.errno == errno.EEXIST: + pass + else: + raise + + def GetBinaryDumpInfo(self): + dir_pkg = self.GetDirFormatPkg() + # Binaries. This could be split off to a separate function. + # man ld.so.1 for more info on this hack + env = copy.copy(os.environ) + env["LD_NOAUXFLTR"] = "1" + binaries_dump_info = [] + for binary in dir_pkg.ListBinaries(): + binary_abs_path = os.path.join(dir_pkg.directory, "root", binary) + binary_base_name = os.path.basename(binary) + args = [DUMP_BIN, "-Lv", binary_abs_path] + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) + stdout, stderr = dump_proc.communicate() + ret = dump_proc.wait() + binary_data = ParseDumpOutput(stdout) + binary_data["path"] = binary + binary_data["base_name"] = binary_base_name + binaries_dump_info.append(binary_data) + return binaries_dump_info + + def GetBasicStats(self): + dir_pkg = self.GetDirFormatPkg() + basic_stats = {} + basic_stats["stats_version"] = PACKAGE_STATS_VERSION + basic_stats["pkg_path"] = self.srv4_pkg.pkg_path + basic_stats["pkg_basename"] = os.path.basename(self.srv4_pkg.pkg_path) + basic_stats["parsed_basename"] = opencsw.ParsePackageFileName( + basic_stats["pkg_basename"]) + basic_stats["pkgname"] = dir_pkg.pkgname + basic_stats["catalogname"] = dir_pkg.GetCatalogname() + basic_stats["md5_sum"] = self.GetMd5sum() + return basic_stats + + def GetOverrides(self): + dir_pkg = self.GetDirFormatPkg() + override_list = dir_pkg.GetOverrides() + def OverrideToDict(override): + return { + "pkgname": override.pkgname, + "tag_name": override.tag_name, + "tag_info": override.tag_info, + } + overrides_simple = [OverrideToDict(x) for x in override_list] + return overrides_simple + + def GetLddMinusRlines(self): + """Returns ldd -r output.""" + dir_pkg = self.GetDirFormatPkg() + binaries = dir_pkg.ListBinaries() + ldd_output = {} + for binary in binaries: + binary_abspath = os.path.join(dir_pkg.directory, "root", binary) + # this could be potentially moved into the DirectoryFormatPackage class. + # ldd needs the binary to be executable + os.chmod(binary_abspath, 0755) + args = ["ldd", "-r", binary_abspath] + ldd_proc = subprocess.Popen( + args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = ldd_proc.communicate() + retcode = ldd_proc.wait() + if retcode: + logging.error("%s returned an error: %s", args, stderr) + ldd_info = [] + for line in stdout.splitlines(): + ldd_info.append(self._ParseLddDashRline(line)) + ldd_output[binary] = ldd_info + return ldd_output + + def GetDefinedSymbols(self): + """Returns text symbols (i.e. defined functions) for packaged ELF objects + + To do this we parse output lines from nm similar to the following. "T"s are + the definitions which we are after. + + 0000104000 D _lib_version + 0000986980 D _libiconv_version + 0000000000 U abort + 0000097616 T aliases_lookup + """ + dir_pkg = self.GetDirFormatPkg() + binaries = dir_pkg.ListBinaries() + defined_symbols = {} + + for binary in binaries: + binary_abspath = os.path.join(dir_pkg.directory, "root", binary) + # Get parsable, ld.so.1 relevant SHT_DYNSYM symbol information + args = ["/usr/ccs/bin/nm", "-p", "-D", binary_abspath] + nm_proc = subprocess.Popen( + args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = nm_proc.communicate() + retcode = nm_proc.wait() + if retcode: + logging.error("%s returned an error: %s", args, stderr) + continue + nm_out = stdout.splitlines() + + defined_symbols[binary] = [] + for line in nm_out: + sym = self._ParseNmSymLine(line) + if not sym: + continue + if sym['type'] not in ("T", "D", "B"): + continue + defined_symbols[binary].append(sym['name']) + + return defined_symbols + + def _ParseNmSymLine(self, line): + re_defined_symbol = re.compile('[0-9]+ [ABDFNSTU] \S+') + m = re_defined_symbol.match(line) + if not m: + return None + fields = line.split() + sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } + return sym + + def CollectStats(self, force=False): + """Lazy stats collection.""" + if force or not self.StatsExist(): + return self._CollectStats() + return self.ReadSavedStats() + + def _CollectStats(self): + """The list of variables needs to be synchronized with the one + at the top of this class. + """ + dir_pkg = self.GetDirFormatPkg() + logging.debug("Collecting %s package statistics.", repr(dir_pkg.pkgname)) + override_dicts = self.GetOverrides() + pkg_stats = { + "binaries": dir_pkg.ListBinaries(), + "binaries_dump_info": self.GetBinaryDumpInfo(), + "depends": dir_pkg.GetDependencies(), + "isalist": GetIsalist(), + "overrides": override_dicts, + "pkgchk": self.GetPkgchkData(), + "pkginfo": dir_pkg.GetParsedPkginfo(), + "pkgmap": dir_pkg.GetPkgmap().entries, + "bad_paths": dir_pkg.GetFilesContaining(BAD_CONTENT_REGEXES), + "basic_stats": self.GetBasicStats(), + "files_metadata": dir_pkg.GetFilesMetadata(), + "mtime": self.GetMtime(), + } + pkgname = pkg_stats["basic_stats"]["pkgname"] + # Getting sqlobject representations. + try: + pkginst = m.Pkginst.select(m.Pkginst.q.pkgname==pkgname).getOne() + except sqlobject.main.SQLObjectNotFound, e: + logging.debug(e) + pkginst = m.Pkginst(pkgname=pkgname) + try: + res = m.Architecture.select( + m.Architecture.q.name==pkg_stats["pkginfo"]["ARCH"]) + arch = res.getOne() + except sqlobject.main.SQLObjectNotFound, e: + logging.debug(e) + arch = m.Architecture(name=pkg_stats["pkginfo"]["ARCH"]) + parsed_basename = pkg_stats["basic_stats"]["parsed_basename"] + os_rel_name = parsed_basename["osrel"] + try: + os_rel = m.OsRelease.select( + m.OsRelease.q.short_name==os_rel_name).getOne() + except sqlobject.main.SQLObjectNotFound, e: + logging.debug(e) + os_rel = m.OsRelease(short_name=os_rel_name, full_name=os_rel_name) + try: + maint_email = pkg_stats["pkginfo"]["EMAIL"] + maintainer = m.Maintainer.select( + m.Maintainer.q.email==maint_email).getOne() + except sqlobject.main.SQLObjectNotFound, e: + logging.debug(e) + maintainer = m.Maintainer(email=maint_email) + + # If there are any previous records of the same pkginst, arch and os_rel, + # we're marking them as not-latest. + # This assumes that the packages are examined in a chronological order. + res = m.Srv4FileStats.select(sqlobject.AND( + m.Srv4FileStats.q.pkginst==pkginst, + m.Srv4FileStats.q.arch==arch, + m.Srv4FileStats.q.os_rel==os_rel)) + for obj in res: + obj.latest = False + + rev=None + if "revision_info" in parsed_basename: + if "REV" in parsed_basename["revision_info"]: + rev = parsed_basename["revision_info"]["REV"] + # Creating the object in the database. + db_pkg_stats = m.Srv4FileStats( + md5_sum=self.GetMd5sum(), + pkginst=pkginst, + catalogname=pkg_stats["basic_stats"]["catalogname"], + stats_version=PACKAGE_STATS_VERSION, + os_rel=os_rel, + arch=arch, + basename=pkg_stats["basic_stats"]["pkg_basename"], + maintainer=maintainer, + latest=True, + version_string=parsed_basename["full_version_string"], + rev=rev, + mtime=self.GetMtime(), + data=cPickle.dumps(pkg_stats)) + # Inserting overrides as rows into the database + for override_dict in override_dicts: + o = m.CheckpkgOverride(srv4_file=db_pkg_stats, + **override_dict) + + # The ldd -r reporting breaks on bigger packages during yaml saving. + # It might work when yaml is disabled + # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") + # This check is currently disabled, let's save time by not collecting + # these data. + # self.DumpObject(self.GetDefinedSymbols(), "defined_symbols") + # This one should be last, so that if the collection is interrupted + # in one of the previous runs, the basic_stats.pickle file is not there + # or not updated, and the collection is started again. + + logging.debug("Statistics of %s have been collected.", repr(dir_pkg.pkgname)) + return pkg_stats + + def GetAllStats(self): + if not self.all_stats and self.StatsExist(): + self.all_stats = self.ReadSavedStats() + elif not self.all_stats: + self.all_stats = self.CollectStats() + return self.all_stats + + def GetSavedOverrides(self): + if not self.StatsExist(): + raise PackageError("Package stats not ready.") + pkg_stats = self.GetDbObject() + res = m.CheckpkgOverride.select(m.CheckpkgOverride.q.srv4_file==pkg_stats) + override_list = [] + for db_override in res: + d = { + 'pkgname': db_override.pkgname, + 'tag_name': db_override.tag_name, + 'tag_info': db_override.tag_info, + } + override_list.append(overrides.Override(**d)) + return override_list + + def GetSavedErrorTags(self): + pkg_stats = self.GetDbObject() + res = m.CheckpkgErrorTag.select(m.CheckpkgErrorTag.q.srv4_file==pkg_stats) + tag_list = [tag.CheckpkgTag(x.pkgname, x.tag_name, x.tag_info, x.msg) + for x in res] + return tag_list + + def ReadSavedStats(self): + if not self.all_stats: + md5_sum = self.GetMd5sum() + res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum) + self.all_stats = cPickle.loads(str(res.getOne().data)) + return self.all_stats + + def _ParseLddDashRline(self, line): + found_re = r"^\t(?P\S+)\s+=>\s+(?P\S+)" + symbol_not_found_re = (r"^\tsymbol not found:\s(?P\S+)\s+" + r"\((?P\S+)\)") + only_so = r"^\t(?P\S+)$" + version_so = (r'^\t(?P\S+) ' + r'\((?P\S+)\) =>\t \(version not found\)') + stv_protected = (r'^\trelocation \S+ symbol: (?P\S+): ' + r'file (?P\S+): ' + r'relocation bound to a symbol ' + r'with STV_PROTECTED visibility$') + sizes_differ = (r'^\trelocation \S+ sizes differ: ' + r'(?P\S+)$') + sizes_info = (r'^\t\t\(file (?P\S+) size=(?P0x\w+); ' + r'file (?P\S+) size=(?P0x\w+)\)$') + sizes_one_used = (r'^\t\t(?P\S+) size used; ' + r'possible insufficient data copied$') + common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s)" + % (found_re, symbol_not_found_re, only_so, version_so, + stv_protected, sizes_differ, sizes_info, sizes_one_used)) + m = re.match(common_re, line) + response = {} + if m: + d = m.groupdict() + if "soname" in d and d["soname"]: + # it was found + response["state"] = "OK" + response["soname"] = d["soname"] + response["path"] = d["path_found"] + response["symbol"] = None + elif "symbol" in d and d["symbol"]: + response["state"] = "symbol-not-found" + response["soname"] = None + response["path"] = d["path_not_found"] + response["symbol"] = d["symbol"] + elif d["path_only"]: + response["state"] = "OK" + response["soname"] = None + response["path"] = d["path_only"] + response["symbol"] = None + elif d["soname_version_not_found"]: + response["state"] = "version-not-found" + response["soname"] = d["soname_version_not_found"] + response["path"] = None + response["symbol"] = None + elif d["relocation_symbol"]: + response["state"] = 'relocation-bound-to-a-symbol-with-STV_PROTECTED-visibility' + response["soname"] = None + response["path"] = d["relocation_path"] + response["symbol"] = d["relocation_symbol"] + elif d["sizes_differ_symbol"]: + response["state"] = 'sizes-differ' + response["soname"] = None + response["path"] = None + response["symbol"] = d["sizes_differ_symbol"] + elif d["sizediff_file1"]: + response["state"] = 'sizes-diff-info' + response["soname"] = None + response["path"] = "%s %s" % (d["sizediff_file1"], d["sizediff_file2"]) + response["symbol"] = None + elif d["sizediffused_file"]: + response["state"] = 'sizes-diff-one-used' + response["soname"] = None + response["path"] = "%s" % (d["sizediffused_file"]) + response["symbol"] = None + else: + raise StdoutSyntaxError("Could not parse %s with %s" + % (repr(line), common_re)) + else: + raise StdoutSyntaxError("Could not parse %s with %s" + % (repr(line), common_re)) + return response + + +def StatsListFromCatalog(file_name_list, catalog_file_name=None, debug=False): + packages = [package.CswSrv4File(x, debug) for x in file_name_list] + if catalog_file_name: + catalog_obj = catalog.OpencswCatalog(catalog_file_name) + md5s_by_basename = catalog_obj.GetDataByBasename() + for pkg in packages: + basename = os.path.basename(pkg.pkg_path) + # It might be the case that a file is present on disk, but missing from + # the catalog file. + if basename in md5s_by_basename: + pkg.md5sum = md5s_by_basename[basename]["md5sum"] + stats_list = [PackageStats(pkg) for pkg in packages] + return stats_list Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2010-10-10 20:37:57 UTC (rev 11223) +++ csw/mgar/gar/v2/tests/run_tests.py 2010-10-10 20:38:42 UTC (rev 11224) @@ -18,6 +18,7 @@ from sharedlib_utils_test import * from catalog_test import * from package_test import * +from package_stats_test import * # These are very slow GAR tests, which I'm disabling for now. # from example_test import * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:40:16 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:40:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[11227] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 11227 http://gar.svn.sourceforge.net/gar/?rev=11227&view=rev Author: wahwah Date: 2010-10-10 20:40:16 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, a bugfix. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:39:49 UTC (rev 11226) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:40:16 UTC (rev 11227) @@ -1026,7 +1026,7 @@ messenger.Message( "The collection of sonames (%s) " "is expected to be in package " - "named %s, but the package name is %s. + "named %s, but the package name is %s. " "More information: " "http://wiki.opencsw.org/checkpkg-error-tags" % (sonames, multilib_pkgname, pkgname)) @@ -1041,8 +1041,6 @@ "soname=%s " "pkgname=%s " "expected=%s" - "More information: " - "http://wiki.opencsw.org/checkpkg-error-tags" % (binary_info["path"], soname, pkgname, policy_pkgname_list)) suggested_pkgname = policy_pkgname_list[0] messenger.SuggestGarLine( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:39:49 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:39:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[11226] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11226 http://gar.svn.sourceforge.net/gar/?rev=11226&view=rev Author: wahwah Date: 2010-10-10 20:39:49 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, more refactoring work and error tag updates. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/package_stats.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-10-10 20:39:10 UTC (rev 11225) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-10-10 20:39:49 UTC (rev 11226) @@ -22,12 +22,10 @@ from sqlobject import sqlbuilder import subprocess import textwrap -import yaml from Cheetah import Template import database -import opencsw -import overrides +import package import package_checks import package_stats import models as m @@ -411,7 +409,7 @@ config_option.int_value = database.DB_SCHEMA_VERSION except sqlobject.main.SQLObjectNotFound, e: version = m.CswConfig(option_key=CONFIG_DB_SCHEMA, - int_value=DB_SCHEMA_VERSION) + int_value=database.DB_SCHEMA_VERSION) def GetPkgmapLineByBasename(self, filename): """Returns pkgmap lines by basename: @@ -1075,7 +1073,7 @@ pkgstat_objs.append(package_stats.PackageStats(pkg, debug=debug)) bar.update(counter.next()) for md5 in md5s: - pkgstat_objs.append(PackageStats(None, md5sum=md5, debug=debug)) + pkgstat_objs.append(package_stats.PackageStats(None, md5sum=md5, debug=debug)) bar.update(counter.next()) bar.finish() return pkgstat_objs Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-10 20:39:10 UTC (rev 11225) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-10 20:39:49 UTC (rev 11226) @@ -14,19 +14,12 @@ import copy import datetime -import difflib -import hashlib import logging import os import os.path import re import shutil -import subprocess -import tempfile -import time import urllib2 -import overrides -import configuration as c from Cheetah import Template import sharedlib_utils as su Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:39:10 UTC (rev 11225) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:39:49 UTC (rev 11226) @@ -1015,6 +1015,21 @@ # If the sonames aren't uniform, there's no point in trying to match # sonames versus pkgname. check_names = False + else: + if multilib_pkgname != pkgname: + error_mgr.ReportError( + "shared-lib-pkgname-mismatch", + "sonames=%s " + "pkgname=%s " + "expected=%s " + % (sorted(set(sonames)), pkgname, multilib_pkgname)) + messenger.Message( + "The collection of sonames (%s) " + "is expected to be in package " + "named %s, but the package name is %s. + "More information: " + "http://wiki.opencsw.org/checkpkg-error-tags" + % (sonames, multilib_pkgname, pkgname)) if check_names: for soname, binary_info in linkable_shared_libs: tmp = su.MakePackageNameBySoname(soname) @@ -1026,7 +1041,17 @@ "soname=%s " "pkgname=%s " "expected=%s" + "More information: " + "http://wiki.opencsw.org/checkpkg-error-tags" % (binary_info["path"], soname, pkgname, policy_pkgname_list)) + suggested_pkgname = policy_pkgname_list[0] + messenger.SuggestGarLine( + "PACKAGES += %s" % suggested_pkgname) + messenger.SuggestGarLine( + "PKGFILES_%s += %s" % (suggested_pkgname, binary_info["path"])) + lib_basename, lib_filename = os.path.split(binary_info["path"]) + messenger.SuggestGarLine( + "PKGFILES_%s += %s/%s.*" % (suggested_pkgname, lib_basename, soname)) messenger.OneTimeMessage( soname, "This shared library (%s) is in a directory indicating that it " @@ -1061,6 +1086,10 @@ error_mgr.ReportError( "shared-lib-package-contains-so-symlink", "file=%s" % entry["path"]) + messenger.SuggestGarLine("# (If %s-devel doesn't exist yet)" % pkgname) + messenger.SuggestGarLine("PACKAGES += %s-devel" % pkgname) + messenger.SuggestGarLine( + "PKGFILES_%s-devel += %s" % (pkgname, entry["path"])) messenger.Message( "The package contains shared libraries together with the " "symlink of the form libfoo.so -> libfoo.so.1. " @@ -1080,3 +1109,13 @@ 2. Contains .so but not .h """ pass + + +def SharedLibraryNameMustBeAsubstringOfSoname(): + pass + +def SonameMustNotBeEqualToFileNameIfFilenameEndsWithSo(): + pass + +def LinkableSoFileMustBeAsymlink(): + pass Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:39:10 UTC (rev 11225) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:39:49 UTC (rev 11226) @@ -22,6 +22,7 @@ from testdata.sudo_stats import pkgstats as sudo_stats from testdata.javasvn_stats import pkgstats as javasvn_stats from testdata.neon_stats import pkgstats as neon_stats +from testdata.bdb48_stats import pkgstat_objs as bdb48_stats from testdata import stubs DEFAULT_PKG_STATS = None @@ -1323,6 +1324,12 @@ "sonames=['libneon.so.26', 'libneon.so.27']") +class TestCheckSharedLibraryNamingPolicyBerkeley(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckSharedLibraryNamingPolicy' + def CheckpkgTest(self): + self.pkg_data = bdb48_stats[0] + + class TestCheckSharedLibraryPkgDoesNotHaveTheSoFile(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckSharedLibraryPkgDoesNotHaveTheSoFile' def CheckpkgTest(self): Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2010-10-10 20:39:10 UTC (rev 11225) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2010-10-10 20:39:49 UTC (rev 11226) @@ -7,6 +7,7 @@ import catalog import database import package +import overrides import models as m import tag Added: csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py 2010-10-10 20:39:49 UTC (rev 11226) @@ -0,0 +1,1198 @@ +import datetime +pkgstat_objs = [{'bad_paths': {}, + 'basic_stats': {'catalogname': 'berkeleydb48', + 'md5_sum': '884e86c865b6cf30d21da6436318c289', + 'parsed_basename': {'arch': 'sparc', + 'catalogname': 'berkeleydb48', + 'full_version_string': '4.8.26,REV=2010.03.02_rev=p0', + 'osrel': 'SunOS5.8', + 'revision_info': {'REV': '2010.03.02', + 'rev': 'p0'}, + 'vendortag': 'CSW', + 'version': '4.8.26', + 'version_info': {'major version': '4', + 'minor version': '8', + 'patchlevel': '26'}}, + 'pkg_basename': 'berkeleydb48-4.8.26,REV=2010.03.02_rev=p0-SunOS5.8-sparc-CSW.pkg.gz', + 'pkg_path': '/tmp/pkg_uOLf65/berkeleydb48-4.8.26,REV=2010.03.02_rev=p0-SunOS5.8-sparc-CSW.pkg.gz', + 'pkgname': 'CSWbdb48', + 'stats_version': 9L}, + 'binaries': ['opt/csw/bdb48/bin/db_archive', + 'opt/csw/bdb48/bin/db_checkpoint', + 'opt/csw/bdb48/bin/db_deadlock', + 'opt/csw/bdb48/bin/db_dump', + 'opt/csw/bdb48/bin/db_hotbackup', + 'opt/csw/bdb48/bin/db_load', + 'opt/csw/bdb48/bin/db_printlog', + 'opt/csw/bdb48/bin/db_recover', + 'opt/csw/bdb48/bin/db_sql', + 'opt/csw/bdb48/bin/db_stat', + 'opt/csw/bdb48/bin/db_upgrade', + 'opt/csw/bdb48/bin/db_verify', + 'opt/csw/bdb48/bin/sparcv9/db_archive', + 'opt/csw/bdb48/bin/sparcv9/db_checkpoint', + 'opt/csw/bdb48/bin/sparcv9/db_deadlock', + 'opt/csw/bdb48/bin/sparcv9/db_dump', + 'opt/csw/bdb48/bin/sparcv9/db_hotbackup', + 'opt/csw/bdb48/bin/sparcv9/db_load', + 'opt/csw/bdb48/bin/sparcv9/db_printlog', + 'opt/csw/bdb48/bin/sparcv9/db_recover', + 'opt/csw/bdb48/bin/sparcv9/db_sql', + 'opt/csw/bdb48/bin/sparcv9/db_stat', + 'opt/csw/bdb48/bin/sparcv9/db_upgrade', + 'opt/csw/bdb48/bin/sparcv9/db_verify', + 'opt/csw/bdb48/lib/libdb-4.8.so', + 'opt/csw/bdb48/lib/libdb_cxx-4.8.so', + 'opt/csw/bdb48/lib/libdb_java-4.8.so', + 'opt/csw/bdb48/lib/libdb_tcl-4.8.so', + 'opt/csw/bdb48/lib/sparcv9/libdb-4.8.so', + 'opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.8.so', + 'opt/csw/bdb48/lib/sparcv9/libdb_java-4.8.so'], + 'binaries_dump_info': [{'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_archive', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/db_archive', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/bdb48/lib')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_checkpoint', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/db_checkpoint', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/bdb48/lib')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_deadlock', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/db_deadlock', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/bdb48/lib')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_dump', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/db_dump', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/bdb48/lib')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_hotbackup', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/db_hotbackup', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/bdb48/lib')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_load', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/db_load', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/bdb48/lib')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_printlog', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/db_printlog', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/bdb48/lib')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_recover', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/db_recover', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/bdb48/lib')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_sql', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/db_sql', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/bdb48/lib')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_stat', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/db_stat', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/bdb48/lib')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_upgrade', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/db_upgrade', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/bdb48/lib')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_verify', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/db_verify', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/bdb48/lib')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_archive', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/sparcv9/db_archive', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_checkpoint', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/sparcv9/db_checkpoint', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_deadlock', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/sparcv9/db_deadlock', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_dump', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/sparcv9/db_dump', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_hotbackup', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/sparcv9/db_hotbackup', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_load', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/sparcv9/db_load', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_printlog', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/sparcv9/db_printlog', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_recover', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/sparcv9/db_recover', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_sql', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/sparcv9/db_sql', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_stat', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/sparcv9/db_stat', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_upgrade', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/sparcv9/db_upgrade', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'db_verify', + 'needed sonames': ('libdb-4.8.so', + 'libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/bin/sparcv9/db_verify', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64')}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'libdb-4.8.so', + 'needed sonames': ('libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/lib/libdb-4.8.so', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib'), + 'soname': 'libdb-4.8.so'}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'libdb_cxx-4.8.so', + 'needed sonames': ('libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1', + 'libCstd.so.1', + 'libCrun.so.1'), + 'path': 'opt/csw/bdb48/lib/libdb_cxx-4.8.so', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/studio/SOS11/SUNWspro/lib/rw7', + '/opt/studio/SOS11/SUNWspro/lib/v8', + '/opt/studio/SOS11/SUNWspro/lib', + '/opt/SUNWspro/lib/v8', + '/opt/SUNWspro/lib', + '/usr/ccs/lib', + '/lib', + '/usr/lib'), + 'soname': 'libdb_cxx-4.8.so'}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'libdb_java-4.8.so', + 'needed sonames': ('libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/lib/libdb_java-4.8.so', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib'), + 'soname': 'libdb_java-4.8.so'}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'libdb_tcl-4.8.so', + 'needed sonames': ('libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/lib/libdb_tcl-4.8.so', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib'), + 'soname': 'libdb_tcl-4.8.so'}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'libdb-4.8.so', + 'needed sonames': ('libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/lib/sparcv9/libdb-4.8.so', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64'), + 'soname': 'libdb-4.8.so'}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'libdb_cxx-4.8.so', + 'needed sonames': ('libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1', + 'libCstd.so.1', + 'libCrun.so.1'), + 'path': 'opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.8.so', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64', + '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', + '/opt/studio/SOS11/SUNWspro/lib/v9', + '/opt/SUNWspro/lib/v9', + '/usr/ccs/lib/sparcv9', + '/lib/sparcv9', + '/usr/lib/sparcv9'), + 'soname': 'libdb_cxx-4.8.so'}, + {'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'libdb_java-4.8.so', + 'needed sonames': ('libresolv.so.2', + 'librt.so.1', + 'libpthread.so.1', + 'libnsl.so.1', + 'libsocket.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bdb48/lib/sparcv9/libdb_java-4.8.so', + 'runpath': ('/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64'), + 'soname': 'libdb_java-4.8.so'}], + 'depends': [('CSWcommon', + 'CSWcommon common - common files and dirs for CSW packages ')], + 'files_metadata': [{'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/berkeleydb48/license'}, + {'mime_type': 'application/zip; charset=binary', + 'path': 'opt/csw/bdb48/lib/db.jar'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-sharedlib; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/lib/libdb_java-4.8.so'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-sharedlib; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/lib/libdb-4.8.so'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-sharedlib; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/lib/libdb_cxx-4.8.so'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-sharedlib; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/lib/libdb_tcl-4.8.so'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-sharedlib; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/lib/sparcv9/libdb-4.8.so'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-sharedlib; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/lib/sparcv9/libdb_java-4.8.so'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-sharedlib; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.8.so'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/db_deadlock'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/db_hotbackup'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/db_stat'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/db_checkpoint'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/db_upgrade'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/db_verify'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/db_archive'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/db_load'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/db_recover'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/db_dump'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/db_sql'}, + {'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/db_printlog'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/sparcv9/db_recover'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/sparcv9/db_dump'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/sparcv9/db_checkpoint'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/sparcv9/db_deadlock'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/sparcv9/db_verify'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/sparcv9/db_printlog'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/sparcv9/db_sql'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/sparcv9/db_upgrade'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/sparcv9/db_load'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/sparcv9/db_hotbackup'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/sparcv9/db_stat'}, + {'endian': 'Big endian', + 'machine_id': 43, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bdb48/bin/sparcv9/db_archive'}], + 'isalist': ('sparcv9+vis2', + 'sparcv9+vis', + 'sparcv9', + 'sparcv8plus+vis2', + 'sparcv8plus+vis', + 'sparcv8plus', + 'sparcv8', + 'sparcv8-fsmuld', + 'sparcv7', + 'sparc'), + 'mtime': datetime.datetime(2010, 3, 2, 18, 9, 30), + 'overrides': [], + 'pkgchk': {'return_code': 0, + 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', + '/var/tmp/aaaRYaGbW/CSWbdb48'], + 'stdout_lines': ['Checking uninstalled stream format package from ', + '## Checking control scripts.', + '## Checking package objects.', + '## Checking is complete.']}, + 'pkginfo': {'ARCH': 'sparc', + 'CATEGORY': 'application', + 'CLASSES': 'none', + 'EMAIL': 'dam at opencsw.org', + 'HOTLINE': 'http://www.opencsw.org/bugtrack/', + 'NAME': 'berkeleydb48 - BerkeleyDB 4.8 embedded database libraries and utilities', + 'OPENCSW_CATALOGNAME': 'berkeleydb48', + 'OPENCSW_MODE64': '32/64', + 'OPENCSW_REPOSITORY': 'https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/bdb48/trunk at 8931', + 'PKG': 'CSWbdb48', + 'PSTAMP': 'dam at build8s-20100302084832', + 'VENDOR': 'http://www.oracle.com/technology/software/products/berkeley-db/db/index.html packaged for CSW by Dagobert Michelsen', + 'VERSION': '4.8.26,REV=2010.03.02_rev=p0', + 'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'}, + 'pkgmap': [{'class': None, + 'group': None, + 'line': ': 1 39447', + 'mode': None, + 'path': None, + 'type': '1', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/bdb48 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/bdb48', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/bdb48/bin 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/bdb48/bin', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/db_archive 0555 root bin 12756 30157 1267481964', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/db_archive', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/db_checkpoint 0555 root bin 16524 8117 1267481965', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/db_checkpoint', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/db_deadlock 0555 root bin 16736 18603 1267481965', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/db_deadlock', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/db_dump 0555 root bin 19188 24549 1267481966', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/db_dump', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/db_hotbackup 0555 root bin 23692 61802 1267481966', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/db_hotbackup', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/db_load 0555 root bin 31864 956 1267481967', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/db_load', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/db_printlog 0555 root bin 92140 3626 1267481967', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/db_printlog', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/db_recover 0555 root bin 14184 52530 1267481968', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/db_recover', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/db_sql 0555 root bin 142252 2715 1267481969', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/db_sql', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/db_stat 0555 root bin 17888 59242 1267481969', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/db_stat', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/db_upgrade 0555 root bin 13600 23802 1267481970', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/db_upgrade', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/db_verify 0555 root bin 16092 4558 1267481970', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/db_verify', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/bdb48/bin/sparcv9 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/bdb48/bin/sparcv9', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/sparcv9/db_archive 0555 root bin 14112 56542 1267483255', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/sparcv9/db_archive', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/sparcv9/db_checkpoint 0555 root bin 18344 42509 1267483256', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/sparcv9/db_checkpoint', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/sparcv9/db_deadlock 0555 root bin 18624 51627 1267483256', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/sparcv9/db_deadlock', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/sparcv9/db_dump 0555 root bin 21232 12373 1267483257', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/sparcv9/db_dump', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/sparcv9/db_hotbackup 0555 root bin 26384 59289 1267483257', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/sparcv9/db_hotbackup', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/sparcv9/db_load 0555 root bin 34768 64531 1267483258', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/sparcv9/db_load', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/sparcv9/db_printlog 0555 root bin 103096 47004 1267483258', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/sparcv9/db_printlog', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/sparcv9/db_recover 0555 root bin 15936 15410 1267483259', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/sparcv9/db_recover', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/sparcv9/db_sql 0555 root bin 150168 35808 1267483259', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/sparcv9/db_sql', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/sparcv9/db_stat 0555 root bin 19512 44064 1267483260', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/sparcv9/db_stat', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/sparcv9/db_upgrade 0555 root bin 15024 53358 1267483261', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/sparcv9/db_upgrade', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/bin/sparcv9/db_verify 0555 root bin 17600 36720 1267483261', + 'mode': '0555', + 'path': '/opt/csw/bdb48/bin/sparcv9/db_verify', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/bdb48/lib 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/bdb48/lib', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/32=.', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/32', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/64=sparcv9', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/64', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/lib/db.jar 0444 root bin 553512 3197 1267481964', + 'mode': '0444', + 'path': '/opt/csw/bdb48/lib/db.jar', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/lib/libdb-4.8.so 0755 root bin 2260000 61706 1267481964', + 'mode': '0755', + 'path': '/opt/csw/bdb48/lib/libdb-4.8.so', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/libdb-4.so=libdb-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/libdb-4.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/libdb.so=libdb-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/libdb.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/lib/libdb_cxx-4.8.so 0755 root bin 2432964 52449 1267481964', + 'mode': '0755', + 'path': '/opt/csw/bdb48/lib/libdb_cxx-4.8.so', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/libdb_cxx-4.so=libdb_cxx-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/libdb_cxx-4.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/libdb_cxx.so=libdb_cxx-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/libdb_cxx.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/lib/libdb_java-4.8.so 0755 root bin 2473128 15946 1267481964', + 'mode': '0755', + 'path': '/opt/csw/bdb48/lib/libdb_java-4.8.so', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/libdb_java-4.8_g.so=libdb_java-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/libdb_java-4.8_g.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/libdb_java-4.so=libdb_java-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/libdb_java-4.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/libdb_java.so=libdb_java-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/libdb_java.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/lib/libdb_tcl-4.8.so 0755 root bin 2395688 2875 1267481964', + 'mode': '0755', + 'path': '/opt/csw/bdb48/lib/libdb_tcl-4.8.so', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/libdb_tcl-4.so=libdb_tcl-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/libdb_tcl-4.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/libdb_tcl.so=libdb_tcl-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/libdb_tcl.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/bdb48/lib/sparcv9 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/bdb48/lib/sparcv9', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/lib/sparcv9/libdb-4.8.so 0755 root bin 2432504 2855 1267483254', + 'mode': '0755', + 'path': '/opt/csw/bdb48/lib/sparcv9/libdb-4.8.so', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/sparcv9/libdb-4.so=libdb-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/sparcv9/libdb-4.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/sparcv9/libdb.so=libdb-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/sparcv9/libdb.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.8.so 0755 root bin 2630200 42499 1267483254', + 'mode': '0755', + 'path': '/opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.8.so', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.so=libdb_cxx-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/sparcv9/libdb_cxx.so=libdb_cxx-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/sparcv9/libdb_cxx.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bdb48/lib/sparcv9/libdb_java-4.8.so 0755 root bin 2688664 15932 1267483254', + 'mode': '0755', + 'path': '/opt/csw/bdb48/lib/sparcv9/libdb_java-4.8.so', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/sparcv9/libdb_java-4.8_g.so=libdb_java-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/sparcv9/libdb_java-4.8_g.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/sparcv9/libdb_java-4.so=libdb_java-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/sparcv9/libdb_java-4.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/bdb48/lib/sparcv9/libdb_java.so=libdb_java-4.8.so', + 'mode': None, + 'path': '/opt/csw/bdb48/lib/sparcv9/libdb_java.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/share/doc/berkeleydb48 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/share/doc/berkeleydb48', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/doc/berkeleydb48/license 0444 root bin 7287 49073 1267516025', + 'mode': '0444', + 'path': '/opt/csw/share/doc/berkeleydb48/license', + 'type': 'f', + 'user': 'root'}, + {'class': None, + 'group': None, + 'line': '1 i copyright 76 7082 1267516024', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': None, + 'group': None, + 'line': '1 i depend 60 5306 1267516112', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': None, + 'group': None, + 'line': '1 i pkginfo 568 47857 1267516117', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}]}] + Added: csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py 2010-10-10 20:39:49 UTC (rev 11226) @@ -0,0 +1,208 @@ +import datetime +pkgstat_objs = [{'bad_paths': {}, + 'basic_stats': {'catalogname': 'libnet', + 'md5_sum': '903c6ab7e055fd7a732f69544f84e05a', + 'parsed_basename': {'arch': 'sparc', + 'catalogname': 'libnet', + 'full_version_string': '1.0.2,REV=2004.04.08_rev=a', + 'osrel': 'SunOS5.8', + 'revision_info': {'REV': '2004.04.08', + 'rev': 'a'}, + 'vendortag': 'CSW', + 'version': '1.0.2', + 'version_info': {'major version': '1', + 'minor version': '0', + 'patchlevel': '2'}}, + 'pkg_basename': 'libnet-1.0.2,REV=2004.04.08_rev=a-SunOS5.8-sparc-CSW.pkg.gz', + 'pkg_path': '/tmp/pkg_m9fsd3/libnet-1.0.2,REV=2004.04.08_rev=a-SunOS5.8-sparc-CSW.pkg.gz', + 'pkgname': 'CSWlibnet', + 'stats_version': 9L}, + 'binaries': [], + 'binaries_dump_info': [], + 'depends': [], + 'files_metadata': [], + 'isalist': ('sparcv9+vis2', + 'sparcv9+vis', + 'sparcv9', + 'sparcv8plus+vis2', + 'sparcv8plus+vis', + 'sparcv8plus', + 'sparcv8', + 'sparcv8-fsmuld', + 'sparcv7', + 'sparc'), + 'mtime': datetime.datetime(2008, 8, 20, 10, 26, 15), + 'overrides': [], + 'pkgchk': {'return_code': 0, + 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', + '/var/tmp/aaaCeaWRE/CSWlibnet'], + 'stdout_lines': ['Checking uninstalled stream format package from ', + '## Checking control scripts.', + '## Checking package objects.', + '## Checking is complete.']}, + 'pkginfo': {'ARCH': 'sparc', + 'BASEDIR': '/opt/csw', + 'CATEGORY': 'system', + 'CLASSES': 'none', + 'EMAIL': 'calmeida at opencsw.org', + 'HOTLINE': 'http://www.opencsw.org/bugtrack/', + 'NAME': 'libnet - the libnet packet construction library', + 'PKG': 'CSWlibnet', + 'PSTAMP': 'apollo20040408205559', + 'VENDOR': 'http://www.packetfactory.net/libnet/dist/ packaged for CSW by Carlos Almeida', + 'VERSION': '1.0.2,REV=2004.04.08_rev=a'}, + 'pkgmap': [{'class': None, + 'group': None, + 'line': ': 1 473', + 'mode': None, + 'path': None, + 'type': '1', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none bin 0755 root bin', + 'mode': '0755', + 'path': 'bin', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none bin/libnet-config 0755 root bin 1080 10209 1081461972', + 'mode': '0755', + 'path': 'bin/libnet-config', + 'type': 'f', + 'user': 'root'}, + {'class': None, + 'group': None, + 'line': '1 i copyright 2588 8797 1081378297', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none include 0755 root bin', + 'mode': '0755', + 'path': 'include', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none include/libnet 0755 root bin', + 'mode': '0755', + 'path': 'include/libnet', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none include/libnet.h 0755 root bin 3022 42918 1081461970', + 'mode': '0755', + 'path': 'include/libnet.h', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none include/libnet/libnet-asn1.h 0755 root bin 7888 3143 1081461971', + 'mode': '0755', + 'path': 'include/libnet/libnet-asn1.h', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none include/libnet/libnet-functions.h 0755 root bin 20023 43138 1081461970', + 'mode': '0755', + 'path': 'include/libnet/libnet-functions.h', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none include/libnet/libnet-headers.h 0755 root bin 15803 12935 1081461970', + 'mode': '0755', + 'path': 'include/libnet/libnet-headers.h', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none include/libnet/libnet-macros.h 0755 root bin 3978 24346 1081461971', + 'mode': '0755', + 'path': 'include/libnet/libnet-macros.h', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none include/libnet/libnet-ospf.h 0755 root bin 10805 26031 1081461971', + 'mode': '0755', + 'path': 'include/libnet/libnet-ospf.h', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none include/libnet/libnet-structures.h 0755 root bin 2711 7297 1081461970', + 'mode': '0755', + 'path': 'include/libnet/libnet-structures.h', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none lib 0755 root bin', + 'mode': '0755', + 'path': 'lib', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 s none lib/libnet.so=libnet.so.1.0.2', + 'mode': None, + 'path': 'lib/libnet.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none lib/libnet.so.1.0.2 0755 root bin 113148 27024 1081461972', + 'mode': '0755', + 'path': 'lib/libnet.so.1.0.2', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 s none lib/libpwrite.so=libnet.so', + 'mode': None, + 'path': 'lib/libpwrite.so', + 'type': 's', + 'user': None}, + {'class': None, + 'group': None, + 'line': '1 i pkginfo 340 28662 1219227975', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none share 0755 root bin', + 'mode': '0755', + 'path': 'share', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none share/man 0755 root bin', + 'mode': '0755', + 'path': 'share/man', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none share/man/man3 0755 root bin', + 'mode': '0755', + 'path': 'share/man/man3', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none share/man/man3/libnet.3 0755 root bin 40321 45395 1081461971', + 'mode': '0755', + 'path': 'share/man/man3/libnet.3', + 'type': 'f', + 'user': 'root'}]}] + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:40:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:40:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[11228] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11228 http://gar.svn.sourceforge.net/gar/?rev=11228&view=rev Author: wahwah Date: 2010-10-10 20:40:43 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: Checking that the soname is a substring of file name. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:40:16 UTC (rev 11227) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:40:43 UTC (rev 11228) @@ -1109,11 +1109,23 @@ pass -def SharedLibraryNameMustBeAsubstringOfSoname(): - pass +def CheckSharedLibraryNameMustBeAsubstringOfSoname( + pkg_data, error_mgr, logger, messenger): + pkgname = pkg_data["basic_stats"]["pkgname"] + for binary_info in pkg_data["binaries_dump_info"]: + if "soname" in binary_info: + if binary_info["soname"] not in binary_info["base_name"]: + error_mgr.ReportError( + "soname-not-part-of-filename", + "soname=%s " + "filename=%s" + % (binary_info["soname"], binary_info["base_name"])) -def SonameMustNotBeEqualToFileNameIfFilenameEndsWithSo(): + +def CheckSonameMustNotBeEqualToFileNameIfFilenameEndsWithSo( + pkg_data, error_mgr, logger, messenger): pass -def LinkableSoFileMustBeAsymlink(): +def CheckLinkableSoFileMustBeAsymlink( + pkg_data, error_mgr, logger, messenger): pass Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:40:16 UTC (rev 11227) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-10-10 20:40:43 UTC (rev 11228) @@ -1340,5 +1340,23 @@ 'shared-lib-package-contains-so-symlink', 'file=/opt/csw/lib/sparcv9/libneon.so') +class TestCheckSharedLibraryNameMustBeAsubstringOfSonameGood( + CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckSharedLibraryNameMustBeAsubstringOfSoname' + def CheckpkgTest(self): + self.pkg_data = neon_stats[0] + + +class TestCheckSharedLibraryNameMustBeAsubstringOfSonameGood( + CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckSharedLibraryNameMustBeAsubstringOfSoname' + def CheckpkgTest(self): + self.pkg_data = copy.deepcopy(neon_stats[0]) + self.pkg_data["binaries_dump_info"][3]["base_name"] = "foo.so.1" + self.error_mgr_mock.ReportError( + 'soname-not-part-of-filename', + 'soname=libneon.so.27 filename=foo.so.1') + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 10 22:45:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:45:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[11229] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 11229 http://gar.svn.sourceforge.net/gar/?rev=11229&view=rev Author: wahwah Date: 2010-10-10 20:45:46 +0000 (Sun, 10 Oct 2010) Log Message: ----------- mGAR v2: When suggesting PKGFILES, prepend the path with a dash to make it absolute. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:40:43 UTC (rev 11228) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-10 20:45:46 UTC (rev 11229) @@ -1046,10 +1046,10 @@ messenger.SuggestGarLine( "PACKAGES += %s" % suggested_pkgname) messenger.SuggestGarLine( - "PKGFILES_%s += %s" % (suggested_pkgname, binary_info["path"])) + "PKGFILES_%s += /%s" % (suggested_pkgname, binary_info["path"])) lib_basename, lib_filename = os.path.split(binary_info["path"]) messenger.SuggestGarLine( - "PKGFILES_%s += %s/%s.*" % (suggested_pkgname, lib_basename, soname)) + "PKGFILES_%s += /%s/%s.*" % (suggested_pkgname, lib_basename, soname)) messenger.OneTimeMessage( soname, "This shared library (%s) is in a directory indicating that it " @@ -1087,7 +1087,7 @@ messenger.SuggestGarLine("# (If %s-devel doesn't exist yet)" % pkgname) messenger.SuggestGarLine("PACKAGES += %s-devel" % pkgname) messenger.SuggestGarLine( - "PKGFILES_%s-devel += %s" % (pkgname, entry["path"])) + "PKGFILES_%s-devel += /%s" % (pkgname, entry["path"])) messenger.Message( "The package contains shared libraries together with the " "symlink of the form libfoo.so -> libfoo.so.1. " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 10 22:56:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 10 Oct 2010 20:56:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[11230] csw/mgar/pkg/taglib/trunk Message-ID: Revision: 11230 http://gar.svn.sourceforge.net/gar/?rev=11230&view=rev Author: dmichelsen Date: 2010-10-10 20:56:34 +0000 (Sun, 10 Oct 2010) Log Message: ----------- taglib: Update to 1.6.3 and add 64 bit Modified Paths: -------------- csw/mgar/pkg/taglib/trunk/Makefile csw/mgar/pkg/taglib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/taglib/trunk/files/0001-Make-sure-m64-is-passed-to-the-linker.patch Modified: csw/mgar/pkg/taglib/trunk/Makefile =================================================================== --- csw/mgar/pkg/taglib/trunk/Makefile 2010-10-10 20:45:46 UTC (rev 11229) +++ csw/mgar/pkg/taglib/trunk/Makefile 2010-10-10 20:56:34 UTC (rev 11230) @@ -1,25 +1,30 @@ GARNAME = taglib -GARVERSION = 1.6.1 +GARVERSION = 1.6.3 CATEGORIES = lib -DESCRIPTION = Brief description +DESCRIPTION = A library for reading and editing the meta-data of several popular audio formats define BLURB - Long description + TagLib is a library for reading and editing the meta-data of several popular audio formats. + Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags + and Vorbis comments in FLAC, MPC, Speex, WavPack and TrueAudio files. endef MASTER_SITES = http://developer.kde.org/~wheeler/files/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Make-sure-m64-is-passed-to-the-linker.patch + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = COPYING.MPL +VENDOR_URL = http://developer.kde.org/~wheeler/taglib.html + RUNTIME_DEP_PKGS_CSWtaglib += CSWzlib -# UPSTREAM_MASTER_SITES = - EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/taglib/trunk/checksums =================================================================== --- csw/mgar/pkg/taglib/trunk/checksums 2010-10-10 20:45:46 UTC (rev 11229) +++ csw/mgar/pkg/taglib/trunk/checksums 2010-10-10 20:56:34 UTC (rev 11230) @@ -1 +1 @@ -db0502b3c3448ff1f1f9b090c1daa5f7 taglib-1.6.1.tar.gz +ddf02f4e1d2dc30f76734df806e613eb taglib-1.6.3.tar.gz Added: csw/mgar/pkg/taglib/trunk/files/0001-Make-sure-m64-is-passed-to-the-linker.patch =================================================================== --- csw/mgar/pkg/taglib/trunk/files/0001-Make-sure-m64-is-passed-to-the-linker.patch (rev 0) +++ csw/mgar/pkg/taglib/trunk/files/0001-Make-sure-m64-is-passed-to-the-linker.patch 2010-10-10 20:56:34 UTC (rev 11230) @@ -0,0 +1,28 @@ +From 0f90de9b021e8f34d4d41df23385a659408be908 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 10 Oct 2010 22:34:31 +0200 +Subject: [PATCH] Make sure -m64 is passed to the linker + +--- + admin/ltmain.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/admin/ltmain.sh b/admin/ltmain.sh +index 27ee8c4..7dcd4cd 100644 +--- a/admin/ltmain.sh ++++ b/admin/ltmain.sh +@@ -1323,9 +1323,9 @@ EOF + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then ++ #if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi ++ #fi + continue + ;; + +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 10 23:19:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 10 Oct 2010 21:19:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11231] csw/mgar/pkg/adobereader/trunk Message-ID: Revision: 11231 http://gar.svn.sourceforge.net/gar/?rev=11231&view=rev Author: dmichelsen Date: 2010-10-10 21:19:33 +0000 (Sun, 10 Oct 2010) Log Message: ----------- adobereader: Update to 9.4.0 Modified Paths: -------------- csw/mgar/pkg/adobereader/trunk/Makefile csw/mgar/pkg/adobereader/trunk/checksums Modified: csw/mgar/pkg/adobereader/trunk/Makefile =================================================================== --- csw/mgar/pkg/adobereader/trunk/Makefile 2010-10-10 20:56:34 UTC (rev 11230) +++ csw/mgar/pkg/adobereader/trunk/Makefile 2010-10-10 21:19:33 UTC (rev 11231) @@ -1,7 +1,9 @@ # $Id$ GARNAME = adobereader GARVERSION_sparc = 8.1.7 -GARVERSION_i386 = 9.3.4 +FILEVERSION_sparc = 8.1.7 +GARVERSION_i386 = 9.4.0 +FILEVERSION_i386 = 9.4 GARVERSION = $(GARVERSION_$(GARCH)) CATEGORIES = apps @@ -11,8 +13,8 @@ MASTER_SITES = ftp://ftp.adobe.com/pub/adobe/reader/unix/$(shell echo $(GARVERSION_sparc) | cut -d. -f1).x/$(GARVERSION_sparc)/enu/ MASTER_SITES += ftp://ftp.adobe.com/pub/adobe/reader/unix/$(shell echo $(GARVERSION_i386) | cut -d. -f1).x/$(GARVERSION_i386)/enu/ -DISTFILES_sparc = AdobeReader_enu-$(GARVERSION_sparc)-1.sparc.tar.bz2 -DISTFILES_i386 = AdbeRdr$(GARVERSION_i386)-1_i486solaris_enu.tar.bz2 +DISTFILES_sparc = AdobeReader_enu-$(FILEVERSION_sparc)-1.sparc.tar.bz2 +DISTFILES_i386 = AdbeRdr$(FILEVERSION_i386)-1_i486solaris_enu.tar.bz2 DISTFILES = $(DISTFILES_sparc) $(DISTFILES_i386) NOEXTRACT = $(filter-out $(DISTFILES_$(GARCH)),$(DISTFILES)) DISTNAME = AdobeReader Modified: csw/mgar/pkg/adobereader/trunk/checksums =================================================================== --- csw/mgar/pkg/adobereader/trunk/checksums 2010-10-10 20:56:34 UTC (rev 11230) +++ csw/mgar/pkg/adobereader/trunk/checksums 2010-10-10 21:19:33 UTC (rev 11231) @@ -1,2 +1,2 @@ -e9148b76a646d43aae30457dceeaee37 AdbeRdr9.3.4-1_i486solaris_enu.tar.bz2 +7cb3117a51d0a992af8239bfb6d8fd8d AdbeRdr9.4-1_i486solaris_enu.tar.bz2 44aea1ffcf857b2ef8ed36a659b32390 AdobeReader_enu-8.1.7-1.sparc.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 11 06:39:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Oct 2010 04:39:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[11232] csw/mgar/pkg/diffstat/trunk Message-ID: Revision: 11232 http://gar.svn.sourceforge.net/gar/?rev=11232&view=rev Author: dmichelsen Date: 2010-10-11 04:39:38 +0000 (Mon, 11 Oct 2010) Log Message: ----------- diffstat: Update to 1.54 Modified Paths: -------------- csw/mgar/pkg/diffstat/trunk/Makefile csw/mgar/pkg/diffstat/trunk/checksums Modified: csw/mgar/pkg/diffstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffstat/trunk/Makefile 2010-10-10 21:19:33 UTC (rev 11231) +++ csw/mgar/pkg/diffstat/trunk/Makefile 2010-10-11 04:39:38 UTC (rev 11232) @@ -1,5 +1,5 @@ GARNAME = diffstat -GARVERSION = 1.53 +GARVERSION = 1.54 CATEGORIES = utils DESCRIPTION = A utility which provides statistics based on the output of diff Modified: csw/mgar/pkg/diffstat/trunk/checksums =================================================================== --- csw/mgar/pkg/diffstat/trunk/checksums 2010-10-10 21:19:33 UTC (rev 11231) +++ csw/mgar/pkg/diffstat/trunk/checksums 2010-10-11 04:39:38 UTC (rev 11232) @@ -1 +1 @@ -0631010aa598a8011259749dd882936a diffstat-1.53.tgz +af08bef2eb37050ceb0c4fddedb2ee36 diffstat-1.54.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 11 07:01:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Oct 2010 05:01:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11233] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 11233 http://gar.svn.sourceforge.net/gar/?rev=11233&view=rev Author: wahwah Date: 2010-10-11 05:01:32 +0000 (Mon, 11 Oct 2010) Log Message: ----------- mGAR v2: Adding 'import os' to package.py. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2010-10-11 04:39:38 UTC (rev 11232) +++ csw/mgar/gar/v2/lib/python/package.py 2010-10-11 05:01:32 UTC (rev 11233) @@ -2,6 +2,7 @@ import hashlib import logging +import os import subprocess import magic This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 11 07:02:17 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Oct 2010 05:02:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11234] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11234 http://gar.svn.sourceforge.net/gar/?rev=11234&view=rev Author: wahwah Date: 2010-10-11 05:02:17 +0000 (Mon, 11 Oct 2010) Log Message: ----------- mGAR v2: Fixing imports and moving constants to appropriate locations. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_stats.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-11 05:01:32 UTC (rev 11233) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-11 05:02:17 UTC (rev 11234) @@ -42,24 +42,6 @@ 'application/x-executable', 'application/x-sharedlib', ) -ADMIN_FILE_CONTENT = """ -basedir=default -runlevel=nocheck -conflict=nocheck -setuid=nocheck -action=nocheck -partial=nocheck -instance=unique -idepend=quit -rdepend=quit -space=quit -authentication=nocheck -networktimeout=10 -networkretries=5 -keystore=/var/sadm/security -proxy= -""" - SUBMITPKG_TMPL = """From: $from To: $to #if $cc Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2010-10-11 05:01:32 UTC (rev 11233) +++ csw/mgar/gar/v2/lib/python/package.py 2010-10-11 05:02:17 UTC (rev 11234) @@ -1,12 +1,21 @@ #!/usr/bin/env python2.6 +import datetime +import difflib +import hachoir_parser as hp import hashlib import logging +import magic import os +import re +import shutil import subprocess +import tempfile +import time -import magic -import hachoir_parser as hp +import configuration as c +import opencsw +import overrides # Suppress unhelpful warnings # http://bitbucket.org/haypo/hachoir/issue/23 @@ -14,6 +23,32 @@ hachoir_core.config.quiet = True +ADMIN_FILE_CONTENT = """ +basedir=default +runlevel=nocheck +conflict=nocheck +setuid=nocheck +action=nocheck +partial=nocheck +instance=unique +idepend=quit +rdepend=quit +space=quit +authentication=nocheck +networktimeout=10 +networkretries=5 +keystore=/var/sadm/security +proxy= +""" + +class Error(Exception): + pass + + +class PackageError(Error): + pass + + class ShellMixin(object): def ShellCommand(self, args, quiet=False): @@ -218,13 +253,13 @@ def GetParsedPkginfo(self): if not self.pkginfo_dict: pkginfo_fd = open(self.GetPkginfoFilename(), "r") - self.pkginfo_dict = ParsePkginfo(pkginfo_fd) + self.pkginfo_dict = opencsw.ParsePkginfo(pkginfo_fd) pkginfo_fd.close() return self.pkginfo_dict def GetSrv4FileName(self): """Guesses the Srv4FileName based on the package directory contents.""" - return PkginfoToSrv4Name(self.GetParsedPkginfo()) + return opencsw.PkginfoToSrv4Name(self.GetParsedPkginfo()) def ToSrv4(self, target_dir): target_file_name = self.GetSrv4FileName() @@ -242,7 +277,7 @@ def GetPkgmap(self, analyze_permissions=False, strip=None): fd = open(os.path.join(self.directory, "pkgmap"), "r") - return Pkgmap(fd, analyze_permissions, strip) + return opencsw.Pkgmap(fd, analyze_permissions, strip) def SetPkginfoEntry(self, key, value): pkginfo = self.GetParsedPkginfo() @@ -305,7 +340,7 @@ def ResetNameProperty(self): """Sometimes, NAME= contains useless data. This method resets them.""" pkginfo_dict = self.GetParsedPkginfo() - catalog_name = PkgnameToCatName(pkginfo_dict["PKG"]) + catalog_name = opencsw.PkgnameToCatName(pkginfo_dict["PKG"]) description = pkginfo_dict["DESC"] pkginfo_name = "%s - %s" % (catalog_name, description) self.SetPkginfoEntry("NAME", pkginfo_name) @@ -365,7 +400,7 @@ # We really don't want that, as it misses binaries. raise PackageError("Could not establish the mime type of %s" % full_path) - if IsBinary(file_info): + if opencsw.IsBinary(file_info): parser = hp.createParser(full_path) if not parser: logging.warning("Can't parse file %s", file_path) @@ -404,7 +439,7 @@ self.binaries = [] # The nested for-loop looks inefficient. for file_info in files_metadata: - if IsBinary(file_info): + if opencsw.IsBinary(file_info): self.binaries.append(file_info["path"]) self.binaries.sort() return self.binaries Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-11 05:01:32 UTC (rev 11233) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-11 05:02:17 UTC (rev 11234) @@ -1087,7 +1087,7 @@ messenger.SuggestGarLine("# (If %s-devel doesn't exist yet)" % pkgname) messenger.SuggestGarLine("PACKAGES += %s-devel" % pkgname) messenger.SuggestGarLine( - "PKGFILES_%s-devel += /%s" % (pkgname, entry["path"])) + "PKGFILES_%s-devel += %s" % (pkgname, entry["path"])) messenger.Message( "The package contains shared libraries together with the " "symlink of the form libfoo.so -> libfoo.so.1. " Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2010-10-11 05:01:32 UTC (rev 11233) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2010-10-11 05:02:17 UTC (rev 11234) @@ -1,18 +1,44 @@ #!/usr/bin/env python2.6 +import copy import cPickle +import logging import os import re +import sqlobject +import subprocess import catalog +import checkpkg import database import package +import opencsw import overrides import models as m import tag +DUMP_BIN = "/usr/ccs/bin/dump" PACKAGE_STATS_VERSION = 9L +BAD_CONTENT_REGEXES = ( + # Slightly obfuscating these by using the default concatenation of + # strings. + r'/export' r'/medusa', + r'/opt' r'/build', +) + +class Error(Exception): + pass + + +class PackageError(Error): + pass + + +class StdoutSyntaxError(Error): + pass + + class PackageStats(database.DatabaseClient): """Collects stats about a package and saves it. @@ -112,7 +138,7 @@ dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) stdout, stderr = dump_proc.communicate() ret = dump_proc.wait() - binary_data = ParseDumpOutput(stdout) + binary_data = checkpkg.ParseDumpOutput(stdout) binary_data["path"] = binary binary_data["base_name"] = binary_base_name binaries_dump_info.append(binary_data) @@ -235,7 +261,7 @@ "binaries": dir_pkg.ListBinaries(), "binaries_dump_info": self.GetBinaryDumpInfo(), "depends": dir_pkg.GetDependencies(), - "isalist": GetIsalist(), + "isalist": checkpkg.GetIsalist(), "overrides": override_dicts, "pkgchk": self.GetPkgchkData(), "pkginfo": dir_pkg.GetParsedPkginfo(), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 11 07:09:56 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Oct 2010 05:09:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[11235] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 11235 http://gar.svn.sourceforge.net/gar/?rev=11235&view=rev Author: wahwah Date: 2010-10-11 05:09:55 +0000 (Mon, 11 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, not reporting individual names when multiple shared libraries are present. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-11 05:02:17 UTC (rev 11234) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-11 05:09:55 UTC (rev 11235) @@ -1011,7 +1011,7 @@ "don't have compatible versions: %s. This means that " "they are best placed in own packages, with each package " "named after library name and version. " - % (pkgname, sonames)) + % (pkgname, sorted(set(sonames)))) # If the sonames aren't uniform, there's no point in trying to match # sonames versus pkgname. check_names = False @@ -1030,6 +1030,7 @@ "More information: " "http://wiki.opencsw.org/checkpkg-error-tags" % (sonames, multilib_pkgname, pkgname)) + check_names = False if check_names: for soname, binary_info in linkable_shared_libs: tmp = su.MakePackageNameBySoname(soname) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 11 07:31:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Oct 2010 05:31:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[11236] csw/mgar/pkg Message-ID: Revision: 11236 http://gar.svn.sourceforge.net/gar/?rev=11236&view=rev Author: wahwah Date: 2010-10-11 05:31:55 +0000 (Mon, 11 Oct 2010) Log Message: ----------- pylint: Initial commit. Modified Paths: -------------- csw/mgar/pkg/lang-python/pylint/trunk/Makefile csw/mgar/pkg/lang-python/pylint/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/ csw/mgar/pkg/lang-python/pylint/ Modified: csw/mgar/pkg/lang-python/pylint/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-09-14 09:44:37 UTC (rev 10958) +++ csw/mgar/pkg/lang-python/pylint/trunk/Makefile 2010-10-11 05:31:55 UTC (rev 11236) @@ -2,184 +2,19 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = pylint +GARVERSION = 0.21.3 +CATEGORIES = python +DESCRIPTION = Python code static checker define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://pypi.python.org/pypi/pylint +MASTER_SITES = http://pypi.python.org/packages/source/p/pylint/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +ARCHALL_CSWpylint = 1 +EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc +# The software name is 'pylint'. +CHECKPKG_OVERRIDES_CSWpylint += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpylint += catalogname-does-not-start-with-py_ +include gar/category.mk Modified: csw/mgar/pkg/lang-python/pylint/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-09-14 09:44:37 UTC (rev 10958) +++ csw/mgar/pkg/lang-python/pylint/trunk/checksums 2010-10-11 05:31:55 UTC (rev 11236) @@ -0,0 +1 @@ +53b88b99085bb46778d4812629de6648 pylint-0.21.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 11 07:41:08 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Oct 2010 05:41:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11237] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Message-ID: Revision: 11237 http://gar.svn.sourceforge.net/gar/?rev=11237&view=rev Author: wahwah Date: 2010-10-11 05:41:08 +0000 (Mon, 11 Oct 2010) Log Message: ----------- mGAR v2: submitpkg, removing unused datetime import. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-10-11 05:31:55 UTC (rev 11236) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-10-11 05:41:08 UTC (rev 11237) @@ -27,7 +27,6 @@ # 6. Tell how to send it (no automatic sending for now) import ConfigParser -import datetime import logging import optparse import os This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 11 08:15:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Oct 2010 06:15:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11238] csw/mgar/pkg/lang-python Message-ID: Revision: 11238 http://gar.svn.sourceforge.net/gar/?rev=11238&view=rev Author: wahwah Date: 2010-10-11 06:15:05 +0000 (Mon, 11 Oct 2010) Log Message: ----------- astng: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/astng/trunk/Makefile csw/mgar/pkg/lang-python/astng/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/astng/ Modified: csw/mgar/pkg/lang-python/astng/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-09-14 09:44:37 UTC (rev 10958) +++ csw/mgar/pkg/lang-python/astng/trunk/Makefile 2010-10-11 06:15:05 UTC (rev 11238) @@ -2,184 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = logilab-astng +GARVERSION = 0.20.3 +CATEGORIES = python +DESCRIPTION = Python Abstract Syntax Tree New Generation +PACKAGES = CSWpy-astng +CATALOGNAME_CSWpy-astng = py_astng define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://www.logilab.org/856 +MASTER_SITES = http://ftp.logilab.org/pub/astng/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc +ARCHALL_CSWpy-astng = 1 +include gar/category.mk Modified: csw/mgar/pkg/lang-python/astng/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-09-14 09:44:37 UTC (rev 10958) +++ csw/mgar/pkg/lang-python/astng/trunk/checksums 2010-10-11 06:15:05 UTC (rev 11238) @@ -0,0 +1 @@ +3379435ce06cdfa43ca9515a8d11affe logilab-astng-0.20.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 11 11:24:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Oct 2010 09:24:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11239] csw/mgar/pkg/lang-python Message-ID: Revision: 11239 http://gar.svn.sourceforge.net/gar/?rev=11239&view=rev Author: wahwah Date: 2010-10-11 09:24:05 +0000 (Mon, 11 Oct 2010) Log Message: ----------- logilab-astng: Renaming astng to loglab-astng. Modified Paths: -------------- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/logilab-astng/ Removed Paths: ------------- csw/mgar/pkg/lang-python/astng/ Modified: csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/astng/trunk/Makefile 2010-10-11 06:15:05 UTC (rev 11238) +++ csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2010-10-11 09:24:05 UTC (rev 11239) @@ -6,8 +6,8 @@ GARVERSION = 0.20.3 CATEGORIES = python DESCRIPTION = Python Abstract Syntax Tree New Generation -PACKAGES = CSWpy-astng -CATALOGNAME_CSWpy-astng = py_astng +PACKAGES = CSWpy-logilab-astng +CATALOGNAME_CSWpy-logilab-astng = py_logilab_astng define BLURB endef SPKG_SOURCEURL = http://www.logilab.org/856 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 11 11:38:08 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Oct 2010 09:38:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11240] csw/mgar/pkg/taglib/trunk/Makefile Message-ID: Revision: 11240 http://gar.svn.sourceforge.net/gar/?rev=11240&view=rev Author: dmichelsen Date: 2010-10-11 09:38:07 +0000 (Mon, 11 Oct 2010) Log Message: ----------- taglib: Add legacy CSWtaglibgcc as stub to CSWtaglib Modified Paths: -------------- csw/mgar/pkg/taglib/trunk/Makefile Modified: csw/mgar/pkg/taglib/trunk/Makefile =================================================================== --- csw/mgar/pkg/taglib/trunk/Makefile 2010-10-11 09:24:05 UTC (rev 11239) +++ csw/mgar/pkg/taglib/trunk/Makefile 2010-10-11 09:38:07 UTC (rev 11240) @@ -2,7 +2,7 @@ GARVERSION = 1.6.3 CATEGORIES = lib -DESCRIPTION = A library for reading and editing the meta-data of several popular audio formats +DESCRIPTION = Library for reading and editing the meta-data of several popular audio formats define BLURB TagLib is a library for reading and editing the meta-data of several popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags @@ -20,8 +20,24 @@ VENDOR_URL = http://developer.kde.org/~wheeler/taglib.html -RUNTIME_DEP_PKGS_CSWtaglib += CSWzlib +# CSWtaglibgcc is an empty stub to CSWtaglib +PACKAGES = CSWtaglib CSWtaglibgcc +CATALOGNAME_CSWtaglib = taglib +CATALOGNAME_CSWtaglibgcc = taglib_gcc + +SPKG_DESC_CSWtaglib = $(DESCRIPTION) +SPKG_DESC_CSWtaglibgcc = Stub to CSWtaglib no longer compiled with gcc + +ARCHALL_CSWtaglibgcc = 1 + +RUNTIME_DEP_PKGS_CSWtaglib = CSWzlib + +RUNTIME_DEP_PKGS_CSWtaglibgcc = CSWtaglib +CHECKPKG_OVERRIDES_CSWtaglibgcc += surplus-dependency|CSWtaglib + +PKGFILES_CSWtaglibgcc = NONE + EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 11 11:38:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Oct 2010 09:38:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11241] csw/mgar/pkg/lang-python Message-ID: Revision: 11241 http://gar.svn.sourceforge.net/gar/?rev=11241&view=rev Author: wahwah Date: 2010-10-11 09:38:19 +0000 (Mon, 11 Oct 2010) Log Message: ----------- logilab-common: Initial commit; logilab-astng: Update to the ARCHALL variable. Modified Paths: -------------- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile csw/mgar/pkg/lang-python/logilab-common/trunk/Makefile csw/mgar/pkg/lang-python/logilab-common/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/logilab-common/ Modified: csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2010-10-11 09:38:07 UTC (rev 11240) +++ csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2010-10-11 09:38:19 UTC (rev 11241) @@ -15,5 +15,5 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc -ARCHALL_CSWpy-astng = 1 +ARCHALL_CSWpy-logilab-astng = 1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/logilab-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2010-10-11 09:24:05 UTC (rev 11239) +++ csw/mgar/pkg/lang-python/logilab-common/trunk/Makefile 2010-10-11 09:38:19 UTC (rev 11241) @@ -2,18 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = logilab-astng -GARVERSION = 0.20.3 +GARNAME = logilab-common +GARVERSION = 0.52.0 CATEGORIES = python DESCRIPTION = Python Abstract Syntax Tree New Generation -PACKAGES = CSWpy-logilab-astng -CATALOGNAME_CSWpy-logilab-astng = py_logilab_astng +PACKAGES = CSWpy-logilab-common +CATALOGNAME_CSWpy-logilab-common = py_logilab_common define BLURB endef -SPKG_SOURCEURL = http://www.logilab.org/856 -MASTER_SITES = http://ftp.logilab.org/pub/astng/ +SPKG_SOURCEURL = http://www.logilab.org/project/logilab-common +MASTER_SITES = http://ftp.logilab.org/pub/common/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc -ARCHALL_CSWpy-astng = 1 +ARCHALL_CSWpy-logilab-common = 1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/logilab-common/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/logilab-astng/trunk/checksums 2010-10-11 09:24:05 UTC (rev 11239) +++ csw/mgar/pkg/lang-python/logilab-common/trunk/checksums 2010-10-11 09:38:19 UTC (rev 11241) @@ -1 +1 @@ -3379435ce06cdfa43ca9515a8d11affe logilab-astng-0.20.3.tar.gz +def802bd1a1fe7910d739f8b18409255 logilab-common-0.52.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 11 11:39:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Oct 2010 09:39:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11242] csw/mgar/pkg/cpan Message-ID: Revision: 11242 http://gar.svn.sourceforge.net/gar/?rev=11242&view=rev Author: dmichelsen Date: 2010-10-11 09:39:33 +0000 (Mon, 11 Oct 2010) Log Message: ----------- cpan/Audo-TagLib: Initial commit, this release supports *only* 1.5.* And why do I package up 1.6? :-( Added Paths: ----------- csw/mgar/pkg/cpan/Audio-TagLib/ csw/mgar/pkg/cpan/Audio-TagLib/branches/ csw/mgar/pkg/cpan/Audio-TagLib/tags/ csw/mgar/pkg/cpan/Audio-TagLib/trunk/ csw/mgar/pkg/cpan/Audio-TagLib/trunk/Makefile csw/mgar/pkg/cpan/Audio-TagLib/trunk/checksums csw/mgar/pkg/cpan/Audio-TagLib/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Audio-TagLib/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Audio-TagLib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Audio-TagLib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Audio-TagLib/trunk/Makefile 2010-10-11 09:39:33 UTC (rev 11242) @@ -0,0 +1,13 @@ +GARNAME = Audio-TagLib +GARVERSION = 1.50_01 +CATEGORIES = cpan +AUTHOR = DONGXU + +DESCRIPTION = A library for reading and editing audio meta data +define BLURB +endef + +PACKAGES = CSWpmaudiotaglib +CATALOGNAME = pm_audiotaglib + +include gar/category.mk Added: csw/mgar/pkg/cpan/Audio-TagLib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Audio-TagLib/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Audio-TagLib/trunk/checksums 2010-10-11 09:39:33 UTC (rev 11242) @@ -0,0 +1 @@ +7d9d046a13605e71c88c1b4a3961b71f Audio-TagLib-1.50_01.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Mon Oct 11 11:52:15 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Mon, 11 Oct 2010 09:52:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11243] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 11243 http://gar.svn.sourceforge.net/gar/?rev=11243&view=rev Author: aigoshin Date: 2010-10-11 09:52:15 +0000 (Mon, 11 Oct 2010) Log Message: ----------- nginx: package release 20101011 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-10-11 09:39:33 UTC (rev 11242) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-10-11 09:52:15 UTC (rev 11243) @@ -1,5 +1,5 @@ GARNAME = nginx -GARVERSION = 0.7.67 +GARVERSION = 0.8.52 CATEGORIES = server GARCOMPILER = SOS11 Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2010-10-11 09:39:33 UTC (rev 11242) +++ csw/mgar/pkg/nginx/trunk/checksums 2010-10-11 09:52:15 UTC (rev 11243) @@ -1,2 +1 @@ -f2229b341ced83f872b78ade9c97fc8e cswnginx -b6e175f969d03a4d3c5643aaabc6a5ff nginx-0.7.67.tar.gz +8c1f0b6b9ad205b65248b1c55d3d801d nginx-0.8.52.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 11 11:57:42 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Oct 2010 09:57:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11244] csw/mgar/pkg/cpan Message-ID: Revision: 11244 http://gar.svn.sourceforge.net/gar/?rev=11244&view=rev Author: dmichelsen Date: 2010-10-11 09:57:42 +0000 (Mon, 11 Oct 2010) Log Message: ----------- cpan/MP3-Tag: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/MP3-Tag/ csw/mgar/pkg/cpan/MP3-Tag/branches/ csw/mgar/pkg/cpan/MP3-Tag/tags/ csw/mgar/pkg/cpan/MP3-Tag/trunk/ csw/mgar/pkg/cpan/MP3-Tag/trunk/Makefile csw/mgar/pkg/cpan/MP3-Tag/trunk/checksums csw/mgar/pkg/cpan/MP3-Tag/trunk/files/ Property changes on: csw/mgar/pkg/cpan/MP3-Tag/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/MP3-Tag/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MP3-Tag/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/MP3-Tag/trunk/Makefile 2010-10-11 09:57:42 UTC (rev 11244) @@ -0,0 +1,20 @@ +GARNAME = MP3-Tag +GARVERSION = 1.13 +CATEGORIES = cpan +AUTHOR = ILYAZ + +DESCRIPTION = Perl module to read/write ID3v1, ID3v1.1 and ID3v2.3 tags of mp3-files +define BLURB +endef + +# Crappy custom pathes. +MASTER_SITES = $(addsuffix modules/,$(CPAN_MIRRORS)) + +LICENSE = README.txt + +PACKAGES = CSWpmmp3tag +CATALOGNAME = pm_mp3tag + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/MP3-Tag/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MP3-Tag/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/MP3-Tag/trunk/checksums 2010-10-11 09:57:42 UTC (rev 11244) @@ -0,0 +1 @@ +1eea17c9c8a03433634eb37fc16311d3 MP3-Tag-1.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From driodeiros at users.sourceforge.net Mon Oct 11 14:14:10 2010 From: driodeiros at users.sourceforge.net (driodeiros at users.sourceforge.net) Date: Mon, 11 Oct 2010 12:14:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11245] csw/mgar/pkg/lighttpd/trunk Message-ID: Revision: 11245 http://gar.svn.sourceforge.net/gar/?rev=11245&view=rev Author: driodeiros Date: 2010-10-11 12:14:10 +0000 (Mon, 11 Oct 2010) Log Message: ----------- Adding Makefile to build lighttpd with gar. Still issues when building. Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile csw/mgar/pkg/lighttpd/trunk/checksums Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2010-10-11 09:57:42 UTC (rev 11244) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2010-10-11 12:14:10 UTC (rev 11245) @@ -1,23 +1,20 @@ -# $Id$ GARNAME = lighttpd -GARVERSION = 1.0 -CATEGORIES = category +GARVERSION = 1.4.28 +CATEGORIES = devel -DESCRIPTION = Brief description +DESCRIPTION = lighttpd - Security, speed, compliance, and flexibility http server define BLURB - Long description + Security, speed, compliance, and flexibility -- all of these describe lighttpd + (pron. lighty) which is rapidly redefining efficiency of a webserver; as it is + designed and optimized for high performance environments. With a small memory + footprint compared to other web-servers, effective management of the cpu-load, + and advanced feature set (FastCGI, SCGI, Auth, Output-Compression, + URL-Rewriting and many more) lighttpd is the perfect solution for every server + that is suffering load problems. And best of all it's Open Source licensed + under the revised BSD license. endef -MASTER_SITES = -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = http://download.lighttpd.net/lighttpd/releases-1.4.x/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - -CONFIGURE_ARGS = $(DIRPATHS) - include gar/category.mk Modified: csw/mgar/pkg/lighttpd/trunk/checksums =================================================================== --- csw/mgar/pkg/lighttpd/trunk/checksums 2010-10-11 09:57:42 UTC (rev 11244) +++ csw/mgar/pkg/lighttpd/trunk/checksums 2010-10-11 12:14:10 UTC (rev 11245) @@ -0,0 +1 @@ +202d36efc6324adb95a3600d2826ec6a lighttpd-1.4.28.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 11 16:07:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Oct 2010 14:07:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11246] csw/mgar/pkg/taglib/trunk/Makefile Message-ID: Revision: 11246 http://gar.svn.sourceforge.net/gar/?rev=11246&view=rev Author: dmichelsen Date: 2010-10-11 14:07:19 +0000 (Mon, 11 Oct 2010) Log Message: ----------- taglib: Move CSWtaglibgcc to separate recipe and split off devel Modified Paths: -------------- csw/mgar/pkg/taglib/trunk/Makefile Modified: csw/mgar/pkg/taglib/trunk/Makefile =================================================================== --- csw/mgar/pkg/taglib/trunk/Makefile 2010-10-11 12:14:10 UTC (rev 11245) +++ csw/mgar/pkg/taglib/trunk/Makefile 2010-10-11 14:07:19 UTC (rev 11246) @@ -20,24 +20,20 @@ VENDOR_URL = http://developer.kde.org/~wheeler/taglib.html -# CSWtaglibgcc is an empty stub to CSWtaglib -PACKAGES = CSWtaglib CSWtaglibgcc +PACKAGES = CSWtaglib CSWtaglibdevel -CATALOGNAME_CSWtaglib = taglib -CATALOGNAME_CSWtaglibgcc = taglib_gcc +CATALOGNAME_CSWtaglib = taglib +CATALOGNAME_CSWtaglibdevel = taglib_devel -SPKG_DESC_CSWtaglib = $(DESCRIPTION) -SPKG_DESC_CSWtaglibgcc = Stub to CSWtaglib no longer compiled with gcc +SPKG_DESC_CSWtaglib = $(DESCRIPTION) +SPKG_DESC_CSWtaglibdevel = Developer files for taglib -ARCHALL_CSWtaglibgcc = 1 - RUNTIME_DEP_PKGS_CSWtaglib = CSWzlib +RUNTIME_DEP_PKGS_CSWtaglibdevel = CSWtaglib +CHECKPKG_OVERRIDES_CSWtaglibdevel += surplus-dependency|CSWtaglib -RUNTIME_DEP_PKGS_CSWtaglibgcc = CSWtaglib -CHECKPKG_OVERRIDES_CSWtaglibgcc += surplus-dependency|CSWtaglib +PKGFILES_CSWtaglibdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWtaglibgcc = NONE - EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 11 16:08:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Oct 2010 14:08:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11247] csw/mgar/pkg/adobereader/trunk/Makefile Message-ID: Revision: 11247 http://gar.svn.sourceforge.net/gar/?rev=11247&view=rev Author: dmichelsen Date: 2010-10-11 14:08:05 +0000 (Mon, 11 Oct 2010) Log Message: ----------- adobereader: Build x86 only for Solaris 10 Modified Paths: -------------- csw/mgar/pkg/adobereader/trunk/Makefile Modified: csw/mgar/pkg/adobereader/trunk/Makefile =================================================================== --- csw/mgar/pkg/adobereader/trunk/Makefile 2010-10-11 14:07:19 UTC (rev 11246) +++ csw/mgar/pkg/adobereader/trunk/Makefile 2010-10-11 14:08:05 UTC (rev 11247) @@ -28,6 +28,8 @@ LICENSE = AdobeReader/ReadMe.htm +PACKAGING_PLATFORMS = solaris9-sparc solaris10-i386 + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Oct 11 17:24:18 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 11 Oct 2010 15:24:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[11248] csw/mgar/pkg/tomcat6/branches/ihsan Message-ID: Revision: 11248 http://gar.svn.sourceforge.net/gar/?rev=11248&view=rev Author: idogan23 Date: 2010-10-11 15:24:17 +0000 (Mon, 11 Oct 2010) Log Message: ----------- tomcat6: reworked package for dynamic prototype and cswclassutils Modified Paths: -------------- csw/mgar/pkg/tomcat6/branches/ihsan/Makefile csw/mgar/pkg/tomcat6/branches/ihsan/checksums csw/mgar/pkg/tomcat6/branches/ihsan/files/cswtomcat6 Added Paths: ----------- csw/mgar/pkg/tomcat6/branches/ihsan/files/LICENSE csw/mgar/pkg/tomcat6/branches/ihsan/files/cswusergroup Removed Paths: ------------- csw/mgar/pkg/tomcat6/branches/ihsan/files/CSWtomcat6.depend csw/mgar/pkg/tomcat6/branches/ihsan/files/CSWtomcat6.gspec csw/mgar/pkg/tomcat6/branches/ihsan/files/CSWtomcat6.prototype csw/mgar/pkg/tomcat6/branches/ihsan/files/checkinstall csw/mgar/pkg/tomcat6/branches/ihsan/files/i.smfno csw/mgar/pkg/tomcat6/branches/ihsan/files/i.smfyes csw/mgar/pkg/tomcat6/branches/ihsan/files/postinstall csw/mgar/pkg/tomcat6/branches/ihsan/files/preinstall csw/mgar/pkg/tomcat6/branches/ihsan/files/preremove csw/mgar/pkg/tomcat6/branches/ihsan/files/space csw/mgar/pkg/tomcat6/branches/ihsan/files/svc-tomcat6 csw/mgar/pkg/tomcat6/branches/ihsan/files/tomcat6 csw/mgar/pkg/tomcat6/branches/ihsan/files/tomcat6.xml Modified: csw/mgar/pkg/tomcat6/branches/ihsan/Makefile =================================================================== --- csw/mgar/pkg/tomcat6/branches/ihsan/Makefile 2010-10-11 14:08:05 UTC (rev 11247) +++ csw/mgar/pkg/tomcat6/branches/ihsan/Makefile 2010-10-11 15:24:17 UTC (rev 11248) @@ -1,5 +1,5 @@ GARNAME = tomcat6 -GARVERSION = 6.0.26 +GARVERSION = 6.0.29 CATEGORIES = server DESCRIPTION = Apache Jakarta Tomcat 6 Servlet/JSP Container @@ -7,22 +7,49 @@ Apache Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed by Sun under the Java Community Process. endef -UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-6/ -MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-6/v$(GARVERSION)/bin/ +MASTER_SITES = http://tomcat.apache.org/ +UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-6/v$(GARVERSION)/bin/ DISTFILES = apache-tomcat-$(GARVERSION).tar.gz PKGDIST = apache-tomcat-$(GARVERSION).tar.gz -DISTFILES += CSWtomcat6.gspec CSWtomcat6.prototype CSWtomcat6.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-tomcat6 tomcat6.xml tomcat6 cswtomcat6 -# DISTFILES += $(call admfiles, CSWtomcat6, depend ) +DISTFILES += cswusergroup +DISTFILES += cswtomcat6 +DISTFILES += LICENSE # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = v(\d+(?:\.\d+)*) +PACKAGES = CSWtomcat6 +CATALOGNAME = tomcat6 +LICENSE = LICENSE + CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none TEST_SCRIPTS = none INSTALL_SCRIPTS = tomcat prefix = / +INITSMF = /etc/opt/csw/init.d/csw$(GARNAME) +USERGROUP = /etc/opt/csw/pkg/$(GARNAME)/cswusergroup +PRESERVECONF = /etc/opt/csw/$(GARNAME)/conf/.* + +PROTOTYPE_MODIFIERS = varuser etcperm + +PROTOTYPE_FILES_varuser = /var/opt/csw/$(GARNAME)/.* +PROTOTYPE_USER_varuser = tomcat +PROTOTYPE_GROUP_varuser = tomcat +PROTOTYPE_FILES_etcperm = /etc/opt/csw/$(GARNAME)/conf/.*\.CSW +PROTOTYPE_PERMS_etcperm = 0644 + +MIGRATE_SOURCE_DIR = /opt/csw/etc/$(GARNAME)/conf +MIGRATE_DEST_DIR = /etc/opt/csw/$(GARNAME)/conf +MIGRATE_FILES = catalina.policy +MIGRATE_FILES += catalina.properties +MIGRATE_FILES += context.xml +MIGRATE_FILES += logging.properties +MIGRATE_FILES += server.xml +MIGRATE_FILES += tomcat-users.xml +MIGRATE_FILES += web.xml + include gar/category.mk configure-none: @@ -36,39 +63,26 @@ post-extract: ( mv $(WORKDIR)/apache-tomcat-$(GARVERSION) $(WORKDIR)/$(DISTNAME) ) - ( OLDDIR=`pwd` && cd $(WORKDIR)/$(DISTNAME)/conf && for i in `find . -type f` ; do mv $$i $$i.CSW ; done && cd $$OLDDIR ) ( for i in temp work logs conf ; do find $(WORKDIR)/$(DISTNAME)/$$i -type d -exec chmod 0750 {} \; ; find $(WORKDIR)/$(DISTNAME)/$$i -type f -exec chmod 0640 {} \; ; done ) @$(MAKECOOKIE) install-tomcat: - ( mkdir -p $(DESTDIR)/etc/init.d ) - ( mkdir -p $(DESTDIR)/etc/opt/csw ) - ( mkdir -p $(DESTDIR)/etc/rc0.d ) - ( mkdir -p $(DESTDIR)/etc/rc1.d ) - ( mkdir -p $(DESTDIR)/etc/rc2.d ) - ( mkdir -p $(DESTDIR)/etc/rc3.d ) - ( mkdir -p $(DESTDIR)/etc/rcS.d ) + ( mkdir -p $(DESTDIR)/etc/opt/csw/init.d ) + ( mkdir -p $(DESTDIR)/etc/opt/csw/pkg/$(GARNAME) ) + ( mkdir -p $(DESTDIR)/etc/opt/csw/$(GARNAME) ) ( mkdir -p $(DESTDIR)/opt/csw/etc/$(GARNAME) ) ( mkdir -p $(DESTDIR)/var/opt/csw/$(GARNAME) ) ( mkdir -p $(DESTDIR)/opt/csw/share ) - ( mkdir -p $(DESTDIR)/etc/opt/csw ) - ( cp -fr $(WORKDIR)/$(DISTNAME) $(DESTDIR)/opt/csw/share/$(GARNAME) ) - ( cp -fr $(FILEDIR)/$(GARNAME) $(DESTDIR)/etc/opt/csw/$(GARNAME) ) - ( cp -fr $(FILEDIR)/csw$(GARNAME) $(DESTDIR)/etc/init.d ) - ( mv $(DESTDIR)/opt/csw/share/$(GARNAME)/conf $(DESTDIR)/opt/csw/etc/$(GARNAME)/conf ) + ( cp -fr $(WORKDIR)/apache-tomcat-$(GARVERSION) $(DESTDIR)/opt/csw/share/$(GARNAME) ) + ( cp -fr $(FILEDIR)/csw$(GARNAME) $(DESTDIR)/etc/opt/csw/init.d ) + ( mv $(DESTDIR)/opt/csw/share/$(GARNAME)/conf $(DESTDIR)/etc/opt/csw/$(GARNAME)/conf ) ( mv $(DESTDIR)/opt/csw/share/$(GARNAME)/logs $(DESTDIR)/var/opt/csw/$(GARNAME) ) ( mv $(DESTDIR)/opt/csw/share/$(GARNAME)/work $(DESTDIR)/var/opt/csw/$(GARNAME) ) ( mv $(DESTDIR)/opt/csw/share/$(GARNAME)/temp $(DESTDIR)/var/opt/csw/$(GARNAME) ) - ( ln -s /opt/csw/etc/$(GARNAME)/conf $(DESTDIR)/opt/csw/share/$(GARNAME)/conf ) + ( ln -s /etc/opt/csw/$(GARNAME)/conf $(DESTDIR)/opt/csw/share/$(GARNAME)/conf ) ( ln -s /var/opt/csw/$(GARNAME)/logs $(DESTDIR)/opt/csw/share/$(GARNAME)/logs ) ( ln -s /var/opt/csw/$(GARNAME)/work $(DESTDIR)/opt/csw/share/$(GARNAME)/work ) ( ln -s /var/opt/csw/$(GARNAME)/temp $(DESTDIR)/opt/csw/share/$(GARNAME)/temp ) - ( ln -s /etc/init.d/cswtomcat6 $(DESTDIR)/etc/rc0.d/K17$(GARNAME) ) - ( ln -s /etc/init.d/cswtomcat6 $(DESTDIR)/etc/rc1.d/K17$(GARNAME) ) - ( ln -s /etc/init.d/cswtomcat6 $(DESTDIR)/etc/rc2.d/K17$(GARNAME) ) - ( ln -s /etc/init.d/cswtomcat6 $(DESTDIR)/etc/rc3.d/S51$(GARNAME) ) - ( ln -s /etc/init.d/cswtomcat6 $(DESTDIR)/etc/rcS.d/K17$(GARNAME) ) + ( ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(GARNAME) ) @$(MAKECOOKIE) - - Modified: csw/mgar/pkg/tomcat6/branches/ihsan/checksums =================================================================== --- csw/mgar/pkg/tomcat6/branches/ihsan/checksums 2010-10-11 14:08:05 UTC (rev 11247) +++ csw/mgar/pkg/tomcat6/branches/ihsan/checksums 2010-10-11 15:24:17 UTC (rev 11248) @@ -1,15 +1,4 @@ -d41d8cd98f00b204e9800998ecf8427e CSWtomcat6.depend -d47fc99cefd4bbf97b124bc7432f573a CSWtomcat6.gspec -d776b690879dc9fef307de153e499af2 CSWtomcat6.prototype -f9eafa9bfd620324d1270ae8f09a8c89 apache-tomcat-6.0.26.tar.gz -3a7532b44b2b0b0f8688bd5177e2bdea checkinstall -2ead862bc2074b9acef4f10d5becc859 cswtomcat6 -08c55c4f691abf3a0783d5275dbd77e7 i.smfno -5936b013c012eceb670ea715e2812ca4 i.smfyes -3792b87a62c4548dda0d5d34b48dd528 postinstall -e3b7c69c73f9a98477476f91930bfa8b preinstall -b46a7d41733aceecfdcba29e8352517f preremove -f49c3339aa897df97abf1baf54582fb8 space -5ce231c9fafe52180725d4d23a538d9a svc-tomcat6 -bb366a079377af5416672ce5dd2a0f79 tomcat6 -2c0f11da2f8d2c5aefefdd2258661b26 tomcat6.xml +a17ccfe15231276c88f63d44334f58d5 LICENSE +7d614e03d18d3f21fcfdff96f0b6c311 apache-tomcat-6.0.29.tar.gz +2976e1c7cc26913a698455a7148471df cswtomcat6 +bca5f2de734691fbc486cf00020d81f1 cswusergroup Deleted: csw/mgar/pkg/tomcat6/branches/ihsan/files/CSWtomcat6.depend =================================================================== Deleted: csw/mgar/pkg/tomcat6/branches/ihsan/files/CSWtomcat6.gspec =================================================================== --- csw/mgar/pkg/tomcat6/branches/ihsan/files/CSWtomcat6.gspec 2010-10-11 14:08:05 UTC (rev 11247) +++ csw/mgar/pkg/tomcat6/branches/ihsan/files/CSWtomcat6.gspec 2010-10-11 15:24:17 UTC (rev 11248) @@ -1,5 +0,0 @@ -%var bitname tomcat6 -%var pkgname CSWtomcat6 -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/tomcat6/branches/ihsan/files/CSWtomcat6.prototype =================================================================== --- csw/mgar/pkg/tomcat6/branches/ihsan/files/CSWtomcat6.prototype 2010-10-11 14:08:05 UTC (rev 11247) +++ csw/mgar/pkg/tomcat6/branches/ihsan/files/CSWtomcat6.prototype 2010-10-11 15:24:17 UTC (rev 11248) @@ -1,702 +0,0 @@ -l smfno /etc/rc0.d/K17cswtomcat6=/etc/init.d/cswtomcat6 -l smfno /etc/rc1.d/K17cswtomcat6=/etc/init.d/cswtomcat6 -l smfno /etc/rc2.d/K17cswtomcat6=/etc/init.d/cswtomcat6 -l smfno /etc/rc3.d/S51cswtomcat6=/etc/init.d/cswtomcat6 -l smfno /etc/rcS.d/K17cswtomcat6=/etc/init.d/cswtomcat6 -d smfyes /opt/csw/var/svc 0755 root bin -d smfyes /opt/csw/var/svc/manifest 0755 root bin -d smfyes /opt/csw/var/svc/manifest/network 0755 root bin -f smfyes /opt/csw/var/svc/manifest/network/tomcat6.xml=tomcat6.xml 0644 root bin -d smfyes /opt/csw/lib/svc 0755 root bin -d smfyes /opt/csw/lib/svc/method 0755 root bin -f smfyes /opt/csw/lib/svc/method/svc-tomcat6=svc-tomcat6 0755 root bin -f none /etc/init.d/cswtomcat6 0755 root bin -f none /etc/opt/csw/tomcat6 0644 root bin -s none /etc/rc0.d/K17tomcat6=/etc/init.d/cswtomcat6 -s none /etc/rc1.d/K17tomcat6=/etc/init.d/cswtomcat6 -s none /etc/rc2.d/K17tomcat6=/etc/init.d/cswtomcat6 -s none /etc/rc3.d/S51tomcat6=/etc/init.d/cswtomcat6 -s none /etc/rcS.d/K17tomcat6=/etc/init.d/cswtomcat6 -d none /opt/csw/etc/tomcat6 0755 root bin -d none /opt/csw/etc/tomcat6/conf 0755 tomcat tomcat -f none /opt/csw/etc/tomcat6/conf/catalina.policy.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat6/conf/catalina.properties.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat6/conf/context.xml.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat6/conf/logging.properties.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat6/conf/server.xml.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat6/conf/tomcat-users.xml.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat6/conf/web.xml.CSW 0640 tomcat tomcat -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/tomcat6 0755 root bin -f none /opt/csw/share/tomcat6/LICENSE 0644 root bin -f none /opt/csw/share/tomcat6/NOTICE 0644 root bin -f none /opt/csw/share/tomcat6/RELEASE-NOTES 0644 root bin -f none /opt/csw/share/tomcat6/RUNNING.txt 0644 root bin -d none /opt/csw/share/tomcat6/bin 0755 root bin -f none /opt/csw/share/tomcat6/bin/bootstrap.jar 0644 root bin -f none /opt/csw/share/tomcat6/bin/catalina-tasks.xml 0644 root bin -f none /opt/csw/share/tomcat6/bin/catalina.bat 0644 root bin -f none /opt/csw/share/tomcat6/bin/catalina.sh 0755 root bin -f none /opt/csw/share/tomcat6/bin/commons-daemon.jar 0644 root bin -f none /opt/csw/share/tomcat6/bin/cpappend.bat 0644 root bin -f none /opt/csw/share/tomcat6/bin/digest.bat 0644 root bin -f none /opt/csw/share/tomcat6/bin/digest.sh 0755 root bin -f none /opt/csw/share/tomcat6/bin/jsvc.tar.gz 0644 root bin -f none /opt/csw/share/tomcat6/bin/service.bat 0644 root bin -f none /opt/csw/share/tomcat6/bin/setclasspath.bat 0644 root bin -f none /opt/csw/share/tomcat6/bin/setclasspath.sh 0755 root bin -f none /opt/csw/share/tomcat6/bin/shutdown.bat 0644 root bin -f none /opt/csw/share/tomcat6/bin/shutdown.sh 0755 root bin -f none /opt/csw/share/tomcat6/bin/startup.bat 0644 root bin -f none /opt/csw/share/tomcat6/bin/startup.sh 0755 root bin -f none /opt/csw/share/tomcat6/bin/tomcat-juli.jar 0644 root bin -f none /opt/csw/share/tomcat6/bin/tomcat-native.tar.gz 0644 root bin -f none /opt/csw/share/tomcat6/bin/tomcat6.exe 0644 root bin -f none /opt/csw/share/tomcat6/bin/tomcat6w.exe 0644 root bin -f none /opt/csw/share/tomcat6/bin/tool-wrapper.bat 0644 root bin -f none /opt/csw/share/tomcat6/bin/tool-wrapper.sh 0755 root bin -f none /opt/csw/share/tomcat6/bin/version.bat 0644 root bin -f none /opt/csw/share/tomcat6/bin/version.sh 0755 root bin -s none /opt/csw/share/tomcat6/conf=/opt/csw/etc/tomcat6/conf -d none /opt/csw/share/tomcat6/lib 0755 root bin -f none /opt/csw/share/tomcat6/lib/annotations-api.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/catalina-ant.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/catalina-ha.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/catalina-tribes.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/catalina.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/el-api.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/jasper-el.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/jasper-jdt.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/jasper.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/jsp-api.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/servlet-api.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/tomcat-coyote.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/tomcat-dbcp.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/tomcat-i18n-es.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/tomcat-i18n-fr.jar 0644 root bin -f none /opt/csw/share/tomcat6/lib/tomcat-i18n-ja.jar 0644 root bin -s none /opt/csw/share/tomcat6/logs=/var/opt/csw/tomcat6/logs -s none /opt/csw/share/tomcat6/temp=/var/opt/csw/tomcat6/temp -d none /opt/csw/share/tomcat6/webapps 0755 root bin -d none /opt/csw/share/tomcat6/webapps/ROOT 0755 root bin -f none /opt/csw/share/tomcat6/webapps/ROOT/RELEASE-NOTES.txt 0644 root bin -d none /opt/csw/share/tomcat6/webapps/ROOT/WEB-INF 0755 root bin -f none /opt/csw/share/tomcat6/webapps/ROOT/WEB-INF/web.xml 0644 root bin -f none /opt/csw/share/tomcat6/webapps/ROOT/asf-logo-wide.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/ROOT/build.xml 0644 root bin -f none /opt/csw/share/tomcat6/webapps/ROOT/favicon.ico 0644 root bin -f none /opt/csw/share/tomcat6/webapps/ROOT/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/ROOT/index.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/ROOT/tomcat-power.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/ROOT/tomcat.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/ROOT/tomcat.svg 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/BUILDING.txt 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/NOTICE 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/RELEASE-NOTES.txt 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/RUNNING.txt 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/WEB-INF 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/WEB-INF/web.xml 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/aio.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/api 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/api/index.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/appdev 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/build.xml.txt 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/deployment.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/installation.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/introduction.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/appdev/printer 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/deployment.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/docs 0755 root bin -d none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/docs/appdev 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/docs/appdev/build.xml.txt 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/docs/appdev/web.xml.txt 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/installation.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/introduction.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/processes.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/source.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/processes.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/build.xml 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/docs 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/docs/README.txt 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/sample.war 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/src 0755 root bin -d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/src/mypackage 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/src/mypackage/Hello.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web 0755 root bin -d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web/WEB-INF 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web/WEB-INF/web.xml 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web/hello.jsp 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web/images 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web/images/tomcat.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/source.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/appdev/web.xml.txt 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/apr.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/architecture 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/architecture/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/architecture/overview.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/architecture/printer 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/architecture/printer/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/architecture/printer/overview.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/architecture/printer/requestProcess.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/architecture/printer/startup.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/architecture/requestProcess 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/architecture/requestProcess.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/architecture/requestProcess/requestProcess.pdf 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/architecture/requestProcess/roseModel.mdl 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/architecture/startup 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/architecture/startup.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/architecture/startup/serverStartup.pdf 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/architecture/startup/serverStartup.txt 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/balancer-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/building.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/cgi-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/changelog.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/class-loader-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/cluster-howto.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/config 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/ajp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-channel.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-deployer.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-interceptor.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-listener.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-manager.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-membership.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-receiver.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-sender.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-valve.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/cluster.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/context.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/engine.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/executor.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/globalresources.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/host.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/http.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/loader.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/manager.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/config/printer 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/ajp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-channel.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-deployer.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-interceptor.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-listener.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-manager.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-membership.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-receiver.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-sender.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-valve.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/context.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/engine.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/executor.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/globalresources.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/host.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/http.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/loader.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/manager.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/realm.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/resources.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/server.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/service.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/systemprops.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/printer/valve.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/realm.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/resources.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/server.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/service.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/systemprops.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/config/valve.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/connectors.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/default-servlet.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/deployer-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/developers.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/extras.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/funcspecs 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-admin-apps.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-admin-objects.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-admin-opers.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-default.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-invoker.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-jdbc-realm.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-jndi-realm.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-memory-realm.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/mbean-names.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-admin-apps.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-admin-objects.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-admin-opers.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-default.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-invoker.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-jdbc-realm.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-jndi-realm.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-memory-realm.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/mbean-names.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/html-manager-howto.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/images 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/images/add.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/images/asf-logo.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/images/code.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/images/design.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/images/docs.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/images/fix.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/images/printer.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/images/tomcat.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/images/tomcat.svg 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/images/update.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/images/void.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/introduction.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/jasper-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/jndi-datasource-examples-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/jndi-resources-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/logging.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/manager-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/maven-jars.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/mbeans-descriptor-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/monitoring.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/printer 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/BUILDING.txt 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/NOTICE 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/RUNNING.txt 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/aio.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/apr.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/balancer-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/building.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/cgi-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/changelog.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/class-loader-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/cluster-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/connectors.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/default-servlet.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/deployer-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/developers.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/extras.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/html-manager-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/introduction.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/jasper-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/jndi-datasource-examples-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/jndi-resources-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/logging.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/manager-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/maven-jars.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/mbeans-descriptor-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/monitoring.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/proxy-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/realm-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/security-manager-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/setup.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/ssi-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/ssl-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/virtual-hosting-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/printer/windows-service-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/proxy-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/realm-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/security-manager-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/setup.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/ssi-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/ssl-howto.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/docs/tribes 0755 root bin -f none /opt/csw/share/tomcat6/webapps/docs/tribes/faq.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/tribes/introduction.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/tribes/setup.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/virtual-hosting-howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/docs/windows-service-howto.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples 0755 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF 0755 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/CookieExample.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/CookieExample.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings.properties 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_en.properties 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_es.properties 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/SessionExample.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/SessionExample.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/Entries.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/Entries.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/Entry.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/Entry.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/JspCalendar.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/JspCalendar.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/TableBean.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/TableBean.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/chat 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet$MessageSender.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/checkbox 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/colors 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/dates 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/dates/JspCalendar.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/dates/JspCalendar.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/error 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/error/Smart.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/error/Smart.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTag.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTag.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/LogTag.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/LogTag.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2 0755 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/listeners 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/num 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/servletToJsp.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/servletToJsp.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/sessions 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/util 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/util/HTMLFilter.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/util/HTMLFilter.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/validators 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.java 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp 0755 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp/applet 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp/applet/Clock2.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp/debug-taglib.tld 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp/example-taglib.tld 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp2 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/lib 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/lib/jstl.jar 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/lib/standard.jar 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/tags 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/tags/displayProducts.tag 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/tags/helloWorld.tag 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/tags/panel.tag 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/tags/xhtmlbasic.tag 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/web.xml 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/index.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp 0755 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/cal 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/Entries.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/Entry.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/JspCalendar.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/TableBean.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/cal1.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/cal1.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/cal2.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/cal2.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/calendar.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/login.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/chat 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/chat/chat.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/chat/chat.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/chat/login.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/chat/login.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/chat/post.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/chat/post.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/checkbox 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/checkbox/CheckTest.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/checkbox/check.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/checkbox/checkresult.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/checkbox/checkresult.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/checkbox/cresult.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/colors 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/colors/ColorGameBean.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/colors/clr.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/colors/colors.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/colors/colrs.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/colors/colrs.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/dates 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/dates/date.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/dates/date.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/dates/date.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/error 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/error/er.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/error/err.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/error/err.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/error/error.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/error/errorpge.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/error/errorpge.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/forward 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/forward/forward.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/forward/forward.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/forward/fwd.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/forward/one.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/forward/one.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/forward/two.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/images 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/images/code.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/images/execute.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/images/read.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/images/return.gif 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/include 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/include/foo.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/include/foo.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/include/foo.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/include/inc.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/include/include.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/include/include.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/index.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2 0755 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/Functions.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/functions.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/functions.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/functions.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/FooBean.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/HelloWorldSimpleTag.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/ShuffleSimpleTag.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/TileSimpleTag.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.jspx 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.jspx.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/svgexample.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jpg 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jspx 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jspx.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/EchoAttributesTag.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/coda.jspf 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/coda.jspf.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/config.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/config.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/config.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/prelude.jspf 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/prelude.jspf.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/BookBean.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/FindBookSimpleTag.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/Functions.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/HelloWorldSimpleTag.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/RepeatSimpleTag.java.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/displayProducts.tag.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/helloWorld.tag.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.tag.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/xhtmlbasic.tag.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv/hello.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv/hello.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv/jts.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv/servletToJsp.java.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/num 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/num/numguess.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/num/numguess.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/num/numguess.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin 0755 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin/applet 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin/applet/Clock2.class 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin/applet/Clock2.java 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin/plugin.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin/plugin.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin/plugin.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/security 0755 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected/error.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected/error.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected/index.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected/index.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected/login.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected/login.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/sessions 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/sessions/DummyCart.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/sessions/carts.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/sessions/carts.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/sessions/carts.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/sessions/crt.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/simpletag 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/simpletag/foo.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/simpletag/foo.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/simpletag/foo.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/snp 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/snp/snoop.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/snp/snoop.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/snp/snoop.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/source.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/source.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/choose.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/choose.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/choose.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/foreach.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/foreach.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/foreach.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/howto.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/if.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/if.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/if.jsp.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/notes.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/jsp/xml 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/xml/xml.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/xml/xml.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/jsp/xml/xml.jsp.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/servlets 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/servlets/cookies.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/servlets/helloworld.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/examples/servlets/images 0755 root bin -f none /opt/csw/share/tomcat6/webapps/examples/servlets/images/code.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/servlets/images/execute.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/servlets/images/return.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/servlets/index.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/servlets/reqheaders.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/servlets/reqinfo.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/servlets/reqparams.html 0644 root bin -f none /opt/csw/share/tomcat6/webapps/examples/servlets/sessions.html 0644 root bin -d none /opt/csw/share/tomcat6/webapps/host-manager 0755 root bin -d none /opt/csw/share/tomcat6/webapps/host-manager/META-INF 0755 root bin -f none /opt/csw/share/tomcat6/webapps/host-manager/META-INF/context.xml 0644 root bin -d none /opt/csw/share/tomcat6/webapps/host-manager/WEB-INF 0755 root bin -f none /opt/csw/share/tomcat6/webapps/host-manager/WEB-INF/web.xml 0644 root bin -d none /opt/csw/share/tomcat6/webapps/host-manager/images 0755 root bin -f none /opt/csw/share/tomcat6/webapps/host-manager/images/add.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/host-manager/images/asf-logo.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/host-manager/images/code.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/host-manager/images/design.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/host-manager/images/docs.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/host-manager/images/fix.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/host-manager/images/tomcat.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/host-manager/images/update.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/host-manager/images/void.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/host-manager/manager.xml 0644 root bin -d none /opt/csw/share/tomcat6/webapps/manager 0755 root bin -f none /opt/csw/share/tomcat6/webapps/manager/401.jsp 0644 root bin -d none /opt/csw/share/tomcat6/webapps/manager/META-INF 0755 root bin -f none /opt/csw/share/tomcat6/webapps/manager/META-INF/context.xml 0644 root bin -d none /opt/csw/share/tomcat6/webapps/manager/WEB-INF 0755 root bin -f none /opt/csw/share/tomcat6/webapps/manager/WEB-INF/web.xml 0644 root bin -d none /opt/csw/share/tomcat6/webapps/manager/images 0755 root bin -f none /opt/csw/share/tomcat6/webapps/manager/images/add.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/manager/images/asf-logo.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/manager/images/code.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/manager/images/design.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/manager/images/docs.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/manager/images/fix.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/manager/images/tomcat.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/manager/images/update.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/manager/images/void.gif 0644 root bin -f none /opt/csw/share/tomcat6/webapps/manager/sessionDetail.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/manager/sessionsList.jsp 0644 root bin -f none /opt/csw/share/tomcat6/webapps/manager/status.xsd 0644 root bin -f none /opt/csw/share/tomcat6/webapps/manager/xform.xsl 0644 root bin -s none /opt/csw/share/tomcat6/work=/var/opt/csw/tomcat6/work -d none /var/opt/csw/tomcat6 0755 root bin -d none /var/opt/csw/tomcat6/logs 0755 tomcat tomcat -d none /var/opt/csw/tomcat6/temp 0755 tomcat tomcat -d none /var/opt/csw/tomcat6/work 0755 tomcat tomcat -i copyright=CSWtomcat6.copyright -i depend=CSWtomcat6.depend -i pkginfo=CSWtomcat6.pkginfo -i checkinstall -i preremove -i postinstall -i preinstall -i i.smfno -i i.smfyes -i space Added: csw/mgar/pkg/tomcat6/branches/ihsan/files/LICENSE =================================================================== --- csw/mgar/pkg/tomcat6/branches/ihsan/files/LICENSE (rev 0) +++ csw/mgar/pkg/tomcat6/branches/ihsan/files/LICENSE 2010-10-11 15:24:17 UTC (rev 11248) @@ -0,0 +1,707 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +APACHE TOMCAT SUBCOMPONENTS: + +Apache Tomcat includes a number of subcomponents with separate copyright notices +and license terms. Your use of these subcomponents is subject to the terms and +conditions of the following licenses. + + +For the jasper-jdt.jar component: + +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are not +derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and such +derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed +Patents to make, use, sell, offer to sell, import and otherwise transfer the +Contribution of such Contributor, if any, in source code and object code form. +This patent license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, such +addition of the Contribution causes such combination to be covered by the +Licensed Patents. The patent license shall not apply to any other combinations +which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to +its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other intellectual +property rights of any other entity. Each Contributor disclaims any liability to +Recipient for claims brought by any other entity based on infringement of +intellectual property rights or otherwise. As a condition to exercising the +rights and licenses granted hereunder, each Recipient hereby assumes sole +responsibility to secure any other intellectual property rights needed, if any. +For example, if a third party patent license is required to allow Recipient to +distribute the Program, it is Recipient's responsibility to acquire that license +before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright +rights in its Contribution, if any, to grant the copyright license set forth in +this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its +own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title and +non-infringement, and implied warranties or conditions of merchantability and +fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered by +that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such Contributor, +and informs licensees how to obtain it in a reasonable manner on or through a +medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the +Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor +to control, and cooperate with the Commercial Contributor in, the defense and +any related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its exercise of +rights under this Agreement , including but not limited to the risks and costs +of program errors, compliance with applicable laws, damage to or loss of data, +programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted under +Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue and +survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to time. +No one other than the Agreement Steward has the right to modify this Agreement. +The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation +may assign the responsibility to serve as the Agreement Steward to a suitable +separate entity. Each new version of the Agreement will be given a +distinguishing version number. The Program (including Contributions) may always +be distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to distribute the Program (including its Contributions) +under the new version. Except as expressly stated in Sections 2(a) and 2(b) +above, Recipient receives no rights or licenses to the intellectual property of +any Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted under +this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. + + +For the Windows Installer component: + + * All NSIS source code, plug-ins, documentation, examples, header files and + graphics, with the exception of the compression modules and where + otherwise noted, are licensed under the zlib/libpng license. + * The zlib compression module for NSIS is licensed under the zlib/libpng + license. + * The bzip2 compression module for NSIS is licensed under the bzip2 license. + * The lzma compression module for NSIS is licensed under the Common Public + License version 1.0. + +zlib/libpng license + +This software is provided 'as-is', without any express or implied warranty. In +no event will the authors be held liable for any damages arising from the use of +this software. + +Permission is granted to anyone to use this software for any purpose, including +commercial applications, and to alter it and redistribute it freely, subject to +the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a + product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +bzip2 license + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a + product, an acknowledgment in the product documentation would be + appreciated but is not required. + 3. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 4. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. + +Julian Seward, Cambridge, UK. + +jseward at acm.org +Common Public License version 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and b) in the case of each subsequent +Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are not +derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents " mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and such +derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed +Patents to make, use, sell, offer to sell, import and otherwise transfer the +Contribution of such Contributor, if any, in source code and object code form. +This patent license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, such +addition of the Contribution causes such combination to be covered by the +Licensed Patents. The patent license shall not apply to any other combinations +which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to +its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other intellectual +property rights of any other entity. Each Contributor disclaims any liability to +Recipient for claims brought by any other entity based on infringement of +intellectual property rights or otherwise. As a condition to exercising the +rights and licenses granted hereunder, each Recipient hereby assumes sole +responsibility to secure any other intellectual property rights needed, if any. +For example, if a third party patent license is required to allow Recipient to +distribute the Program, it is Recipient's responsibility to acquire that license +before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright +rights in its Contribution, if any, to grant the copyright license set forth in +this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its +own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title and +non-infringement, and implied warranties or conditions of merchantability and +fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered by +that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such Contributor, +and informs licensees how to obtain it in a reasonable manner on or through a +medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the +Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor to +control, and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may participate in +any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its exercise of +rights under this Agreement, including but not limited to the risks and costs of +program errors, compliance with applicable laws, damage to or loss of data, +programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 11 17:43:14 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Oct 2010 15:43:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[11249] csw/mgar/pkg Message-ID: Revision: 11249 http://gar.svn.sourceforge.net/gar/?rev=11249&view=rev Author: dmichelsen Date: 2010-10-11 15:43:14 +0000 (Mon, 11 Oct 2010) Log Message: ----------- taglib_gcc: Initial commit Added Paths: ----------- csw/mgar/pkg/taglib_gcc/ csw/mgar/pkg/taglib_gcc/trunk/Makefile csw/mgar/pkg/taglib_gcc/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/taglib_gcc/trunk/Makefile csw/mgar/pkg/taglib_gcc/trunk/checksums Deleted: csw/mgar/pkg/taglib_gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/taglib/trunk/Makefile 2010-10-05 02:35:10 UTC (rev 11153) +++ csw/mgar/pkg/taglib_gcc/trunk/Makefile 2010-10-11 15:43:14 UTC (rev 11249) @@ -1,27 +0,0 @@ -GARNAME = taglib -GARVERSION = 1.6.1 -CATEGORIES = lib - -DESCRIPTION = Brief description -define BLURB - Long description -endef - -MASTER_SITES = http://developer.kde.org/~wheeler/files/src/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -LICENSE = COPYING.MPL - -RUNTIME_DEP_PKGS_CSWtaglib += CSWzlib - -# UPSTREAM_MASTER_SITES = - -EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm - -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - -include gar/category.mk Copied: csw/mgar/pkg/taglib_gcc/trunk/Makefile (from rev 11240, csw/mgar/pkg/taglib/trunk/Makefile) =================================================================== --- csw/mgar/pkg/taglib_gcc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/taglib_gcc/trunk/Makefile 2010-10-11 15:43:14 UTC (rev 11249) @@ -0,0 +1,37 @@ +GARNAME = taglib +GARVERSION = 1.6.3 +CATEGORIES = lib + +DESCRIPTION = Library for reading and editing the meta-data of several popular audio formats +define BLURB + TagLib is a library for reading and editing the meta-data of several popular audio formats. + Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags + and Vorbis comments in FLAC, MPC, Speex, WavPack and TrueAudio files. +endef + +MASTER_SITES = http://developer.kde.org/~wheeler/files/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = COPYING.MPL + +VENDOR_URL = http://developer.kde.org/~wheeler/taglib.html + +PACKAGES = CSWtaglibgcc +CATALOGNAME = taglib_gcc + +RUNTIME_DEP_PKGS_CSWtaglibgcc += CSWzlib +RUNTIME_DEP_PKGS_CSWtaglibgcc += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWtaglibgcc += CSWgcc4g++rt + +GARCOMPILER = GCC4 + +EXTRA_LD_FLAGS = -lc -lm + +prefix = $(BUILD_PREFIX)/kde-gcc +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Deleted: csw/mgar/pkg/taglib_gcc/trunk/checksums =================================================================== --- csw/mgar/pkg/taglib/trunk/checksums 2010-10-05 02:35:10 UTC (rev 11153) +++ csw/mgar/pkg/taglib_gcc/trunk/checksums 2010-10-11 15:43:14 UTC (rev 11249) @@ -1 +0,0 @@ -db0502b3c3448ff1f1f9b090c1daa5f7 taglib-1.6.1.tar.gz Copied: csw/mgar/pkg/taglib_gcc/trunk/checksums (from rev 11230, csw/mgar/pkg/taglib/trunk/checksums) =================================================================== --- csw/mgar/pkg/taglib_gcc/trunk/checksums (rev 0) +++ csw/mgar/pkg/taglib_gcc/trunk/checksums 2010-10-11 15:43:14 UTC (rev 11249) @@ -0,0 +1 @@ +ddf02f4e1d2dc30f76734df806e613eb taglib-1.6.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 11 17:49:44 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Oct 2010 15:49:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[11251] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 11251 http://gar.svn.sourceforge.net/gar/?rev=11251&view=rev Author: bdwalton Date: 2010-10-11 15:49:44 +0000 (Mon, 11 Oct 2010) Log Message: ----------- cswclassutils: automatically generate subpackages for each CAS in filedir; top package depends on all of them. Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-10-11 15:45:32 UTC (rev 11250) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-10-11 15:49:44 UTC (rev 11251) @@ -4,6 +4,51 @@ GARVERSION = 1.42 CATEGORIES = utils +# a few handy functions for defining 'generic' things dynmaically +set = $(eval $1 := $2) + +define cas_shortname +$(subst csw,,$(1)) +endef + +define csw_pkgname +CSWcas-$(call cas_shortname,$(1)) +endef + +define var_name +$(1)_$(call csw_pkgname,$(2)) +endef + +define spkg_desc_val +Class action script $(call cas_shortname,$(1)) +endef + +define pkgfiles_val +/usr/sadm/install/scripts/.*$(1) +endef + +define catname_val +cas_$(call cas_shortname,$(1)) +endef + +define spkg_desc +$(call set,$(call var_name,SPKG_DESC,$(1)),$(call spkg_desc_val,$(1))) +endef + +define pkg_files +$(call set,$(call var_name,PKGFILES,$(1)),$(call pkgfiles_val,$(1))) +endef + +define catname +$(call set,$(call var_name,CATALOGNAME,$(1)),$(call catname_val,$(1))) +endef + +define surplus_dep +$(eval CHECKPKG_OVERRIDES_CSWcswclassutils += surplus-dependency|$(call csw_pkgname,$(1))) +endef + +# end of handy functions + DESCRIPTION = CSW class action utilities MASTER_SITES = @@ -18,10 +63,21 @@ SPKG_SOURCEURL = http://www.opencsw.org +FILEDIR = files + CASFILES = $(wildcard $(FILEDIR)/CSW$(GARNAME).[ir].*) CASLIST = $(foreach F,$(CASFILES), $(subst $(FILEDIR)/CSW$(GARNAME).,,$(F))) +CSWCLASSES = $(subst .,,$(sort $(suffix $(CASLIST)))) + DISTFILES += $(subst $(FILEDIR)/,,$(CASFILES)) +CASPACKAGES += $(foreach C,$(CSWCLASSES),CSWcas-$(call cas_shortname,$(C))) + +PACKAGES = CSWcswclassutils +PACKAGES += $(CASPACKAGES) + +RUNTIME_DEP_PKGS_CSWcswclassutils = $(CASPACKAGES) + PROTOTYPE_MODIFIERS = cas PROTOTYPE_FILES_cas = /usr/sadm/install/scripts/.* PROTOTYPE_USER_cas = bin @@ -31,6 +87,18 @@ CHECKPKG_OVERRIDES_CSWcswclassutils += init-file-wrong-location CHECKPKG_OVERRIDES_CSWcswclassutils += init-file-wrong-location|/opt/csw/etc/init.d/csw.smf.sample +# set a unique description for each CAS +$(foreach C,$(CSWCLASSES),$(call spkg_desc,$(C))) +SPKG_DESC_CSWcswclassutils = $(DESCRIPTION) + +# and add the base set of files belonging to the CAS +$(foreach C,$(CSWCLASSES),$(call pkg_files,$(C))) +# and the catalog names +$(foreach C,$(CSWCLASSES),$(call catname,$(C))) + +# tell checkpkg to ignore the surplus dep on the subpkgs +$(foreach C,$(CSWCLASSES),$(call surplus_dep,$(C))) + include gar/category.mk install-custom: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 11 17:45:32 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Oct 2010 15:45:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11250] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 11250 http://gar.svn.sourceforge.net/gar/?rev=11250&view=rev Author: bdwalton Date: 2010-10-11 15:45:32 +0000 (Mon, 11 Oct 2010) Log Message: ----------- gar/v2: detect missing or duplicate SPKG_DESC values without calls to shell (heavy weight, side effects with var expansion in corner cases) Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-10-11 15:43:14 UTC (rev 11249) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-10-11 15:45:32 UTC (rev 11250) @@ -551,11 +551,13 @@ # Make sure every producable package contains specific descriptions. # We explicitly ignore NOPACKAGE here to disallow circumventing the check. +$(if $(filter-out $(firstword $(SPKG_SPECS)),$(SPKG_SPECS)),\ + $(foreach P,$(SPKG_SPECS),\ + $(if $(SPKG_DESC_$(P)),,$(error Multiple packages defined and SPKG_DESC_$(P) is not set.)))) + $(foreach P,$(SPKG_SPECS),\ - $(foreach Q,$(filter-out $P,$(SPKG_SPECS)),\ - $(if $(shell if test "$(SPKG_DESC_$P)" = "$(SPKG_DESC_$Q)"; then echo ERROR; fi),\ - $(error The package descriptions for $P and $Q are identical, please make sure all package descriptions are unique by setting SPKG_DESC_ for each package) \ -))) + $(foreach Q,$(filter-out $(P),$(SPKG_SPECS)),\ + $(if $(filter-out $(sort $(SPKG_DESC_$(P))),$(sort $(SPKG_DESC_$(P)) $(SPKG_DESC_$(Q)))),,$(error The package descriptions for $(P) [$(if $(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),)] and $(Q) [$(if $(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),)] are identical. Please make sure that all descriptions are unique by setting SPKG_DESC_ for each package.)))) .PRECIOUS: $(WORKDIR)/%.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 11 18:06:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Oct 2010 16:06:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[11252] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 11252 http://gar.svn.sourceforge.net/gar/?rev=11252&view=rev Author: dmichelsen Date: 2010-10-11 16:06:52 +0000 (Mon, 11 Oct 2010) Log Message: ----------- gnulinks: Remove links to CSWbison Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2010-10-11 15:49:44 UTC (rev 11251) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2010-10-11 16:06:52 UTC (rev 11252) @@ -4,7 +4,7 @@ VENDOR_URL = http://opencsw.org -GLINKPKGS = CSWggettext CSWggettextrt CSWbison CSWbinutils +GLINKPKGS = CSWggettext CSWggettextrt CSWbinutils GLINKPKGS += CSWggetopt CSWfindutils CSWgwhois BUILD_DEP_PKGS = $(GLINKPKGS) CSWpkgutil CSWbash This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 11 18:11:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Oct 2010 16:11:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[11253] csw/mgar/pkg/adobereader/trunk/Makefile Message-ID: Revision: 11253 http://gar.svn.sourceforge.net/gar/?rev=11253&view=rev Author: dmichelsen Date: 2010-10-11 16:11:26 +0000 (Mon, 11 Oct 2010) Log Message: ----------- adobereader: Make sure the correct vendor URL is used Modified Paths: -------------- csw/mgar/pkg/adobereader/trunk/Makefile Modified: csw/mgar/pkg/adobereader/trunk/Makefile =================================================================== --- csw/mgar/pkg/adobereader/trunk/Makefile 2010-10-11 16:06:52 UTC (rev 11252) +++ csw/mgar/pkg/adobereader/trunk/Makefile 2010-10-11 16:11:26 UTC (rev 11253) @@ -11,10 +11,11 @@ define BLURB endef -MASTER_SITES = ftp://ftp.adobe.com/pub/adobe/reader/unix/$(shell echo $(GARVERSION_sparc) | cut -d. -f1).x/$(GARVERSION_sparc)/enu/ -MASTER_SITES += ftp://ftp.adobe.com/pub/adobe/reader/unix/$(shell echo $(GARVERSION_i386) | cut -d. -f1).x/$(GARVERSION_i386)/enu/ -DISTFILES_sparc = AdobeReader_enu-$(FILEVERSION_sparc)-1.sparc.tar.bz2 -DISTFILES_i386 = AdbeRdr$(FILEVERSION_i386)-1_i486solaris_enu.tar.bz2 +MASTER_SITES_sparc = ftp://ftp.adobe.com/pub/adobe/reader/unix/$(shell echo $(GARVERSION_sparc) | cut -d. -f1).x/$(GARVERSION_sparc)/enu/ +MASTER_SITES_i386 = ftp://ftp.adobe.com/pub/adobe/reader/unix/$(shell echo $(GARVERSION_i386) | cut -d. -f1).x/$(GARVERSION_i386)/enu/ +MASTER_SITES = $(MASTER_SITES_sparc) $(MASTER_SITES_i386) +DISTFILES_sparc = AdobeReader_enu-$(FILEVERSION_sparc)-1.sparc.tar.bz2 +DISTFILES_i386 = AdbeRdr$(FILEVERSION_i386)-1_i486solaris_enu.tar.bz2 DISTFILES = $(DISTFILES_sparc) $(DISTFILES_i386) NOEXTRACT = $(filter-out $(DISTFILES_$(GARCH)),$(DISTFILES)) DISTNAME = AdobeReader @@ -28,6 +29,8 @@ LICENSE = AdobeReader/ReadMe.htm +VENDOR_URL = $(MASTER_SITES_$(GARCH)) + PACKAGING_PLATFORMS = solaris9-sparc solaris10-i386 CONFIGURE_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Oct 11 19:50:51 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 11 Oct 2010 17:50:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[11254] csw/mgar/pkg/tomcat6/branches/ihsan/Makefile Message-ID: Revision: 11254 http://gar.svn.sourceforge.net/gar/?rev=11254&view=rev Author: idogan23 Date: 2010-10-11 17:50:51 +0000 (Mon, 11 Oct 2010) Log Message: ----------- tomcat6: set ARCHALL to 1, changed user/group for config files to tomcat Modified Paths: -------------- csw/mgar/pkg/tomcat6/branches/ihsan/Makefile Modified: csw/mgar/pkg/tomcat6/branches/ihsan/Makefile =================================================================== --- csw/mgar/pkg/tomcat6/branches/ihsan/Makefile 2010-10-11 16:11:26 UTC (rev 11253) +++ csw/mgar/pkg/tomcat6/branches/ihsan/Makefile 2010-10-11 17:50:51 UTC (rev 11254) @@ -21,6 +21,7 @@ PACKAGES = CSWtomcat6 CATALOGNAME = tomcat6 LICENSE = LICENSE +ARCHALL = 1 CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none @@ -32,13 +33,14 @@ USERGROUP = /etc/opt/csw/pkg/$(GARNAME)/cswusergroup PRESERVECONF = /etc/opt/csw/$(GARNAME)/conf/.* -PROTOTYPE_MODIFIERS = varuser etcperm - +PROTOTYPE_MODIFIERS = varuser etcperm PROTOTYPE_FILES_varuser = /var/opt/csw/$(GARNAME)/.* PROTOTYPE_USER_varuser = tomcat PROTOTYPE_GROUP_varuser = tomcat PROTOTYPE_FILES_etcperm = /etc/opt/csw/$(GARNAME)/conf/.*\.CSW -PROTOTYPE_PERMS_etcperm = 0644 +PROTOTYPE_PERMS_etcperm = 0640 +PROTOTYPE_USER_etcperm = tomcat +PROTOTYPE_GROUP_etcperm = tomcat MIGRATE_SOURCE_DIR = /opt/csw/etc/$(GARNAME)/conf MIGRATE_DEST_DIR = /etc/opt/csw/$(GARNAME)/conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 11 20:17:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Oct 2010 18:17:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[11255] csw/mgar/pkg/lang-python/logilab-astng/trunk/ Makefile Message-ID: Revision: 11255 http://gar.svn.sourceforge.net/gar/?rev=11255&view=rev Author: wahwah Date: 2010-10-11 18:17:46 +0000 (Mon, 11 Oct 2010) Log Message: ----------- logilab-astng: Adding the dependency on logilab-common. Modified Paths: -------------- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile Modified: csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2010-10-11 17:50:51 UTC (rev 11254) +++ csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2010-10-11 18:17:46 UTC (rev 11255) @@ -16,4 +16,6 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc ARCHALL_CSWpy-logilab-astng = 1 +RUNTIME_DEP_PKGS_CSWpy-logilab-astng = CSWpy-logilab-common +CHECKPKG_OVERRIDES_CSWpy-logilab-astng += surplus-dependency|CSWpy-logilab-common include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 11 20:28:27 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Oct 2010 18:28:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[11256] csw/mgar/pkg/lang-python/pylint/trunk/Makefile Message-ID: Revision: 11256 http://gar.svn.sourceforge.net/gar/?rev=11256&view=rev Author: wahwah Date: 2010-10-11 18:28:27 +0000 (Mon, 11 Oct 2010) Log Message: ----------- pylint: Adding the dependency on logilab-astng. Modified Paths: -------------- csw/mgar/pkg/lang-python/pylint/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pylint/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pylint/trunk/Makefile 2010-10-11 18:17:46 UTC (rev 11255) +++ csw/mgar/pkg/lang-python/pylint/trunk/Makefile 2010-10-11 18:28:27 UTC (rev 11256) @@ -17,4 +17,6 @@ # The software name is 'pylint'. CHECKPKG_OVERRIDES_CSWpylint += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpylint += catalogname-does-not-start-with-py_ +RUNTIME_DEP_PKGS_CSWpylint = CSWpy-logilab-astng +CHECKPKG_OVERRIDES_CSWpylint += surplus-dependency|CSWpy-logilab-astng include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 12 03:27:30 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Oct 2010 01:27:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[11257] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 11257 http://gar.svn.sourceforge.net/gar/?rev=11257&view=rev Author: bdwalton Date: 2010-10-12 01:27:30 +0000 (Tue, 12 Oct 2010) Log Message: ----------- cswclassutils: add a few manual pkg file splits and move the checkpkg overrides to the appropriate sub-package Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-10-11 18:28:27 UTC (rev 11256) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-10-12 01:27:30 UTC (rev 11257) @@ -83,9 +83,6 @@ PROTOTYPE_USER_cas = bin PROTOTYPE_GROUP_cas = sys -CHECKPKG_OVERRIDES_CSWcswclassutils += init-file-missing-cswinitsmf-class -CHECKPKG_OVERRIDES_CSWcswclassutils += init-file-wrong-location -CHECKPKG_OVERRIDES_CSWcswclassutils += init-file-wrong-location|/opt/csw/etc/init.d/csw.smf.sample # set a unique description for each CAS $(foreach C,$(CSWCLASSES),$(call spkg_desc,$(C))) @@ -99,6 +96,15 @@ # tell checkpkg to ignore the surplus dep on the subpkgs $(foreach C,$(CSWCLASSES),$(call surplus_dep,$(C))) +# Add non-auto changes to checkpkg overrides, pkg files, etc. + +PKGFILES_CSWcas-initsmf += /opt/csw/etc/init.d/.* +PKGFILES_CSWcas-initsmf += /var/opt/csw/svc/.* + +CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-missing-cswinitsmf-class +CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-wrong-location +CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-wrong-location|/opt/csw/etc/init.d/csw.smf.sample + include gar/category.mk install-custom: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 12 03:42:23 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Oct 2010 01:42:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[11258] csw/mgar/pkg/cswclassutils/trunk/README.maintainers Message-ID: Revision: 11258 http://gar.svn.sourceforge.net/gar/?rev=11258&view=rev Author: bdwalton Date: 2010-10-12 01:42:19 +0000 (Tue, 12 Oct 2010) Log Message: ----------- cswclassutils: Add a maintainer readme. Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/README.maintainers Added: csw/mgar/pkg/cswclassutils/trunk/README.maintainers =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/README.maintainers (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/README.maintainers 2010-10-12 01:42:19 UTC (rev 11258) @@ -0,0 +1,27 @@ +Fellow maintainers: + +cswclassutils is now a shell package for several subpackages that +primarily consist of nothing more than a single i, r CAS pair. The +GAR recipe is setup such that all you normally need to do to add a new +CAS is to add the scripts to the files/ directory, following the +naming convention CSWcswclassutils.[ir].csw$name (eg: +CSWcswclassutils.i.cswpycompile). + +To release an update of a script pair that you tend, do: + +1. Update the script(s) appropriately. +2. Bump the version number in Makefile +3. Commit changes to svn. +4. gmake package-CSWcas-$name (eg: package-CSWcas-initsmf) + +All of the GAR stuff is dynamically generated. You can override these +values if desired, but in most cases this won't be required. + +You should get a package file with a filename like: + +cas_$name-X.Y.Z,REV=%Y.%m.%d... + +Ask on the list if you have any questions about this.. + +Thanks +-Ben This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 12 10:20:26 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Oct 2010 08:20:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[11259] csw/mgar/pkg/lang-python/logilab-astng/trunk/ Makefile Message-ID: Revision: 11259 http://gar.svn.sourceforge.net/gar/?rev=11259&view=rev Author: wahwah Date: 2010-10-12 08:20:26 +0000 (Tue, 12 Oct 2010) Log Message: ----------- logilab-astng: Better sourceurl. Modified Paths: -------------- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile Modified: csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2010-10-12 01:42:19 UTC (rev 11258) +++ csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2010-10-12 08:20:26 UTC (rev 11259) @@ -10,7 +10,7 @@ CATALOGNAME_CSWpy-logilab-astng = py_logilab_astng define BLURB endef -SPKG_SOURCEURL = http://www.logilab.org/856 +SPKG_SOURCEURL = http://www.logilab.org/project/logilab-astng MASTER_SITES = http://ftp.logilab.org/pub/astng/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Oct 12 10:39:32 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 12 Oct 2010 08:39:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11260] csw/mgar/pkg/tomcat6/branches/ihsan Message-ID: Revision: 11260 http://gar.svn.sourceforge.net/gar/?rev=11260&view=rev Author: idogan23 Date: 2010-10-12 08:39:32 +0000 (Tue, 12 Oct 2010) Log Message: ----------- tomcat6: if available, use OpenCSW java Modified Paths: -------------- csw/mgar/pkg/tomcat6/branches/ihsan/checksums csw/mgar/pkg/tomcat6/branches/ihsan/files/cswtomcat6 Modified: csw/mgar/pkg/tomcat6/branches/ihsan/checksums =================================================================== --- csw/mgar/pkg/tomcat6/branches/ihsan/checksums 2010-10-12 08:20:26 UTC (rev 11259) +++ csw/mgar/pkg/tomcat6/branches/ihsan/checksums 2010-10-12 08:39:32 UTC (rev 11260) @@ -1,4 +1,4 @@ a17ccfe15231276c88f63d44334f58d5 LICENSE 7d614e03d18d3f21fcfdff96f0b6c311 apache-tomcat-6.0.29.tar.gz -2976e1c7cc26913a698455a7148471df cswtomcat6 +086e84cce8156899aa3d563da69c33c1 cswtomcat6 bca5f2de734691fbc486cf00020d81f1 cswusergroup Modified: csw/mgar/pkg/tomcat6/branches/ihsan/files/cswtomcat6 =================================================================== --- csw/mgar/pkg/tomcat6/branches/ihsan/files/cswtomcat6 2010-10-12 08:20:26 UTC (rev 11259) +++ csw/mgar/pkg/tomcat6/branches/ihsan/files/cswtomcat6 2010-10-12 08:39:32 UTC (rev 11260) @@ -76,7 +76,14 @@ SPECIFIC_CONFIG_FILE=/etc/opt/csw/tomcat6/conf GLOBAL_CONFIG_FILE=/opt/csw/etc/tomcat6/conf/tomcat6 -JAVA_HOME=/usr/java +# If available, use the OpenCSW Java package +if [ -L /opt/csw/java/jre/jre6 ] +then + JAVA_HOME=/opt/csw/java/jre/jre6 +else + JAVA_HOME=/usr/java +fi + TOMCAT_USER=tomcat ################################################################## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 12 11:44:35 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Oct 2010 09:44:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[11261] csw/mgar/pkg/python/branches/libpython25/ Message-ID: Revision: 11261 http://gar.svn.sourceforge.net/gar/?rev=11261&view=rev Author: wahwah Date: 2010-10-12 09:44:35 +0000 (Tue, 12 Oct 2010) Log Message: ----------- python: Making a snapshot of the build that produces libpython25 Added Paths: ----------- csw/mgar/pkg/python/branches/libpython25/ Property changes on: csw/mgar/pkg/python/branches/libpython25 ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: svn:mergeinfo + /csw/mgar/pkg/python/branches/python-2.6.4+patch7242:8407-9385 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 12 11:46:42 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Oct 2010 09:46:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11262] csw/mgar/pkg/python/trunk Message-ID: Revision: 11262 http://gar.svn.sourceforge.net/gar/?rev=11262&view=rev Author: wahwah Date: 2010-10-12 09:46:42 +0000 (Tue, 12 Oct 2010) Log Message: ----------- python: Updating trunk to build libpython26 Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/python/trunk/ Property changes on: csw/mgar/pkg/python/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/pkg/python/branches/python-2.6.4+patch7242:8407-9385 + /csw/mgar/pkg/python/branches/python-2.6.4+patch7242:8407-9385 /csw/mgar/pkg/python/branches/soname-granularity:11052-11261 Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2010-10-12 09:44:35 UTC (rev 11261) +++ csw/mgar/pkg/python/trunk/Makefile 2010-10-12 09:46:42 UTC (rev 11262) @@ -78,6 +78,8 @@ PACKAGES += CSWpython-devel PACKAGES += CSWpython-test PACKAGES += CSWpython-tk +PACKAGES += CSWlibpython25 +PACKAGES += CSWlibpython26 INCOMPATIBLE_PKGS_CSWpython = CSWpydistutils @@ -99,25 +101,36 @@ PKGFILES_CSWpython-test += $(libdir)/python/json/tests.* PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* +PKGFILES_CSWlibpython25 += $(libdir)/libpython2\.5.* +PKGFILES_CSWlibpython26 += $(libdir)/libpython2\.6.* ARCHALL_CSWpython-test = 1 ARCHALL_CSWidle = 1 -RUNTIME_DEP_PKGS_CSWidle = CSWpython CSWpython-tk +RUNTIME_DEP_PKGS_CSWidle += CSWpython +RUNTIME_DEP_PKGS_CSWidle += CSWpython-tk RUNTIME_DEP_PKGS_CSWpython += CSWbdb47 RUNTIME_DEP_PKGS_CSWpython += CSWbzip2 RUNTIME_DEP_PKGS_CSWpython += CSWgdbm RUNTIME_DEP_PKGS_CSWpython += CSWggettextrt +RUNTIME_DEP_PKGS_CSWpython += CSWlibpython26 RUNTIME_DEP_PKGS_CSWpython += CSWncurses RUNTIME_DEP_PKGS_CSWpython += CSWosslrt RUNTIME_DEP_PKGS_CSWpython += CSWreadline -RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt CSWzlib +RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt +RUNTIME_DEP_PKGS_CSWpython += CSWzlib +RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibpython26 RUNTIME_DEP_PKGS_CSWpython-tk += CSWpython RUNTIME_DEP_PKGS_CSWpython-tk += CSWtcl RUNTIME_DEP_PKGS_CSWpython-tk += CSWtk -RUNTIME_DEP_PKGS_CSWpython-devel = CSWpython +RUNTIME_DEP_PKGS_CSWpython-devel += CSWpython RUNTIME_DEP_PKGS_CSWpython-test += CSWpython +# There are packages depending on libpython2.5, and listing CSWpython as the +# dependency. +DEP_PKGS_CSWpython += CSWlibpython25 +DEP_PKGS_CSWpython += CSWlibpython26 + # This could be handled by automatic dependency detection CHECKPKG_OVERRIDES_CSWidle += surplus-dependency|CSWpython-tk @@ -126,17 +139,21 @@ CATALOGNAME_CSWpython-devel = python_devel CATALOGNAME_CSWpython-tk = python_tk CATALOGNAME_CSWpython-test = python_test +CATALOGNAME_CSWlibpython25 = libpython25 +CATALOGNAME_CSWlibpython26 = libpython26 SPKG_DESC_CSWidle = Python IDE SPKG_DESC_CSWpython = A high-level scripting language. SPKG_DESC_CSWpython-devel = Development Files for Python SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) SPKG_DESC_CSWpython-test = Python Test modules +SPKG_DESC_CSWlibpython25 = Python shared library (2.5) +SPKG_DESC_CSWlibpython26 = Python shared library (2.6) LICENSE = LICENSE # These won't be fixed. -CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content +CHECKPKG_OVERRIDES_CSWlibpython25 += file-with-bad-content # This is an exception, since these are original Python packages. CHECKPKG_OVERRIDES_CSWpython-test += pkgname-does-not-start-with-CSWpy- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue Oct 12 12:22:23 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 12 Oct 2010 10:22:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[11263] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 11263 http://gar.svn.sourceforge.net/gar/?rev=11263&view=rev Author: aigoshin Date: 2010-10-12 10:22:22 +0000 (Tue, 12 Oct 2010) Log Message: ----------- nginx: package release 20101012 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 09:46:42 UTC (rev 11262) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 10:22:22 UTC (rev 11263) @@ -29,7 +29,7 @@ NGINXCPU_i386 = pentium NGINXCPU_pentium_pro = pentium3 -NGINXCPU_sparcv8 = sparc32 +NGINXCPU_sparcv8plus = sparc32 NGINXCPU_sparcv9 = sparc64 NGINXCPU_$(ISA) ?= $(ISA) NGINXCPU = $(NGINXCPU_$(ISA)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue Oct 12 12:28:06 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 12 Oct 2010 10:28:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[11264] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 11264 http://gar.svn.sourceforge.net/gar/?rev=11264&view=rev Author: aigoshin Date: 2010-10-12 10:28:06 +0000 (Tue, 12 Oct 2010) Log Message: ----------- nginx: package release 20101012 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 10:22:22 UTC (rev 11263) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 10:28:06 UTC (rev 11264) @@ -25,7 +25,7 @@ PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 -EXTRA_BUILD_ISAS_sparc = sparcv9 +EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv9 NGINXCPU_i386 = pentium NGINXCPU_pentium_pro = pentium3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue Oct 12 13:09:45 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 12 Oct 2010 11:09:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[11265] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 11265 http://gar.svn.sourceforge.net/gar/?rev=11265&view=rev Author: aigoshin Date: 2010-10-12 11:09:45 +0000 (Tue, 12 Oct 2010) Log Message: ----------- nginx: package release 20101012 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 10:28:06 UTC (rev 11264) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 11:09:45 UTC (rev 11265) @@ -25,15 +25,17 @@ PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 -EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv9 +EXTRA_BUILD_ISAS_sparc = sparcv9 NGINXCPU_i386 = pentium NGINXCPU_pentium_pro = pentium3 -NGINXCPU_sparcv8plus = sparc32 +NGINXCPU_sparcv8 = sparc32 NGINXCPU_sparcv9 = sparc64 NGINXCPU_$(ISA) ?= $(ISA) NGINXCPU = $(NGINXCPU_$(ISA)) +CHECKPKG_OVERRIDES_CSWnginx += binary-architecture-does-not-match-placement|file=opt/csw/sbin/sparcv8/nginx|arch_id=18|arch_name=sparcv8+ + CFLAGS = sysconfdir=/etc/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue Oct 12 14:47:37 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 12 Oct 2010 12:47:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[11266] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 11266 http://gar.svn.sourceforge.net/gar/?rev=11266&view=rev Author: aigoshin Date: 2010-10-12 12:47:37 +0000 (Tue, 12 Oct 2010) Log Message: ----------- nginx: package release 20101012 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 11:09:45 UTC (rev 11265) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 12:47:37 UTC (rev 11266) @@ -66,7 +66,7 @@ TEST_SCRIPTS = INITSMF = $(sysconfdir)/init.d/cswnginx -PRESERVECONF = $(sysconfdir)/nginx/fastcgi.conf $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf +PRESERVECONF = $(sysconfdir)/nginx/fastcgi.conf $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf $(sysconfdir)/nginx/scgi_params $(sysconfdir)/nginx/uwsgi_params NGINXDOCS = CHANGES CHANGES.ru LICENSE README This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 12 15:16:28 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Oct 2010 13:16:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[11267] csw/mgar/pkg/python/branches Message-ID: Revision: 11267 http://gar.svn.sourceforge.net/gar/?rev=11267&view=rev Author: wahwah Date: 2010-10-12 13:16:28 +0000 (Tue, 12 Oct 2010) Log Message: ----------- python: Rules to build libpython2_5_1_0 Modified Paths: -------------- csw/mgar/pkg/python/branches/libpython2_5_1_0/Makefile Added Paths: ----------- csw/mgar/pkg/python/branches/libpython2_5_1_0/ Modified: csw/mgar/pkg/python/branches/libpython2_5_1_0/Makefile =================================================================== --- csw/mgar/pkg/python/branches/libpython25/Makefile 2010-10-12 09:46:42 UTC (rev 11262) +++ csw/mgar/pkg/python/branches/libpython2_5_1_0/Makefile 2010-10-12 13:16:28 UTC (rev 11267) @@ -30,10 +30,6 @@ DISTFILES = $(DISTNAME).tar.bz2 -# Previous Library for compatability -DISTFILES += libpython2.5.so.1.0-isa-sparcv8 -DISTFILES += libpython2.5.so.1.0-isa-i386 - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -78,8 +74,8 @@ PACKAGES += CSWpython-devel PACKAGES += CSWpython-test PACKAGES += CSWpython-tk -PACKAGES += CSWlibpython25 -PACKAGES += CSWlibpython26 +PACKAGES += CSWlibpython2-5-1-0 +PACKAGES += CSWlibpython2-6-1-0 INCOMPATIBLE_PKGS_CSWpython = CSWpydistutils @@ -88,6 +84,7 @@ PKGFILES_CSWpython-devel = $(includedir)/.* PKGFILES_CSWpython-devel += $(libdir)/.*/config/.* PKGFILES_CSWpython-devel += $(bindir)/.*config.* +PKGFILES_CSWpython-devel += $(libdir)/libpython2.6.so # No idea why would this be in CSWpython, and no good idea for a better package # to put it. PKGFILES_CSWpython-devel += $(bindir)/smtpd.py @@ -101,8 +98,8 @@ PKGFILES_CSWpython-test += $(libdir)/python/json/tests.* PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* -PKGFILES_CSWlibpython25 += $(libdir)/libpython2\.5.* -PKGFILES_CSWlibpython26 += $(libdir)/libpython2\.6.* +PKGFILES_CSWlibpython2-5-1-0 += $(libdir)/libpython2\.5\.so\..* +PKGFILES_CSWlibpython2-6-1-0 += $(libdir)/libpython2\.6\.so\..* ARCHALL_CSWpython-test = 1 ARCHALL_CSWidle = 1 @@ -113,13 +110,13 @@ RUNTIME_DEP_PKGS_CSWpython += CSWbzip2 RUNTIME_DEP_PKGS_CSWpython += CSWgdbm RUNTIME_DEP_PKGS_CSWpython += CSWggettextrt -RUNTIME_DEP_PKGS_CSWpython += CSWlibpython26 +RUNTIME_DEP_PKGS_CSWpython += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpython += CSWncurses RUNTIME_DEP_PKGS_CSWpython += CSWosslrt RUNTIME_DEP_PKGS_CSWpython += CSWreadline RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt RUNTIME_DEP_PKGS_CSWpython += CSWzlib -RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibpython26 +RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpython-tk += CSWpython RUNTIME_DEP_PKGS_CSWpython-tk += CSWtcl RUNTIME_DEP_PKGS_CSWpython-tk += CSWtk @@ -128,8 +125,7 @@ # There are packages depending on libpython2.5, and listing CSWpython as the # dependency. -DEP_PKGS_CSWpython += CSWlibpython25 -DEP_PKGS_CSWpython += CSWlibpython26 +RUNTIME_DEP_PKGS_CSWpython += CSWlibpython2-5-1-0 # This could be handled by automatic dependency detection CHECKPKG_OVERRIDES_CSWidle += surplus-dependency|CSWpython-tk @@ -139,21 +135,21 @@ CATALOGNAME_CSWpython-devel = python_devel CATALOGNAME_CSWpython-tk = python_tk CATALOGNAME_CSWpython-test = python_test -CATALOGNAME_CSWlibpython25 = libpython25 -CATALOGNAME_CSWlibpython26 = libpython26 +CATALOGNAME_CSWlibpython2-5-1-0 = libpython2_5_1_0 +CATALOGNAME_CSWlibpython2-6-1-0 = libpython2_6_1_0 SPKG_DESC_CSWidle = Python IDE SPKG_DESC_CSWpython = A high-level scripting language. SPKG_DESC_CSWpython-devel = Development Files for Python SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) SPKG_DESC_CSWpython-test = Python Test modules -SPKG_DESC_CSWlibpython25 = Python shared library (2.5) -SPKG_DESC_CSWlibpython26 = Python shared library (2.6) +SPKG_DESC_CSWlibpython2-5-1-0 = Python shared library (2.5) +SPKG_DESC_CSWlibpython2-6-1-0 = Python shared library (2.6) LICENSE = LICENSE # These won't be fixed. -CHECKPKG_OVERRIDES_CSWlibpython25 += file-with-bad-content +CHECKPKG_OVERRIDES_CSWlibpython2-5-1-0 += file-with-bad-content # This is an exception, since these are original Python packages. CHECKPKG_OVERRIDES_CSWpython-test += pkgname-does-not-start-with-CSWpy- @@ -166,6 +162,7 @@ CHECKPKG_OVERRIDES_CSWpython-devel += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWlibpython2-5-1-0 include gar/category.mk @@ -174,7 +171,7 @@ install-deprecated-libs: echo "===> Installing deprecated Libraries into $(libdir)" - cp $(DOWNLOADDIR)/libpython2.5.so.1.0-$(MODULATION) \ + cp $(FILEDIR)/libpython2.5.so.1.0-$(MODULATION) \ $(DESTDIR)$(libdir)/libpython2.5.so.1.0 cd $(DESTDIR)$(libdir); ln -s libpython2.5.so.1.0 libpython2.5.so @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 12 16:44:01 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Oct 2010 14:44:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[11268] csw/mgar/pkg/python Message-ID: Revision: 11268 http://gar.svn.sourceforge.net/gar/?rev=11268&view=rev Author: wahwah Date: 2010-10-12 14:44:00 +0000 (Tue, 12 Oct 2010) Log Message: ----------- python: Trunk no longer builds the legacy libraries; renamed the libraries to what checkpkg suggests. Modified Paths: -------------- csw/mgar/pkg/python/branches/libpython2_5_1_0/Makefile csw/mgar/pkg/python/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/python/branches/libpython25/ csw/mgar/pkg/python/trunk/files/libpython2.5.so.1.0-isa-i386 csw/mgar/pkg/python/trunk/files/libpython2.5.so.1.0-isa-sparcv8 Modified: csw/mgar/pkg/python/branches/libpython2_5_1_0/Makefile =================================================================== --- csw/mgar/pkg/python/branches/libpython2_5_1_0/Makefile 2010-10-12 13:16:28 UTC (rev 11267) +++ csw/mgar/pkg/python/branches/libpython2_5_1_0/Makefile 2010-10-12 14:44:00 UTC (rev 11268) @@ -138,11 +138,11 @@ CATALOGNAME_CSWlibpython2-5-1-0 = libpython2_5_1_0 CATALOGNAME_CSWlibpython2-6-1-0 = libpython2_6_1_0 -SPKG_DESC_CSWidle = Python IDE -SPKG_DESC_CSWpython = A high-level scripting language. -SPKG_DESC_CSWpython-devel = Development Files for Python -SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) -SPKG_DESC_CSWpython-test = Python Test modules +SPKG_DESC_CSWidle = Python IDE +SPKG_DESC_CSWpython = A high-level scripting language. +SPKG_DESC_CSWpython-devel = Development Files for Python +SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) +SPKG_DESC_CSWpython-test = Python Test modules SPKG_DESC_CSWlibpython2-5-1-0 = Python shared library (2.5) SPKG_DESC_CSWlibpython2-6-1-0 = Python shared library (2.6) Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2010-10-12 13:16:28 UTC (rev 11267) +++ csw/mgar/pkg/python/trunk/Makefile 2010-10-12 14:44:00 UTC (rev 11268) @@ -30,10 +30,6 @@ DISTFILES = $(DISTNAME).tar.bz2 -# Previous Library for compatability -DISTFILES += libpython2.5.so.1.0-isa-sparcv8 -DISTFILES += libpython2.5.so.1.0-isa-i386 - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -78,8 +74,7 @@ PACKAGES += CSWpython-devel PACKAGES += CSWpython-test PACKAGES += CSWpython-tk -PACKAGES += CSWlibpython25 -PACKAGES += CSWlibpython26 +PACKAGES += CSWlibpython2-6-1-0 INCOMPATIBLE_PKGS_CSWpython = CSWpydistutils @@ -88,6 +83,7 @@ PKGFILES_CSWpython-devel = $(includedir)/.* PKGFILES_CSWpython-devel += $(libdir)/.*/config/.* PKGFILES_CSWpython-devel += $(bindir)/.*config.* +PKGFILES_CSWpython-devel += $(libdir)/libpython2.6.so # No idea why would this be in CSWpython, and no good idea for a better package # to put it. PKGFILES_CSWpython-devel += $(bindir)/smtpd.py @@ -101,8 +97,7 @@ PKGFILES_CSWpython-test += $(libdir)/python/json/tests.* PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* -PKGFILES_CSWlibpython25 += $(libdir)/libpython2\.5.* -PKGFILES_CSWlibpython26 += $(libdir)/libpython2\.6.* +PKGFILES_CSWlibpython2-6-1-0 += $(libdir)/libpython2\.6\.so\..* ARCHALL_CSWpython-test = 1 ARCHALL_CSWidle = 1 @@ -113,13 +108,13 @@ RUNTIME_DEP_PKGS_CSWpython += CSWbzip2 RUNTIME_DEP_PKGS_CSWpython += CSWgdbm RUNTIME_DEP_PKGS_CSWpython += CSWggettextrt -RUNTIME_DEP_PKGS_CSWpython += CSWlibpython26 +RUNTIME_DEP_PKGS_CSWpython += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpython += CSWncurses RUNTIME_DEP_PKGS_CSWpython += CSWosslrt RUNTIME_DEP_PKGS_CSWpython += CSWreadline RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt RUNTIME_DEP_PKGS_CSWpython += CSWzlib -RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibpython26 +RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpython-tk += CSWpython RUNTIME_DEP_PKGS_CSWpython-tk += CSWtcl RUNTIME_DEP_PKGS_CSWpython-tk += CSWtk @@ -128,8 +123,7 @@ # There are packages depending on libpython2.5, and listing CSWpython as the # dependency. -DEP_PKGS_CSWpython += CSWlibpython25 -DEP_PKGS_CSWpython += CSWlibpython26 +RUNTIME_DEP_PKGS_CSWpython += CSWlibpython2-5-1-0 # This could be handled by automatic dependency detection CHECKPKG_OVERRIDES_CSWidle += surplus-dependency|CSWpython-tk @@ -139,22 +133,17 @@ CATALOGNAME_CSWpython-devel = python_devel CATALOGNAME_CSWpython-tk = python_tk CATALOGNAME_CSWpython-test = python_test -CATALOGNAME_CSWlibpython25 = libpython25 -CATALOGNAME_CSWlibpython26 = libpython26 +CATALOGNAME_CSWlibpython2-6-1-0 = libpython2_6_1_0 -SPKG_DESC_CSWidle = Python IDE -SPKG_DESC_CSWpython = A high-level scripting language. -SPKG_DESC_CSWpython-devel = Development Files for Python -SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) -SPKG_DESC_CSWpython-test = Python Test modules -SPKG_DESC_CSWlibpython25 = Python shared library (2.5) -SPKG_DESC_CSWlibpython26 = Python shared library (2.6) +SPKG_DESC_CSWidle = Python IDE +SPKG_DESC_CSWpython = A high-level scripting language. +SPKG_DESC_CSWpython-devel = Development Files for Python +SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) +SPKG_DESC_CSWpython-test = Python Test modules +SPKG_DESC_CSWlibpython2-6-1-0 = Python shared library (2.6) LICENSE = LICENSE -# These won't be fixed. -CHECKPKG_OVERRIDES_CSWlibpython25 += file-with-bad-content - # This is an exception, since these are original Python packages. CHECKPKG_OVERRIDES_CSWpython-test += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython-test += catalogname-does-not-start-with-py_ @@ -166,15 +155,6 @@ CHECKPKG_OVERRIDES_CSWpython-devel += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWlibpython2-5-1-0 include gar/category.mk - -post-install-modulated: install-deprecated-libs - @$(MAKECOOKIE) - -install-deprecated-libs: - echo "===> Installing deprecated Libraries into $(libdir)" - cp $(DOWNLOADDIR)/libpython2.5.so.1.0-$(MODULATION) \ - $(DESTDIR)$(libdir)/libpython2.5.so.1.0 - cd $(DESTDIR)$(libdir); ln -s libpython2.5.so.1.0 libpython2.5.so - @$(MAKECOOKIE) Deleted: csw/mgar/pkg/python/trunk/files/libpython2.5.so.1.0-isa-i386 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/python/trunk/files/libpython2.5.so.1.0-isa-sparcv8 =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 12 17:02:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Oct 2010 15:02:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11269] csw/mgar/pkg/python/branches/libpython2_5_1_0/ Makefile Message-ID: Revision: 11269 http://gar.svn.sourceforge.net/gar/?rev=11269&view=rev Author: wahwah Date: 2010-10-12 15:02:43 +0000 (Tue, 12 Oct 2010) Log Message: ----------- python: Added back DISTFILES entries for legacy shared libraries. Modified Paths: -------------- csw/mgar/pkg/python/branches/libpython2_5_1_0/Makefile Modified: csw/mgar/pkg/python/branches/libpython2_5_1_0/Makefile =================================================================== --- csw/mgar/pkg/python/branches/libpython2_5_1_0/Makefile 2010-10-12 14:44:00 UTC (rev 11268) +++ csw/mgar/pkg/python/branches/libpython2_5_1_0/Makefile 2010-10-12 15:02:43 UTC (rev 11269) @@ -30,6 +30,10 @@ DISTFILES = $(DISTNAME).tar.bz2 +# Previous Library for compatability +DISTFILES += libpython2.5.so.1.0-isa-sparcv8 +DISTFILES += libpython2.5.so.1.0-isa-i386 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -171,7 +175,7 @@ install-deprecated-libs: echo "===> Installing deprecated Libraries into $(libdir)" - cp $(FILEDIR)/libpython2.5.so.1.0-$(MODULATION) \ + cp $(DOWNLOADDIR)/libpython2.5.so.1.0-$(MODULATION) \ $(DESTDIR)$(libdir)/libpython2.5.so.1.0 cd $(DESTDIR)$(libdir); ln -s libpython2.5.so.1.0 libpython2.5.so @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue Oct 12 17:47:41 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 12 Oct 2010 15:47:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[11270] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 11270 http://gar.svn.sourceforge.net/gar/?rev=11270&view=rev Author: aigoshin Date: 2010-10-12 15:47:41 +0000 (Tue, 12 Oct 2010) Log Message: ----------- nginx: package release 20101012 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 15:02:43 UTC (rev 11269) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 15:47:41 UTC (rev 11270) @@ -56,6 +56,7 @@ CONFIGURE_ARGS += --http-log-path=$(localstatedir)/nginx/logs/access.log CONFIGURE_ARGS += --with-md5=YES CONFIGURE_ARGS += --with-sha1=YES +CONFIGURE_ARGS += --with-http_addition_module CONFIGURE_ARGS += --with-http_dav_module CONFIGURE_ARGS += --with-http_flv_module CONFIGURE_ARGS += --with-http_realip_module This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue Oct 12 18:46:04 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 12 Oct 2010 16:46:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[11271] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 11271 http://gar.svn.sourceforge.net/gar/?rev=11271&view=rev Author: aigoshin Date: 2010-10-12 16:46:03 +0000 (Tue, 12 Oct 2010) Log Message: ----------- nginx: package release 20101012 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/nginx/trunk/files/sunc.diff Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 15:47:41 UTC (rev 11270) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 16:46:03 UTC (rev 11271) @@ -25,17 +25,16 @@ PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 -EXTRA_BUILD_ISAS_sparc = sparcv9 +EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv9 NGINXCPU_i386 = pentium NGINXCPU_pentium_pro = pentium3 -NGINXCPU_sparcv8 = sparc32 +NGINXCPU_sparcv8 = sparc +NGINXCPU_sparcv8plus = sparc32 NGINXCPU_sparcv9 = sparc64 NGINXCPU_$(ISA) ?= $(ISA) NGINXCPU = $(NGINXCPU_$(ISA)) -CHECKPKG_OVERRIDES_CSWnginx += binary-architecture-does-not-match-placement|file=opt/csw/sbin/sparcv8/nginx|arch_id=18|arch_name=sparcv8+ - CFLAGS = sysconfdir=/etc/opt/csw @@ -74,6 +73,10 @@ include gar/category.mk +pre-configure-modulated: + cd $(WORKSRC)/auto/cc; \ + gpatch -p $(WORKDIR)/sunc.diff + post-configure-modulated: gsed -i s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h gsed -i 's# pause# rep; nop#' $(WORKSRC)/src/os/unix/ngx_sunpro_amd64.il Added: csw/mgar/pkg/nginx/trunk/files/sunc.diff =================================================================== --- csw/mgar/pkg/nginx/trunk/files/sunc.diff (rev 0) +++ csw/mgar/pkg/nginx/trunk/files/sunc.diff 2010-10-12 16:46:03 UTC (rev 11271) @@ -0,0 +1,25 @@ +--- sunc.OLD Tue Oct 12 18:34:30 2010 ++++ sunc Tue Oct 12 18:35:43 2010 +@@ -37,6 +37,7 @@ + ngx_amd64="-m64" + + else ++ ngx_sparc="-xarch=v8" + ngx_sparc32="-xarch=v8plus" + ngx_sparc64="-xarch=v9" + ngx_amd64="-xarch=amd64" +@@ -94,6 +95,14 @@ + CPU_OPT="$CPU_OPT -xcache=64/64/2:1024/64/16" + ;; + ++ sparc) ++ # build 32-bit Sparc v8 binary ++ CPU_OPT="$ngx_sparc" ++ CORE_LINK="$CORE_LINK $ngx_sparc" ++ CC_AUX_FLAGS="$CC_AUX_FLAGS $ngx_sparc" ++ NGX_CPU_CACHE_LINE=64 ++ ;; ++ + sparc32) + # build 32-bit UltraSparc binary + CPU_OPT="$ngx_sparc32" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue Oct 12 19:13:09 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 12 Oct 2010 17:13:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[11272] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 11272 http://gar.svn.sourceforge.net/gar/?rev=11272&view=rev Author: aigoshin Date: 2010-10-12 17:13:08 +0000 (Tue, 12 Oct 2010) Log Message: ----------- nginx: package release 20101012 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 16:46:03 UTC (rev 11271) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 17:13:08 UTC (rev 11272) @@ -12,7 +12,7 @@ MASTER_SITES = http://sysoev.ru/nginx/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += cswnginx +DISTFILES += cswnginx sunc.diff LICENSE = LICENSE @@ -74,8 +74,8 @@ include gar/category.mk pre-configure-modulated: - cd $(WORKSRC)/auto/cc; \ - gpatch -p $(WORKDIR)/sunc.diff + gpatch -d $(WORKSRC)/auto/cc -i ../../../../../../$(WORKDIR)/sunc.diff + $(MAKECOOKIE) post-configure-modulated: gsed -i s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Tue Oct 12 19:18:34 2010 From: bwalton at opencsw.org (Ben Walton) Date: Tue, 12 Oct 2010 13:18:34 -0400 Subject: [csw-devel] SF.net SVN: gar:[11272] csw/mgar/pkg/nginx/trunk/Makefile In-Reply-To: References: Message-ID: <1286903896-sup-4664@pinkfloyd.chass.utoronto.ca> Excerpts from aigoshin's message of Tue Oct 12 13:13:09 -0400 2010: Hi Andy, > +DISTFILES += cswnginx sunc.diff If you make sunc.diff a PATCHFILES (eg: PATCHFILES += sunc.diff), it'll be applied automatically for you during the patch step. You can then remove it from the pre-configure manual step. HTH. -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From wahwah at users.sourceforge.net Tue Oct 12 19:55:20 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Oct 2010 17:55:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[11273] csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile Message-ID: Revision: 11273 http://gar.svn.sourceforge.net/gar/?rev=11273&view=rev Author: wahwah Date: 2010-10-12 17:55:20 +0000 (Tue, 12 Oct 2010) Log Message: ----------- puppet-0.25.x: Using /etc/opt/csw for init scripts. Modified Paths: -------------- csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile 2010-10-12 17:13:08 UTC (rev 11272) +++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile 2010-10-12 17:55:20 UTC (rev 11273) @@ -35,11 +35,11 @@ # Disabling SMF support for puppetd. There are problems with it. It's a # better choice to run it from cron. -# INITSMF = $(sysconfdir)/init\.d/cswpuppetd -INITSMF += $(prefix)/etc/init\.d/cswpuppetmasterd +INITSMF = $(sysconfdir)/init\.d/cswpuppetd +# INITSMF += $(prefix)/etc/init\.d/cswpuppetmasterd USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup -CHECKPKG_OVERRIDES_CSWpuppet += init-file-missing-cswinitsmf-class|/opt/csw/etc/init.d/cswpuppetd|class=none +CHECKPKG_OVERRIDES_CSWpuppetmaster += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswpuppetmasterd|class=none # Creating a separate package CSWpuppetmaster so that the cswpuppetmaster # service isn't started upon the installation of CSWpuppet. @@ -54,7 +54,7 @@ RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby -PKGFILES_CSWpuppetmaster = $(prefix)/etc/init\.d/cswpuppetmasterd +PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd PKGFILES_CSWpuppetmaster += $(mandir)/man8/puppetmasterd.8 PKGFILES_CSWpuppetmaster += $(libdir)/.*/puppet/application/puppetmasterd.rb @@ -84,14 +84,14 @@ ginstall -m 755 -d $(DESTDIR) ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/puppet ginstall -m 755 -d $(DESTDIR)$(localstatedir)/puppet/run - ginstall -m 755 -d $(DESTDIR)$(prefix)/etc/init.d + ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d # $(sysconfdir)/pkg//crontabs ginstall -m 755 -d $(DESTDIR)$(CRONDIR) ginstall -m 644 \ $(FILEDIR)/CSWpuppet.cron.root \ $(DESTDIR)$(CRONDIR)/root - ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(prefix)/etc/init.d - ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(prefix)/etc/init.d + ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d (cd $(WORKSRC) && \ gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \ gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 12 19:58:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Oct 2010 17:58:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11274] csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile Message-ID: Revision: 11274 http://gar.svn.sourceforge.net/gar/?rev=11274&view=rev Author: wahwah Date: 2010-10-12 17:58:43 +0000 (Tue, 12 Oct 2010) Log Message: ----------- puppet-0.25.x: Changing the default GARFLAVOR to OPT. Modified Paths: -------------- csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile 2010-10-12 17:55:20 UTC (rev 11273) +++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile 2010-10-12 17:58:43 UTC (rev 11274) @@ -31,7 +31,7 @@ # Handy when doing multiple updates per day. Adds hours and minutes to the # timestamp. -GARFLAVOR = DBG +GARFLAVOR ?= OPT # Disabling SMF support for puppetd. There are problems with it. It's a # better choice to run it from cron. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 12 21:01:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Oct 2010 19:01:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[11275] csw/mgar/pkg/pil/trunk/Makefile Message-ID: Revision: 11275 http://gar.svn.sourceforge.net/gar/?rev=11275&view=rev Author: wahwah Date: 2010-10-12 19:01:44 +0000 (Tue, 12 Oct 2010) Log Message: ----------- pil: Getting ready for a rebuild against Python 2.6. Modified Paths: -------------- csw/mgar/pkg/pil/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/pil/trunk/Makefile Modified: csw/mgar/pkg/pil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pil/trunk/Makefile 2010-10-12 17:58:43 UTC (rev 11274) +++ csw/mgar/pkg/pil/trunk/Makefile 2010-10-12 19:01:44 UTC (rev 11275) @@ -1,3 +1,5 @@ +# $Id$ + GARNAME = pil GARVERSION = 1.1.7 CATEGORIES = python @@ -3,29 +5,47 @@ DISTNAME = Imaging-$(GARVERSION) - -DESCRIPTION = Python Imaging Library define BLURB - Long description + The Python Imaging Library (PIL) adds image processing capabilities to your + Python interpreter. This library supports many file formats, and provides + powerful image processing and graphics capabilities. endef MASTER_SITES = http://effbot.org/downloads/ DISTFILES = $(DISTNAME).tar.gz +PACKAGES = CSWpy-pil CSWpil -RUNTIME_DEP_PKGS_CSWpil = CSWlcmsrt CSWftype2 CSWjpeg CSWtcl CSWzlib CSWtk +SPKG_DESC_CSWpy-pil = Python Imaging Library +SPKG_DESC_CSWpil = An empty transitional package +CATALOGNAME_CSWpy-pil = py_pil +CATALOGNAME_CSWpil = pil -# We define upstream file regex so we can be notifed of new upstream software release +ARCHALL_CSWpil = 1 + +PKGFILES_CSWpil = NONE + +RUNTIME_DEP_PKGS_CSWpy-pil += CSWftype2 +RUNTIME_DEP_PKGS_CSWpy-pil += CSWjpeg +RUNTIME_DEP_PKGS_CSWpy-pil += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWpy-pil += CSWtcl +RUNTIME_DEP_PKGS_CSWpy-pil += CSWtk +RUNTIME_DEP_PKGS_CSWpy-pil += CSWzlib + +RUNTIME_DEP_PKGS_CSWpil += CSWpy-pil + UFILES_REGEX = Imaging-(\d+(?:\.\d+)*).tar.gz +EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +# The empty transitional package still has the dependency on CSWpython added by +# GAR. It's not really necessary, becayse CSWpy-pil depends on Python too, but +# it doesn't do any harm either. +CHECKPKG_OVERRIDES_CSWpil += surplus-dependency|CSWpython +# Transitional dependency. +CHECKPKG_OVERRIDES_CSWpil += surplus-dependency|CSWpy-pil -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = TEST_SCRIPTS = -CHECKPKG_OVERRIDES_CSWpil += license-missing +LICENSE = README include gar/category.mk Property changes on: csw/mgar/pkg/pil/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue Oct 12 21:18:40 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 12 Oct 2010 19:18:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11276] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 11276 http://gar.svn.sourceforge.net/gar/?rev=11276&view=rev Author: aigoshin Date: 2010-10-12 19:18:40 +0000 (Tue, 12 Oct 2010) Log Message: ----------- nginx: package release 20101012 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 19:01:44 UTC (rev 11275) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-10-12 19:18:40 UTC (rev 11276) @@ -11,8 +11,8 @@ endef MASTER_SITES = http://sysoev.ru/nginx/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += cswnginx sunc.diff +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += cswnginx LICENSE = LICENSE @@ -24,16 +24,26 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +# default sparc arch is set to sparcv8plus because nginx contains +# assembler parts specific to v8plus and v9 arches: +# .inline ngx_casa,0 +# casa [%o2] 0x80, %o1, %o0 +# .end +# +# .inline ngx_casxa,0 +# casxa [%o2] 0x80, %o1, %o0 +# .end + +ISA_DEFAULT_sparc = sparcv8plus EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 -EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv9 +EXTRA_BUILD_ISAS_sparc = sparcv9 -NGINXCPU_i386 = pentium -NGINXCPU_pentium_pro = pentium3 -NGINXCPU_sparcv8 = sparc -NGINXCPU_sparcv8plus = sparc32 -NGINXCPU_sparcv9 = sparc64 -NGINXCPU_$(ISA) ?= $(ISA) -NGINXCPU = $(NGINXCPU_$(ISA)) +NGINXCPU_i386 = pentium +NGINXCPU_pentium_pro = pentium3 +NGINXCPU_sparcv8plus = sparc32 +NGINXCPU_sparcv9 = sparc64 +NGINXCPU_$(ISA) ?= $(ISA) +NGINXCPU = $(NGINXCPU_$(ISA)) CFLAGS = @@ -73,10 +83,6 @@ include gar/category.mk -pre-configure-modulated: - gpatch -d $(WORKSRC)/auto/cc -i ../../../../../../$(WORKDIR)/sunc.diff - $(MAKECOOKIE) - post-configure-modulated: gsed -i s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h gsed -i 's# pause# rep; nop#' $(WORKSRC)/src/os/unix/ngx_sunpro_amd64.il This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue Oct 12 21:43:08 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 12 Oct 2010 19:43:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11277] csw/mgar/pkg/nginx/trunk/files/sunc.diff Message-ID: Revision: 11277 http://gar.svn.sourceforge.net/gar/?rev=11277&view=rev Author: aigoshin Date: 2010-10-12 19:43:08 +0000 (Tue, 12 Oct 2010) Log Message: ----------- nginx: package release 20101012 Removed Paths: ------------- csw/mgar/pkg/nginx/trunk/files/sunc.diff Deleted: csw/mgar/pkg/nginx/trunk/files/sunc.diff =================================================================== --- csw/mgar/pkg/nginx/trunk/files/sunc.diff 2010-10-12 19:18:40 UTC (rev 11276) +++ csw/mgar/pkg/nginx/trunk/files/sunc.diff 2010-10-12 19:43:08 UTC (rev 11277) @@ -1,25 +0,0 @@ ---- sunc.OLD Tue Oct 12 18:34:30 2010 -+++ sunc Tue Oct 12 18:35:43 2010 -@@ -37,6 +37,7 @@ - ngx_amd64="-m64" - - else -+ ngx_sparc="-xarch=v8" - ngx_sparc32="-xarch=v8plus" - ngx_sparc64="-xarch=v9" - ngx_amd64="-xarch=amd64" -@@ -94,6 +95,14 @@ - CPU_OPT="$CPU_OPT -xcache=64/64/2:1024/64/16" - ;; - -+ sparc) -+ # build 32-bit Sparc v8 binary -+ CPU_OPT="$ngx_sparc" -+ CORE_LINK="$CORE_LINK $ngx_sparc" -+ CC_AUX_FLAGS="$CC_AUX_FLAGS $ngx_sparc" -+ NGX_CPU_CACHE_LINE=64 -+ ;; -+ - sparc32) - # build 32-bit UltraSparc binary - CPU_OPT="$ngx_sparc32" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 13 01:54:28 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Oct 2010 23:54:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[11278] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 11278 http://gar.svn.sourceforge.net/gar/?rev=11278&view=rev Author: bdwalton Date: 2010-10-12 23:54:28 +0000 (Tue, 12 Oct 2010) Log Message: ----------- libxslt: drop I dep on py_libxslt from libxslt Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2010-10-12 19:43:08 UTC (rev 11277) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2010-10-12 23:54:28 UTC (rev 11278) @@ -15,7 +15,6 @@ PACKAGES = CSWlibxslt CSWlibxsltdevel CSWpy-libxslt INCOMPATIBLE_PKGS_CSWpy-libxslt = CSWpylibxslt -INCOMPATIBLE_PKGS_CSWlibxslt = CSWpylibxslt CATALOGNAME_CSWlibxsltdevel = libxslt_devel CATALOGNAME_CSWpy-libxslt = py_libxslt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 13 02:26:16 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Oct 2010 00:26:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[11279] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 11279 http://gar.svn.sourceforge.net/gar/?rev=11279&view=rev Author: bdwalton Date: 2010-10-13 00:26:16 +0000 (Wed, 13 Oct 2010) Log Message: ----------- cswclassutils: share /var/opt/csw/cswclassutils between to CAS subpackages Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-10-12 23:54:28 UTC (rev 11278) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-10-13 00:26:16 UTC (rev 11279) @@ -101,6 +101,11 @@ PKGFILES_CSWcas-initsmf += /opt/csw/etc/init.d/.* PKGFILES_CSWcas-initsmf += /var/opt/csw/svc/.* +# Mark these as _extra_ so they're applied after the excludes, which would +# include files from the other packages and thus clash. +PKGFILES_CSWcas-inetd_SHARED += /var/opt/csw/cswclassutils +PKGFILES_CSWcas-pycompile_SHARED += /var/opt/csw/cswclassutils + CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-missing-cswinitsmf-class CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-wrong-location CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-wrong-location|/opt/csw/etc/init.d/csw.smf.sample This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 13 02:26:56 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Oct 2010 00:26:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[11280] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 11280 http://gar.svn.sourceforge.net/gar/?rev=11280&view=rev Author: bdwalton Date: 2010-10-13 00:26:56 +0000 (Wed, 13 Oct 2010) Log Message: ----------- cswclassutils: ensure the two CAS scripts that use /var/opt/csw/cswclassutils create the dir if required Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2010-10-13 00:26:16 UTC (rev 11279) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2010-10-13 00:26:56 UTC (rev 11280) @@ -5,6 +5,8 @@ # Written and maintained by Ben Walton # # 2009-10-02 Initial release +# 2010-10-12 Update to ensure TMPDIR exists (Ben Walton) +# # set DEBUG to any value to enable trace output DEBUG= @@ -76,7 +78,9 @@ manifest=$outdir/$svcname-$proto.xml - TMPOUT=/var/opt/csw/cswclassutils/$svcname.$$ + TMPDIR=/var/opt/csw/cswclassutils + [ -d "$TMPDIR" ] || mkdir -p "$TMPDIR" + TMPOUT=$TMPDIR/$svcname.$$ echo "$inetdsvc" > $TMPOUT Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2010-10-13 00:26:16 UTC (rev 11279) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2010-10-13 00:26:56 UTC (rev 11280) @@ -8,6 +8,7 @@ # # 2009-05-25 First Release # 2009-10-14 Update to only compile package specific files (Ben Walton) +# 2010-10-12 Update to ensure creation of TMPDIR (Ben Walton) # # Force Path for the script to use @@ -22,8 +23,11 @@ echo PACKAGE: $PKGINST fi -TMPPY=/var/opt/csw/cswclassutils/pycomp.$$.`date +%Y%m%d%H%M%S`.py +TMPDIR=/var/opt/csw/cswclassutils +[ -d "$TMPDIR" ] || mkdir -p "$TMPDIR" +TMPPY=$TMPDIR/pycomp.$$.`date +%Y%m%d%H%M%S`.py + cat < $TMPPY import py_compile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 13 03:02:21 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Oct 2010 01:02:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[11281] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 11281 http://gar.svn.sourceforge.net/gar/?rev=11281&view=rev Author: bdwalton Date: 2010-10-13 01:02:21 +0000 (Wed, 13 Oct 2010) Log Message: ----------- gar/v2: add auto dep and class handling for upcoming cswap2mod CAS Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-10-13 00:26:56 UTC (rev 11280) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-10-13 01:02:21 UTC (rev 11281) @@ -454,6 +454,7 @@ # actually matching the _TEXINFO_FILTER. This is done at the prototype-level. $(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),CSWalternatives) +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswap2mod")')),CSWapache2) $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) # The final "true" is for packages without dependencies to make the shell happy as "( )" is not allowed. @@ -564,6 +565,7 @@ # The texinfo filter has been taken out of the normal filters as TEXINFO has a default. $(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype $(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),cswalternatives) +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswap2mod")')),cswap2mod) $(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(shell cat $(WORKDIR)/$*.prototype | perl -e 'while(<>){@F=split;$$c{$$F[1]}++};$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$c{$C});)') $(WORKDIR)/%.pkginfo: $(WORKDIR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 13 09:44:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Oct 2010 07:44:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[11282] csw/mgar/pkg/lang-python/logilab-astng/trunk/ Makefile Message-ID: Revision: 11282 http://gar.svn.sourceforge.net/gar/?rev=11282&view=rev Author: wahwah Date: 2010-10-13 07:44:47 +0000 (Wed, 13 Oct 2010) Log Message: ----------- logilab-astng: Removing /opt/csw/lib/python/site-packages/logilab/__init__.py which already exists in logilab-common. Modified Paths: -------------- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile Modified: csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2010-10-13 01:02:21 UTC (rev 11281) +++ csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2010-10-13 07:44:47 UTC (rev 11282) @@ -19,3 +19,6 @@ RUNTIME_DEP_PKGS_CSWpy-logilab-astng = CSWpy-logilab-common CHECKPKG_OVERRIDES_CSWpy-logilab-astng += surplus-dependency|CSWpy-logilab-common include gar/category.mk +post-install-modulated: + rm $(DESTDIR)/opt/csw/lib/python/site-packages/logilab/__init__.py + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 13 10:47:23 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Oct 2010 08:47:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[11283] csw/mgar/pkg Message-ID: Revision: 11283 http://gar.svn.sourceforge.net/gar/?rev=11283&view=rev Author: wahwah Date: 2010-10-13 08:47:23 +0000 (Wed, 13 Oct 2010) Log Message: ----------- py_antlr: Moved to lang-python. A test commit using git-svn. Added Paths: ----------- csw/mgar/pkg/lang-python/py_antlr/ csw/mgar/pkg/lang-python/py_antlr/Makefile csw/mgar/pkg/lang-python/py_antlr/trunk/ csw/mgar/pkg/lang-python/py_antlr/trunk/Makefile csw/mgar/pkg/lang-python/py_antlr/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/py_antlr/Makefile csw/mgar/pkg/py_antlr/trunk/Makefile csw/mgar/pkg/py_antlr/trunk/checksums Copied: csw/mgar/pkg/lang-python/py_antlr/Makefile (from rev 11282, csw/mgar/pkg/py_antlr/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/py_antlr/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/py_antlr/Makefile 2010-10-13 08:47:23 UTC (rev 11283) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Copied: csw/mgar/pkg/lang-python/py_antlr/trunk/Makefile (from rev 11282, csw/mgar/pkg/py_antlr/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/py_antlr/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/py_antlr/trunk/Makefile 2010-10-13 08:47:23 UTC (rev 11283) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +GARNAME = py_antlr +GARVERSION = 3.1.1 +CATEGORIES = python + +DESCRIPTION = Python ANTLR runtime +define BLURB + Python ANTLR runtime, needed for Python ANTLR-generated parsers to run. +endef + +MASTER_SITES = http://www.antlr.org/download/Python/ +DISTFILES = antlr_python_runtime-$(GARVERSION).tar.gz + +WORKSRC = $(WORKDIR)/antlr_python_runtime-$(GARVERSION) + +PACKAGES = CSWpy-antlr +CATALOGNAME = py_antlr +BUILD_DEP_PKGS = CSWpysetuptools + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +ARCHALL = 1 + +# BUILD_SCRIPTS = $(WORKSRC)/setup.py + +# INSTALL_SCRIPTS = $(WORKSRC)/setup.py +# INSTALL_ARGS += --root=$(DESTDIR) --prefix=$(prefix) + +TEST_SCRIPTS = + +include gar/category.mk + +post-install: + gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \; + @$(MAKECOOKIE) Copied: csw/mgar/pkg/lang-python/py_antlr/trunk/checksums (from rev 11282, csw/mgar/pkg/py_antlr/trunk/checksums) =================================================================== --- csw/mgar/pkg/lang-python/py_antlr/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/py_antlr/trunk/checksums 2010-10-13 08:47:23 UTC (rev 11283) @@ -0,0 +1 @@ +74f1e1650a7cd6f04f2f6c2710199c1e download/antlr_python_runtime-3.1.1.tar.gz Deleted: csw/mgar/pkg/py_antlr/Makefile =================================================================== --- csw/mgar/pkg/py_antlr/Makefile 2010-10-13 07:44:47 UTC (rev 11282) +++ csw/mgar/pkg/py_antlr/Makefile 2010-10-13 08:47:23 UTC (rev 11283) @@ -1,15 +0,0 @@ -# vim: ft=make ts=4 sw=4 noet - -default: - @echo "You are in the pkg/ directory." - -%: - $(MAKE) -C trunk $* - -paranoid-%: - $(MAKE) -C trunk $* || exit 2 - -export BUILDLOG ?= $(shell pwd)/buildlog.txt - -report-%: - $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Deleted: csw/mgar/pkg/py_antlr/trunk/Makefile =================================================================== --- csw/mgar/pkg/py_antlr/trunk/Makefile 2010-10-13 07:44:47 UTC (rev 11282) +++ csw/mgar/pkg/py_antlr/trunk/Makefile 2010-10-13 08:47:23 UTC (rev 11283) @@ -1,38 +0,0 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -GARNAME = py_antlr -GARVERSION = 3.1.1 -CATEGORIES = python - -DESCRIPTION = Python ANTLR runtime -define BLURB - Python ANTLR runtime, needed for Python ANTLR-generated parsers to run. -endef - -MASTER_SITES = http://www.antlr.org/download/Python/ -DISTFILES = antlr_python_runtime-$(GARVERSION).tar.gz - -WORKSRC = $(WORKDIR)/antlr_python_runtime-$(GARVERSION) - -PACKAGES = CSWpy-antlr -CATALOGNAME = py_antlr -BUILD_DEP_PKGS = CSWpysetuptools - -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -ARCHALL = 1 - -# BUILD_SCRIPTS = $(WORKSRC)/setup.py - -# INSTALL_SCRIPTS = $(WORKSRC)/setup.py -# INSTALL_ARGS += --root=$(DESTDIR) --prefix=$(prefix) - -TEST_SCRIPTS = - -include gar/category.mk - -post-install: - gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \; - @$(MAKECOOKIE) Deleted: csw/mgar/pkg/py_antlr/trunk/checksums =================================================================== --- csw/mgar/pkg/py_antlr/trunk/checksums 2010-10-13 07:44:47 UTC (rev 11282) +++ csw/mgar/pkg/py_antlr/trunk/checksums 2010-10-13 08:47:23 UTC (rev 11283) @@ -1 +0,0 @@ -74f1e1650a7cd6f04f2f6c2710199c1e download/antlr_python_runtime-3.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 13 12:26:49 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Oct 2010 10:26:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[11284] csw/mgar/pkg Message-ID: Revision: 11284 http://gar.svn.sourceforge.net/gar/?rev=11284&view=rev Author: wahwah Date: 2010-10-13 10:26:49 +0000 (Wed, 13 Oct 2010) Log Message: ----------- py_antlr: Cleanup after git-svn hasn't moved directories. Added Paths: ----------- csw/mgar/pkg/lang-python/py_antlr/branches/ csw/mgar/pkg/lang-python/py_antlr/tags/ csw/mgar/pkg/lang-python/py_antlr/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/py_antlr/branches/ csw/mgar/pkg/py_antlr/tags/ csw/mgar/pkg/py_antlr/trunk/files/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Oct 13 12:39:59 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 13 Oct 2010 10:39:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11285] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 11285 http://gar.svn.sourceforge.net/gar/?rev=11285&view=rev Author: idogan23 Date: 2010-10-13 10:39:59 +0000 (Wed, 13 Oct 2010) Log Message: ----------- jdk6: bump version to 1.6.0 Revision 22 Revision Links: -------------- http://gar.svn.sourceforge.net/gar/?rev=22&view=rev Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/Makefile csw/mgar/pkg/jdk6/trunk/checksums Modified: csw/mgar/pkg/jdk6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2010-10-13 10:26:49 UTC (rev 11284) +++ csw/mgar/pkg/jdk6/trunk/Makefile 2010-10-13 10:39:59 UTC (rev 11285) @@ -1,6 +1,6 @@ GARNAME = jdk6 -SPKG_VERSION = 1.6.0_21 -GARVERSION = 6u21 +SPKG_VERSION = 1.6.0_22 +GARVERSION = 6u22 CATEGORIES = lang DESCRIPTION = Java Development Kit 6 Modified: csw/mgar/pkg/jdk6/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk6/trunk/checksums 2010-10-13 10:26:49 UTC (rev 11284) +++ csw/mgar/pkg/jdk6/trunk/checksums 2010-10-13 10:39:59 UTC (rev 11285) @@ -1,4 +1,4 @@ -6e35025369e5f9bbcaa138f272d1d6da jdk-6u21-solaris-i586.sh -7af288faca89565c710c7c6210cfe066 jdk-6u21-solaris-sparc.sh -95b97a9ae3de3a08a21d6d6a304fd579 jdk-6u21-solaris-sparcv9.sh -af040a249aff4ad41ccc4f0abd3830a7 jdk-6u21-solaris-x64.sh +2b197573425005c3fa717753648d5dfc jdk-6u22-solaris-i586.sh +b0bfc1b660a820f4453b85a936b07a35 jdk-6u22-solaris-sparc.sh +e43d5c860c7e11e5cacecfe872612e0a jdk-6u22-solaris-sparcv9.sh +78d6943c090d23853ec11acddcc15409 jdk-6u22-solaris-x64.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 13 13:46:33 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Oct 2010 11:46:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11286] csw/mgar/pkg Message-ID: Revision: 11286 http://gar.svn.sourceforge.net/gar/?rev=11286&view=rev Author: wahwah Date: 2010-10-13 11:46:32 +0000 (Wed, 13 Oct 2010) Log Message: ----------- python packages: Moving them to the lang-python subtree Added Paths: ----------- csw/mgar/pkg/lang-python/pyboto/ csw/mgar/pkg/lang-python/pycairo/ csw/mgar/pkg/lang-python/pychecker/ csw/mgar/pkg/lang-python/pycurl/ csw/mgar/pkg/lang-python/pydes/ csw/mgar/pkg/lang-python/pydocutils/ csw/mgar/pkg/lang-python/pyfpconst/ csw/mgar/pkg/lang-python/pygobject/ csw/mgar/pkg/lang-python/pygtk/ csw/mgar/pkg/lang-python/pykstat/ csw/mgar/pkg/lang-python/pylxml/ csw/mgar/pkg/lang-python/pyorbit/ csw/mgar/pkg/lang-python/pysetuptools/ csw/mgar/pkg/lang-python/pysoappy/ csw/mgar/pkg/lang-python/pysqlite/ csw/mgar/pkg/lang-python/pysqlite2/ csw/mgar/pkg/lang-python/pysvn/ csw/mgar/pkg/lang-python/python/ csw/mgar/pkg/lang-python/python-augeas/ csw/mgar/pkg/lang-python/python-gflags/ csw/mgar/pkg/lang-python/python-graph/ csw/mgar/pkg/lang-python/python-magic/ csw/mgar/pkg/lang-python/python-pexpect/ csw/mgar/pkg/lang-python/python-suds/ csw/mgar/pkg/lang-python/python25/ csw/mgar/pkg/lang-python/python3/ csw/mgar/pkg/lang-python/pyyaml/ csw/mgar/pkg/lang-python/pyzor/ Removed Paths: ------------- csw/mgar/pkg/pyboto/ csw/mgar/pkg/pycairo/ csw/mgar/pkg/pychecker/ csw/mgar/pkg/pycurl/ csw/mgar/pkg/pydes/ csw/mgar/pkg/pydocutils/ csw/mgar/pkg/pyfpconst/ csw/mgar/pkg/pygobject/ csw/mgar/pkg/pygtk/ csw/mgar/pkg/pykstat/ csw/mgar/pkg/pylxml/ csw/mgar/pkg/pyorbit/ csw/mgar/pkg/pysetuptools/ csw/mgar/pkg/pysoappy/ csw/mgar/pkg/pysqlite/ csw/mgar/pkg/pysqlite2/ csw/mgar/pkg/pysvn/ csw/mgar/pkg/python/ csw/mgar/pkg/python-augeas/ csw/mgar/pkg/python-gflags/ csw/mgar/pkg/python-graph/ csw/mgar/pkg/python-magic/ csw/mgar/pkg/python-pexpect/ csw/mgar/pkg/python-suds/ csw/mgar/pkg/python25/ csw/mgar/pkg/python3/ csw/mgar/pkg/pyyaml/ csw/mgar/pkg/pyzor/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 13 13:57:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Oct 2010 11:57:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[11287] csw/mgar/pkg/py_antlr/ Message-ID: Revision: 11287 http://gar.svn.sourceforge.net/gar/?rev=11287&view=rev Author: wahwah Date: 2010-10-13 11:57:48 +0000 (Wed, 13 Oct 2010) Log Message: ----------- py_antlr: Removing the remaining directory. Removed Paths: ------------- csw/mgar/pkg/py_antlr/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 13 14:05:50 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Oct 2010 12:05:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11288] csw/mgar/pkg Message-ID: Revision: 11288 http://gar.svn.sourceforge.net/gar/?rev=11288&view=rev Author: wahwah Date: 2010-10-13 12:05:49 +0000 (Wed, 13 Oct 2010) Log Message: ----------- more python packages: Moving them to the lang-python subtree Added Paths: ----------- csw/mgar/pkg/lang-python/dbus-python/ csw/mgar/pkg/lang-python/gdata-python-client/ csw/mgar/pkg/lang-python/guppy/ csw/mgar/pkg/lang-python/ipython/ csw/mgar/pkg/lang-python/mod_python/ csw/mgar/pkg/lang-python/mysql-python/ csw/mgar/pkg/lang-python/numpy/ csw/mgar/pkg/lang-python/shout-python/ csw/mgar/pkg/lang-python/soappy/ csw/mgar/pkg/lang-python/supybot/ Removed Paths: ------------- csw/mgar/pkg/dbus-python/ csw/mgar/pkg/gdata-python-client/ csw/mgar/pkg/guppy/ csw/mgar/pkg/ipython/ csw/mgar/pkg/mod_python/ csw/mgar/pkg/mysql-python/ csw/mgar/pkg/numpy/ csw/mgar/pkg/shout-python/ csw/mgar/pkg/soappy/ csw/mgar/pkg/supybot/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 13 14:42:37 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Oct 2010 12:42:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[11289] csw/mgar/pkg Message-ID: Revision: 11289 http://gar.svn.sourceforge.net/gar/?rev=11289&view=rev Author: wahwah Date: 2010-10-13 12:42:37 +0000 (Wed, 13 Oct 2010) Log Message: ----------- gnome packages: Moving them to the gnome-base subtree Added Paths: ----------- csw/mgar/pkg/gnome-base/ csw/mgar/pkg/gnome-base/gail/ csw/mgar/pkg/gnome-base/gconf-editor/ csw/mgar/pkg/gnome-base/gconf2/ csw/mgar/pkg/gnome-base/gnome/ csw/mgar/pkg/gnome-base/gnome-applets/ csw/mgar/pkg/gnome-base/gnome-icon-theme/ csw/mgar/pkg/gnome-base/gnome-keyring/ csw/mgar/pkg/gnome-base/gnome-mime-data/ csw/mgar/pkg/gnome-base/gnome-panel/ csw/mgar/pkg/gnome-base/gnome-pilot/ csw/mgar/pkg/gnome-base/gnome-session/ csw/mgar/pkg/gnome-base/gnome-skeleton/ csw/mgar/pkg/gnome-base/gnome-spell/ csw/mgar/pkg/gnome-base/gnome-terminal/ csw/mgar/pkg/gnome-base/gnome-utils/ csw/mgar/pkg/gnome-base/gnome_theme_extras/ csw/mgar/pkg/gnome-base/gnome_themes/ csw/mgar/pkg/gnome-base/gnomedesktop/ csw/mgar/pkg/gnome-base/gnomemedia/ csw/mgar/pkg/gnome-base/gnomevfs2/ csw/mgar/pkg/gnome-base/libbonobo2/ csw/mgar/pkg/gnome-base/libbonoboui/ csw/mgar/pkg/gnome-base/libgail_gnome/ csw/mgar/pkg/gnome-base/libgnome/ csw/mgar/pkg/gnome-base/libgnomecanvas/ csw/mgar/pkg/gnome-base/libgnomecups/ csw/mgar/pkg/gnome-base/libgnomedb/ csw/mgar/pkg/gnome-base/libgnomekbd/ csw/mgar/pkg/gnome-base/libgnomeprint/ csw/mgar/pkg/gnome-base/libgnomeprintui/ csw/mgar/pkg/gnome-base/libgnomeui/ csw/mgar/pkg/gnome-base/orbit2/ Removed Paths: ------------- csw/mgar/pkg/gail/ csw/mgar/pkg/gconf-editor/ csw/mgar/pkg/gconf2/ csw/mgar/pkg/gnome/ csw/mgar/pkg/gnome-applets/ csw/mgar/pkg/gnome-icon-theme/ csw/mgar/pkg/gnome-keyring/ csw/mgar/pkg/gnome-mime-data/ csw/mgar/pkg/gnome-panel/ csw/mgar/pkg/gnome-pilot/ csw/mgar/pkg/gnome-session/ csw/mgar/pkg/gnome-skeleton/ csw/mgar/pkg/gnome-spell/ csw/mgar/pkg/gnome-terminal/ csw/mgar/pkg/gnome-utils/ csw/mgar/pkg/gnome_theme_extras/ csw/mgar/pkg/gnome_themes/ csw/mgar/pkg/gnomedesktop/ csw/mgar/pkg/gnomemedia/ csw/mgar/pkg/gnomevfs2/ csw/mgar/pkg/libbonobo2/ csw/mgar/pkg/libbonoboui/ csw/mgar/pkg/libgail_gnome/ csw/mgar/pkg/libgnome/ csw/mgar/pkg/libgnomecanvas/ csw/mgar/pkg/libgnomecups/ csw/mgar/pkg/libgnomedb/ csw/mgar/pkg/libgnomekbd/ csw/mgar/pkg/libgnomeprint/ csw/mgar/pkg/libgnomeprintui/ csw/mgar/pkg/libgnomeui/ csw/mgar/pkg/orbit2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 13 17:50:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Oct 2010 15:50:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11290] csw/mgar/pkg Message-ID: Revision: 11290 http://gar.svn.sourceforge.net/gar/?rev=11290&view=rev Author: wahwah Date: 2010-10-13 15:50:53 +0000 (Wed, 13 Oct 2010) Log Message: ----------- twisted: Moving to lang-python Added Paths: ----------- csw/mgar/pkg/lang-python/twisted/ Removed Paths: ------------- csw/mgar/pkg/twisted/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 13 18:14:28 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Oct 2010 16:14:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[11291] csw/mgar/pkg/lang-python/twisted/trunk Message-ID: Revision: 11291 http://gar.svn.sourceforge.net/gar/?rev=11291&view=rev Author: wahwah Date: 2010-10-13 16:14:27 +0000 (Wed, 13 Oct 2010) Log Message: ----------- twisted: Upgrade to 10.1, and package name change to CSWpy-twisted. Modified Paths: -------------- csw/mgar/pkg/lang-python/twisted/trunk/Makefile csw/mgar/pkg/lang-python/twisted/trunk/checksums Modified: csw/mgar/pkg/lang-python/twisted/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2010-10-13 15:50:53 UTC (rev 11290) +++ csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2010-10-13 16:14:27 UTC (rev 11291) @@ -3,18 +3,18 @@ # $Id$ GARNAME = twisted -MAJ_VERSION = 9.0 +MAJ_VERSION = 10.1 PATCHLEVEL = 0 GARVERSION = $(MAJ_VERSION).$(PATCHLEVEL) CATEGORIES = python -DESCRIPTION = An event-driven networking engine define BLURB Twisted is a networking engine written in Python, supporting numerous protocols. It contains a web server, numerous chat clients, chat servers, mail servers, and more. endef +PACKAGES = CSWpy-twisted CSWtwisted UPSTREAM_NAME = Twisted DISTNAME = $(UPSTREAM_NAME)-$(GARVERSION) MASTER_SITES = http://tmrc.mit.edu/mirror/$(GARNAME)/$(UPSTREAM_NAME)/$(MAJ_VERSION)/ @@ -22,5 +22,16 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 TEST_SCRIPTS = LICENSE = LICENSE - +EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc] +PKGFILES_CSWtwisted = NONE +RUNTIME_DEP_PKGS_CSWtwisted = CSWpy-twisted +SPKG_DESC_CSWtwisted = An event-driven networking engine +SPKG_DESC_CSWpy-twisted = An empty transitional package +CATALOGNAME_CSWtwisted = twisted +CATALOGNAME_CSWpy-twisted = py_twisted +# CSWtwisted is now empty, so we need to tell checkpkg that it really needs to +# depend on these two packages. +ARCHALL_CSWtwisted = 1 +CHECKPKG_OVERRIDES_CSWtwisted += surplus-dependency|CSWpy-twisted +CHECKPKG_OVERRIDES_CSWtwisted += surplus-dependency|CSWpython include gar/category.mk Modified: csw/mgar/pkg/lang-python/twisted/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/checksums 2010-10-13 15:50:53 UTC (rev 11290) +++ csw/mgar/pkg/lang-python/twisted/trunk/checksums 2010-10-13 16:14:27 UTC (rev 11291) @@ -1 +1 @@ -93fc2756a09ffd1350c046cc940e4311 Twisted-9.0.0.tar.bz2 +04cca97506e830074cffc1965297da3f Twisted-10.1.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 13 19:29:40 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Oct 2010 17:29:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11292] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 11292 http://gar.svn.sourceforge.net/gar/?rev=11292&view=rev Author: wahwah Date: 2010-10-13 17:29:40 +0000 (Wed, 13 Oct 2010) Log Message: ----------- mGAR v2: Changing the pycompile regex back to /opt/csw/lib/python/ (without the version number). Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-10-13 16:14:27 UTC (rev 11291) +++ csw/mgar/gar/v2/gar.mk 2010-10-13 17:29:40 UTC (rev 11292) @@ -738,7 +738,7 @@ # Support for cswpycompile, skip pre-compiled python files (.pyc, .pyo) # during the merge phase. -_PYCOMPILE_FILES = /opt/csw/lib/python2.6/site-packages/.*\.py +_PYCOMPILE_FILES = /opt/csw/lib/python/site-packages/.*\.py MERGE_EXCLUDE_PYCOMPILE ?= $(if $(PYCOMPILE), $(addsuffix c,$(_PYCOMPILE_FILES)) $(addsuffix o,$(_PYCOMPILE_FILES))) MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 13 20:34:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Oct 2010 18:34:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11293] csw/mgar/pkg/pkgconfig/trunk Message-ID: Revision: 11293 http://gar.svn.sourceforge.net/gar/?rev=11293&view=rev Author: dmichelsen Date: 2010-10-13 18:34:17 +0000 (Wed, 13 Oct 2010) Log Message: ----------- pkgconfig: Update to 0.25 and several testsuite fixes for Solaris Modified Paths: -------------- csw/mgar/pkg/pkgconfig/trunk/Makefile csw/mgar/pkg/pkgconfig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pkgconfig/trunk/files/0001-Ugly-shell-fixes-and-force-gnome-config-to-be-there.patch Removed Paths: ------------- csw/mgar/pkg/pkgconfig/trunk/files/fixme.sh csw/mgar/pkg/pkgconfig/trunk/files/gsed-check.patch Modified: csw/mgar/pkg/pkgconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgconfig/trunk/Makefile 2010-10-13 17:29:40 UTC (rev 11292) +++ csw/mgar/pkg/pkgconfig/trunk/Makefile 2010-10-13 18:34:17 UTC (rev 11293) @@ -1,5 +1,5 @@ GARNAME = pkg-config -GARVERSION = 0.23 +GARVERSION = 0.25 CATEGORIES = devel DESCRIPTION = Tool for determining the configuration of installed software @@ -14,27 +14,24 @@ MASTER_SITES = http://pkg-config.freedesktop.org/releases/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += fixme.sh PACKAGES = CSWpkgconfig +CATALOGNAME = pkgconfig SPKG_SOURCEURL = http://pkg-config.freedesktop.org # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES = gsed-check.patch -PATCHFILES += manpage-macro.patch +PATCHFILES = manpage-macro.patch +PATCHFILES += 0001-Ugly-shell-fixes-and-force-gnome-config-to-be-there.patch -RUNTIME_DEP_PKGS = CSWggettextrt CSWglib2 +DEP_PKGS = CSWggettextrt CSWglib2 -CONFIGURE_ARGS = $(DIRPATHS) --with-installed-glib +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --docdir=$(docdir)/$(CATALOGNAME) +CONFIGURE_ARGS += --with-installed-glib TEST_TARGET = check include gar/category.mk - -post-configure-modulated: - @echo " ==> Fixing libtool .la-files" - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgconfig/trunk/checksums 2010-10-13 17:29:40 UTC (rev 11292) +++ csw/mgar/pkg/pkgconfig/trunk/checksums 2010-10-13 18:34:17 UTC (rev 11293) @@ -1,4 +1,3 @@ -64d266fb8acf7df52088b9796f928b60 download/fixme.sh -8d47301467b9f5932f56562585ebc068 download/gsed-check.patch -73a8bc0d5ab5236dcb183460bc0311e4 download/manpage-macro.patch -d922a88782b64441d06547632fd85744 download/pkg-config-0.23.tar.gz +8d47301467b9f5932f56562585ebc068 gsed-check.patch +73a8bc0d5ab5236dcb183460bc0311e4 manpage-macro.patch +a3270bab3f4b69b7dc6dbdacbcae9745 pkg-config-0.25.tar.gz Added: csw/mgar/pkg/pkgconfig/trunk/files/0001-Ugly-shell-fixes-and-force-gnome-config-to-be-there.patch =================================================================== --- csw/mgar/pkg/pkgconfig/trunk/files/0001-Ugly-shell-fixes-and-force-gnome-config-to-be-there.patch (rev 0) +++ csw/mgar/pkg/pkgconfig/trunk/files/0001-Ugly-shell-fixes-and-force-gnome-config-to-be-there.patch 2010-10-13 18:34:17 UTC (rev 11293) @@ -0,0 +1,175 @@ +From 070eb10bb70272feecaacd7d4e875bc241751d0a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 13 Oct 2010 20:11:40 +0200 +Subject: [PATCH 3/3] Ugly shell fixes and force gnome-config to be there + +--- + check/check-cflags | 2 +- + check/check-conflicts | 2 +- + check/check-define-variable | 2 +- + check/check-idirafter | 2 +- + check/check-includedir | 2 +- + check/check-libs | 2 +- + check/check-libs-private | 2 +- + check/check-missing | 2 +- + check/check-requires-private | 2 +- + check/check-whitespace | 2 +- + check/common | 2 +- + check/gnome-config | 1 + + 12 files changed, 12 insertions(+), 11 deletions(-) + create mode 120000 check/gnome-config + +diff --git a/check/check-cflags b/check/check-cflags +index eb2d6bc..8c89731 100755 +--- a/check/check-cflags ++++ b/check/check-cflags +@@ -2,7 +2,7 @@ + + # Make sure we're POSIX + if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then +- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@" ++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@" + fi + + set -e +diff --git a/check/check-conflicts b/check/check-conflicts +index 8092ba9..9b6d378 100755 +--- a/check/check-conflicts ++++ b/check/check-conflicts +@@ -2,7 +2,7 @@ + + # Make sure we're POSIX + if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then +- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@" ++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@" + fi + + set -e +diff --git a/check/check-define-variable b/check/check-define-variable +index bf8aebe..60f651e 100755 +--- a/check/check-define-variable ++++ b/check/check-define-variable +@@ -2,7 +2,7 @@ + + # Make sure we're POSIX + if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then +- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@" ++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@" + fi + + set -e +diff --git a/check/check-idirafter b/check/check-idirafter +index 7abd2dc..b4f9446 100755 +--- a/check/check-idirafter ++++ b/check/check-idirafter +@@ -2,7 +2,7 @@ + + # Make sure we're POSIX + if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then +- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@" ++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@" + fi + + set -e +diff --git a/check/check-includedir b/check/check-includedir +index d78ec24..98b8682 100755 +--- a/check/check-includedir ++++ b/check/check-includedir +@@ -2,7 +2,7 @@ + + # Make sure we're POSIX + if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then +- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@" ++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@" + fi + + set -e +diff --git a/check/check-libs b/check/check-libs +index 9b1b495..dfef4cc 100755 +--- a/check/check-libs ++++ b/check/check-libs +@@ -2,7 +2,7 @@ + + # Make sure we're POSIX + if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then +- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@" ++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@" + fi + + set -e +diff --git a/check/check-libs-private b/check/check-libs-private +index 961962b..5f79fba 100755 +--- a/check/check-libs-private ++++ b/check/check-libs-private +@@ -2,7 +2,7 @@ + + # Make sure we're POSIX + if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then +- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@" ++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@" + fi + + set -e +diff --git a/check/check-missing b/check/check-missing +index fba43a7..300519b 100755 +--- a/check/check-missing ++++ b/check/check-missing +@@ -2,7 +2,7 @@ + + # Make sure we're POSIX + if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then +- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@" ++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@" + fi + + . ${srcdir}/common +diff --git a/check/check-requires-private b/check/check-requires-private +index 45115ee..4803097 100755 +--- a/check/check-requires-private ++++ b/check/check-requires-private +@@ -2,7 +2,7 @@ + + # Make sure we're POSIX + if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then +- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@" ++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@" + fi + set -e + +diff --git a/check/check-whitespace b/check/check-whitespace +index 31a413c..607cacf 100755 +--- a/check/check-whitespace ++++ b/check/check-whitespace +@@ -2,7 +2,7 @@ + + # Make sure we're POSIX + if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then +- PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@" ++ PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH`:`pwd` exec bash $0 "$@" + fi + + set -e +diff --git a/check/common b/check/common +index 57aa806..ef96b68 100644 +--- a/check/common ++++ b/check/common +@@ -22,7 +22,7 @@ run_test () { + exit 1 + fi + +- R=$(${pkgconfig} $ARGS 2>&1 | sed -e 's,^[[:space:]]*,,' -e 's,[[:space:]]*$,,') ++ R=$(${pkgconfig} $ARGS 2>&1 | /opt/csw/bin/gsed -e 's,^[[:space:]]*,,' -e 's,[[:space:]]*$,,') + if [ "$R" != "$RESULT" ]; then + echo "${pkgconfig} $ARGS :" + echo "'$R' != '$RESULT'" +diff --git a/check/gnome-config b/check/gnome-config +new file mode 120000 +index 0000000..7d77455 +--- /dev/null ++++ b/check/gnome-config +@@ -0,0 +1 @@ ++/usr/bin/true +\ No newline at end of file +-- +1.7.3 + Deleted: csw/mgar/pkg/pkgconfig/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/pkgconfig/trunk/files/fixme.sh 2010-10-13 17:29:40 UTC (rev 11292) +++ csw/mgar/pkg/pkgconfig/trunk/files/fixme.sh 2010-10-13 18:34:17 UTC (rev 11293) @@ -1,48 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} -done - -for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} -done - Deleted: csw/mgar/pkg/pkgconfig/trunk/files/gsed-check.patch =================================================================== --- csw/mgar/pkg/pkgconfig/trunk/files/gsed-check.patch 2010-10-13 17:29:40 UTC (rev 11292) +++ csw/mgar/pkg/pkgconfig/trunk/files/gsed-check.patch 2010-10-13 18:34:17 UTC (rev 11293) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -Nru pkg-config-0.23.orig/check/common pkg-config-0.23/check/common ---- pkg-config-0.23.orig/check/common 2008-01-16 21:42:49.000000000 +0100 -+++ pkg-config-0.23/check/common 2008-02-04 06:32:58.994364000 +0100 -@@ -16,7 +16,7 @@ - exit 1 - fi - -- R=$(${pkgconfig} $ARGS | sed -e 's,^[[:space:]]*,,' -e 's,[[:space:]]*$,,') -+ R=$(${pkgconfig} $ARGS | /opt/csw/bin/gsed -e 's,^[[:space:]]*,,' -e 's,[[:space:]]*$,,') - if [ "$R" != "$RESULT" ]; then - echo "${pkgconfig} $ARGS :" - echo "'$R' != '$RESULT'" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Wed Oct 13 23:49:33 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Wed, 13 Oct 2010 21:49:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11294] csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Message-ID: Revision: 11294 http://gar.svn.sourceforge.net/gar/?rev=11294&view=rev Author: opk Date: 2010-10-13 21:49:33 +0000 (Wed, 13 Oct 2010) Log Message: ----------- revert package name as it predated the convention so shouldn't be renamed Modified Paths: -------------- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2010-10-13 18:34:17 UTC (rev 11293) +++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2010-10-13 21:49:33 UTC (rev 11294) @@ -13,11 +13,11 @@ STRIP_LIBTOOL = 1 -PACKAGES = CSWpy-gobject -RUNTIME_DEP_PKGS_CSWpy-gobject = CSWpython CSWggettextrt CSWglib2 +PACKAGES = CSWpygobject +RUNTIME_DEP_PKGS_CSWpygobject = CSWpython CSWggettextrt CSWglib2 -CATALOGNAME_CSWpy-gobject = py_gobject -SPKG_DESC_CSWpy-gobject = $(DESCRIPTION) +CATALOGNAME_CSWpygobject = py_gobject +SPKG_DESC_CSWpygobject = $(DESCRIPTION) PYCOMPILE = 1 PATCHFILES = 0001-forcing-lglib-2.0.patch @@ -32,4 +32,7 @@ TEST_TARGET = check TEST_SCRIPTS = +# This package predates the convention and renaming is problematic +CHECKPKG_OVERRIDES_CSWpygobject += pkgname-does-not-start-with-CSWpy- + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 14 00:15:59 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Oct 2010 22:15:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11295] csw/mgar/pkg/lang-python Message-ID: Revision: 11295 http://gar.svn.sourceforge.net/gar/?rev=11295&view=rev Author: wahwah Date: 2010-10-13 22:15:58 +0000 (Wed, 13 Oct 2010) Log Message: ----------- virtualenv: Initial commit. Modified Paths: -------------- csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile csw/mgar/pkg/lang-python/virtualenv/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/virtualenv/ Modified: csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-10-13 12:42:37 UTC (rev 11289) +++ csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile 2010-10-13 22:15:58 UTC (rev 11295) @@ -2,184 +2,19 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = virtualenv +GARVERSION = 1.5.1 +PACKAGES = CSWpy-virtualenv +CATALOGNAME_CSWpy-virtualenv = py_virtualenv +CATEGORIES = python +SPKG_DESC_CSWpy-virtualenv = Virtual Python Environment builder +ARCHALL_CSWpy-virtualenv = 1 define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://pypi.python.org/pypi/virtualenv +MASTER_SITES = http://pypi.python.org/packages/source/v/virtualenv/ +# virtualenv-1.5.1.tar.gz#md5=3daa1f449d5d2ee03099484cecb1c2b7 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +LICENSE = PKG-INFO +include gar/category.mk Modified: csw/mgar/pkg/lang-python/virtualenv/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-10-13 12:42:37 UTC (rev 11289) +++ csw/mgar/pkg/lang-python/virtualenv/trunk/checksums 2010-10-13 22:15:58 UTC (rev 11295) @@ -0,0 +1 @@ +3daa1f449d5d2ee03099484cecb1c2b7 virtualenv-1.5.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 14 00:33:51 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Oct 2010 22:33:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[11296] csw/mgar/pkg/scons/trunk Message-ID: Revision: 11296 http://gar.svn.sourceforge.net/gar/?rev=11296&view=rev Author: wahwah Date: 2010-10-13 22:33:51 +0000 (Wed, 13 Oct 2010) Log Message: ----------- scons: Upgrade to 1.3.1 Modified Paths: -------------- csw/mgar/pkg/scons/trunk/Makefile csw/mgar/pkg/scons/trunk/checksums Modified: csw/mgar/pkg/scons/trunk/Makefile =================================================================== --- csw/mgar/pkg/scons/trunk/Makefile 2010-10-13 22:15:58 UTC (rev 11295) +++ csw/mgar/pkg/scons/trunk/Makefile 2010-10-13 22:33:51 UTC (rev 11296) @@ -1,6 +1,6 @@ GARNAME = scons -GARVERSION = 1.2.0 -CATEGORIES = devel +GARVERSION = 1.3.1 +CATEGORIES = python DESCRIPTION = A next-generation build tool define BLURB @@ -11,26 +11,15 @@ caches such as ccache. In short, SCons is an easier, more reliable and faster way to build software. endef - SF_PROJ = scons MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - SPKG_SOURCEURL = http://www.scons.org/ - LICENSE = LICENSE.txt - CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = -INSTALL_SCRIPTS = $(WORKSRC)/setup.py -INSTALL_ARGS = --root=$(DESTDIR) - EXTRA_PAX_ARGS = -s ",\./opt/csw/man,./opt/csw/share/man," - ARCHALL = 1 - +EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/$(GARNAME)-$(GARVERSION)/SCons/.*\.py[co] include gar/category.mk Modified: csw/mgar/pkg/scons/trunk/checksums =================================================================== --- csw/mgar/pkg/scons/trunk/checksums 2010-10-13 22:15:58 UTC (rev 11295) +++ csw/mgar/pkg/scons/trunk/checksums 2010-10-13 22:33:51 UTC (rev 11296) @@ -1 +1 @@ -53b6aa7281811717a57598e319441cf7 scons-1.2.0.tar.gz +e3411dc316b2f6be5226cd71dbdeb0c1 scons-1.3.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 14 08:38:42 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Oct 2010 06:38:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11297] csw/mgar/pkg/lang-python/twisted/trunk/Makefile Message-ID: Revision: 11297 http://gar.svn.sourceforge.net/gar/?rev=11297&view=rev Author: wahwah Date: 2010-10-14 06:38:42 +0000 (Thu, 14 Oct 2010) Log Message: ----------- twisted: A new dependency on a Python library. Modified Paths: -------------- csw/mgar/pkg/lang-python/twisted/trunk/Makefile Modified: csw/mgar/pkg/lang-python/twisted/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2010-10-13 22:33:51 UTC (rev 11296) +++ csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2010-10-14 06:38:42 UTC (rev 11297) @@ -22,9 +22,9 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 TEST_SCRIPTS = LICENSE = LICENSE -EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc] PKGFILES_CSWtwisted = NONE RUNTIME_DEP_PKGS_CSWtwisted = CSWpy-twisted +RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibpython2-6-1-0 SPKG_DESC_CSWtwisted = An event-driven networking engine SPKG_DESC_CSWpy-twisted = An empty transitional package CATALOGNAME_CSWtwisted = twisted This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Thu Oct 14 12:28:16 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 14 Oct 2010 10:28:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[11298] csw/mgar/pkg/lang-python Message-ID: Revision: 11298 http://gar.svn.sourceforge.net/gar/?rev=11298&view=rev Author: opk Date: 2010-10-14 10:28:15 +0000 (Thu, 14 Oct 2010) Log Message: ----------- add py-nose package for unit testing framework used by numpy Added Paths: ----------- csw/mgar/pkg/lang-python/nose/ csw/mgar/pkg/lang-python/nose/Makefile csw/mgar/pkg/lang-python/nose/branches/ csw/mgar/pkg/lang-python/nose/tags/ csw/mgar/pkg/lang-python/nose/trunk/ csw/mgar/pkg/lang-python/nose/trunk/Makefile csw/mgar/pkg/lang-python/nose/trunk/checksums csw/mgar/pkg/lang-python/nose/trunk/files/ Added: csw/mgar/pkg/lang-python/nose/Makefile =================================================================== --- csw/mgar/pkg/lang-python/nose/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/nose/Makefile 2010-10-14 10:28:15 UTC (rev 11298) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/lang-python/nose/Makefile ___________________________________________________________________ Added: svn:keywords + URL Id Property changes on: csw/mgar/pkg/lang-python/nose/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/lang-python/nose/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/nose/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/nose/trunk/Makefile 2010-10-14 10:28:15 UTC (rev 11298) @@ -0,0 +1,34 @@ +GARNAME = nose +GARVERSION = 0.11.2 +CATEGORIES = python + +DESCRIPTION = Nose extends unittest to make testing easier +define BLURB + Nose collects tests from unittest.TestCase subclasses. But you can + also write simple test functions, as well as test classes that are not + subclasses of unittest.TestCase. nose also supplies a number of + helpful functions for writing timed tests, testing for exceptions, and + other common use cases. +endef + +MASTER_SITES = http://somethingaboutorange.com/mrl/projects/$(GARNAME)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWpy-nose +CATALOGNAME = py_nose +SPKG_DESC = $(DESCRIPTION) + +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +TEST_SCRIPTS = +# tests fail because some multiprocessing module doesn't like Solaris sem_open +# TEST_SCRIPTS = $(WORKSRC)/selftest.py + +LICENSE = lgpl.txt +ARCHALL = 1 + +include gar/category.mk + +INSTALL_ARGS += --install-data=$(prefix)/share Property changes on: csw/mgar/pkg/lang-python/nose/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/nose/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/nose/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/nose/trunk/checksums 2010-10-14 10:28:15 UTC (rev 11298) @@ -0,0 +1 @@ +cae8bb7a080871886602489677474036 nose-0.11.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Thu Oct 14 12:36:18 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 14 Oct 2010 10:36:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[11299] csw/mgar/pkg/lang-python/nose/tags/nose-0.11.2, REV= 2010.10.14/ Message-ID: Revision: 11299 http://gar.svn.sourceforge.net/gar/?rev=11299&view=rev Author: opk Date: 2010-10-14 10:36:18 +0000 (Thu, 14 Oct 2010) Log Message: ----------- nose: Tag as release 0.11.2,REV=2010.10.14 Added Paths: ----------- csw/mgar/pkg/lang-python/nose/tags/nose-0.11.2,REV=2010.10.14/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 14 20:48:52 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Oct 2010 18:48:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[11300] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 11300 http://gar.svn.sourceforge.net/gar/?rev=11300&view=rev Author: wahwah Date: 2010-10-14 18:48:52 +0000 (Thu, 14 Oct 2010) Log Message: ----------- mGAR v2: Suggesting GAR lines to separate out sonames into individual packages. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-14 10:36:18 UTC (rev 11299) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-14 18:48:52 UTC (rev 11300) @@ -1014,6 +1014,30 @@ % (pkgname, sorted(set(sonames)))) # If the sonames aren't uniform, there's no point in trying to match # sonames versus pkgname. + for soname, binary_info in linkable_shared_libs: + lib_path, lib_basename = os.path.split(binary_info["path"]) + messenger.SuggestGarLine( + "# Suggesting how to separate out %s" + % soname) + messenger.SuggestGarLine( + "# You will most probably need to further edit these lines. " + "Use with caution!") + tmp = su.MakePackageNameBySoname(soname) + policy_pkgname_list, policy_catalogname_list = tmp + messenger.SuggestGarLine("PACKAGES += %s" % policy_pkgname_list[0]) + messenger.SuggestGarLine( + "CATALOGNAME_%s += %s" + % (policy_pkgname_list[0], policy_catalogname_list[0])) + messenger.SuggestGarLine( + "PKGFILES_%s += /%s" + % (policy_pkgname_list[0], os.path.join(lib_path, lib_basename))) + messenger.SuggestGarLine( + "PKGFILES_%s += /%s\.[0-9\.]+" + % (policy_pkgname_list[0], os.path.join(lib_path, soname))) + messenger.SuggestGarLine( + "RUNTIME_DEP_PKGS_%s += %s" + % (pkgname, policy_pkgname_list[0])) + check_names = False else: if multilib_pkgname != pkgname: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 15 01:07:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Oct 2010 23:07:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[11301] csw/mgar/pkg/lang-python/python/branches/python-3.1 Message-ID: Revision: 11301 http://gar.svn.sourceforge.net/gar/?rev=11301&view=rev Author: wahwah Date: 2010-10-14 23:07:54 +0000 (Thu, 14 Oct 2010) Log Message: ----------- python-3.1: Modifications to make 2.6 and 3.1 build files more alike. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile Removed Paths: ------------- csw/mgar/pkg/lang-python/python/branches/python-3.1/files/libpython2.5.so.1.0-isa-i386 csw/mgar/pkg/lang-python/python/branches/python-3.1/files/libpython2.5.so.1.0-isa-sparcv8 Modified: csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile 2010-10-14 18:48:52 UTC (rev 11300) +++ csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile 2010-10-14 23:07:54 UTC (rev 11301) @@ -3,12 +3,19 @@ GARNAME = Python GARVERSION = 3.1.2 CATEGORIES = lang +VER = 3.1 +DVER = 3-1 +UVER = 3_1 +PVER = python$(VER) +CVER = 31 # Known issues: # # - No 64-bit build # - ctypes module doesn't compile # - http://forums.sun.com/thread.jspa?threadID=5148204 +# - http://bugs.python.org/issue4902 +# - Python-2.6.1/Modules/_ctypes/libffi/src/x86/sysv.S SPKG_SOURCEURL = http://python.org/download/releases/$(GARVERSION) @@ -43,10 +50,10 @@ # Test for sunaudiodev fails. SKIPTEST = 1 -EXTRA_INC += $(prefix)/X11/include -EXTRA_LIB += $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +# EXTRA_INC += $(prefix)/X11/include +# EXTRA_LIB += $(prefix)/X11/lib +# EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +# EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS @@ -67,74 +74,95 @@ # use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -PACKAGES = CSWidle31 -PACKAGES += CSWpython31 -PACKAGES += CSWpython31-devel -PACKAGES += CSWpython31-test -PACKAGES += CSWpython31-tk +PACKAGES = CSWidle$(CVER) +PACKAGES += CSWpython$(CVER) +PACKAGES += CSWpython$(CVER)-devel +PACKAGES += CSWpython$(CVER)-test +PACKAGES += CSWpython$(CVER)-tk +PACKAGES += CSWlibpython$(DVER)-1-0 -INCOMPATIBLE_PKGS_CSWpython31 = CSWpydistutils +INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils -PKGFILES_CSWidle31 = $(libdir)/.*/idlelib/.* -PKGFILES_CSWidle31 += $(bindir)/idle -PKGFILES_CSWpython31-devel = $(includedir)/.* -PKGFILES_CSWpython31-devel += $(libdir)/.*/config/.* -PKGFILES_CSWpython31-devel += $(bindir)/.*config.* -# No idea why would this be in CSWpython31, and no good idea for a better package +PKGFILES_CSWidle$(CVER) = $(libdir)/.*/idlelib/.* +PKGFILES_CSWidle$(CVER) += $(bindir)/idle +PKGFILES_CSWpython$(CVER)-devel = $(includedir)/.* +PKGFILES_CSWpython$(CVER)-devel += $(libdir)/.*/config/.* +PKGFILES_CSWpython$(CVER)-devel += $(bindir)/.*config.* +PKGFILES_CSWpython-devel += $(libdir)/libpython$(VER).so +# No idea why would this be in CSWpython, and no good idea for a better package # to put it. -PKGFILES_CSWpython31-devel += $(bindir)/smtpd.py -PKGFILES_CSWpython31-tk = $(libdir)/.*/lib-tk/.* -PKGFILES_CSWpython31-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* -PKGFILES_CSWpython31-test = $(libdir)/python/test/.* -PKGFILES_CSWpython31-test += $(libdir)/python/bsddb/test.* -PKGFILES_CSWpython31-test += $(libdir)/python/ctypes/test.* -PKGFILES_CSWpython31-test += $(libdir)/python/email/test.* -PKGFILES_CSWpython31-test += $(libdir)/python/distutils/tests.* -PKGFILES_CSWpython31-test += $(libdir)/python/json/tests.* -PKGFILES_CSWpython31-test += $(libdir)/python/lib2to3/tests.* -PKGFILES_CSWpython31-test += $(libdir)/python/sqlite3/test.* +PKGFILES_CSWpython$(CVER)-devel += $(bindir)/smtpd.py +PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* +PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* +PKGFILES_CSWpython$(CVER)-test = $(libdir)/python/test/.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/bsddb/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/ctypes/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/email/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/distutils/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/json/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/lib2to3/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/sqlite3/test.* +PKGFILES_CSWlibpython$(DVER)-1-0 += $(libdir)/libpython$(VER)\.so\.([0-9\.]+) -ARCHALL_CSWpython31-test = 1 -ARCHALL_CSWidle31 = 1 +ARCHALL_CSWpython$(CVER)-test = 1 +ARCHALL_CSWidle$(CVER) = 1 -RUNTIME_DEP_PKGS_CSWidle31 += CSWpython31 -RUNTIME_DEP_PKGS_CSWidle31 += CSWpython31-tk -RUNTIME_DEP_PKGS_CSWpython31 += CSWbzip2 -RUNTIME_DEP_PKGS_CSWpython31 += CSWgdbm -RUNTIME_DEP_PKGS_CSWpython31 += CSWggettextrt -RUNTIME_DEP_PKGS_CSWpython31 += CSWncurses -RUNTIME_DEP_PKGS_CSWpython31 += CSWosslrt -RUNTIME_DEP_PKGS_CSWpython31 += CSWreadline -RUNTIME_DEP_PKGS_CSWpython31 += CSWsqlite3rt CSWzlib -RUNTIME_DEP_PKGS_CSWpython31-tk += CSWpython31 -RUNTIME_DEP_PKGS_CSWpython31-tk += CSWtcl -RUNTIME_DEP_PKGS_CSWpython31-tk += CSWtk -RUNTIME_DEP_PKGS_CSWpython31-tk += CSWlibx11 -RUNTIME_DEP_PKGS_CSWpython31-devel += CSWpython31 -RUNTIME_DEP_PKGS_CSWpython31-test += CSWpython31 +RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER)-tk +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbzip2 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWgdbm +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWggettextrt +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWncurses +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWosslrt +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWreadline +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWsqlite3rt +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWzlib +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtcl +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtk +RUNTIME_DEP_PKGS_CSWpython$(CVER)-devel += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWlibpython$(DVER)-1-0 += CSWggettextrt # This could be handled by automatic dependency detection -CHECKPKG_OVERRIDES_CSWidle31 += surplus-dependency|CSWpython31-tk +CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk -CATALOGNAME_CSWidle31 = idle_31 -CATALOGNAME_CSWpython31 = python_31 -CATALOGNAME_CSWpython31-devel = python_31_devel -CATALOGNAME_CSWpython31-tk = python_31_tk -CATALOGNAME_CSWpython31-test = python_31_test +CATALOGNAME_CSWidle$(CVER) = idle_$(CVER) +CATALOGNAME_CSWpython$(CVER) = python_$(CVER) +CATALOGNAME_CSWpython$(CVER)-devel = python_$(CVER)_devel +CATALOGNAME_CSWpython$(CVER)-tk = python_$(CVER)_tk +CATALOGNAME_CSWpython$(CVER)-test = python_$(CVER)_test +CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 -SPKG_DESC_CSWidle31 = Python IDE -SPKG_DESC_CSWpython31 = A high-level scripting language, 3.1 series -SPKG_DESC_CSWpython31-devel = Development Files for Python -SPKG_DESC_CSWpython31-tk = Python Tk Interface (TkInter) -SPKG_DESC_CSWpython31-test = Python Test modules +SPKG_DESC_CSWidle$(CVER) = Python IDE +SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series +SPKG_DESC_CSWpython$(CVER)-devel = Development Files for Python +SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) +SPKG_DESC_CSWpython$(CVER)-test = Python Test modules +SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) -CHECKPKG_OVERRIDES_CSWpython31 += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWpython31-test += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWpython31-test += surplus-dependency|CSWpython31 -CHECKPKG_OVERRIDES_CSWidle31 += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWidle31 += surplus-dependency|CSWpython31 -CHECKPKG_OVERRIDES_CSWpython31-devel += surplus-dependency|CSWpython31 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += surplus-dependency|CSWpython$(CVER) +CHECKPKG_OVERRIDES_CSWidle$(CVER) += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER) +CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += surplus-dependency|CSWpython$(CVER) LICENSE = LICENSE +# This is an exception, since these are original Python packages. +CHECKPKG_OVERRIDES_CSWidle$(CVER) += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython$(CVER) + include gar/category.mk Deleted: csw/mgar/pkg/lang-python/python/branches/python-3.1/files/libpython2.5.so.1.0-isa-i386 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/lang-python/python/branches/python-3.1/files/libpython2.5.so.1.0-isa-sparcv8 =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 15 01:47:41 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Oct 2010 23:47:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[11302] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11302 http://gar.svn.sourceforge.net/gar/?rev=11302&view=rev Author: wahwah Date: 2010-10-14 23:47:41 +0000 (Thu, 14 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, better handling of shared library policy wrt sonames such as libnspr4.so. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/sharedlib_utils.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-14 23:07:54 UTC (rev 11301) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-14 23:47:41 UTC (rev 11302) @@ -999,34 +999,35 @@ linkable_shared_libs.append((soname, binary_info)) check_names = True if len(linkable_shared_libs) > 1: - sonames = [x[0] for x in linkable_shared_libs] - multilib_pkgname = su.MakePackageNameBySonameCollection(sonames) - if not multilib_pkgname: + sonames = sorted(set([x[0] for x in linkable_shared_libs])) + tmp = su.MakePackageNameBySonameCollection(sonames) + multilib_pkgnames, multilib_catalogname = tmp + if not multilib_pkgnames: error_mgr.ReportError( "non-uniform-lib-versions-in-package", "sonames=%s" - % sorted(set(sonames))) + % (sonames)) messenger.Message( - "Package %s contains shared libraries with sonames that " - "don't have compatible versions: %s. This means that " - "they are best placed in own packages, with each package " - "named after library name and version. " - % (pkgname, sorted(set(sonames)))) + "Package %s contains shared libraries, and their soname " + "versions are not in sync: %s. This means that " + "each soname is likely to be retired at a different time " + "and each soname is best placed in a separate package, " + "named after soname and version. " + % (pkgname, sonames)) # If the sonames aren't uniform, there's no point in trying to match # sonames versus pkgname. + messenger.SuggestGarLine( + "# Suggesting how to separate out shared libraries.") + messenger.SuggestGarLine( + "# You will most probably need to further edit these lines. " + "Use with caution!") for soname, binary_info in linkable_shared_libs: lib_path, lib_basename = os.path.split(binary_info["path"]) - messenger.SuggestGarLine( - "# Suggesting how to separate out %s" - % soname) - messenger.SuggestGarLine( - "# You will most probably need to further edit these lines. " - "Use with caution!") tmp = su.MakePackageNameBySoname(soname) policy_pkgname_list, policy_catalogname_list = tmp messenger.SuggestGarLine("PACKAGES += %s" % policy_pkgname_list[0]) messenger.SuggestGarLine( - "CATALOGNAME_%s += %s" + "CATALOGNAME_%s = %s" % (policy_pkgname_list[0], policy_catalogname_list[0])) messenger.SuggestGarLine( "PKGFILES_%s += /%s" @@ -1034,26 +1035,31 @@ messenger.SuggestGarLine( "PKGFILES_%s += /%s\.[0-9\.]+" % (policy_pkgname_list[0], os.path.join(lib_path, soname))) + pkginfo = pkg_data["pkginfo"] + description = " ".join(pkginfo["NAME"].split(" ")[2:]) messenger.SuggestGarLine( + "SPKG_DESC_%s += %s, %s" + % (policy_pkgname_list[0], description, soname)) + messenger.SuggestGarLine( "RUNTIME_DEP_PKGS_%s += %s" % (pkgname, policy_pkgname_list[0])) check_names = False else: - if multilib_pkgname != pkgname: + if pkgname not in multilib_pkgnames: error_mgr.ReportError( "shared-lib-pkgname-mismatch", "sonames=%s " "pkgname=%s " "expected=%s " - % (sorted(set(sonames)), pkgname, multilib_pkgname)) + % (sonames, pkgname, multilib_pkgnames)) messenger.Message( "The collection of sonames (%s) " "is expected to be in package " "named %s, but the package name is %s. " "More information: " "http://wiki.opencsw.org/checkpkg-error-tags" - % (sonames, multilib_pkgname, pkgname)) + % (sonames, multilib_pkgnames, pkgname)) check_names = False if check_names: for soname, binary_info in linkable_shared_libs: Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-14 23:07:54 UTC (rev 11301) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-14 23:47:41 UTC (rev 11302) @@ -4,6 +4,7 @@ import re import os.path + SPARCV8_PATHS = ('sparcv8', 'sparcv8-fsmuld', 'sparcv7', 'sparc') SPARCV8PLUS_PATHS = ('sparcv8plus+vis2', 'sparcv8plus+vis', 'sparcv8plus') @@ -15,9 +16,11 @@ LEGIT_CHAR_RE = re.compile(r"[a-zA-Z0-9\+]+") SONAME_VERSION_RE = re.compile("^(?P.*)\.so\.(?P[\d\.]+)$") + class SonameParsingException(Exception): pass + def IsLibraryLinkable(file_path): arch_subdirs = (SPARCV8_PATHS + SPARCV8PLUS_PATHS + SPARCV9_PATHS + INTEL_386_PATHS + AMD64_PATHS) @@ -107,11 +110,13 @@ m = SONAME_VERSION_RE.search(soname) if m: versions.append(m.groupdict()["version"]) + else: + versions.append("") versions_set = set(versions) if len(versions_set) > 1 or not versions_set: - return None + return (False, None) else: - return versions_set.pop() + return (True, versions_set.pop()) def MakePackageNameBySonameCollection(sonames): @@ -120,8 +125,8 @@ Try to find the largest common prefix in the sonames, and establish whether there is a common version to them. """ - common_version = GetCommonVersion(sonames) - if not common_version: + common_version_exists, common_version = GetCommonVersion(sonames) + if not common_version_exists: # If the sonames don't have a common version, they shouldn't be together # in one package. return None @@ -139,12 +144,16 @@ lcs = CollectionLongestCommonSubstring(copy.copy(common_substring_candidates)) pkgnames = [ "CSW" + SanitizeWithChar("lib%s%s" % (lcs, common_version), "-"), - "CSW" + SanitizeWithChar("lib%s-%s" % (lcs, common_version), "-"), ] + dashed = "CSW" + SanitizeWithChar("lib%s-%s" % (lcs, common_version), "-") + if dashed not in pkgnames: + pkgnames.append(dashed) catalognames = [ SanitizeWithChar("lib%s%s" % (lcs, common_version), "_"), - SanitizeWithChar("lib%s_%s" % (lcs, common_version), "_"), ] + underscored = SanitizeWithChar("lib%s_%s" % (lcs, common_version), "_") + if underscored not in catalognames: + catalognames.append(underscored) return pkgnames, catalognames Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-14 23:07:54 UTC (rev 11301) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-14 23:47:41 UTC (rev 11302) @@ -157,17 +157,21 @@ def testGetCommonVersionSimple(self): sonames = ["libfoo.so.0", "libfoo_util.so.0"] - self.assertEqual("0", su.GetCommonVersion(sonames)) + self.assertEqual((True, "0"), su.GetCommonVersion(sonames)) def testGetCommonVersionMore(self): sonames = ["libfoo.so.0.2.1", "libfoo_util.so.0.2.1"] - self.assertEqual("0.2.1", su.GetCommonVersion(sonames)) + self.assertEqual((True, "0.2.1"), su.GetCommonVersion(sonames)) def testGetCommonVersionInvalid(self): sonames = ["libfoo.so.0.2.1", "libfoo_util.so.0.2.3"] - self.assertEqual(None, su.GetCommonVersion(sonames)) + self.assertEqual((False, None), su.GetCommonVersion(sonames)) + def testGetCommonVersionEndsWithSo(self): + sonames = ["libfoo1.so", "libfoo1.so"] + self.assertEqual((True, ""), su.GetCommonVersion(sonames)) + class MakePackageNameBySonameCollectionUnitTest(unittest.TestCase): def testMakePackageNameBySonameCollectionTwo(self): @@ -198,7 +202,15 @@ sonames = ["libfoo.so.0", "libfoo_util.so.1"] self.assertEqual(None, su.MakePackageNameBySonameCollection(sonames)) + def testMakePackageNameBySonameCollectionMultipleSo(self): + sonames = ["libfoo1.so", "libfoo1.so"] + expected = ( + ["CSWlibfoo1"], + ["libfoo1"], + ) + self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames)) + class CommomSubstringTest(unittest.TestCase): def testLongestCommonSubstring_1(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 15 11:57:29 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 15 Oct 2010 09:57:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[11303] csw/mgar/pkg/nspr/trunk Message-ID: Revision: 11303 http://gar.svn.sourceforge.net/gar/?rev=11303&view=rev Author: wahwah Date: 2010-10-15 09:57:29 +0000 (Fri, 15 Oct 2010) Log Message: ----------- nspr4: upgrade to 4.8.6, rename to CSWlibnspr4. Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile csw/mgar/pkg/nspr/trunk/checksums Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2010-10-14 23:47:41 UTC (rev 11302) +++ csw/mgar/pkg/nspr/trunk/Makefile 2010-10-15 09:57:29 UTC (rev 11303) @@ -8,7 +8,7 @@ GARNAME = nspr MAJOR_VERSION = 4 -MIN_VERSION = 8 +MIN_VERSION = 8.6 GARVERSION = $(MAJOR_VERSION).$(MIN_VERSION) CATEGORIES = lib @@ -23,17 +23,28 @@ DISTFILES += LICENSE PATCHFILES = nspr-4.6.1-config.patch -PACKAGES = CSWnspr CSWnspr-devel -PKGFILES_CSWnspr-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWnspr-devel += $(bindir).*nspr-config -PKGFILES_CSWnspr-devel += .*/nspr\.pc -PKGFILES_CSWnspr-devel += .*compile-et\.pl +PACKAGES += CSWnspr +PACKAGES += CSWnspr-devel +PACKAGES += CSWlibnspr4-devel +PACKAGES += CSWlibnspr4 +PKGFILES_CSWlibnspr4-devel += $(PKGFILES_DEVEL) +PKGFILES_CSWlibnspr4-devel += $(bindir).*nspr-config +PKGFILES_CSWlibnspr4-devel += .*/nspr\.pc +PKGFILES_CSWlibnspr4-devel += .*compile-et\.pl +PKGFILES_CSWnspr = Invisible-Pink-Unicorn +PKGFILES_CSWnspr-devel = Flying-Spaghetti-Monster -SPKG_DESC_CSWnspr = Netscape Portable Runtime -SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime header files -CATALOGNAME_CSWnspr-devel = nspr_devel -RUNTIME_DEP_PKGS_CSWnspr-devel = CSWnspr -RUNTIME_DEP_PKGS_CSWnspr-devel += CSWperl +SPKG_DESC_CSWnspr = Empty, transitional package (CSWnspr) +SPKG_DESC_CSWnspr-devel = Empty, transitional package (CSWnspr-devel) +SPKG_DESC_CSWlibnspr4 = Netscape Portable Runtime +SPKG_DESC_CSWlibnspr4-devel = Netscape Portable Runtime, header files +CATALOGNAME_CSWnspr-devel = nspr_devel +CATALOGNAME_CSWlibnspr4-devel = nspr4_devel +RUNTIME_DEP_PKGS_CSWnspr = CSWlibnspr4 +RUNTIME_DEP_PKGS_CSWnspr-devel = CSWlibnspr4-devel +RUNTIME_DEP_PKGS_CSWlibnspr4-devel = CSWlibnspr4 +RUNTIME_DEP_PKGS_CSWlibnspr4-devel += CSWperl +ARCHALL_CSWnspr = 1 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -58,10 +69,10 @@ CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit CONFIGURE_ARGS_isa-amd64 = --enable-64bit CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) -CONFIGURE_ARGS_OPT = --enable-optimize="-xO3" +CONFIGURE_ARGS_OPT += --enable-optimize="-xO3" CONFIGURE_ARGS_OPT += --disable-debug CONFIGURE_ARGS_OPT += --enable-strip -CONFIGURE_ARGS_DBG = --enable-debug +CONFIGURE_ARGS_DBG += --enable-debug CONFIGURE_ARGS_DBG += --disable-strip CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) @@ -69,6 +80,16 @@ LICENSE = LICENSE +# Checkpkg suggests CSWlibp (the longest common substring), but we want the +# three libraries to be in one package. +CHECKPKG_OVERRIDES_CSWlibnspr4 += shared-lib-pkgname-mismatch + +CHECKPKG_OVERRIDES_CSWlibnspr4-devel += surplus-dependency|CSWlibnspr4 + +# For transitional packages +CHECKPKG_OVERRIDES_CSWnspr += surplus-dependency|CSWlibnspr4 +CHECKPKG_OVERRIDES_CSWnspr-devel += surplus-dependency|CSWlibnspr4-devel + include gar/category.mk configure-nspr: Modified: csw/mgar/pkg/nspr/trunk/checksums =================================================================== --- csw/mgar/pkg/nspr/trunk/checksums 2010-10-14 23:47:41 UTC (rev 11302) +++ csw/mgar/pkg/nspr/trunk/checksums 2010-10-15 09:57:29 UTC (rev 11303) @@ -1,3 +1 @@ -a932cf1d314e57b35153c4f672a95001 LICENSE -4720bb68a64bfa9188ac6318458b47d2 nspr-4.6.1-config.patch -e0916a72bcc6c427551ea262183fdb26 nspr-4.8.tar.gz +592c275728c29d193fdba8009165990b nspr-4.8.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Fri Oct 15 11:59:52 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Fri, 15 Oct 2010 09:59:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[11304] csw/mgar/pkg/lang-python/pycairo/trunk/Makefile Message-ID: Revision: 11304 http://gar.svn.sourceforge.net/gar/?rev=11304&view=rev Author: opk Date: 2010-10-15 09:59:52 +0000 (Fri, 15 Oct 2010) Log Message: ----------- revert name as we can't change both catalogue name and package name together (package predates convention on python package naming) Modified Paths: -------------- csw/mgar/pkg/lang-python/pycairo/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pycairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycairo/trunk/Makefile 2010-10-15 09:57:29 UTC (rev 11303) +++ csw/mgar/pkg/lang-python/pycairo/trunk/Makefile 2010-10-15 09:59:52 UTC (rev 11304) @@ -20,12 +20,10 @@ # new upstream software release UFILES_REGEX = py2cairo-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWpy-cairo +CATALOGNAME = py_cairo -CATALOGNAME_CSWpy-cairo = py_cairo -SPKG_DESC_CSWpy-cairo = $(DESCRIPTION) +RUNTIME_DEP_PKGS = CSWlibcairo CSWpython -RUNTIME_DEP_PKGS_CSWpy-cairo = CSWlibcairo CSWpython - CAIRO_LIBS = -L/opt/csw/lib -R/opt/csw/lib/\$$ISALIST -lcairo CAIRO_CFLAGS = -I/opt/csw/include -I/opt/csw/include/cairo EXTRA_CONFIGURE_EXPORTS += CAIRO_LIBS CAIRO_CFLAGS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 15 15:11:24 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 15 Oct 2010 13:11:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[11305] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 11305 http://gar.svn.sourceforge.net/gar/?rev=11305&view=rev Author: wahwah Date: 2010-10-15 13:11:24 +0000 (Fri, 15 Oct 2010) Log Message: ----------- nspr4: Adjusting libnspr4_devel catalogname. Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2010-10-15 09:59:52 UTC (rev 11304) +++ csw/mgar/pkg/nspr/trunk/Makefile 2010-10-15 13:11:24 UTC (rev 11305) @@ -39,7 +39,7 @@ SPKG_DESC_CSWlibnspr4 = Netscape Portable Runtime SPKG_DESC_CSWlibnspr4-devel = Netscape Portable Runtime, header files CATALOGNAME_CSWnspr-devel = nspr_devel -CATALOGNAME_CSWlibnspr4-devel = nspr4_devel +CATALOGNAME_CSWlibnspr4-devel = libnspr4_devel RUNTIME_DEP_PKGS_CSWnspr = CSWlibnspr4 RUNTIME_DEP_PKGS_CSWnspr-devel = CSWlibnspr4-devel RUNTIME_DEP_PKGS_CSWlibnspr4-devel = CSWlibnspr4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Fri Oct 15 18:35:54 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Fri, 15 Oct 2010 16:35:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[11306] csw/mgar/pkg/proftpd/trunk Message-ID: Revision: 11306 http://gar.svn.sourceforge.net/gar/?rev=11306&view=rev Author: aigoshin Date: 2010-10-15 16:35:54 +0000 (Fri, 15 Oct 2010) Log Message: ----------- proftpd: package release 20101015 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile csw/mgar/pkg/proftpd/trunk/checksums Added Paths: ----------- csw/mgar/pkg/proftpd/trunk/files/cswproftpd Removed Paths: ------------- csw/mgar/pkg/proftpd/trunk/files/CSWproftpd.gspec Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-15 13:11:24 UTC (rev 11305) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-15 16:35:54 UTC (rev 11306) @@ -1,7 +1,9 @@ GARNAME = proftpd -GARVERSION = 1.3.1 +GARVERSION = 1.3.3b CATEGORIES = server +GARCOMPILER = GCC3 + DESCRIPTION = Advanced, incredibly configurable and secure FTP daemon define BLURB ProFTPD is a proven, high-performance, scalable FTP server written from @@ -13,46 +15,55 @@ endef MASTER_SITES = ftp://ftp.proftpd.org/distrib/source/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWproftpd,) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += cswproftpd +LICENSE = COPYING + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -CONFIGURE_ARGS = $(DIRPATHS) +RUNTIME_DEP_PKGS = CSWosslrt CSWtcpwrap CSWggettextrt CSWiconv -# No test suite +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 + +EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 +EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv9 + +sysconfdir=/etc/opt/csw +localstatedir=/var/opt/csw + +CONFIGURE_ENV = install_user=$(USER) install_group=csw + +CONFIGURE_ARGS += --prefix=$(prefix) +CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) +CONFIGURE_ARGS += --localstatedir=/var/run/proftpd +CONFIGURE_ARGS += --mandir=$(prefix)/share/man +CONFIGURE_ARGS += --docdir=$(prefix)/share/doc/proftpd +CONFIGURE_ARGS += --enable-facl +CONFIGURE_ARGS += --enable-openssl +CONFIGURE_ARGS += --enable-sendfile +CONFIGURE_ARGS += --enable-nls +CONFIGURE_ARGS += --enable-ctrls +CONFIGURE_ARGS += --enable-buffer-size=8192 +CONFIGURE_ARGS += --with-includes=$(prefix)/include:$(prefix)/include/openssl +CONFIGURE_ARGS += --with-modules=mod_rewrite:mod_ifsession:mod_ratio:mod_tls:mod_readme:mod_auth_pam:mod_wrap:mod_radius:mod_ban + TEST_SCRIPTS = -INSTALL_SCRIPTS = custom +INITSMF = $(sysconfdir)/init.d/cswproftpd +PRESERVECONF = $(sysconfdir)/proftpd.conf -PROFTPDBIN=ftpcount ftpdctl ftpshut ftptop ftpwho -PROFTPDDOC=doc sample-configurations -PROFTPDMAN1=utils/ftpcount.1 utils/ftptop.1 utils/ftpwho.1 -PROFTPDMAN5=src/xferlog.5 -PROFTPDMAN8=src/ftpdctl.8 src/proftpd.8 +PROFTPDDOC = doc sample-configurations COPYING NEWS README RELEASE_NOTES -install-custom: - ginstall -d $(DESTDIR)$(prefix)/etc - ginstall -d $(DESTDIR)$(prefix)/bin - ginstall -d $(DESTDIR)$(prefix)/sbin - ginstall -d $(DESTDIR)$(prefix)/var/proftpd + +include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)$(sysconfdir)/init.d ginstall -d $(DESTDIR)$(prefix)/share/doc/proftpd - ginstall -d $(DESTDIR)$(prefix)/share/man/man1 - ginstall -d $(DESTDIR)$(prefix)/share/man/man5 - ginstall -d $(DESTDIR)$(prefix)/share/man/man8 - cd $(WORKSRC); \ - cp sample-configurations/basic.conf proftpd.conf.CSW; \ - cp proftpd.conf.CSW $(DESTDIR)$(prefix)/etc; \ - cp $(PROFTPDBIN) $(DESTDIR)$(prefix)/bin; \ - cp proftpd $(DESTDIR)$(prefix)/sbin; \ - chmod 755 $(DESTDIR)$(prefix)/sbin/proftpd; \ - cp -r $(PROFTPDDOC) $(DESTDIR)$(prefix)/share/doc/proftpd; \ - cp -r $(PROFTPDDOC) $(DESTDIR)$(prefix)/share/doc/proftpd; \ - cp $(PROFTPDMAN1) $(DESTDIR)$(prefix)/share/man/man1; \ - cp $(PROFTPDMAN1) $(DESTDIR)$(prefix)/share/man/man5; \ - cp $(PROFTPDMAN1) $(DESTDIR)$(prefix)/share/man/man8 + ginstall -d $(DESTDIR)$(localstatedir)/proftpd + ginstall -d $(DESTDIR)$(localstatedir)/proftpd/logs + cp $(WORKDIR)/cswproftpd $(DESTDIR)$(sysconfdir)/init.d/ + cd $(WORKSRC); cp -r $(PROFTPDDOC) $(DESTDIR)$(prefix)/share/doc/proftpd $(MAKECOOKIE) - - -include gar/category.mk Modified: csw/mgar/pkg/proftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/proftpd/trunk/checksums 2010-10-15 13:11:24 UTC (rev 11305) +++ csw/mgar/pkg/proftpd/trunk/checksums 2010-10-15 16:35:54 UTC (rev 11306) @@ -1,2 +1 @@ -175958df8de92d5209b7b1e2e23a5a28 download/proftpd-1.3.1.tar.bz2 -b3648813a40ab5e2df1dd0756805e36f download/CSWproftpd.gspec +721b8232fcac36317a6a1d29fa86250e proftpd-1.3.3b.tar.bz2 Deleted: csw/mgar/pkg/proftpd/trunk/files/CSWproftpd.gspec =================================================================== --- csw/mgar/pkg/proftpd/trunk/files/CSWproftpd.gspec 2010-10-15 13:11:24 UTC (rev 11305) +++ csw/mgar/pkg/proftpd/trunk/files/CSWproftpd.gspec 2010-10-15 16:35:54 UTC (rev 11306) @@ -1,4 +0,0 @@ -%var bitname proftpd -%var pkgname CSWproftpd -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/proftpd/trunk/files/cswproftpd =================================================================== --- csw/mgar/pkg/proftpd/trunk/files/cswproftpd (rev 0) +++ csw/mgar/pkg/proftpd/trunk/files/cswproftpd 2010-10-15 16:35:54 UTC (rev 11306) @@ -0,0 +1,31 @@ +#!/bin/sh +# +#RC_KNUM 20 +#RC_SNUM 88 +#RC_KLEV 0,1,S +#RC_SLEV 2 +#AUTOENABLE no +# + +case "$1" in + start) + [ ! -d /var/run/proftpd ] && mkdir /var/run/proftpd + /opt/csw/sbin/proftpd + ;; + stop) + pkill -f "\/opt\/csw\/sbin\/proftpd" + sleep 1 + ;; + restart) + $0 stop + $0 start + ;; + refresh) + [ -f /var/run/proftpd/proftpd.pid ] && kill -HUP `cat /var/run/proftpd/proftpd.pid` + ;; + *) + echo "Usage: $0 {start|stop|restart|refresh}" + exit 1 +esac + +exit 0 Property changes on: csw/mgar/pkg/proftpd/trunk/files/cswproftpd ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Fri Oct 15 19:04:09 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Fri, 15 Oct 2010 17:04:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[11307] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11307 http://gar.svn.sourceforge.net/gar/?rev=11307&view=rev Author: aigoshin Date: 2010-10-15 17:04:09 +0000 (Fri, 15 Oct 2010) Log Message: ----------- proftpd: package release 20101015 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-15 16:35:54 UTC (rev 11306) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-15 17:04:09 UTC (rev 11307) @@ -34,6 +34,7 @@ localstatedir=/var/opt/csw CONFIGURE_ENV = install_user=$(USER) install_group=csw +CONFIGURE_ENV += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CONFIGURE_ARGS += --prefix=$(prefix) CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Fri Oct 15 19:22:40 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Fri, 15 Oct 2010 17:22:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11308] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11308 http://gar.svn.sourceforge.net/gar/?rev=11308&view=rev Author: aigoshin Date: 2010-10-15 17:22:40 +0000 (Fri, 15 Oct 2010) Log Message: ----------- proftpd: package release 20101015 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-15 17:04:09 UTC (rev 11307) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-15 17:22:40 UTC (rev 11308) @@ -23,7 +23,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -RUNTIME_DEP_PKGS = CSWosslrt CSWtcpwrap CSWggettextrt CSWiconv +RUNTIME_DEP_PKGS = CSWosslrt CSWggettextrt CSWiconv PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 @@ -48,7 +48,7 @@ CONFIGURE_ARGS += --enable-ctrls CONFIGURE_ARGS += --enable-buffer-size=8192 CONFIGURE_ARGS += --with-includes=$(prefix)/include:$(prefix)/include/openssl -CONFIGURE_ARGS += --with-modules=mod_rewrite:mod_ifsession:mod_ratio:mod_tls:mod_readme:mod_auth_pam:mod_wrap:mod_radius:mod_ban +CONFIGURE_ARGS += --with-modules=mod_rewrite:mod_ifsession:mod_ratio:mod_tls:mod_readme:mod_auth_pam:mod_radius:mod_ban TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Fri Oct 15 19:47:43 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Fri, 15 Oct 2010 17:47:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11309] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11309 http://gar.svn.sourceforge.net/gar/?rev=11309&view=rev Author: aigoshin Date: 2010-10-15 17:47:43 +0000 (Fri, 15 Oct 2010) Log Message: ----------- proftpd: package release 20101015 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-15 17:22:40 UTC (rev 11308) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-15 17:47:43 UTC (rev 11309) @@ -48,7 +48,7 @@ CONFIGURE_ARGS += --enable-ctrls CONFIGURE_ARGS += --enable-buffer-size=8192 CONFIGURE_ARGS += --with-includes=$(prefix)/include:$(prefix)/include/openssl -CONFIGURE_ARGS += --with-modules=mod_rewrite:mod_ifsession:mod_ratio:mod_tls:mod_readme:mod_auth_pam:mod_radius:mod_ban +CONFIGURE_ARGS += --with-modules=mod_rewrite:mod_ifsession:mod_ratio:mod_tls:mod_readme:mod_auth_pam:mod_radius:mod_ban:mod_wrap2:mod_wrap2_file TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Fri Oct 15 19:52:05 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Fri, 15 Oct 2010 17:52:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11310] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11310 http://gar.svn.sourceforge.net/gar/?rev=11310&view=rev Author: aigoshin Date: 2010-10-15 17:52:05 +0000 (Fri, 15 Oct 2010) Log Message: ----------- proftpd: package release 20101015 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-15 17:47:43 UTC (rev 11309) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-15 17:52:05 UTC (rev 11310) @@ -40,7 +40,6 @@ CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) CONFIGURE_ARGS += --localstatedir=/var/run/proftpd CONFIGURE_ARGS += --mandir=$(prefix)/share/man -CONFIGURE_ARGS += --docdir=$(prefix)/share/doc/proftpd CONFIGURE_ARGS += --enable-facl CONFIGURE_ARGS += --enable-openssl CONFIGURE_ARGS += --enable-sendfile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Fri Oct 15 22:06:49 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Fri, 15 Oct 2010 20:06:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[11311] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 11311 http://gar.svn.sourceforge.net/gar/?rev=11311&view=rev Author: aigoshin Date: 2010-10-15 20:06:49 +0000 (Fri, 15 Oct 2010) Log Message: ----------- proftpd: package release 20101015 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-10-15 17:52:05 UTC (rev 11310) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-10-15 20:06:49 UTC (rev 11311) @@ -14,7 +14,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += cswnginx -LICENSE = LICENSE +LICENSE = LICENSE # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -78,7 +78,7 @@ INITSMF = $(sysconfdir)/init.d/cswnginx PRESERVECONF = $(sysconfdir)/nginx/fastcgi.conf $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf $(sysconfdir)/nginx/scgi_params $(sysconfdir)/nginx/uwsgi_params -NGINXDOCS = CHANGES CHANGES.ru LICENSE README +NGINXDOCS = CHANGES CHANGES.ru LICENSE README include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Fri Oct 15 22:09:35 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Fri, 15 Oct 2010 20:09:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[11312] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11312 http://gar.svn.sourceforge.net/gar/?rev=11312&view=rev Author: aigoshin Date: 2010-10-15 20:09:35 +0000 (Fri, 15 Oct 2010) Log Message: ----------- proftpd: package release 20101015 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-15 20:06:49 UTC (rev 11311) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-15 20:09:35 UTC (rev 11312) @@ -27,7 +27,7 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 +EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv9 sysconfdir=/etc/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Oct 16 02:21:42 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 16 Oct 2010 00:21:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11313] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Message-ID: Revision: 11313 http://gar.svn.sourceforge.net/gar/?rev=11313&view=rev Author: wahwah Date: 2010-10-16 00:21:41 +0000 (Sat, 16 Oct 2010) Log Message: ----------- submitpkg: Ground work for missing architectures check. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-10-15 20:09:35 UTC (rev 11312) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-10-16 00:21:41 UTC (rev 11313) @@ -33,6 +33,7 @@ import subprocess import sys import opencsw +import tag CONFIG_INFO = """Create a file in ~/.releases.ini with the following content: @@ -85,6 +86,29 @@ raise PackageSubmissionError(msg) +def RsyncFiles(files_to_rsync, dst_arg): + args = ["rsync", "-v"] + files_to_rsync + [dst_arg] + logging.debug(args) + try: + ret = subprocess.call(args) + except OSError, e: + raise PackageSubmissionError( + "Couldn't run %s, is the binary " + "in the $PATH? The error was: %s" % (repr(args[0]), e)) + if ret: + msg = ("Copying %s to %s has failed. " + "Are you on the login host?" % (p, dst_arg)) + logging.error(msg) + raise PackageSubmissionError(msg) + + +class FileSetChecker(object): + + def CheckFiles(self, file_list): + """Checks a set of files. Reports error tags.""" + pass + + def main(): try: config = ConfigParser.SafeConfigParser() @@ -113,6 +137,10 @@ dest="clean", default=True, action="store_false", help="Prevent submitpkg from deleting old files from newpkgs") + parser.add_option("-n", "--dry-run", + dest="dry_run", + default=False, action="store_true", + help="") (options, args) = parser.parse_args() file_names = args level = logging.INFO @@ -179,19 +207,11 @@ remote_package_references.append(dst_arg + "/" + package_base_file_name) if options.clean: RemoveOldFiles(catalognames, target_host, target_dir) - args = ["rsync", "-v"] + files_to_rsync + [dst_arg] - logging.debug(args) - try: - ret = subprocess.call(args) - except OSError, e: - raise PackageSubmissionError( - "Couldn't run %s, is the binary " - "in the $PATH? The error was: %s" % (repr(args[0]), e)) - if ret: - msg = ("Copying %s to %s has failed. " - "Are you on the login host?" % (p, dst_arg)) - logging.error(msg) - raise PackageSubmissionError(msg) + if options.dry_run: + print "files_to_rsync", files_to_rsync + print "dst_arg", dst_arg + else: + RsyncFiles(files_to_rsync, dst_arg) nm = opencsw.NewpkgMailer( catalognames, remote_package_references, release_mgr_name=release_mgr_name, @@ -200,18 +220,22 @@ sender_email=config.get(CONFIG_RELEASE_SECTION, "sender email"), release_cc=release_cc) mail_text = nm.FormatMail() - fd = open(DEFAULT_FILE_NAME, "w") - fd.write(mail_text) - fd.close() - text_editor = nm.GetEditorName(os.environ) - args = [text_editor, DEFAULT_FILE_NAME] - editor_ret = subprocess.call(args) - if editor_ret: - raise Error("File editing has failed.") - print - print "Your e-mail hasn't been sent yet!" - print "Issue the following command to have it sent:" - print "sendmail -t < %s" % DEFAULT_FILE_NAME + if options.dry_run: + print "Not writing the e-mail to disk." + print mail_text + else: + fd = open(DEFAULT_FILE_NAME, "w") + fd.write(mail_text) + fd.close() + text_editor = nm.GetEditorName(os.environ) + args = [text_editor, DEFAULT_FILE_NAME] + editor_ret = subprocess.call(args) + if editor_ret: + raise Error("File editing has failed.") + print + print "Your e-mail hasn't been sent yet!" + print "Issue the following command to have it sent:" + print "sendmail -t < %s" % DEFAULT_FILE_NAME if __name__ == '__main__': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Oct 16 02:22:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 16 Oct 2010 00:22:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11314] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11314 http://gar.svn.sourceforge.net/gar/?rev=11314&view=rev Author: wahwah Date: 2010-10-16 00:22:38 +0000 (Sat, 16 Oct 2010) Log Message: ----------- submitpkg: Tags are reported, and tags can be compared. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py csw/mgar/gar/v2/lib/python/tag.py csw/mgar/gar/v2/lib/python/tag_test.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py Property Changed: ---------------- csw/mgar/gar/v2/lib/python/tag_test.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-10-16 00:21:41 UTC (rev 11313) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-10-16 00:22:38 UTC (rev 11314) @@ -105,8 +105,27 @@ class FileSetChecker(object): def CheckFiles(self, file_list): - """Checks a set of files. Reports error tags.""" - pass + """Checks a set of files. Returns error tags.""" + catalognames_by_arch = { + "i386": set(), + "sparc": set(), + } + for file_path in file_list: + pkg_path, basename = os.path.split(file_path) + parsed = opencsw.ParsePackageFileName(basename) + if parsed["arch"] == "all": + for arch in ("i386", "sparc"): + catalognames_by_arch[arch].add(parsed["catalogname"]) + else: + catalognames_by_arch[parsed["arch"]].add(parsed["catalogname"]) + i386 = catalognames_by_arch["i386"] + sparc = catalognames_by_arch["sparc"] + tags = [] + for catalogname in i386.difference(sparc): + tags.append(tag.CheckpkgTag(None, "sparc-arch-missing", catalogname)) + for catalogname in sparc.difference(i386): + tags.append(tag.CheckpkgTag(None, "i386-arch-missing", catalogname)) + return tags def main(): Added: csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py (rev 0) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2010-10-16 00:22:38 UTC (rev 11314) @@ -0,0 +1,26 @@ +#!/opt/csw/bin/python2.6 + +import unittest +import submit_to_newpkgs as stn +import tag + +SAMPLE_FILES = [ + # This file intentionally missing. + # '/home/experimental/maciej/libnspr4-4.8.6,REV=2010.10.16-SunOS5.9-i386-CSW.pkg.gz', + '/home/experimental/maciej/libnspr4-4.8.6,REV=2010.10.16-SunOS5.9-sparc-CSW.pkg.gz', + '/home/experimental/maciej/libnspr4_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-CSW.pkg.gz', + '/home/experimental/maciej/libnspr4_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-CSW.pkg.gz', + '/home/experimental/maciej/nspr-4.8.6,REV=2010.10.16-SunOS5.9-all-CSW.pkg.gz', + '/home/experimental/maciej/nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-CSW.pkg.gz', + '/home/experimental/maciej/nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-CSW.pkg.gz', +] + +class FileSetCheckerUnitTest(unittest.TestCase): + + def testNsprFiles(self): + fc = stn.FileSetChecker() + expected = [tag.CheckpkgTag(None, 'i386-arch-missing', 'libnspr4')] + self.assertEqual(expected, fc.CheckFiles(SAMPLE_FILES)) + +if __name__ == '__main__': + unittest.main() Property changes on: csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/gar/v2/lib/python/tag.py =================================================================== --- csw/mgar/gar/v2/lib/python/tag.py 2010-10-16 00:21:41 UTC (rev 11313) +++ csw/mgar/gar/v2/lib/python/tag.py 2010-10-16 00:22:38 UTC (rev 11314) @@ -35,7 +35,20 @@ % (self.pkgname, self.tag_name, tag_postfix)) return "\n".join(msg_lines) + def __eq__(self, other): + value = ( + self.pkgname == other.pkgname + and + self.tag_name == other.tag_name + and + self.tag_info == other.tag_info + and + self.severity == other.severity + and + self.msg == other.msg) + return value + def ParseTagLine(line): """Parses a line from the tag.${module} file. Modified: csw/mgar/gar/v2/lib/python/tag_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/tag_test.py 2010-10-16 00:21:41 UTC (rev 11313) +++ csw/mgar/gar/v2/lib/python/tag_test.py 2010-10-16 00:22:38 UTC (rev 11314) @@ -1,3 +1,4 @@ +#!/opt/csw/bin/python2.6 # $Id$ # coding=utf-8 @@ -19,7 +20,12 @@ t = tag.CheckpkgTag("CSWfoo", "bar", "a b c") self.assertEquals(u'CHECKPKG_OVERRIDES_CSWfoo += bar|a|b|c', t.ToGarSyntax()) + def testComparison(self): + t1 = tag.CheckpkgTag("CSWfoo", "bar", "a b c") + t2 = tag.CheckpkgTag("CSWfoo", "bar", "a b c") + self.assertEquals(t1, t2) + class ParseTagLineUnitTest(unittest.TestCase): def testParseTagLine1(self): Property changes on: csw/mgar/gar/v2/lib/python/tag_test.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Oct 16 02:23:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 16 Oct 2010 00:23:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[11315] csw/mgar/gar/v2 Message-ID: Revision: 11315 http://gar.svn.sourceforge.net/gar/?rev=11315&view=rev Author: wahwah Date: 2010-10-16 00:23:21 +0000 (Sat, 16 Oct 2010) Log Message: ----------- mGAR: checkpkg, added new test file to common tests, and fixed a bug caucht by a unit test in shared libraries code. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/tests/run_tests.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-16 00:22:38 UTC (rev 11314) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-16 00:23:21 UTC (rev 11315) @@ -1001,7 +1001,10 @@ if len(linkable_shared_libs) > 1: sonames = sorted(set([x[0] for x in linkable_shared_libs])) tmp = su.MakePackageNameBySonameCollection(sonames) - multilib_pkgnames, multilib_catalogname = tmp + if tmp: + multilib_pkgnames, multilib_catalogname = tmp + else: + multilib_pkgnames, multilib_catalogname = (None, None) if not multilib_pkgnames: error_mgr.ReportError( "non-uniform-lib-versions-in-package", Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2010-10-16 00:22:38 UTC (rev 11314) +++ csw/mgar/gar/v2/tests/run_tests.py 2010-10-16 00:23:21 UTC (rev 11315) @@ -19,6 +19,7 @@ from catalog_test import * from package_test import * from package_stats_test import * +from submit_to_newpkgs_test import * # These are very slow GAR tests, which I'm disabling for now. # from example_test import * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Oct 16 02:23:40 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 16 Oct 2010 00:23:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11316] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Message-ID: Revision: 11316 http://gar.svn.sourceforge.net/gar/?rev=11316&view=rev Author: wahwah Date: 2010-10-16 00:23:40 +0000 (Sat, 16 Oct 2010) Log Message: ----------- submitpkg: Reporting an error when one architecture is missing. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-10-16 00:23:21 UTC (rev 11315) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-10-16 00:23:40 UTC (rev 11316) @@ -224,6 +224,15 @@ remote_package_files.append(dst_arg) package_base_file_name = os.path.split(p)[1] remote_package_references.append(dst_arg + "/" + package_base_file_name) + fc = FileSetChecker() + error_tags = fc.CheckFiles(files_to_rsync) + if error_tags: + for error_tag in error_tags: + print error_tag + print( + "There is a package that is available for one architecture, " + "but not the other.") + sys.exit(1) if options.clean: RemoveOldFiles(catalognames, target_host, target_dir) if options.dry_run: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Mon Oct 18 10:16:22 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Mon, 18 Oct 2010 08:16:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11317] csw/mgar/pkg/lang-python Message-ID: Revision: 11317 http://gar.svn.sourceforge.net/gar/?rev=11317&view=rev Author: opk Date: 2010-10-18 08:16:22 +0000 (Mon, 18 Oct 2010) Log Message: ----------- add package for python-dateutil Added Paths: ----------- csw/mgar/pkg/lang-python/python-dateutil/ csw/mgar/pkg/lang-python/python-dateutil/Makefile csw/mgar/pkg/lang-python/python-dateutil/branches/ csw/mgar/pkg/lang-python/python-dateutil/tags/ csw/mgar/pkg/lang-python/python-dateutil/trunk/ csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile csw/mgar/pkg/lang-python/python-dateutil/trunk/checksums csw/mgar/pkg/lang-python/python-dateutil/trunk/files/ Added: csw/mgar/pkg/lang-python/python-dateutil/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/python-dateutil/Makefile 2010-10-18 08:16:22 UTC (rev 11317) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/lang-python/python-dateutil/Makefile ___________________________________________________________________ Added: svn:keywords + URL Id Property changes on: csw/mgar/pkg/lang-python/python-dateutil/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile 2010-10-18 08:16:22 UTC (rev 11317) @@ -0,0 +1,34 @@ +# $Id$ +GARNAME = python-dateutil +GARVERSION = 1.5 +CATEGORIES = python + +DESCRIPTION = Dateutil provides powerful extensions to the standard python datetime module +define BLURB + Dateutil offers functionality such as computing relative time deltas, + computing dates based on flexible recurrence rules, generic parsing of + dates, handling of tzfile(5) format files and computing of Easter + Sunday for various calendars. +endef + +MASTER_SITES = http://labix.org/download/$(GARNAME)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +SPKG_SOURCEURL = http://labix.org/$(GARNAME)/ +BUILD_DEP_PKGS = CSWpysetuptools +PACKAGES = CSWpy-dateutil +CATALOGNAME = py_dateutil + +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +TEST_SCRIPTS = dateutil + +LICENSE = LICENSE +ARCHALL = 1 + +include gar/category.mk + +test-dateutil: + (cd $(WORKSRC); python test.py) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/python-dateutil/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/python-dateutil/trunk/checksums 2010-10-18 08:16:22 UTC (rev 11317) @@ -0,0 +1 @@ +35f3732db3f2cc4afdc68a8533b60a52 python-dateutil-1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Mon Oct 18 11:15:45 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Mon, 18 Oct 2010 09:15:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[11318] csw/mgar/pkg/lang-python Message-ID: Revision: 11318 http://gar.svn.sourceforge.net/gar/?rev=11318&view=rev Author: opk Date: 2010-10-18 09:15:45 +0000 (Mon, 18 Oct 2010) Log Message: ----------- add package for pytz python module Added Paths: ----------- csw/mgar/pkg/lang-python/pytz/ csw/mgar/pkg/lang-python/pytz/branches/ csw/mgar/pkg/lang-python/pytz/tags/ csw/mgar/pkg/lang-python/pytz/trunk/ csw/mgar/pkg/lang-python/pytz/trunk/Makefile csw/mgar/pkg/lang-python/pytz/trunk/checksums csw/mgar/pkg/lang-python/pytz/trunk/files/ Property changes on: csw/mgar/pkg/lang-python/pytz/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/lang-python/pytz/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2010-10-18 09:15:45 UTC (rev 11318) @@ -0,0 +1,28 @@ +# $Id$ +GARNAME = pytz +GARVERSION = 2010l +CATEGORIES = python + +DESCRIPTION = Pytz brings the Olson timezone database into Python. +define BLURB + pytz brings the Olson tz database into Python. This library allows + accurate and cross platform timezone calculations using Python 2.3 + or higher. It also solves the issue of ambiguous times at the end + of daylight savings, which you can read more about in the Python + Library Reference (datetime.tzinfo). +endef + +MASTER_SITES = http://pypi.python.org/packages/source/p/pytz/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +SPKG_SOURCEURL = http://$(GARNAME).sourceforge.net/ +PACKAGES = CSWpy-tz +CATALOGNAME = py_tz + +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc + +UFILES_REGEX = $(GARNAME)-(\d+[a-z]).tar.bz2 + +LICENSE = LICENSE.txt +ARCHALL = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/pytz/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/pytz/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/pytz/trunk/checksums 2010-10-18 09:15:45 UTC (rev 11318) @@ -0,0 +1 @@ +8ea38ffd627f2169b597442928ea5967 pytz-2010l.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 18 12:27:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Oct 2010 10:27:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[11319] csw/mgar/pkg/adobereader/trunk/Makefile Message-ID: Revision: 11319 http://gar.svn.sourceforge.net/gar/?rev=11319&view=rev Author: dmichelsen Date: 2010-10-18 10:27:35 +0000 (Mon, 18 Oct 2010) Log Message: ----------- adobereader: Fix Solaris Sparc 9 version #4577 Modified Paths: -------------- csw/mgar/pkg/adobereader/trunk/Makefile Modified: csw/mgar/pkg/adobereader/trunk/Makefile =================================================================== --- csw/mgar/pkg/adobereader/trunk/Makefile 2010-10-18 09:15:45 UTC (rev 11318) +++ csw/mgar/pkg/adobereader/trunk/Makefile 2010-10-18 10:27:35 UTC (rev 11319) @@ -11,8 +11,11 @@ define BLURB endef -MASTER_SITES_sparc = ftp://ftp.adobe.com/pub/adobe/reader/unix/$(shell echo $(GARVERSION_sparc) | cut -d. -f1).x/$(GARVERSION_sparc)/enu/ -MASTER_SITES_i386 = ftp://ftp.adobe.com/pub/adobe/reader/unix/$(shell echo $(GARVERSION_i386) | cut -d. -f1).x/$(GARVERSION_i386)/enu/ +MAJORVERSION_sparc = $(shell echo $(GARVERSION_sparc) | cut -d. -f1) +MAJORVERSION_i386 = $(shell echo $(GARVERSION_i386) | cut -d. -f1) + +MASTER_SITES_sparc = ftp://ftp.adobe.com/pub/adobe/reader/unix/$(MAJORVERSION_sparc).x/$(GARVERSION_sparc)/enu/ +MASTER_SITES_i386 = ftp://ftp.adobe.com/pub/adobe/reader/unix/$(MAJORVERSION_i386).x/$(GARVERSION_i386)/enu/ MASTER_SITES = $(MASTER_SITES_sparc) $(MASTER_SITES_i386) DISTFILES_sparc = AdobeReader_enu-$(FILEVERSION_sparc)-1.sparc.tar.bz2 DISTFILES_i386 = AdbeRdr$(FILEVERSION_i386)-1_i486solaris_enu.tar.bz2 @@ -43,15 +46,24 @@ CHECKPKG_OVERRIDES += bad-rpath-entry CHECKPKG_OVERRIDES += soname-not-found +# Can't check the library depepdency as this is done via LD_LIBRARY_PATH in the run scri\xC3pt +CHECKPKG_OVERRIDES_sparc += surplus-dependency|CSWpango +CHECKPKG_OVERRIDES += $(CHECKPKG_OVERRIDES_$(GARCH)) + +RUNTIME_DEP_PKGS_sparc = CSWpango +RUNTIME_DEP_PKGS = $(RUNTIME_DEP_PKGS_$(GARCH)) + include gar/category.mk install-custom: ginstall -d $(DESTDIR)$(sharedstatedir) cd $(WORKSRC) && ./INSTALL --install_path=$(DESTDIR)$(sharedstatedir) ginstall -d $(DESTDIR)$(bindir) - ln -s ../share/Adobe/Reader9/bin/acroread $(DESTDIR)$(bindir)/acroread + ln -s ../share/Adobe/Reader$(MAJORVERSION_$(GARCH))/bin/acroread $(DESTDIR)$(bindir)/acroread @$(MAKECOOKIE) +# Entries with spaces in the filepath are not allowed in the pkgmap. +# Adjust the directory path to the help pages in 8.1.7 post-install-modulated: cd $(DESTDIR); find . -type d -name "* *" | \ while read F; do \ @@ -64,3 +76,9 @@ mv "$$F" $$N; \ done; @$(MAKECOOKIE) + +# The older Sparc version needs libpangoxft-1.0.so.0 from CSWpango (or another location) +# Make sure it can be found by explicitly setting LD_LIBRARY_PATH in environment setting +post-install-isa-sparcv8: + perl -i -npe 'if( /^ACRO_LD_LIBRARY_PATH=/ ) { print "LD_LIBRARY_PATH=$(libdir)\n" }' $(DESTDIR)$(sharedstatedir)/Adobe/Reader$(MAJORVERSION_$(GARCH))/bin/acroread + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 18 14:39:43 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Oct 2010 12:39:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11320] csw/mgar/pkg/mtools/trunk Message-ID: Revision: 11320 http://gar.svn.sourceforge.net/gar/?rev=11320&view=rev Author: dmichelsen Date: 2010-10-18 12:39:43 +0000 (Mon, 18 Oct 2010) Log Message: ----------- mtools: Update to 4.0.15 Modified Paths: -------------- csw/mgar/pkg/mtools/trunk/Makefile csw/mgar/pkg/mtools/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/mtools/trunk/files/0001-Removeprototypes-unknown-to-Sun-Studio.patch Modified: csw/mgar/pkg/mtools/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtools/trunk/Makefile 2010-10-18 10:27:35 UTC (rev 11319) +++ csw/mgar/pkg/mtools/trunk/Makefile 2010-10-18 12:39:43 UTC (rev 11320) @@ -1,8 +1,8 @@ GARNAME = mtools -GARVERSION = 4.0.13 +GARVERSION = 4.0.15 CATEGORIES = utils -DESCRIPTION = read/write/list/format DOS disks under Unix +DESCRIPTION = Read/write/list/format DOS disks under Unix define BLURB Mtools is a collection of utilities to access MS-DOS disks from GNU and Unix without mounting them. It supports long file names, OS/2 Xdf @@ -10,17 +10,15 @@ 3 1/2 disk). endef -MASTER_SITES = http://ftp.gnu.org/gnu/mtools/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PATCHFILES = 0001-Removeprototypes-unknown-to-Sun-Studio.patch +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.lz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.lz -# X11 is also used, but Openwin X11 is sufficient. RUNTIME_DEP_PKGS = CSWiconv -EXTRA_LINKER_FLAGS = -liconv +EXTRA_LINKER_FLAGS = -liconv -lnsl CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/mtools/trunk/checksums =================================================================== --- csw/mgar/pkg/mtools/trunk/checksums 2010-10-18 10:27:35 UTC (rev 11319) +++ csw/mgar/pkg/mtools/trunk/checksums 2010-10-18 12:39:43 UTC (rev 11320) @@ -1,2 +1 @@ -b3625d680ccc02b0a941e98c5bd36118 0001-Removeprototypes-unknown-to-Sun-Studio.patch -334fe1580d6e3f4b5c904ce097267477 mtools-4.0.13.tar.bz2 +59f49e8290997d6c1ae0c330e8899287 mtools-4.0.15.tar.lz Deleted: csw/mgar/pkg/mtools/trunk/files/0001-Removeprototypes-unknown-to-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/mtools/trunk/files/0001-Removeprototypes-unknown-to-Sun-Studio.patch 2010-10-18 10:27:35 UTC (rev 11319) +++ csw/mgar/pkg/mtools/trunk/files/0001-Removeprototypes-unknown-to-Sun-Studio.patch 2010-10-18 12:39:43 UTC (rev 11320) @@ -1,25 +0,0 @@ -From acaf71a39ce5155d336b0fcdfea3a475952bcfdf Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 26 Nov 2009 10:10:13 +0100 -Subject: [PATCH] Removeprototypes unknown to Sun Studio - ---- - mtools.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/mtools.h b/mtools.h -index 0d4fa6f..94ffc63 100644 ---- a/mtools.h -+++ b/mtools.h -@@ -251,7 +251,7 @@ char getDrive(Stream_t *Stream); - - - void printOom(void); --int ask_confirmation(const char *, ...) __attribute__ ((format (printf, 1, 2))); -+int ask_confirmation(const char *, ...); - - int helpFlag(int, char **); - --- -1.6.5.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 18 14:39:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Oct 2010 12:39:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[11321] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 11321 http://gar.svn.sourceforge.net/gar/?rev=11321&view=rev Author: dmichelsen Date: 2010-10-18 12:39:56 +0000 (Mon, 18 Oct 2010) Log Message: ----------- mGAR v2: Use sane vendor URL for GNU projects Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-10-18 12:39:43 UTC (rev 11320) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-10-18 12:39:56 UTC (rev 11321) @@ -152,7 +152,10 @@ SPKG_DESC ?= $(DESCRIPTION) SPKG_VERSION ?= $(GARVERSION) SPKG_CATEGORY ?= application -SPKG_SOURCEURL ?= $(firstword $(VENDOR_URL) $(MASTER_SITES) $(GIT_REPOS)) +SPKG_SOURCEURL ?= $(firstword $(VENDOR_URL) \ + $(if $(filter $(GNU_MIRROR),$(MASTER_SITES)),http://www.gnu.org/software/$(GNU_PROJ)) \ + $(MASTER_SITES) \ + $(GIT_REPOS)) SPKG_VENDOR ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER) SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S') SPKG_BASEDIR ?= $(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 18 15:10:34 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 18 Oct 2010 13:10:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[11322] csw/mgar/pkg/bind/trunk Message-ID: Revision: 11322 http://gar.svn.sourceforge.net/gar/?rev=11322&view=rev Author: bonivart Date: 2010-10-18 13:10:34 +0000 (Mon, 18 Oct 2010) Log Message: ----------- bind: update to 9.7.2-P2 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2010-10-18 12:39:56 UTC (rev 11321) +++ csw/mgar/pkg/bind/trunk/Makefile 2010-10-18 13:10:34 UTC (rev 11322) @@ -6,11 +6,11 @@ CATEGORIES = net # Enable these for Px-releases -#RELEASE = P2 -#DISTVERSION = $(GARVERSION)-$(RELEASE) -#SPKG_VERSION = $(GARVERSION)$(RELEASE) -#DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE) -#WORKSRC = $(WORKDIR)/$(DISTNAME) +RELEASE = P2 +DISTVERSION = $(GARVERSION)-$(RELEASE) +SPKG_VERSION = $(GARVERSION)$(RELEASE) +DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE) +WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation define BLURB @@ -21,12 +21,12 @@ endef # Enable these for Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ -#DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ +DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/ +#DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWbindchroot.postinstall @@ -87,11 +87,13 @@ SPKG_SOURCEURL = http://www.isc.org/software/bind -#CHECKPKG_OVERRIDES = symbol-not-found -CHECKPKG_OVERRIDES_CSWbinddevel += surplus-dependency|CSWbind -CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils -CHECKPKG_OVERRIDES_CSWbindchroot += surplus-dependency|CSWbind -CHECKPKG_OVERRIDES_CSWbinddevel += archall-devel-package +CHECKPKG_OVERRIDES_CSWlibbind += non-uniform-lib-versions-in-package|sonames=['libbind9.so.60',|'libdns.so.69',|'libisc.so.62',|'libisccc.so.60',|'libisccfg.so.62',|'liblwres.so.60'] +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libbind9.so +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libdns.so +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libisc.so +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libisccc.so +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libisccfg.so +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblwres.so include gar/category.mk Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2010-10-18 12:39:56 UTC (rev 11321) +++ csw/mgar/pkg/bind/trunk/checksums 2010-10-18 13:10:34 UTC (rev 11322) @@ -1 +1 @@ -166832fc0f94d6e4eb2dac8bed3b275f bind-9.7.2.tar.gz +e74de6ec9c2cd27576794c873bd85f4a bind-9.7.2-P2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 18 15:24:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Oct 2010 13:24:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[11323] csw/mgar/pkg/mantis/trunk Message-ID: Revision: 11323 http://gar.svn.sourceforge.net/gar/?rev=11323&view=rev Author: dmichelsen Date: 2010-10-18 13:24:12 +0000 (Mon, 18 Oct 2010) Log Message: ----------- mantis: Update to 1.2.3 Modified Paths: -------------- csw/mgar/pkg/mantis/trunk/Makefile csw/mgar/pkg/mantis/trunk/checksums Modified: csw/mgar/pkg/mantis/trunk/Makefile =================================================================== --- csw/mgar/pkg/mantis/trunk/Makefile 2010-10-18 13:10:34 UTC (rev 11322) +++ csw/mgar/pkg/mantis/trunk/Makefile 2010-10-18 13:24:12 UTC (rev 11323) @@ -1,5 +1,5 @@ GARNAME = mantisbt -GARVERSION = 1.2.0 +GARVERSION = 1.2.3 CATEGORIES = apps DESCRIPTION = Mantis is a free popular web-based bugtracking system @@ -35,13 +35,19 @@ POSTMSG = $(docdir)/$(CATALOGNAME)/$(PACKAGES).postmsg +CHECKPKG_OVERRIDES_CSWmantis += surplus-dependency|CSWphp5mysql +CHECKPKG_OVERRIDES_CSWmantis += surplus-dependency|CSWap2modphp5 +CHECKPKG_OVERRIDES_CSWmantis += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWmantis += surplus-dependency|CSWphp5session + include gar/category.mk install-custom: @echo " ==> Installing $(GARNAME)" ginstall -d $(DESTDIR)$(sharedstatedir)/www/mantis/htdocs - cd $(WORKSRC) && tar cf - . | ( cd $(DESTDIR)$(sharedstatedir)/www/mantis/htdocs; tar xvf - ) - find $(DESTDIR)$(sharedstatedir)/www/mantis/htdocs -name .cvsignore -exec rm \{\} \; + (echo ".git"; echo ".cvsignore") >$(WORKDIR)/tarexclude + cd $(WORKSRC) && tar cfX - $(abspath $(WORKDIR)/tarexclude) . | ( cd $(DESTDIR)$(sharedstatedir)/www/mantis/htdocs; tar xvf - ) + #find $(DESTDIR)$(sharedstatedir)/www/mantis/htdocs -name .cvsignore -exec rm \{\} \; ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs ln -s $(sharedstatedir)/www/mantis/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/mantis ginstall -d $(PKGROOT)$(docdir)/$(CATALOGNAME)/ Modified: csw/mgar/pkg/mantis/trunk/checksums =================================================================== --- csw/mgar/pkg/mantis/trunk/checksums 2010-10-18 13:10:34 UTC (rev 11322) +++ csw/mgar/pkg/mantis/trunk/checksums 2010-10-18 13:24:12 UTC (rev 11323) @@ -1,3 +1 @@ -1595f79fe473ab5490496c4067240599 CSWmantis.postmsg -96401030529fc97656cf78d4f7b170e7 CSWmantis.preinstall -0c129b1cdfc1d9eef7688f9b6128a726 mantisbt-1.2.0.tar.gz +2bdefcf858643d1a212b7d8dd3d3d10b mantisbt-1.2.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 18 15:50:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Oct 2010 13:50:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[11324] csw/mgar/pkg/shmux/trunk/Makefile Message-ID: Revision: 11324 http://gar.svn.sourceforge.net/gar/?rev=11324&view=rev Author: dmichelsen Date: 2010-10-18 13:50:15 +0000 (Mon, 18 Oct 2010) Log Message: ----------- shmux: Add license Modified Paths: -------------- csw/mgar/pkg/shmux/trunk/Makefile Modified: csw/mgar/pkg/shmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/shmux/trunk/Makefile 2010-10-18 13:24:12 UTC (rev 11323) +++ csw/mgar/pkg/shmux/trunk/Makefile 2010-10-18 13:50:15 UTC (rev 11324) @@ -25,6 +25,8 @@ # release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +LICENSE = LICENSE + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 18 16:34:28 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 18 Oct 2010 14:34:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[11325] csw/mgar/pkg/bind/trunk/Makefile Message-ID: Revision: 11325 http://gar.svn.sourceforge.net/gar/?rev=11325&view=rev Author: bonivart Date: 2010-10-18 14:34:27 +0000 (Mon, 18 Oct 2010) Log Message: ----------- bind: more overrides Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2010-10-18 13:50:15 UTC (rev 11324) +++ csw/mgar/pkg/bind/trunk/Makefile 2010-10-18 14:34:27 UTC (rev 11325) @@ -87,6 +87,10 @@ SPKG_SOURCEURL = http://www.isc.org/software/bind +CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils +CHECKPKG_OVERRIDES_CSWbindchroot += surplus-dependency|CSWbind +CHECKPKG_OVERRIDES_CSWbinddevel += archall-devel-package +CHECKPKG_OVERRIDES_CSWbinddevel += surplus-dependency|CSWbind CHECKPKG_OVERRIDES_CSWlibbind += non-uniform-lib-versions-in-package|sonames=['libbind9.so.60',|'libdns.so.69',|'libisc.so.62',|'libisccc.so.60',|'libisccfg.so.62',|'liblwres.so.60'] CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libbind9.so CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libdns.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Mon Oct 18 17:56:22 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Mon, 18 Oct 2010 15:56:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11326] csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Message-ID: Revision: 11326 http://gar.svn.sourceforge.net/gar/?rev=11326&view=rev Author: opk Date: 2010-10-18 15:56:22 +0000 (Mon, 18 Oct 2010) Log Message: ----------- split into separate packages for -devel and the library Modified Paths: -------------- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2010-10-18 14:34:27 UTC (rev 11325) +++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2010-10-18 15:56:22 UTC (rev 11326) @@ -13,16 +13,30 @@ STRIP_LIBTOOL = 1 -PACKAGES = CSWpygobject -RUNTIME_DEP_PKGS_CSWpygobject = CSWpython CSWggettextrt CSWglib2 +PACKAGES = CSWpy-gobject-devel CSWpygobject CSWlibpyglib-2-0-python0 CATALOGNAME_CSWpygobject = py_gobject SPKG_DESC_CSWpygobject = $(DESCRIPTION) +CHECKPKG_OVERRIDES_CSWpygobject += pkgname-does-not-start-with-CSWpy- +RUNTIME_DEP_PKGS_CSWpygobject = CSWpython CSWggettextrt CSWglib2 +RUNTIME_DEP_PKGS_CSWpygobject += CSWlibpyglib-2-0-python0 +PKGFILES_CSWpygobject = $(libdir)/python/site-packages/.* + +SPKG_DESC_CSWlibpyglib-2-0-python0 = Runtime library for the Python GObject library +CATALOGNAME_CSWlibpyglib-2-0-python0 = libpyglib_2_0_python0 +PKGFILES_CSWlibpyglib-2-0-python0 = $(libdir)/libpyglib-2.0-python.so.0.* +RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-python0 = CSWggettextrt CSWglib2 + +SPKG_DESC_CSWpy-gobject-devel = Development files for the Python GObject library +CATALOGNAME_CSWpy-gobject-devel = py_gobject_devel +RUNTIME_DEP_PKGS_CSWpy-gobject-devel = CSWpython +ARCHALL_CSWpy-gobject-devel = 1 + PYCOMPILE = 1 PATCHFILES = 0001-forcing-lglib-2.0.patch -EXTRA_MERGE_EXCLUDE_FILES += .*\.egg-info.* .*\.pyo .*\.pyc +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc UFILES_REGEX = (\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 18 19:04:27 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 18 Oct 2010 17:04:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[11327] csw/mgar/pkg Message-ID: Revision: 11327 http://gar.svn.sourceforge.net/gar/?rev=11327&view=rev Author: wahwah Date: 2010-10-18 17:04:26 +0000 (Mon, 18 Oct 2010) Log Message: ----------- v8: Initial commit. Modified Paths: -------------- csw/mgar/pkg/v8/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/v8/ Modified: csw/mgar/pkg/v8/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/v8/trunk/Makefile 2010-10-18 17:04:26 UTC (rev 11327) @@ -2,184 +2,43 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = v8 +GARVERSION = bleeding_edge CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = Google\'s open source JavaScript engine define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +SPKG_SOURCEURL = http://code.google.com/p/v8/ -#include gar/category.mk +MASTER_SITES = svn-http://v8.googlecode.com/svn/branches/ +# svn checkout http://v8.googlecode.com/svn/branches/bleeding_edge/ v8 +PATCHFILES += 0001-uninitialized-member-v8-internal-Sampler-synchronous.patch +DISTFILES = $(GARVERSION) +NOCHECKSUM = $(GARVERSION) +# $(GARNAME)-$(GARVERSION).tar.gz +# UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +BUILD_DEP_PKGS += CSWscons +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = v8 +INSTALL_SCRIPTS = v8 +TEST_SCRIPTS = +GARCOMPILER = GNU + +include gar/category.mk + +build-v8: + (cd $(WORKSRC); mkdir -p build-solaris; \ + CC=/opt/csw/gcc4/bin/gcc \ + CXX=/opt/csw/gcc4/bin/g++ \ + RANLIB=/opt/csw/gcc4/bin/ranlib \ + LD=/opt/csw/bin/gld \ + AR=/opt/csw/bin/gar \ + SHCXX=/opt/csw/gcc4/bin/g++ \ + LINKFLAGS='-R/opt/csw/gcc4/lib' \ + scons -Y .. \ + visibility=default library=shared toolchain=gcc soname=on -j3) + @$(MAKECOOKIE) + +install-v8: + false This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 18 22:09:30 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 18 Oct 2010 20:09:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[11328] csw/mgar/pkg/v8/trunk/Makefile Message-ID: Revision: 11328 http://gar.svn.sourceforge.net/gar/?rev=11328&view=rev Author: wahwah Date: 2010-10-18 20:09:30 +0000 (Mon, 18 Oct 2010) Log Message: ----------- v8: It builds now. Modified Paths: -------------- csw/mgar/pkg/v8/trunk/Makefile Modified: csw/mgar/pkg/v8/trunk/Makefile =================================================================== --- csw/mgar/pkg/v8/trunk/Makefile 2010-10-18 17:04:26 UTC (rev 11327) +++ csw/mgar/pkg/v8/trunk/Makefile 2010-10-18 20:09:30 UTC (rev 11328) @@ -12,9 +12,10 @@ MASTER_SITES = svn-http://v8.googlecode.com/svn/branches/ # svn checkout http://v8.googlecode.com/svn/branches/bleeding_edge/ v8 -PATCHFILES += 0001-uninitialized-member-v8-internal-Sampler-synchronous.patch +# PATCHFILES += 0001-uninitialized-member-v8-internal-Sampler-synchronous.patch DISTFILES = $(GARVERSION) NOCHECKSUM = $(GARVERSION) +DISTNAME = $(GARVERSION) # $(GARNAME)-$(GARVERSION).tar.gz # UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) @@ -24,7 +25,26 @@ INSTALL_SCRIPTS = v8 TEST_SCRIPTS = GARCOMPILER = GNU +SONAME_V = 2.5.1 +PACKAGING_PLATFORMS = solaris10-i386 + +PACKAGES += CSWlibv8-2-5-1 +PACKAGES += CSWlibv8-devel +CATALOGNAME_CSWlibv8-2-5-1 = libv8_2_5_1 +CATALOGNAME_CSWlibv8-devel = libv8_devel + +PKGFILES_CSWlibv8-devel = $(includedir).* +PKGFILES_CSWlibv8-devel = $(libdir)/libv8\.so + +SPKG_DESC_CSWlibv8-2-5-1 = Google\'s open source JavaScript engine +SPKG_DESC_CSWlibv8-devel = Header files for V8 + +RUNTIME_DEP_PKGS_CSWlibv8-2-5-1 += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWlibv8-2-5-1 += CSWgcc4corert + +LICENSE = LICENSE + include gar/category.mk build-v8: @@ -41,4 +61,12 @@ @$(MAKECOOKIE) install-v8: - false + ginstall -d -m 755 $(DESTDIR)$(libdir) + ginstall -m 755 $(WORKSRC)/libv8-$(SONAME_V).so $(DESTDIR)$(libdir) + ln -sf libv8-$(SONAME_V).so $(DESTDIR)$(libdir)/libv8.so + ginstall -d -m 755 $(DESTDIR)$(includedir) + for f in $(WORKSRC)/include/*.h; do \ + ginstall -m 644 $${f} $(DESTDIR)$(includedir); \ + done + tree $(DESTDIR) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 18 22:12:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 18 Oct 2010 20:12:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[11329] csw/mgar/pkg/v8/trunk/Makefile Message-ID: Revision: 11329 http://gar.svn.sourceforge.net/gar/?rev=11329&view=rev Author: wahwah Date: 2010-10-18 20:12:18 +0000 (Mon, 18 Oct 2010) Log Message: ----------- v8: Making the devel package depend on the library. Modified Paths: -------------- csw/mgar/pkg/v8/trunk/Makefile Modified: csw/mgar/pkg/v8/trunk/Makefile =================================================================== --- csw/mgar/pkg/v8/trunk/Makefile 2010-10-18 20:09:30 UTC (rev 11328) +++ csw/mgar/pkg/v8/trunk/Makefile 2010-10-18 20:12:18 UTC (rev 11329) @@ -42,6 +42,8 @@ RUNTIME_DEP_PKGS_CSWlibv8-2-5-1 += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWlibv8-2-5-1 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlibv8-devel += CSWlibv8-2-5-1 +CHECKPKG_OVERRIDES_CSWlibv8-devel += surplus-dependency|CSWlibv8-2-5-1 LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 18 22:55:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 18 Oct 2010 20:55:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11330] csw/mgar/pkg/v8/trunk/Makefile Message-ID: Revision: 11330 http://gar.svn.sourceforge.net/gar/?rev=11330&view=rev Author: wahwah Date: 2010-10-18 20:55:19 +0000 (Mon, 18 Oct 2010) Log Message: ----------- v8: Using GARVERSION properly. Modified Paths: -------------- csw/mgar/pkg/v8/trunk/Makefile Modified: csw/mgar/pkg/v8/trunk/Makefile =================================================================== --- csw/mgar/pkg/v8/trunk/Makefile 2010-10-18 20:12:18 UTC (rev 11329) +++ csw/mgar/pkg/v8/trunk/Makefile 2010-10-18 20:55:19 UTC (rev 11330) @@ -3,53 +3,50 @@ # $Id$ GARNAME = v8 -GARVERSION = bleeding_edge +GARVERSION = 2.5.1 +# GARVERSION = bleeding_edge CATEGORIES = lib -DESCRIPTION = Google\'s open source JavaScript engine define BLURB +Google's open source JavaScript engine endef -SPKG_SOURCEURL = http://code.google.com/p/v8/ +SPKG_SOURCEURL = http://code.google.com/p/$(GARNAME)/ -MASTER_SITES = svn-http://v8.googlecode.com/svn/branches/ -# svn checkout http://v8.googlecode.com/svn/branches/bleeding_edge/ v8 -# PATCHFILES += 0001-uninitialized-member-v8-internal-Sampler-synchronous.patch -DISTFILES = $(GARVERSION) -NOCHECKSUM = $(GARVERSION) -DISTNAME = $(GARVERSION) -# $(GARNAME)-$(GARVERSION).tar.gz -# UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +MASTER_SITES = svn-http//$(GARNAME).googlecode.com/svn/branches/ +DISTFILES = bleeding_edge +NOCHECKSUM = bleeding_edge +DISTNAME = bleeding_edge BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) BUILD_DEP_PKGS += CSWscons CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = v8 -INSTALL_SCRIPTS = v8 +BUILD_SCRIPTS = $(GARNAME) +INSTALL_SCRIPTS = $(GARNAME) TEST_SCRIPTS = GARCOMPILER = GNU SONAME_V = 2.5.1 PACKAGING_PLATFORMS = solaris10-i386 -PACKAGES += CSWlibv8-2-5-1 -PACKAGES += CSWlibv8-devel -CATALOGNAME_CSWlibv8-2-5-1 = libv8_2_5_1 -CATALOGNAME_CSWlibv8-devel = libv8_devel +PACKAGES += CSWlib$(GARNAME)-2-5-1 +PACKAGES += CSWlib$(GARNAME)-devel +CATALOGNAME_CSWlib$(GARNAME)-2-5-1 = lib$(GARNAME)_2_5_1 +CATALOGNAME_CSWlib$(GARNAME)-devel = lib$(GARNAME)_devel -PKGFILES_CSWlibv8-devel = $(includedir).* -PKGFILES_CSWlibv8-devel = $(libdir)/libv8\.so +PKGFILES_CSWlib$(GARNAME)-devel = $(includedir).* +PKGFILES_CSWlib$(GARNAME)-devel = $(libdir)/lib$(GARNAME)\.so -SPKG_DESC_CSWlibv8-2-5-1 = Google\'s open source JavaScript engine -SPKG_DESC_CSWlibv8-devel = Header files for V8 +SPKG_DESC_CSWlib$(GARNAME)-2-5-1 = Google\'s open source JavaScript engine +SPKG_DESC_CSWlib$(GARNAME)-devel = Header files for V8 -RUNTIME_DEP_PKGS_CSWlibv8-2-5-1 += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWlibv8-2-5-1 += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWlibv8-devel += CSWlibv8-2-5-1 -CHECKPKG_OVERRIDES_CSWlibv8-devel += surplus-dependency|CSWlibv8-2-5-1 +RUNTIME_DEP_PKGS_CSWlib$(GARNAME)-2-5-1 += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWlib$(GARNAME)-2-5-1 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlib$(GARNAME)-devel += CSWlib$(GARNAME)-2-5-1 +CHECKPKG_OVERRIDES_CSWlib$(GARNAME)-devel += surplus-dependency|CSWlib$(GARNAME)-2-5-1 LICENSE = LICENSE include gar/category.mk -build-v8: +build-$(GARNAME): (cd $(WORKSRC); mkdir -p build-solaris; \ CC=/opt/csw/gcc4/bin/gcc \ CXX=/opt/csw/gcc4/bin/g++ \ @@ -62,10 +59,10 @@ visibility=default library=shared toolchain=gcc soname=on -j3) @$(MAKECOOKIE) -install-v8: +install-$(GARNAME): ginstall -d -m 755 $(DESTDIR)$(libdir) - ginstall -m 755 $(WORKSRC)/libv8-$(SONAME_V).so $(DESTDIR)$(libdir) - ln -sf libv8-$(SONAME_V).so $(DESTDIR)$(libdir)/libv8.so + ginstall -m 755 $(WORKSRC)/lib$(GARNAME)-$(SONAME_V).so $(DESTDIR)$(libdir) + ln -sf lib$(GARNAME)-$(SONAME_V).so $(DESTDIR)$(libdir)/lib$(GARNAME).so ginstall -d -m 755 $(DESTDIR)$(includedir) for f in $(WORKSRC)/include/*.h; do \ ginstall -m 644 $${f} $(DESTDIR)$(includedir); \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Oct 19 00:13:05 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Mon, 18 Oct 2010 22:13:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11331] csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Message-ID: Revision: 11331 http://gar.svn.sourceforge.net/gar/?rev=11331&view=rev Author: opk Date: 2010-10-18 22:13:05 +0000 (Mon, 18 Oct 2010) Log Message: ----------- shorten CSWlibpyglib-2-0-python0 package name to fit in the 20 character limit go back again to the name CSWpy-gobject, will try to fix up all dependencies Modified Paths: -------------- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2010-10-18 20:55:19 UTC (rev 11330) +++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2010-10-18 22:13:05 UTC (rev 11331) @@ -13,24 +13,25 @@ STRIP_LIBTOOL = 1 -PACKAGES = CSWpy-gobject-devel CSWpygobject CSWlibpyglib-2-0-python0 +PACKAGES = CSWpy-gobject-devel CSWpy-gobject CSWlibpyglib-2-0-py0 -CATALOGNAME_CSWpygobject = py_gobject -SPKG_DESC_CSWpygobject = $(DESCRIPTION) -CHECKPKG_OVERRIDES_CSWpygobject += pkgname-does-not-start-with-CSWpy- -RUNTIME_DEP_PKGS_CSWpygobject = CSWpython CSWggettextrt CSWglib2 -RUNTIME_DEP_PKGS_CSWpygobject += CSWlibpyglib-2-0-python0 -PKGFILES_CSWpygobject = $(libdir)/python/site-packages/.* +CATALOGNAME_CSWpy-gobject = py_gobject +SPKG_DESC_CSWpy-gobject = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWpy-gobject = CSWpython CSWggettextrt CSWglib2 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib-2-0-py0 +INCOMPATIBLE_PKGS_CSWpy-gobject = CSWpygobject +PKGFILES_CSWpy-gobject = $(libdir)/python/site-packages/.* -SPKG_DESC_CSWlibpyglib-2-0-python0 = Runtime library for the Python GObject library -CATALOGNAME_CSWlibpyglib-2-0-python0 = libpyglib_2_0_python0 -PKGFILES_CSWlibpyglib-2-0-python0 = $(libdir)/libpyglib-2.0-python.so.0.* -RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-python0 = CSWggettextrt CSWglib2 +SPKG_DESC_CSWlibpyglib-2-0-py0 = Runtime library for the Python GObject library +CATALOGNAME_CSWlibpyglib-2-0-py0 = libpyglib_2_0_py0 +PKGFILES_CSWlibpyglib-2-0-py0 = $(libdir)/libpyglib-2.0-python.so.0.* +RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 = CSWggettextrt CSWglib2 +# soname results in a package name that is too long so it was shortened +CHECKPKG_OVERRIDES_CSWlibpyglib-2-0-py0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpyglib-2.0-python.so.0.0.0|soname=libpyglib-2.0-python.so.0|pkgname=CSWlibpyglib-2-0-py0|expected=['CSWlibpyglib-2-0-python0',|'CSWlibpyglib-2-0-python-0'] SPKG_DESC_CSWpy-gobject-devel = Development files for the Python GObject library CATALOGNAME_CSWpy-gobject-devel = py_gobject_devel RUNTIME_DEP_PKGS_CSWpy-gobject-devel = CSWpython -ARCHALL_CSWpy-gobject-devel = 1 PYCOMPILE = 1 @@ -46,7 +47,4 @@ TEST_TARGET = check TEST_SCRIPTS = -# This package predates the convention and renaming is problematic -CHECKPKG_OVERRIDES_CSWpygobject += pkgname-does-not-start-with-CSWpy- - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 19 00:42:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 18 Oct 2010 22:42:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11332] csw/mgar/pkg/v8/trunk/Makefile Message-ID: Revision: 11332 http://gar.svn.sourceforge.net/gar/?rev=11332&view=rev Author: wahwah Date: 2010-10-18 22:42:53 +0000 (Mon, 18 Oct 2010) Log Message: ----------- v8: Enabling 64-bit build. Modified Paths: -------------- csw/mgar/pkg/v8/trunk/Makefile Modified: csw/mgar/pkg/v8/trunk/Makefile =================================================================== --- csw/mgar/pkg/v8/trunk/Makefile 2010-10-18 22:13:05 UTC (rev 11331) +++ csw/mgar/pkg/v8/trunk/Makefile 2010-10-18 22:42:53 UTC (rev 11332) @@ -32,7 +32,7 @@ CATALOGNAME_CSWlib$(GARNAME)-devel = lib$(GARNAME)_devel PKGFILES_CSWlib$(GARNAME)-devel = $(includedir).* -PKGFILES_CSWlib$(GARNAME)-devel = $(libdir)/lib$(GARNAME)\.so +PKGFILES_CSWlib$(GARNAME)-devel = $(libdir)(/[^/]+)?/lib$(GARNAME)\.so SPKG_DESC_CSWlib$(GARNAME)-2-5-1 = Google\'s open source JavaScript engine SPKG_DESC_CSWlib$(GARNAME)-devel = Header files for V8 @@ -42,8 +42,15 @@ RUNTIME_DEP_PKGS_CSWlib$(GARNAME)-devel += CSWlib$(GARNAME)-2-5-1 CHECKPKG_OVERRIDES_CSWlib$(GARNAME)-devel += surplus-dependency|CSWlib$(GARNAME)-2-5-1 +# 64-bit support via a special scons option; passing CFLAGS and CXXFLAGS does +# not work here. +SCONS_ARCH_isa-amd64 = arch=x64 +SCONS_ARCH += $(SCONS_ARCH_$(MODULATION)) + LICENSE = LICENSE +BUILD64 = 1 + include gar/category.mk build-$(GARNAME): @@ -56,6 +63,7 @@ SHCXX=/opt/csw/gcc4/bin/g++ \ LINKFLAGS='-R/opt/csw/gcc4/lib' \ scons -Y .. \ + $(SCONS_ARCH) \ visibility=default library=shared toolchain=gcc soname=on -j3) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 19 08:29:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Oct 2010 06:29:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[11333] csw/mgar/pkg/v8/trunk/Makefile Message-ID: Revision: 11333 http://gar.svn.sourceforge.net/gar/?rev=11333&view=rev Author: wahwah Date: 2010-10-19 06:29:21 +0000 (Tue, 19 Oct 2010) Log Message: ----------- v8: Fixed a bug in PKGFILES, '=' is different from '+='. Modified Paths: -------------- csw/mgar/pkg/v8/trunk/Makefile Modified: csw/mgar/pkg/v8/trunk/Makefile =================================================================== --- csw/mgar/pkg/v8/trunk/Makefile 2010-10-18 22:42:53 UTC (rev 11332) +++ csw/mgar/pkg/v8/trunk/Makefile 2010-10-19 06:29:21 UTC (rev 11333) @@ -31,8 +31,8 @@ CATALOGNAME_CSWlib$(GARNAME)-2-5-1 = lib$(GARNAME)_2_5_1 CATALOGNAME_CSWlib$(GARNAME)-devel = lib$(GARNAME)_devel -PKGFILES_CSWlib$(GARNAME)-devel = $(includedir).* -PKGFILES_CSWlib$(GARNAME)-devel = $(libdir)(/[^/]+)?/lib$(GARNAME)\.so +PKGFILES_CSWlib$(GARNAME)-devel += $(includedir).* +PKGFILES_CSWlib$(GARNAME)-devel += $(libdir)(/[^/]+)?/lib$(GARNAME)\.so SPKG_DESC_CSWlib$(GARNAME)-2-5-1 = Google\'s open source JavaScript engine SPKG_DESC_CSWlib$(GARNAME)-devel = Header files for V8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 19 10:33:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Oct 2010 08:33:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[11334] csw/mgar/pkg/gnupg/trunk Message-ID: Revision: 11334 http://gar.svn.sourceforge.net/gar/?rev=11334&view=rev Author: dmichelsen Date: 2010-10-19 08:33:58 +0000 (Tue, 19 Oct 2010) Log Message: ----------- gnupg: Update to 1.4.11, use prototype modifier instead of filter, disable 64 bit Modified Paths: -------------- csw/mgar/pkg/gnupg/trunk/Makefile csw/mgar/pkg/gnupg/trunk/checksums Modified: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2010-10-19 06:29:21 UTC (rev 11333) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2010-10-19 08:33:58 UTC (rev 11334) @@ -1,5 +1,5 @@ GARNAME = gnupg -GARVERSION = 1.4.10 +GARVERSION = 1.4.11 CATEGORIES = apps DESCRIPTION = GnuPG is a complete and free replacement for PGP. @@ -19,9 +19,6 @@ # new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) -RUNPATHQUOTE = 1 -BUILD64 = 1 - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libcurl=$(prefix) CONFIGURE_ARGS += --with-ldap=$(prefix) @@ -36,8 +33,11 @@ CONFIGURE_ARGS += --disable-asm EXTRA_MERGE_EXCLUDE_FILES += .*/charset.alias -PROTOTYPE_FILTER = awk '$$$$3 ~/\/gpg$$$$/ { $$$$4 = 4755 } { print }' +PROTOTYPE_MODIFIERS = suid +PROTOTYPE_FILES_suid = .*/gpg +PROTOTYPE_PERMS_suid = 4755 + RUNTIME_DEP_PKGS_CSWgnupg = CSWbzip2 CSWcurlrt CSWggettextrt CSWiconv RUNTIME_DEP_PKGS_CSWgnupg += CSWoldaprt CSWreadline CSWzlib Modified: csw/mgar/pkg/gnupg/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg/trunk/checksums 2010-10-19 06:29:21 UTC (rev 11333) +++ csw/mgar/pkg/gnupg/trunk/checksums 2010-10-19 08:33:58 UTC (rev 11334) @@ -1 +1 @@ -dcf7ed712997888d616e029637bfc303 gnupg-1.4.10.tar.bz2 +411744e1ef8ce90b87938c4203f001f1 gnupg-1.4.11.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 19 12:09:30 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Oct 2010 10:09:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[11335] csw/mgar/pkg Message-ID: Revision: 11335 http://gar.svn.sourceforge.net/gar/?rev=11335&view=rev Author: wahwah Date: 2010-10-19 10:09:30 +0000 (Tue, 19 Oct 2010) Log Message: ----------- mongodb: Initial commit, work in progress. Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/Makefile csw/mgar/pkg/mongodb/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mongodb/ csw/mgar/pkg/mongodb/trunk/files/0001-Disabling-the-libstdc-check.patch Modified: csw/mgar/pkg/mongodb/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-07-11 14:03:10 UTC (rev 10496) +++ csw/mgar/pkg/mongodb/trunk/Makefile 2010-10-19 10:09:30 UTC (rev 11335) @@ -2,184 +2,40 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = mongodb +GARVERSION = 1.6.3 + +# http://fastdl.mongodb.org/src/mongodb-src-r1.6.3.tar.gz CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = A scalable, high-performance, open source, document-oriented database define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release +SPKG_SOURCEURL = http://www.mongodb.org/ +MASTER_SITES = http://fastdl.mongodb.org/src/ +DISTNAME = $(GARNAME)-src-r$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = mongo +INSTALL_SCRIPTS = mongo +TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +GARCOMPILER = GNU +PATCHFILES += 0001-Disabling-the-libstdc-check.patch -#include gar/category.mk +BUILD_DEP_PKGS = CSWboostdevel + +# Depends on V8 which is available on Solaris 10 x86 only. +PACKAGING_PLATFORMS = solaris10-i386 + +include gar/category.mk + +# scons libboost-dev libpcre++-dev xulrunner-1.9.1-dev + +build-mongo: + (cd $(WORKSRC); $(BUILD_ENV) scons --extrapathdyn=/opt/csw,/opt/csw/gcc4 --cxx /opt/csw/gcc4/bin/g++ --usev8 all) + @$(MAKECOOKIE) + +install-mongo: + (cd $(WORKSRC); $(INSTALL_ENV) scons -Q --prefix=$(DESTDIR)/opt/csw install) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/mongodb/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-07-11 14:03:10 UTC (rev 10496) +++ csw/mgar/pkg/mongodb/trunk/checksums 2010-10-19 10:09:30 UTC (rev 11335) @@ -0,0 +1 @@ +076b91f37ee434db80441e9028fe50a5 mongodb-src-r1.6.3.tar.gz Added: csw/mgar/pkg/mongodb/trunk/files/0001-Disabling-the-libstdc-check.patch =================================================================== --- csw/mgar/pkg/mongodb/trunk/files/0001-Disabling-the-libstdc-check.patch (rev 0) +++ csw/mgar/pkg/mongodb/trunk/files/0001-Disabling-the-libstdc-check.patch 2010-10-19 10:09:30 UTC (rev 11335) @@ -0,0 +1,42 @@ +From a13b7d40da0c25087c2054d8fd02a27a334bfd2b Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 19 Oct 2010 01:33:35 +0200 +Subject: [PATCH] Disabling the libstdc++ check + +--- + SConstruct | 12 +++++++----- + 1 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/SConstruct b/SConstruct +index e3046ff..0feedc0 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -309,7 +309,8 @@ usePCH = not GetOption( "usePCH" ) is None + + justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient']) + +-env = Environment( MSVS_ARCH=msarch , tools = ["default", "gch"], toolpath = '.' ) ++env = Environment( MSVS_ARCH=msarch , tools = ["default", "gch"], toolpath = '.', ++ CPPPATH = ['/opt/csw/include', '/opt/csw/include/boost']) + if GetOption( "cxx" ) is not None: + env["CC"] = GetOption( "cxx" ) + env["CXX"] = GetOption( "cxx" ) +@@ -858,10 +859,11 @@ def doConfigure( myenv , needPcre=True , shell=False ): + print( "c++ compiler not installed!" ) + Exit(1) + +- if nix and not shell: +- if not conf.CheckLib( "stdc++" ): +- print( "can't find stdc++ library which is needed" ); +- Exit(1) ++ # libstdc++ is not necessary when compiling with Sun Studio ++ # if nix and not shell: ++ # if not conf.CheckLib( "stdc++" ): ++ # print( "can't find stdc++ library which is needed" ); ++ # Exit(1) + + def myCheckLib( poss , failIfNotFound=False , staticOnly=False): + +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 19 13:24:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Oct 2010 11:24:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[11336] csw/mgar/pkg/boost/branches/boost-gcc/ Message-ID: Revision: 11336 http://gar.svn.sourceforge.net/gar/?rev=11336&view=rev Author: wahwah Date: 2010-10-19 11:24:00 +0000 (Tue, 19 Oct 2010) Log Message: ----------- Branching Boost to build it with gcc. Added Paths: ----------- csw/mgar/pkg/boost/branches/boost-gcc/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 19 14:58:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Oct 2010 12:58:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[11337] csw/mgar/pkg/boost/trunk Message-ID: Revision: 11337 http://gar.svn.sourceforge.net/gar/?rev=11337&view=rev Author: dmichelsen Date: 2010-10-19 12:58:58 +0000 (Tue, 19 Oct 2010) Log Message: ----------- boost: Update to 1.44.0, some warnings left Modified Paths: -------------- csw/mgar/pkg/boost/trunk/Makefile csw/mgar/pkg/boost/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/boost/trunk/files/CSWboost.gspec Property Changed: ---------------- csw/mgar/pkg/boost/trunk/ Property changes on: csw/mgar/pkg/boost/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/boost/trunk/Makefile =================================================================== --- csw/mgar/pkg/boost/trunk/Makefile 2010-10-19 11:24:00 UTC (rev 11336) +++ csw/mgar/pkg/boost/trunk/Makefile 2010-10-19 12:58:58 UTC (rev 11337) @@ -1,5 +1,5 @@ GARNAME = boost -GARVERSION = 1.33.0 +GARVERSION = 1.44.0 CATEGORIES = lib DESCRIPTION = A collection of C++ libraries @@ -17,39 +17,54 @@ MASTER_SITES = $(SF_MIRROR)/$(GARNAME)/ DISTVERSION = $(subst .,_,$(GARVERSION)) -DISTFILES = $(GARNAME)_$(DISTVERSION).tar.bz2 -DISTFILES += CSWboost.gspec +DISTNAME = $(GARNAME)_$(DISTVERSION) +DISTFILES = $(DISTNAME).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=7586 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -WORKSRC = $(WORKDIR)/$(GARNAME)_$(DISTVERSION) +PACKAGES = CSWboost +CATALOGNAME_CSWboost = boost +LICENSE = LICENSE_1_0.txt + +BUILD_DEP_PKGS += CSWstar + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = bjam BUILD_ARGS = --prefix=$(DESTDIR)$(prefix) -BUILD_ARGS += -sTOOLS=sunpro -BUILD_ARGS += --with-python-root=$(prefix) +BUILD_ARGS += toolset=sun +#BUILD_ARGS += --with-python-root=$(prefix) TEST_SCRIPTS = +JAMDIR_sparc = solarissparc +JAMDIR_i386 = solarisx86 +JAMDIR = $(JAMDIR_$(GARCH)) + include gar/category.mk PYTHON_ROOT = $(prefix) PYTHON_VERSION = 2.3 export PYTHON_ROOT PYTHON_VERSION -pre-configure: - ( cd $(WORKSRC)/tools/build/jam_src ; \ +# Boost is not extractable with SUNW tar nor GNU tar :-( +tar-bz-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + /opt/csw/bin/star -bz -x -C $(EXTRACTDIR) -f $(DOWNLOADDIR)/$* + @$(MAKECOOKIE) + +pre-configure-modulated: + ( cd $(WORKSRC)/tools/jam/src ; \ ./build.sh sunpro ; \ mkdir -p $(DESTDIR)$(bindir) ; \ - mv bin.solaris/bjam $(DESTDIR)$(bindir) ) + mv bin.$(JAMDIR)/bjam $(DESTDIR)$(bindir) ) @$(MAKECOOKIE) install-bjam: - ( cd $(WORKSRC) ; bjam $(BUILD_ARGS) install ) || exit 1 + ( cd $(WORKSRC) ; which bjam; bjam $(BUILD_ARGS) install ) || exit 1 @$(MAKECOOKIE) Modified: csw/mgar/pkg/boost/trunk/checksums =================================================================== --- csw/mgar/pkg/boost/trunk/checksums 2010-10-19 11:24:00 UTC (rev 11336) +++ csw/mgar/pkg/boost/trunk/checksums 2010-10-19 12:58:58 UTC (rev 11337) @@ -1,2 +1 @@ -43d87bbd827a8299f408df5efe5f0fd8 download/boost_1_33_0.tar.bz2 -a00cee53babcf663a51e117741f777d0 download/CSWboost.gspec +f02578f5218f217a9f20e9c30e119c6a boost_1_44_0.tar.bz2 Deleted: csw/mgar/pkg/boost/trunk/files/CSWboost.gspec =================================================================== --- csw/mgar/pkg/boost/trunk/files/CSWboost.gspec 2010-10-19 11:24:00 UTC (rev 11336) +++ csw/mgar/pkg/boost/trunk/files/CSWboost.gspec 2010-10-19 12:58:58 UTC (rev 11337) @@ -1,4 +0,0 @@ -%var bitname boost -%var pkgname CSWboost -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 19 16:02:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Oct 2010 14:02:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11338] csw/mgar/pkg/boost/branches/boost-1.33.0/ Message-ID: Revision: 11338 http://gar.svn.sourceforge.net/gar/?rev=11338&view=rev Author: dmichelsen Date: 2010-10-19 14:02:15 +0000 (Tue, 19 Oct 2010) Log Message: ----------- boost: Tag 1.33.0 Added Paths: ----------- csw/mgar/pkg/boost/branches/boost-1.33.0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Oct 19 16:11:53 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 19 Oct 2010 14:11:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11339] csw/mgar/pkg/squid/trunk/Makefile Message-ID: Revision: 11339 http://gar.svn.sourceforge.net/gar/?rev=11339&view=rev Author: idogan23 Date: 2010-10-19 14:11:53 +0000 (Tue, 19 Oct 2010) Log Message: ----------- squid: move config files to /etc/opt/csw, some cleanups Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2010-10-19 14:02:15 UTC (rev 11338) +++ csw/mgar/pkg/squid/trunk/Makefile 2010-10-19 14:11:53 UTC (rev 11339) @@ -15,16 +15,25 @@ PACKAGES = CSWsquid CATALOGNAME_CSWsquid = squid -SPKG_DESC_CSWsquid = $(DESCRIPTION) -SPKG_CLASSES_CSWsquid = none cswinitsmf RUNTIME_DEP_PKGS_CSWsquid = CSWoldaprt CSWosslrt CSWsasl -PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswsquid$$$$/ { $$$$2 = "cswinitsmf" } { print }' +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +INITSMF = /etc/opt/csw/init.d/csw$(GARNAME) +PRESERVECONF = /etc/opt/csw/$(GARNAME)/cachemgr.conf +PRESERVECONF = /etc/opt/csw/$(GARNAME)/squid.conf +PRESERVECONF = /etc/opt/csw/$(GARNAME)/mime.conf +MIGRATE_SOURCE_DIR = /opt/csw/etc +MIGRATE_DEST_DIR = /etc/opt/csw/$(GARNAME) +MIGRATE_FILES = cachemgr.conf +MIGRATE_FILES += mime.conf +MIGRATE_FILES += squid.conf + MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(GARVERSION)/ DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += CSWsquid.postinstall CSWsquid.preremove cswsquid squid.conf.CSW CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/$(GARNAME) CONFIGURE_ARGS += --datadir=$(datadir)/$(GARNAME) CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(GARNAME) CONFIGURE_ARGS += --enable-arp-acl @@ -61,9 +70,6 @@ ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/logs ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/cache - gcp $(DOWNLOADDIR)/cswsquid $(DESTDIR)/etc/opt/csw/init.d/ - chmod 0755 $(DESTDIR)/etc/opt/csw/init.d/cswsquid - grm $(DESTDIR)$(sysconfdir)/squid.conf - gcp $(DOWNLOADDIR)/squid.conf.CSW $(DESTDIR)$(sysconfdir)/ + ginstall -m 755 $(DOWNLOADDIR)/cswsquid $(DESTDIR)/etc/opt/csw/init.d/cswsquid @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 19 18:02:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Oct 2010 16:02:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[11340] csw/mgar/pkg/libnet/branches Message-ID: Revision: 11340 http://gar.svn.sourceforge.net/gar/?rev=11340&view=rev Author: dmichelsen Date: 2010-10-19 16:02:25 +0000 (Tue, 19 Oct 2010) Log Message: ----------- libnet: Rename branch to 1.1.x Added Paths: ----------- csw/mgar/pkg/libnet/branches/1.1.x/ Removed Paths: ------------- csw/mgar/pkg/libnet/branches/1.1.2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 19 18:22:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Oct 2010 16:22:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[11341] csw/mgar/pkg/libnet/branches/1.1.x Message-ID: Revision: 11341 http://gar.svn.sourceforge.net/gar/?rev=11341&view=rev Author: dmichelsen Date: 2010-10-19 16:22:17 +0000 (Tue, 19 Oct 2010) Log Message: ----------- libnet 1.1.2: First small steps, downloadable package is too old, need to replicate git Modified Paths: -------------- csw/mgar/pkg/libnet/branches/1.1.x/Makefile csw/mgar/pkg/libnet/branches/1.1.x/checksums Modified: csw/mgar/pkg/libnet/branches/1.1.x/Makefile =================================================================== --- csw/mgar/pkg/libnet/branches/1.1.x/Makefile 2010-10-19 16:02:25 UTC (rev 11340) +++ csw/mgar/pkg/libnet/branches/1.1.x/Makefile 2010-10-19 16:22:17 UTC (rev 11341) @@ -1,71 +1,78 @@ GARNAME = libnet -GARVERSION = 1.1.2.1 +GARVERSION = 1.1.4 CATEGORIES = lib DESCRIPTION = The libnet packet construction library define BLURB - Libnet is a high-level API (toolkit) allowing the application programmer to construct and inject network packets. It provides a portable and simplified interface for low-level network packet shaping, handling and injection. Libnet hides much of the tedium of packet creation from the application programmer such as multiplexing, buffer management, arcane packet header information, byte-ordering, OS-dependent issues, and much more. Libnet features portable packet creation interfaces at both the IP-layer and link-layer, as well as a host of supplementary and complementary functionality. + Libnet is a high-level API (toolkit) allowing the application programmer to + construct and inject network packets. It provides a portable and simplified + interface for low-level network packet shaping, handling and injection. + Libnet hides much of the tedium of packet creation from the application + programmer such as multiplexing, buffer management, arcane packet header + information, byte-ordering, OS-dependent issues, and much more. + Libnet features portable packet creation interfaces at both the IP-layer + and link-layer, as well as a host of supplementary and complementary + functionality. endef -MASTER_SITES = http://www.packetfactory.net/libnet/dist/ +SF_PROJ = libnet-dev +MASTER_SITES = $(SF_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz LICENSE = doc/COPYING UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.packetfactory.net/libnet/ +SPKG_SOURCEURL = http://github.com/sam-github/libnet BUILD64 = 1 -DISTNAME = libnet +#PATCHFILES = buildpatch +#PATCHFILES += libnet_pblock_coalesce_leak.patch +#PATCHFILES += libnet-cq-end-loop.patch +#PATCHFILES += libnet_build_ntp.patch +#PATCHFILES += libnet_checksum.c.patch -PATCHFILES = buildpatch -PATCHFILES += libnet_pblock_coalesce_leak.patch -PATCHFILES += libnet-cq-end-loop.patch -PATCHFILES += libnet_build_ntp.patch -PATCHFILES += libnet_checksum.c.patch - CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = include gar/category.mk -post-extract-$(MODULATION): - ( cp $(FILEDIR)/ltmain.sh $(WORKROOTDIR)/build-$(MODULATION)/$(DISTNAME) ) - ( cp $(FILEDIR)/libnet.pc.in $(WORKROOTDIR)/build-$(MODULATION)/$(DISTNAME)/src ) - @$(MAKECOOKIE) +#post-extract-$(MODULATION): +# ( cp $(FILEDIR)/ltmain.sh $(WORKROOTDIR)/build-$(MODULATION)/$(DISTNAME) ) +# ( cp $(FILEDIR)/libnet.pc.in $(WORKROOTDIR)/build-$(MODULATION)/$(DISTNAME)/src ) +# @$(MAKECOOKIE) +# +#post-install-modulated: +# @ginstall -d $(DESTDIR)$(bindir) +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/libnet-config $(DESTDIR)$(bindir) +# @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/BUGS $(DESTDIR)$(docdir)/$(GARNAME) +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/CHANGELOG $(DESTDIR)$(docdir)/$(GARNAME) +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/CONTRIB $(DESTDIR)$(docdir)/$(GARNAME) +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/COPYING $(DESTDIR)$(docdir)/$(GARNAME) +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/DESIGN_NOTES $(DESTDIR)$(docdir)/$(GARNAME) +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/MIGRATION $(DESTDIR)$(docdir)/$(GARNAME) +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/PACKET_BUILDING $(DESTDIR)$(docdir)/$(GARNAME) +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/PORTED $(DESTDIR)$(docdir)/$(GARNAME) +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/RAWSOCKET_NON_SEQUITUR $(DESTDIR)$(docdir)/$(GARNAME) +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/TODO $(DESTDIR)$(docdir)/$(GARNAME) +# @ginstall -d $(DESTDIR)$(mandir)/man3 +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-functions.h.3 $(DESTDIR)$(mandir)/man3 +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-headers.h.3 $(DESTDIR)$(mandir)/man3 +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-macros.h.3 $(DESTDIR)$(mandir)/man3 +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet.h.3 $(DESTDIR)$(mandir)/man3 +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet_802_1q_hdr.3 $(DESTDIR)$(mandir)/man3 +# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet_802_1x_hdr.3 $(DESTDIR)$(mandir)/man3 +# @$(MAKECOOKIE) -post-install-modulated: - @ginstall -d $(DESTDIR)$(bindir) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/libnet-config $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/BUGS $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/CHANGELOG $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/CONTRIB $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/COPYING $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/DESIGN_NOTES $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/MIGRATION $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/PACKET_BUILDING $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/PORTED $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/RAWSOCKET_NON_SEQUITUR $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/TODO $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -d $(DESTDIR)$(mandir)/man3 - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-functions.h.3 $(DESTDIR)$(mandir)/man3 - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-headers.h.3 $(DESTDIR)$(mandir)/man3 - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-macros.h.3 $(DESTDIR)$(mandir)/man3 - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet.h.3 $(DESTDIR)$(mandir)/man3 - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet_802_1q_hdr.3 $(DESTDIR)$(mandir)/man3 - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet_802_1x_hdr.3 $(DESTDIR)$(mandir)/man3 - @$(MAKECOOKIE) - -post-install-isa-sparcv8: - @ginstall -d $(DESTDIR)$(libdir) - @cp $(FILEDIR)/libnet.so.1.0.2.s $(INSTALLISADIR)/opt/csw/lib/libnet.so.1.0.2 - @$(MAKECOOKIE) - -post-install-isa-i386: - @ginstall -d $(DESTDIR)$(libdir) - @cp $(FILEDIR)/libnet.so.1.0.2.i $(INSTALLISADIR)/opt/csw/lib/libnet.so.1.0.2 - @$(MAKECOOKIE) +#post-install-isa-sparcv8: +# @ginstall -d $(DESTDIR)$(libdir) +# @cp $(FILEDIR)/libnet.so.1.0.2.s $(INSTALLISADIR)/opt/csw/lib/libnet.so.1.0.2 +# @$(MAKECOOKIE) +# +#post-install-isa-i386: +# @ginstall -d $(DESTDIR)$(libdir) +# @cp $(FILEDIR)/libnet.so.1.0.2.i $(INSTALLISADIR)/opt/csw/lib/libnet.so.1.0.2 +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/libnet/branches/1.1.x/checksums =================================================================== --- csw/mgar/pkg/libnet/branches/1.1.x/checksums 2010-10-19 16:02:25 UTC (rev 11340) +++ csw/mgar/pkg/libnet/branches/1.1.x/checksums 2010-10-19 16:22:17 UTC (rev 11341) @@ -1,6 +1 @@ -be845c41170d72c7db524f3411b50256 download/libnet-1.1.2.1.tar.gz -8bd8908d73e8b0e81e372f5ef2cf552a download/buildpatch -c074b4d206f3041a64afcde1a5b2d5d0 download/libnet_pblock_coalesce_leak.patch -ca892b6a33f04cafb6def978c97ecb45 download/libnet-cq-end-loop.patch -b49b610c4726a359bd42c3ad3211f169 download/libnet_build_ntp.patch -fe5dc7c78f5326f271c75595ff50d376 download/libnet_checksum.c.patch +c5e06418a89cc4209f677a776a798fd9 libnet-1.1.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Oct 19 18:33:01 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 19 Oct 2010 16:33:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[11342] csw/mgar/pkg/bind/trunk/Makefile Message-ID: Revision: 11342 http://gar.svn.sourceforge.net/gar/?rev=11342&view=rev Author: bonivart Date: 2010-10-19 16:33:00 +0000 (Tue, 19 Oct 2010) Log Message: ----------- bind: move so-symlinks to devel pkg Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2010-10-19 16:22:17 UTC (rev 11341) +++ csw/mgar/pkg/bind/trunk/Makefile 2010-10-19 16:33:00 UTC (rev 11342) @@ -67,7 +67,18 @@ EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la PKGFILES_CSWbinddevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibbind = $(libdir)/.* +PKGFILES_CSWlibbind += /opt/csw/lib/libbind9.so.60.* +PKGFILES_CSWlibbind += /opt/csw/lib/libdns.so.69.* +PKGFILES_CSWlibbind += /opt/csw/lib/libisc.so.62.* +PKGFILES_CSWlibbind += /opt/csw/lib/libisccc.so.60.* +PKGFILES_CSWlibbind += /opt/csw/lib/libisccfg.so.62.* +PKGFILES_CSWlibbind += /opt/csw/lib/liblwres.so.60.* +PKGFILES_CSWbinddevel += /opt/csw/lib/libbind9.so +PKGFILES_CSWbinddevel += /opt/csw/lib/libdns.so +PKGFILES_CSWbinddevel += /opt/csw/lib/libisc.so +PKGFILES_CSWbinddevel += /opt/csw/lib/libisccc.so +PKGFILES_CSWbinddevel += /opt/csw/lib/libisccfg.so +PKGFILES_CSWbinddevel += /opt/csw/lib/liblwres.so PKGFILES_CSWbindutils = $(bindir)/.* PKGFILES_CSWbindchroot = .*chroot.* @@ -92,12 +103,6 @@ CHECKPKG_OVERRIDES_CSWbinddevel += archall-devel-package CHECKPKG_OVERRIDES_CSWbinddevel += surplus-dependency|CSWbind CHECKPKG_OVERRIDES_CSWlibbind += non-uniform-lib-versions-in-package|sonames=['libbind9.so.60',|'libdns.so.69',|'libisc.so.62',|'libisccc.so.60',|'libisccfg.so.62',|'liblwres.so.60'] -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libbind9.so -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libdns.so -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libisc.so -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libisccc.so -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libisccfg.so -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblwres.so include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Oct 19 22:17:41 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 19 Oct 2010 20:17:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[11343] csw/mgar/pkg/bind/trunk/Makefile Message-ID: Revision: 11343 http://gar.svn.sourceforge.net/gar/?rev=11343&view=rev Author: bonivart Date: 2010-10-19 20:17:41 +0000 (Tue, 19 Oct 2010) Log Message: ----------- bind: simplify pkg split Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2010-10-19 16:33:00 UTC (rev 11342) +++ csw/mgar/pkg/bind/trunk/Makefile 2010-10-19 20:17:41 UTC (rev 11343) @@ -67,18 +67,8 @@ EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la PKGFILES_CSWbinddevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibbind += /opt/csw/lib/libbind9.so.60.* -PKGFILES_CSWlibbind += /opt/csw/lib/libdns.so.69.* -PKGFILES_CSWlibbind += /opt/csw/lib/libisc.so.62.* -PKGFILES_CSWlibbind += /opt/csw/lib/libisccc.so.60.* -PKGFILES_CSWlibbind += /opt/csw/lib/libisccfg.so.62.* -PKGFILES_CSWlibbind += /opt/csw/lib/liblwres.so.60.* -PKGFILES_CSWbinddevel += /opt/csw/lib/libbind9.so -PKGFILES_CSWbinddevel += /opt/csw/lib/libdns.so -PKGFILES_CSWbinddevel += /opt/csw/lib/libisc.so -PKGFILES_CSWbinddevel += /opt/csw/lib/libisccc.so -PKGFILES_CSWbinddevel += /opt/csw/lib/libisccfg.so -PKGFILES_CSWbinddevel += /opt/csw/lib/liblwres.so +PKGFILES_CSWbinddevel += .*\.so +PKGFILES_CSWlibbind = .*\.so\..* PKGFILES_CSWbindutils = $(bindir)/.* PKGFILES_CSWbindchroot = .*chroot.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Wed Oct 20 11:55:35 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Wed, 20 Oct 2010 09:55:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[11344] csw/mgar/pkg Message-ID: Revision: 11344 http://gar.svn.sourceforge.net/gar/?rev=11344&view=rev Author: khabermann Date: 2010-10-20 09:55:35 +0000 (Wed, 20 Oct 2010) Log Message: ----------- new package ndiff added Added Paths: ----------- csw/mgar/pkg/ndiff/ csw/mgar/pkg/ndiff/branches/ csw/mgar/pkg/ndiff/tags/ csw/mgar/pkg/ndiff/trunk/ csw/mgar/pkg/ndiff/trunk/Makefile csw/mgar/pkg/ndiff/trunk/checksums csw/mgar/pkg/ndiff/trunk/files/ csw/mgar/pkg/ndiff/trunk/files/0001-fixed-install-target-in-makefile.patch Property changes on: csw/mgar/pkg/ndiff/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ndiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/ndiff/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ndiff/trunk/Makefile 2010-10-20 09:55:35 UTC (rev 11344) @@ -0,0 +1,31 @@ +GARNAME = ndiff +GARVERSION = 2.00 +CATEGORIES = utils + +DESCRIPTION = Compare putatively similar files, ignoring small numeric differences +define BLURB + Ndiff assumes that you have two text files containing numerical values, + and the two files are expected to be identical, or at least numerically + similar. ndiff allows you to specify absolute and/or relative error + tolerances for differences between numerical values in the two files, + and then reports only the lines with values exceeding those tolerances. + It also tells you by how much they differ. +endef + +MASTER_SITES = ftp://ftp.math.utah.edu/pub/misc/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-fixed-install-target-in-makefile.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +RUNTIME_DEP_PKGS_CSWndiff += CSWlibgmp +BUILD_DEP_PKGS = + +VENDOR_URL = http://www.math.utah.edu/~beebe/software/ndiff/ + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +TEST_TARGET = check Property changes on: csw/mgar/pkg/ndiff/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/ndiff/trunk/checksums =================================================================== --- csw/mgar/pkg/ndiff/trunk/checksums (rev 0) +++ csw/mgar/pkg/ndiff/trunk/checksums 2010-10-20 09:55:35 UTC (rev 11344) @@ -0,0 +1,2 @@ +885548b4dc26e72c5455bebb5ba6c16d ndiff-2.00.tar.gz +fe48e85a1e214584588c49859f22e1e2 0001-fixed-install-target-in-makefile.patch Added: csw/mgar/pkg/ndiff/trunk/files/0001-fixed-install-target-in-makefile.patch =================================================================== --- csw/mgar/pkg/ndiff/trunk/files/0001-fixed-install-target-in-makefile.patch (rev 0) +++ csw/mgar/pkg/ndiff/trunk/files/0001-fixed-install-target-in-makefile.patch 2010-10-20 09:55:35 UTC (rev 11344) @@ -0,0 +1,95 @@ +From 933babaed72b895ac309bd1591ba6386e3193002 Mon Sep 17 00:00:00 2001 +From: Kester Habermann +Date: Wed, 20 Oct 2010 11:37:44 +0200 +Subject: [PATCH] fixed install-target in makefile + +--- + Makefile.in | 38 ++++++++++++++++++++------------------ + 1 files changed, 20 insertions(+), 18 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 78f5e95..1225685 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -61,8 +61,8 @@ DATE = @DATE@ + + prefix = @prefix@ + bindir = $(prefix)/bin +-catdir = $(prefix)/man/cat$(manext) +-mandir = $(prefix)/man/man$(manext) ++catdir = $(prefix)/share/man/cat$(manext) ++mandir = $(prefix)/share/man/man$(manext) + manext = 1 + shrlibdir = $(shrlibtop)/$(PROGNAME)-$(VERSION) + shrlibtop = $(prefix)/share/lib/$(PROGNAME) +@@ -599,17 +599,18 @@ html: $(HTMLFILES) + install: install-exe install-shrlib install-man install-show + + install-exe: uninstall-exe ++ -$(MKDIR) $(DESTDIR)$(bindir) + if test -f $(PROGNAME) ; \ + then \ +- $(CP) $(PROGNAME) $(bindir)/$(PROGNAME) ; \ +- $(LN) $(bindir)/$(PROGNAME) $(bindir)/$(PROGNAME)-$(VERSION) ; \ ++ $(CP) $(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME) ; \ ++ $(LN) $(DESTDIR)$(bindir)/$(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME)-$(VERSION) ; \ + else \ + for f in $(SHFILES) ; \ + do \ + g=`basename $$f .sh` ; \ +- $(SEDCMD) $$f | $(CHECKSUM) > $(bindir)/$$g ; \ +- $(LN) $(bindir)/$$g $(bindir)/$$g-$(VERSION) ; \ +- $(CHMOD) 775 $(bindir)/$$g $(bindir)/$$g-$(VERSION) ; \ ++ $(SEDCMD) $$f | $(CHECKSUM) > $(DESTDIR)$(bindir)/$$g ; \ ++ $(LN) $(DESTDIR)$(bindir)/$$g $(DESTDIR)$(bindir)/$$g-$(VERSION) ; \ ++ $(CHMOD) 775 $(DESTDIR)$(bindir)/$$g $(DESTDIR)$(bindir)/$$g-$(VERSION) ; \ + done ; \ + fi + +@@ -625,31 +626,32 @@ install-ftp: dist + $(LS) -l $(FTPDIR)/$(PROGNAME)* + + install-man: uninstall-man ++ -$(MKDIR) $(DESTDIR)$(mandir) + for f in $(MANFILES) ; \ + do \ + g=`basename $$f .man` ; \ +- $(SEDCMD) $$f | $(CHECKSUM) > $(mandir)/$$g.$(manext) ; \ +- $(CHMOD) 664 $(mandir)/$$g.$(manext) ; \ ++ $(SEDCMD) $$f | $(CHECKSUM) > $(DESTDIR)$(mandir)/$$g.$(manext) ; \ ++ $(CHMOD) 664 $(DESTDIR)$(mandir)/$$g.$(manext) ; \ + done + + install-show: + @echo '' + @echo Installed files... +- @$(LS) -l $(bindir)/$(PROGNAME) $(bindir)/$(PROGNAME)-$(VERSION) +- @$(LS) -l $(mandir)/$(PROGNAME).$(manext) +- @if test -d $(shrlibdir) ; then $(LS) -lR $(shrlibdir)/* ; fi ++ @$(LS) -l $(DESTDIR)$(bindir)/$(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME)-$(VERSION) ++ @$(LS) -l $(DESTDIR)$(mandir)/$(PROGNAME).$(manext) ++ @if test -d $(DESTDIR)$(shrlibdir) ; then $(LS) -lR $(DESTDIR)$(shrlibdir)/* ; fi + @echo '' + + install-shrlib: uninstall-shrlib +- -$(MKDIR) $(shrlibtop) +- @if test -d $(shrlibtop) ; then true ; else echo Cannot create $(shrlibtop) ; exit 1 ; fi +- -$(MKDIR) $(shrlibdir) +- @if test -d $(shrlibdir) ; then true ; else echo Cannot create $(shrlibdir) ; exit 1 ; fi ++ -$(MKDIR) $(DESTDIR)$(shrlibtop) ++ @if test -d $(DESTDIR)$(shrlibtop) ; then true ; else echo Cannot create $(DESTDIR)$(shrlibtop) ; exit 1 ; fi ++ -$(MKDIR) $(DESTDIR)$(shrlibdir) ++ @if test -d $(shrlibdir) ; then true ; else echo Cannot create $(DESTDIR)$(shrlibdir) ; exit 1 ; fi + for f in $(SHRLIBFILES) ; \ + do \ +- $(SEDCMD) < $$f > $(shrlibdir)/$$f ; \ ++ $(SEDCMD) < $$f > $(DESTDIR)$(shrlibdir)/$$f ; \ + done +- $(CHMOD) 664 $(shrlibdir)/* ++ $(CHMOD) 664 $(DESTDIR)$(shrlibdir)/* + + maintainer-clean: distclean cleandocs + @echo "This command is intended for maintainers to use;" +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Oct 20 12:14:00 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 20 Oct 2010 10:14:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[11345] csw/mgar/pkg/ldns/trunk Message-ID: Revision: 11345 http://gar.svn.sourceforge.net/gar/?rev=11345&view=rev Author: idogan23 Date: 2010-10-20 10:13:59 +0000 (Wed, 20 Oct 2010) Log Message: ----------- ldns: bump version to 1.6.6 Modified Paths: -------------- csw/mgar/pkg/ldns/trunk/Makefile csw/mgar/pkg/ldns/trunk/checksums Modified: csw/mgar/pkg/ldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile 2010-10-20 09:55:35 UTC (rev 11344) +++ csw/mgar/pkg/ldns/trunk/Makefile 2010-10-20 10:13:59 UTC (rev 11345) @@ -1,5 +1,5 @@ GARNAME = ldns -GARVERSION = 1.6.5 +GARVERSION = 1.6.6 CATEGORIES = lib DESCRIPTION = A library for programs conforming to DNS RFCs and drafts Modified: csw/mgar/pkg/ldns/trunk/checksums =================================================================== --- csw/mgar/pkg/ldns/trunk/checksums 2010-10-20 09:55:35 UTC (rev 11344) +++ csw/mgar/pkg/ldns/trunk/checksums 2010-10-20 10:13:59 UTC (rev 11345) @@ -1,2 +1,2 @@ b5516aacfa819947cbfb6d0c34f0c546 CSWldns.doxyparse.diff -ab41a641a0416908e03e63631f527c4a ldns-1.6.5.tar.gz +f2bff31764c98aa69749070a21199164 ldns-1.6.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Wed Oct 20 12:23:52 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Wed, 20 Oct 2010 10:23:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[11346] csw/mgar/pkg/ndiff/trunk Message-ID: Revision: 11346 http://gar.svn.sourceforge.net/gar/?rev=11346&view=rev Author: khabermann Date: 2010-10-20 10:23:52 +0000 (Wed, 20 Oct 2010) Log Message: ----------- fixed patch Modified Paths: -------------- csw/mgar/pkg/ndiff/trunk/Makefile csw/mgar/pkg/ndiff/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ndiff/trunk/files/0001-fixed-make-install-target.patch Removed Paths: ------------- csw/mgar/pkg/ndiff/trunk/files/0001-fixed-install-target-in-makefile.patch Modified: csw/mgar/pkg/ndiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/ndiff/trunk/Makefile 2010-10-20 10:13:59 UTC (rev 11345) +++ csw/mgar/pkg/ndiff/trunk/Makefile 2010-10-20 10:23:52 UTC (rev 11346) @@ -13,8 +13,8 @@ endef MASTER_SITES = ftp://ftp.math.utah.edu/pub/misc/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-fixed-install-target-in-makefile.patch +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-fixed-make-install-target.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/ndiff/trunk/checksums =================================================================== --- csw/mgar/pkg/ndiff/trunk/checksums 2010-10-20 10:13:59 UTC (rev 11345) +++ csw/mgar/pkg/ndiff/trunk/checksums 2010-10-20 10:23:52 UTC (rev 11346) @@ -1,2 +1,2 @@ 885548b4dc26e72c5455bebb5ba6c16d ndiff-2.00.tar.gz -fe48e85a1e214584588c49859f22e1e2 0001-fixed-install-target-in-makefile.patch +459c0dde5a477d7bf1baa8fa50a3f2ad 0001-fixed-make-install-target.patch Deleted: csw/mgar/pkg/ndiff/trunk/files/0001-fixed-install-target-in-makefile.patch =================================================================== --- csw/mgar/pkg/ndiff/trunk/files/0001-fixed-install-target-in-makefile.patch 2010-10-20 10:13:59 UTC (rev 11345) +++ csw/mgar/pkg/ndiff/trunk/files/0001-fixed-install-target-in-makefile.patch 2010-10-20 10:23:52 UTC (rev 11346) @@ -1,95 +0,0 @@ -From 933babaed72b895ac309bd1591ba6386e3193002 Mon Sep 17 00:00:00 2001 -From: Kester Habermann -Date: Wed, 20 Oct 2010 11:37:44 +0200 -Subject: [PATCH] fixed install-target in makefile - ---- - Makefile.in | 38 ++++++++++++++++++++------------------ - 1 files changed, 20 insertions(+), 18 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 78f5e95..1225685 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -61,8 +61,8 @@ DATE = @DATE@ - - prefix = @prefix@ - bindir = $(prefix)/bin --catdir = $(prefix)/man/cat$(manext) --mandir = $(prefix)/man/man$(manext) -+catdir = $(prefix)/share/man/cat$(manext) -+mandir = $(prefix)/share/man/man$(manext) - manext = 1 - shrlibdir = $(shrlibtop)/$(PROGNAME)-$(VERSION) - shrlibtop = $(prefix)/share/lib/$(PROGNAME) -@@ -599,17 +599,18 @@ html: $(HTMLFILES) - install: install-exe install-shrlib install-man install-show - - install-exe: uninstall-exe -+ -$(MKDIR) $(DESTDIR)$(bindir) - if test -f $(PROGNAME) ; \ - then \ -- $(CP) $(PROGNAME) $(bindir)/$(PROGNAME) ; \ -- $(LN) $(bindir)/$(PROGNAME) $(bindir)/$(PROGNAME)-$(VERSION) ; \ -+ $(CP) $(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME) ; \ -+ $(LN) $(DESTDIR)$(bindir)/$(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME)-$(VERSION) ; \ - else \ - for f in $(SHFILES) ; \ - do \ - g=`basename $$f .sh` ; \ -- $(SEDCMD) $$f | $(CHECKSUM) > $(bindir)/$$g ; \ -- $(LN) $(bindir)/$$g $(bindir)/$$g-$(VERSION) ; \ -- $(CHMOD) 775 $(bindir)/$$g $(bindir)/$$g-$(VERSION) ; \ -+ $(SEDCMD) $$f | $(CHECKSUM) > $(DESTDIR)$(bindir)/$$g ; \ -+ $(LN) $(DESTDIR)$(bindir)/$$g $(DESTDIR)$(bindir)/$$g-$(VERSION) ; \ -+ $(CHMOD) 775 $(DESTDIR)$(bindir)/$$g $(DESTDIR)$(bindir)/$$g-$(VERSION) ; \ - done ; \ - fi - -@@ -625,31 +626,32 @@ install-ftp: dist - $(LS) -l $(FTPDIR)/$(PROGNAME)* - - install-man: uninstall-man -+ -$(MKDIR) $(DESTDIR)$(mandir) - for f in $(MANFILES) ; \ - do \ - g=`basename $$f .man` ; \ -- $(SEDCMD) $$f | $(CHECKSUM) > $(mandir)/$$g.$(manext) ; \ -- $(CHMOD) 664 $(mandir)/$$g.$(manext) ; \ -+ $(SEDCMD) $$f | $(CHECKSUM) > $(DESTDIR)$(mandir)/$$g.$(manext) ; \ -+ $(CHMOD) 664 $(DESTDIR)$(mandir)/$$g.$(manext) ; \ - done - - install-show: - @echo '' - @echo Installed files... -- @$(LS) -l $(bindir)/$(PROGNAME) $(bindir)/$(PROGNAME)-$(VERSION) -- @$(LS) -l $(mandir)/$(PROGNAME).$(manext) -- @if test -d $(shrlibdir) ; then $(LS) -lR $(shrlibdir)/* ; fi -+ @$(LS) -l $(DESTDIR)$(bindir)/$(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME)-$(VERSION) -+ @$(LS) -l $(DESTDIR)$(mandir)/$(PROGNAME).$(manext) -+ @if test -d $(DESTDIR)$(shrlibdir) ; then $(LS) -lR $(DESTDIR)$(shrlibdir)/* ; fi - @echo '' - - install-shrlib: uninstall-shrlib -- -$(MKDIR) $(shrlibtop) -- @if test -d $(shrlibtop) ; then true ; else echo Cannot create $(shrlibtop) ; exit 1 ; fi -- -$(MKDIR) $(shrlibdir) -- @if test -d $(shrlibdir) ; then true ; else echo Cannot create $(shrlibdir) ; exit 1 ; fi -+ -$(MKDIR) $(DESTDIR)$(shrlibtop) -+ @if test -d $(DESTDIR)$(shrlibtop) ; then true ; else echo Cannot create $(DESTDIR)$(shrlibtop) ; exit 1 ; fi -+ -$(MKDIR) $(DESTDIR)$(shrlibdir) -+ @if test -d $(shrlibdir) ; then true ; else echo Cannot create $(DESTDIR)$(shrlibdir) ; exit 1 ; fi - for f in $(SHRLIBFILES) ; \ - do \ -- $(SEDCMD) < $$f > $(shrlibdir)/$$f ; \ -+ $(SEDCMD) < $$f > $(DESTDIR)$(shrlibdir)/$$f ; \ - done -- $(CHMOD) 664 $(shrlibdir)/* -+ $(CHMOD) 664 $(DESTDIR)$(shrlibdir)/* - - maintainer-clean: distclean cleandocs - @echo "This command is intended for maintainers to use;" --- -1.7.1 - Added: csw/mgar/pkg/ndiff/trunk/files/0001-fixed-make-install-target.patch =================================================================== --- csw/mgar/pkg/ndiff/trunk/files/0001-fixed-make-install-target.patch (rev 0) +++ csw/mgar/pkg/ndiff/trunk/files/0001-fixed-make-install-target.patch 2010-10-20 10:23:52 UTC (rev 11346) @@ -0,0 +1,95 @@ +From 384dc4cc022b87aafef94fd1010fadd9ca0ce015 Mon Sep 17 00:00:00 2001 +From: Kester Habermann +Date: Wed, 20 Oct 2010 12:17:04 +0200 +Subject: [PATCH] fixed make-install target + +--- + Makefile.in | 38 ++++++++++++++++++++------------------ + 1 files changed, 20 insertions(+), 18 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 78f5e95..d0a26bd 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -61,8 +61,8 @@ DATE = @DATE@ + + prefix = @prefix@ + bindir = $(prefix)/bin +-catdir = $(prefix)/man/cat$(manext) +-mandir = $(prefix)/man/man$(manext) ++catdir = $(prefix)/share/man/cat$(manext) ++mandir = $(prefix)/share/man/man$(manext) + manext = 1 + shrlibdir = $(shrlibtop)/$(PROGNAME)-$(VERSION) + shrlibtop = $(prefix)/share/lib/$(PROGNAME) +@@ -599,17 +599,18 @@ html: $(HTMLFILES) + install: install-exe install-shrlib install-man install-show + + install-exe: uninstall-exe ++ -$(MKDIR) $(DESTDIR)$(bindir) + if test -f $(PROGNAME) ; \ + then \ +- $(CP) $(PROGNAME) $(bindir)/$(PROGNAME) ; \ +- $(LN) $(bindir)/$(PROGNAME) $(bindir)/$(PROGNAME)-$(VERSION) ; \ ++ $(CP) $(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME) ; \ ++ $(LN) $(DESTDIR)$(bindir)/$(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME)-$(VERSION) ; \ + else \ + for f in $(SHFILES) ; \ + do \ + g=`basename $$f .sh` ; \ +- $(SEDCMD) $$f | $(CHECKSUM) > $(bindir)/$$g ; \ +- $(LN) $(bindir)/$$g $(bindir)/$$g-$(VERSION) ; \ +- $(CHMOD) 775 $(bindir)/$$g $(bindir)/$$g-$(VERSION) ; \ ++ $(SEDCMD) $$f | $(CHECKSUM) > $(DESTDIR)$(bindir)/$$g ; \ ++ $(LN) $(DESTDIR)$(bindir)/$$g $(DESTDIR)$(bindir)/$$g-$(VERSION) ; \ ++ $(CHMOD) 775 $(DESTDIR)$(bindir)/$$g $(DESTDIR)$(bindir)/$$g-$(VERSION) ; \ + done ; \ + fi + +@@ -625,31 +626,32 @@ install-ftp: dist + $(LS) -l $(FTPDIR)/$(PROGNAME)* + + install-man: uninstall-man ++ -$(MKDIR) $(DESTDIR)$(mandir) + for f in $(MANFILES) ; \ + do \ + g=`basename $$f .man` ; \ +- $(SEDCMD) $$f | $(CHECKSUM) > $(mandir)/$$g.$(manext) ; \ +- $(CHMOD) 664 $(mandir)/$$g.$(manext) ; \ ++ $(SEDCMD) $$f | $(CHECKSUM) > $(DESTDIR)$(mandir)/$$g.$(manext) ; \ ++ $(CHMOD) 664 $(DESTDIR)$(mandir)/$$g.$(manext) ; \ + done + + install-show: + @echo '' + @echo Installed files... +- @$(LS) -l $(bindir)/$(PROGNAME) $(bindir)/$(PROGNAME)-$(VERSION) +- @$(LS) -l $(mandir)/$(PROGNAME).$(manext) +- @if test -d $(shrlibdir) ; then $(LS) -lR $(shrlibdir)/* ; fi ++ @$(LS) -l $(DESTDIR)$(bindir)/$(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME)-$(VERSION) ++ @$(LS) -l $(DESTDIR)$(mandir)/$(PROGNAME).$(manext) ++ @if test -d $(DESTDIR)$(shrlibdir) ; then $(LS) -lR $(DESTDIR)$(shrlibdir)/* ; fi + @echo '' + + install-shrlib: uninstall-shrlib +- -$(MKDIR) $(shrlibtop) +- @if test -d $(shrlibtop) ; then true ; else echo Cannot create $(shrlibtop) ; exit 1 ; fi +- -$(MKDIR) $(shrlibdir) +- @if test -d $(shrlibdir) ; then true ; else echo Cannot create $(shrlibdir) ; exit 1 ; fi ++ -$(MKDIR) $(DESTDIR)$(shrlibtop) ++ @if test -d $(DESTDIR)$(shrlibtop) ; then true ; else echo Cannot create $(DESTDIR)$(shrlibtop) ; exit 1 ; fi ++ -$(MKDIR) $(DESTDIR)$(shrlibdir) ++ @if test -d $(DESTDIR)$(shrlibdir) ; then true ; else echo Cannot create $(DESTDIR)$(shrlibdir) ; exit 1 ; fi + for f in $(SHRLIBFILES) ; \ + do \ +- $(SEDCMD) < $$f > $(shrlibdir)/$$f ; \ ++ $(SEDCMD) < $$f > $(DESTDIR)$(shrlibdir)/$$f ; \ + done +- $(CHMOD) 664 $(shrlibdir)/* ++ $(CHMOD) 664 $(DESTDIR)$(shrlibdir)/* + + maintainer-clean: distclean cleandocs + @echo "This command is intended for maintainers to use;" +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Oct 20 13:51:32 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 20 Oct 2010 11:51:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11347] csw/mgar/pkg/ldns/trunk/Makefile Message-ID: Revision: 11347 http://gar.svn.sourceforge.net/gar/?rev=11347&view=rev Author: idogan23 Date: 2010-10-20 11:51:31 +0000 (Wed, 20 Oct 2010) Log Message: ----------- ldns: typo fix Modified Paths: -------------- csw/mgar/pkg/ldns/trunk/Makefile Modified: csw/mgar/pkg/ldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile 2010-10-20 10:23:52 UTC (rev 11346) +++ csw/mgar/pkg/ldns/trunk/Makefile 2010-10-20 11:51:31 UTC (rev 11347) @@ -22,7 +22,7 @@ CATALOGNAME_CSWldnsdevel = ldns_devel SPKG_DESC_CSWldns = $(DESCRIPTION) -SPKG_DESC_CSWldnsdevel = $(DESCRIPTION) development package +SPKG_DESC_CSWldnsdevel = "$(DESCRIPTION) development package" CHECKPKG_OVERRIDES_CSWldnsdevel += surplus-dependency|CSWldns SPKG_SOURCEURL = http://www.nlnetlabs.nl/projects/ldns/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Oct 20 14:28:26 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 20 Oct 2010 12:28:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[11348] csw/mgar/pkg/ldns/trunk/Makefile Message-ID: Revision: 11348 http://gar.svn.sourceforge.net/gar/?rev=11348&view=rev Author: idogan23 Date: 2010-10-20 12:28:26 +0000 (Wed, 20 Oct 2010) Log Message: ----------- ldns: removing " Modified Paths: -------------- csw/mgar/pkg/ldns/trunk/Makefile Modified: csw/mgar/pkg/ldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile 2010-10-20 11:51:31 UTC (rev 11347) +++ csw/mgar/pkg/ldns/trunk/Makefile 2010-10-20 12:28:26 UTC (rev 11348) @@ -22,7 +22,7 @@ CATALOGNAME_CSWldnsdevel = ldns_devel SPKG_DESC_CSWldns = $(DESCRIPTION) -SPKG_DESC_CSWldnsdevel = "$(DESCRIPTION) development package" +SPKG_DESC_CSWldnsdevel = $(DESCRIPTION) development package CHECKPKG_OVERRIDES_CSWldnsdevel += surplus-dependency|CSWldns SPKG_SOURCEURL = http://www.nlnetlabs.nl/projects/ldns/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Oct 20 14:49:19 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 20 Oct 2010 12:49:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11349] csw/mgar/pkg/squid/trunk Message-ID: Revision: 11349 http://gar.svn.sourceforge.net/gar/?rev=11349&view=rev Author: idogan23 Date: 2010-10-20 12:49:19 +0000 (Wed, 20 Oct 2010) Log Message: ----------- squid: config file path corrected in init script Modified Paths: -------------- csw/mgar/pkg/squid/trunk/checksums csw/mgar/pkg/squid/trunk/files/cswsquid Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2010-10-20 12:28:26 UTC (rev 11348) +++ csw/mgar/pkg/squid/trunk/checksums 2010-10-20 12:49:19 UTC (rev 11349) @@ -1 +1,5 @@ +257a1bb82830125d2e63e5ff6103992f CSWsquid.postinstall +f97bf395c3d2d73a876f9091707126bc CSWsquid.preremove +cfe8562d5581309ea7f0665f1aa9044e cswsquid 3c6642c85470b1079207d43bba25a819 squid-2.7.STABLE9.tar.bz2 +8548ba784b9e7a8920afcfcb4c05ea0a squid.conf.CSW Modified: csw/mgar/pkg/squid/trunk/files/cswsquid =================================================================== --- csw/mgar/pkg/squid/trunk/files/cswsquid 2010-10-20 12:28:26 UTC (rev 11348) +++ csw/mgar/pkg/squid/trunk/files/cswsquid 2010-10-20 12:49:19 UTC (rev 11349) @@ -2,10 +2,10 @@ PATH=/usr/bin CSWPREFIX=/opt/csw -CSWETC=${CSWPREFIX}/etc +CSWETC=/etc/opt/csw CSWSBIN=${CSWPREFIX}/sbin SQUID_DAEMON=${CSWSBIN}/squid -SQUID_CONF=${CSWETC}/squid.conf +SQUID_CONF=${CSWETC}/squid/squid.conf SQUID_PIDFILE=/var/opt/csw/squid/logs/squid.pid if [ -f /lib/svc/share/smf_include.sh ]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Oct 20 16:13:50 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 20 Oct 2010 14:13:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11350] csw/mgar/pkg/squid/trunk Message-ID: Revision: 11350 http://gar.svn.sourceforge.net/gar/?rev=11350&view=rev Author: idogan23 Date: 2010-10-20 14:13:50 +0000 (Wed, 20 Oct 2010) Log Message: ----------- squid: cleaning up, fixing permissions Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squid/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall csw/mgar/pkg/squid/trunk/files/CSWsquid.preremove csw/mgar/pkg/squid/trunk/files/squid.conf.CSW Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2010-10-20 12:49:19 UTC (rev 11349) +++ csw/mgar/pkg/squid/trunk/Makefile 2010-10-20 14:13:50 UTC (rev 11350) @@ -30,8 +30,9 @@ MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(GARVERSION)/ DISTFILES = $(DISTNAME).tar.bz2 -DISTFILES += CSWsquid.postinstall CSWsquid.preremove cswsquid squid.conf.CSW +DISTFILES += cswsquid + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/$(GARNAME) CONFIGURE_ARGS += --datadir=$(datadir)/$(GARNAME) @@ -58,6 +59,12 @@ TEST_TARGET = check +PROTOTYPE_MODIFIERS = varuser +PROTOTYPE_FILES_varuser = /var/opt/csw/squid/cache +PROTOTYPE_FILES_varuser += /var/opt/csw/squid/logs +PROTOTYPE_USER_varuser = nobody +PROTOTYPE_GROUP_varuser = nobody + include gar/category.mk SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(RELEASE) Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2010-10-20 12:49:19 UTC (rev 11349) +++ csw/mgar/pkg/squid/trunk/checksums 2010-10-20 14:13:50 UTC (rev 11350) @@ -1,5 +1 @@ -257a1bb82830125d2e63e5ff6103992f CSWsquid.postinstall -f97bf395c3d2d73a876f9091707126bc CSWsquid.preremove -cfe8562d5581309ea7f0665f1aa9044e cswsquid 3c6642c85470b1079207d43bba25a819 squid-2.7.STABLE9.tar.bz2 -8548ba784b9e7a8920afcfcb4c05ea0a squid.conf.CSW Deleted: csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall 2010-10-20 12:49:19 UTC (rev 11349) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall 2010-10-20 14:13:50 UTC (rev 11350) @@ -1,38 +0,0 @@ -#!/bin/sh -# -# Squid-cache preremove script - -PATH=/usr/bin:/usr/sbin -umask 0022 - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -SQUID_CONFDIR=${CSW_PREFIX}/etc -SQUID_VARDIR=/var/opt/csw/squid -SQUID_SBINDIR=${CSW_PREFIX}/sbin -USER='' -GRP='' - -if [ -f ${SQUID_CONFDIR}/squid.conf ]; then - echo 'squid.conf found, Preserving Existing Config!' - USER="`awk '$1 ~ /cache_effective_user/ {print $2}' \ - ${SQUID_CONFDIR}/squid.conf`" - GRP="`awk '$1 ~ /cache_effective_group/ {print $2}' \ - ${SQUID_CONFDIR}/squid.conf`" -else - cp ${SQUID_CONFDIR}/squid.conf.CSW ${SQUID_CONFDIR}/squid.conf - chmod 0644 ${SQUID_CONFDIR}/squid.conf -fi - -if [ "_x${USER}x_" = "_xx_" ]; then - USER=nobody -fi -if [ "_x${GRP}x_" = "_xx_" ]; then - GRP=nobody -fi - -chown ${USER}:${GRP} ${SQUID_VARDIR}/logs -chown ${USER}:${GRP} ${SQUID_VARDIR}/cache - -${SQUID_SBINDIR}/squid -z - -exit 0 Deleted: csw/mgar/pkg/squid/trunk/files/CSWsquid.preremove =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.preremove 2010-10-20 12:49:19 UTC (rev 11349) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.preremove 2010-10-20 14:13:50 UTC (rev 11350) @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Squid-cache preremove script - -PATH=/usr/bin:/usr/sbin -export PATH -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -SQUID_CONFDIR=${CSW_PREFIX}/etc - -if [ -x /usr/sbin/svccfg -a -x /usr/sbin/svcadm ]; then - echo 'Stopping squid server and unregistering from smf' - svcadm disable -s svc:application/server/cswsquid:default - svccfg delete svc:application/server/cswsquid:default -else - echo 'Stopping squid server' - if [ -x ${PKG_INSTALL_ROOT}/etc/opt/csw/init.d/cswsquid ]; then - ${PKG_INSTALL_ROOT}/etc/opt/csw/init.d/cswsquid stop - else - pkill -9 squid - fi -fi - -exit 0 Deleted: csw/mgar/pkg/squid/trunk/files/squid.conf.CSW =================================================================== --- csw/mgar/pkg/squid/trunk/files/squid.conf.CSW 2010-10-20 12:49:19 UTC (rev 11349) +++ csw/mgar/pkg/squid/trunk/files/squid.conf.CSW 2010-10-20 14:13:50 UTC (rev 11350) @@ -1,4900 +0,0 @@ - -# WELCOME TO SQUID 2.7.STABLE6 -# ---------------------------- -# -# This is the default Squid configuration file. You may wish -# to look at the Squid home page (http://www.squid-cache.org/) -# for the FAQ and other documentation. -# -# The default Squid config file shows what the defaults for -# various options happen to be. If you don't need to change the -# default, you shouldn't uncomment the line. Doing so may cause -# run-time problems. In some cases "none" refers to no default -# setting at all, while in other cases it refers to a valid -# option - the comments for that keyword indicate if this is the -# case. -# - - -# Configuration options can be included using the "include" directive. -# Include takes a list of files to include. Quoting and wildcards is -# supported. -# -# For example, -# -# include /path/to/included/file/squid.acl.config -# -# Includes can be nested up to a hard-coded depth of 16 levels. -# This arbitrary restriction is to prevent recursive include references -# from causing Squid entering an infinite loop whilst trying to load -# configuration files. - - -# OPTIONS FOR AUTHENTICATION -# ----------------------------------------------------------------------------- - -# TAG: auth_param -# This is used to define parameters for the various authentication -# schemes supported by Squid. -# -# format: auth_param scheme parameter [setting] -# -# The order in which authentication schemes are presented to the client is -# dependent on the order the scheme first appears in config file. IE -# has a bug (it's not RFC 2617 compliant) in that it will use the basic -# scheme if basic is the first entry presented, even if more secure -# schemes are presented. For now use the order in the recommended -# settings section below. If other browsers have difficulties (don't -# recognize the schemes offered even if you are using basic) either -# put basic first, or disable the other schemes (by commenting out their -# program entry). -# -# Once an authentication scheme is fully configured, it can only be -# shutdown by shutting squid down and restarting. Changes can be made on -# the fly and activated with a reconfigure. I.E. You can change to a -# different helper, but not unconfigure the helper completely. -# -# Please note that while this directive defines how Squid processes -# authentication it does not automatically activate authentication. -# To use authentication you must in addition make use of ACLs based -# on login name in http_access (proxy_auth, proxy_auth_regex or -# external with %LOGIN used in the format tag). The browser will be -# challenged for authentication on the first such acl encountered -# in http_access processing and will also be re-challenged for new -# login credentials if the request is being denied by a proxy_auth -# type acl. -# -# WARNING: authentication can't be used in a transparently intercepting -# proxy as the client then thinks it is talking to an origin server and -# not the proxy. This is a limitation of bending the TCP/IP protocol to -# transparently intercepting port 80, not a limitation in Squid. -# -# === Parameters for the basic scheme follow. === -# -# "program" cmdline -# Specify the command for the external authenticator. Such a program -# reads a line containing "username password" and replies "OK" or -# "ERR" in an endless loop. "ERR" responses may optionally be followed -# by a error description available as %m in the returned error page. -# -# By default, the basic authentication scheme is not used unless a -# program is specified. -# -# If you want to use the traditional proxy authentication, jump over to -# the helpers/basic_auth/NCSA directory and type: -# % make -# % make install -# -# Then, set this line to something like -# -# auth_param basic program /opt/csw/libexec/ncsa_auth /opt/csw/etc/passwd -# -# "children" numberofchildren -# The number of authenticator processes to spawn. If you start too few -# squid will have to wait for them to process a backlog of credential -# verifications, slowing it down. When credential verifications are -# done via a (slow) network you are likely to need lots of -# authenticator processes. -# auth_param basic children 5 -# -# "concurrency" numberofconcurrentrequests -# The number of concurrent requests/channels the helper supports. -# Changes the protocol used to include a channel number first on -# the request/response line, allowing multiple requests to be sent -# to the same helper in parallell without wating for the response. -# Must not be set unless it's known the helper supports this. -# -# "realm" realmstring -# Specifies the realm name which is to be reported to the client for -# the basic proxy authentication scheme (part of the text the user -# will see when prompted their username and password). -# auth_param basic realm Squid proxy-caching web server -# -# "credentialsttl" timetolive -# Specifies how long squid assumes an externally validated -# username:password pair is valid for - in other words how often the -# helper program is called for that user. Set this low to force -# revalidation with short lived passwords. Note that setting this high -# does not impact your susceptibility to replay attacks unless you are -# using an one-time password system (such as SecureID). If you are using -# such a system, you will be vulnerable to replay attacks unless you -# also use the max_user_ip ACL in an http_access rule. -# auth_param basic credentialsttl 2 hours -# -# "casesensitive" on|off -# Specifies if usernames are case sensitive. Most user databases are -# case insensitive allowing the same username to be spelled using both -# lower and upper case letters, but some are case sensitive. This -# makes a big difference for user_max_ip ACL processing and similar. -# auth_param basic casesensitive off -# -# "blankpassword" on|off -# Specifies if blank passwords should be supported. Defaults to off -# as there is multiple authentication backends which handles blank -# passwords as "guest" access. -# -# === Parameters for the digest scheme follow === -# -# "program" cmdline -# Specify the command for the external authenticator. Such a program -# reads a line containing "username":"realm" and replies with the -# appropriate H(A1) value hex encoded or ERR if the user (or his H(A1) -# hash) does not exists. See RFC 2616 for the definition of H(A1). -# "ERR" responses may optionally be followed by a error description -# available as %m in the returned error page. -# -# By default, the digest authentication scheme is not used unless a -# program is specified. -# -# If you want to use a digest authenticator, jump over to the -# helpers/digest_auth/ directory and choose the authenticator to use. -# It it's directory type -# % make -# % make install -# -# Then, set this line to something like -# -# auth_param digest program /opt/csw/libexec/digest_auth_pw /opt/csw/etc/digpass -# -# "children" numberofchildren -# The number of authenticator processes to spawn. If you start too few -# squid will have to wait for them to process a backlog of credential -# verifications, slowing it down. When credential verifications are -# done via a (slow) network you are likely to need lots of -# authenticator processes. -# auth_param digest children 5 -# -# "concurrency" numberofconcurrentrequests -# The number of concurrent requests/channels the helper supports. -# Changes the protocol used to include a channel number first on -# the request/response line, allowing multiple requests to be sent -# to the same helper in parallell without wating for the response. -# Must not be set unless it's known the helper supports this. -# -# "realm" realmstring -# Specifies the realm name which is to be reported to the client for the -# digest proxy authentication scheme (part of the text the user will see -# when prompted their username and password). -# auth_param digest realm Squid proxy-caching web server -# -# "nonce_garbage_interval" timeinterval -# Specifies the interval that nonces that have been issued to clients are -# checked for validity. -# auth_param digest nonce_garbage_interval 5 minutes -# -# "nonce_max_duration" timeinterval -# Specifies the maximum length of time a given nonce will be valid for. -# auth_param digest nonce_max_duration 30 minutes -# -# "nonce_max_count" number -# Specifies the maximum number of times a given nonce can be used. -# auth_param digest nonce_max_count 50 -# -# "nonce_strictness" on|off -# Determines if squid requires strict increment-by-1 behavior for nonce -# counts, or just incrementing (off - for use when useragents generate -# nonce counts that occasionally miss 1 (ie, 1,2,4,6)). -# auth_param digest nonce_strictness off -# -# "check_nonce_count" on|off -# This directive if set to off can disable the nonce count check -# completely to work around buggy digest qop implementations in certain -# mainstream browser versions. Default on to check the nonce count to -# protect from authentication replay attacks. -# auth_param digest check_nonce_count on -# -# "post_workaround" on|off -# This is a workaround to certain buggy browsers who sends an incorrect -# request digest in POST requests when reusing the same nonce as acquired -# earlier in response to a GET request. -# auth_param digest post_workaround off -# -# === NTLM scheme options follow === -# -# "program" cmdline -# Specify the command for the external NTLM authenticator. Such a -# program participates in the NTLMSSP exchanges between Squid and the -# client and reads commands according to the Squid NTLMSSP helper -# protocol. See helpers/ntlm_auth/ for details. Recommended ntlm -# authenticator is ntlm_auth from Samba-3.X, but a number of other -# ntlm authenticators is available. -# -# By default, the ntlm authentication scheme is not used unless a -# program is specified. -# -# auth_param ntlm program /path/to/samba/bin/ntlm_auth --helper-protocol=squid-2.5-ntlmssp -# -# "children" numberofchildren -# The number of authenticator processes to spawn. If you start too few -# squid will have to wait for them to process a backlog of credential -# verifications, slowing it down. When credential verifications are -# done via a (slow) network you are likely to need lots of -# authenticator processes. -# auth_param ntlm children 5 -# -# "keep_alive" on|off -# This option enables the use of keep-alive on the initial -# authentication request. It has been reported some versions of MSIE -# have problems if this is enabled, but performance will be increased -# if enabled. -# -# auth_param ntlm keep_alive on -# -# === Negotiate scheme options follow === -# -# "program" cmdline -# Specify the command for the external Negotiate authenticator. Such a -# program participates in the SPNEGO exchanges between Squid and the -# client and reads commands according to the Squid ntlmssp helper -# protocol. See helpers/ntlm_auth/ for details. Recommended SPNEGO -# authenticator is ntlm_auth from Samba-4.X. -# -# By default, the Negotiate authentication scheme is not used unless a -# program is specified. -# -# auth_param negotiate program /path/to/samba/bin/ntlm_auth --helper-protocol=gss-spnego -# -# "children" numberofchildren -# The number of authenticator processes to spawn. If you start too few -# squid will have to wait for them to process a backlog of credential -# verifications, slowing it down. When credential verifications are -# done via a (slow) network you are likely to need lots of -# authenticator processes. -# auth_param negotiate children 5 -# -# "keep_alive" on|off -# If you experience problems with PUT/POST requests when using the -# Negotiate authentication scheme then you can try setting this to -# off. This will cause Squid to forcibly close the connection on -# the initial requests where the browser asks which schemes are -# supported by the proxy. -# -# auth_param negotiate keep_alive on -# -#Recommended minimum configuration per scheme: -#auth_param negotiate program -#auth_param negotiate children 5 -#auth_param negotiate keep_alive on -#auth_param ntlm program -#auth_param ntlm children 5 -#auth_param ntlm keep_alive on -#auth_param digest program -#auth_param digest children 5 -#auth_param digest realm Squid proxy-caching web server -#auth_param digest nonce_garbage_interval 5 minutes -#auth_param digest nonce_max_duration 30 minutes -#auth_param digest nonce_max_count 50 -#auth_param basic program -#auth_param basic children 5 -#auth_param basic realm Squid proxy-caching web server -#auth_param basic credentialsttl 2 hours -#auth_param basic casesensitive off - -# TAG: authenticate_cache_garbage_interval -# The time period between garbage collection across the username cache. -# This is a tradeoff between memory utilization (long intervals - say -# 2 days) and CPU (short intervals - say 1 minute). Only change if you -# have good reason to. -# -#Default: -# authenticate_cache_garbage_interval 1 hour - -# TAG: authenticate_ttl -# The time a user & their credentials stay in the logged in user cache -# since their last request. When the garbage interval passes, all user -# credentials that have passed their TTL are removed from memory. -# -#Default: -# authenticate_ttl 1 hour - -# TAG: authenticate_ip_ttl -# If you use proxy authentication and the 'max_user_ip' ACL, this -# directive controls how long Squid remembers the IP addresses -# associated with each user. Use a small value (e.g., 60 seconds) if -# your users might change addresses quickly, as is the case with -# dialups. You might be safe using a larger value (e.g., 2 hours) in a -# corporate LAN environment with relatively static address assignments. -# -#Default: -# authenticate_ip_ttl 0 seconds - -# TAG: authenticate_ip_shortcircuit_ttl -# Cache authentication credentials per client IP address for this -# long. Default is 0 seconds (disabled). -# -# See also authenticate_ip_shortcircuit_access directive. -# -#Default: -# authenticate_ip_shortcircuit_ttl 0 seconds - - -# ACCESS CONTROLS -# ----------------------------------------------------------------------------- - -# TAG: external_acl_type -# This option defines external acl classes using a helper program to -# look up the status -# -# external_acl_type name [options] FORMAT.. /path/to/helper [helper arguments..] -# -# Options: -# -# ttl=n TTL in seconds for cached results (defaults to 3600 -# for 1 hour) -# negative_ttl=n -# TTL for cached negative lookups (default same -# as ttl) -# children=n number of processes spawn to service external acl -# lookups of this type. (default 5). -# concurrency=n concurrency level per process. Only used with helpers -# capable of processing more than one query at a time. -# Note: see compatibility note below -# cache=n result cache size, 0 is unbounded (default) -# grace= Percentage remaining of TTL where a refresh of a -# cached entry should be initiated without needing to -# wait for a new reply. (default 0 for no grace period) -# protocol=2.5 Compatibility mode for Squid-2.5 external acl helpers -# -# FORMAT specifications -# -# %LOGIN Authenticated user login name -# %EXT_USER Username from external acl -# %IDENT Ident user name -# %SRC Client IP -# %SRCPORT Client source port -# %URI Requested URI -# %DST Requested host -# %PROTO Requested protocol -# %PORT Requested port -# %METHOD Request method -# %MYADDR Squid interface address -# %MYPORT Squid http_port number -# %PATH Requested URL-path (including query-string if any) -# %USER_CERT SSL User certificate in PEM format -# %USER_CERTCHAIN SSL User certificate chain in PEM format -# %USER_CERT_xx SSL User certificate subject attribute xx -# %USER_CA_xx SSL User certificate issuer attribute xx -# %{Header} HTTP request header -# %{Hdr:member} HTTP request header list member -# %{Hdr:;member} -# HTTP request header list member using ; as -# list separator. ; can be any non-alphanumeric -# character. -# %ACL The ACL name -# %DATA The ACL arguments. If not used then any arguments -# is automatically added at the end -# -# In addition to the above, any string specified in the referencing -# acl will also be included in the helper request line, after the -# specified formats (see the "acl external" directive) -# -# The helper receives lines per the above format specification, -# and returns lines starting with OK or ERR indicating the validity -# of the request and optionally followed by additional keywords with -# more details. -# -# General result syntax: -# -# OK/ERR keyword=value ... -# -# Defined keywords: -# -# user= The users name (login also understood) -# password= The users password (for PROXYPASS login= cache_peer) -# message= Error message or similar used as %o in error messages -# (error also understood) -# log= String to be logged in access.log. Available as -# %ea in logformat specifications -# -# If protocol=3.0 (the default) then URL escaping is used to protect -# each value in both requests and responses. -# -# If using protocol=2.5 then all values need to be enclosed in quotes -# if they may contain whitespace, or the whitespace escaped using \. -# And quotes or \ characters within the keyword value must be \ escaped. -# -# When using the concurrency= option the protocol is changed by -# introducing a query channel tag infront of the request/response. -# The query channel tag is a number between 0 and concurrency-1. -# -# Compatibility Note: The children= option was named concurrency= in -# Squid-2.5.STABLE3 and earlier, and was accepted as an alias for the -# duration of the Squid-2.5 releases to keep compatibility. However, -# the meaning of concurrency= option has changed in Squid-2.6 to match -# that of Squid-3 and the old syntax no longer works. -# -#Default: -# none - -# TAG: acl -# Defining an Access List -# -# Every access list definition must begin with an aclname and acltype, -# followed by either type-specific arguments or a quoted filename that -# they are read from. -# -# acl aclname acltype argument ... -# acl aclname acltype "file" ... -# -# when using "file", the file should contain one item per line. -# -# By default, regular expressions are CASE-SENSITIVE. To make -# them case-insensitive, use the -i option. -# -# acl aclname src ip-address/netmask ... (clients IP address) -# acl aclname src addr1-addr2/netmask ... (range of addresses) -# acl aclname dst ip-address/netmask ... (URL host's IP address) -# acl aclname myip ip-address/netmask ... (local socket IP address) -# -# acl aclname arp mac-address ... (xx:xx:xx:xx:xx:xx notation) -# # The arp ACL requires the special configure option --enable-arp-acl. -# # Furthermore, the arp ACL code is not portable to all operating systems. -# # It works on Linux, Solaris, FreeBSD and some other *BSD variants. -# # -# # NOTE: Squid can only determine the MAC address for clients that are on -# # the same subnet. If the client is on a different subnet, then Squid cannot -# # find out its MAC address. -# -# acl aclname srcdomain .foo.com ... # reverse lookup, client IP -# acl aclname dstdomain .foo.com ... # Destination server from URL -# acl aclname srcdom_regex [-i] xxx ... # regex matching client name -# acl aclname dstdom_regex [-i] xxx ... # regex matching server -# # For dstdomain and dstdom_regex a reverse lookup is tried if a IP -# # based URL is used and no match is found. The name "none" is used -# # if the reverse lookup fails. -# -# acl aclname time [day-abbrevs] [h1:m1-h2:m2] -# # day-abbrevs: -# # S - Sunday -# # M - Monday -# # T - Tuesday -# # W - Wednesday -# # H - Thursday -# # F - Friday -# # A - Saturday -# # h1:m1 must be less than h2:m2 -# acl aclname url_regex [-i] ^http:// ... # regex matching on whole URL -# acl aclname urlpath_regex [-i] \.gif$ ... # regex matching on URL path -# acl aclname urllogin [-i] [^a-zA-Z0-9] ... # regex matching on URL login field -# acl aclname port 80 70 21 ... -# acl aclname port 0-1024 ... # ranges allowed -# acl aclname myport 3128 ... # (local socket TCP port) -# acl aclname myportname 3128 ... # http(s)_port name -# acl aclname proto HTTP FTP ... -# acl aclname method GET POST ... -# acl aclname browser [-i] regexp ... -# # pattern match on User-Agent header (see also req_header below) -# acl aclname referer_regex [-i] regexp ... -# # pattern match on Referer header -# # Referer is highly unreliable, so use with care -# acl aclname ident username ... -# acl aclname ident_regex [-i] pattern ... -# # string match on ident output. -# # use REQUIRED to accept any non-null ident. -# acl aclname src_as number ... -# acl aclname dst_as number ... -# # Except for access control, AS numbers can be used for -# # routing of requests to specific caches. Here's an -# # example for routing all requests for AS#1241 and only -# # those to mycache.mydomain.net: -# # acl asexample dst_as 1241 -# # cache_peer_access mycache.mydomain.net allow asexample -# # cache_peer_access mycache_mydomain.net deny all -# -# acl aclname proxy_auth [-i] username ... -# acl aclname proxy_auth_regex [-i] pattern ... -# # list of valid usernames -# # use REQUIRED to accept any valid username. -# # -# # NOTE: when a Proxy-Authentication header is sent but it is not -# # needed during ACL checking the username is NOT logged -# # in access.log. -# # -# # NOTE: proxy_auth requires a EXTERNAL authentication program -# # to check username/password combinations (see -# # auth_param directive). -# # -# # NOTE: proxy_auth can't be used in a transparent proxy as -# # the browser needs to be configured for using a proxy in order -# # to respond to proxy authentication. -# -# acl aclname snmp_community string ... -# # A community string to limit access to your SNMP Agent -# # Example: -# # -# # acl snmppublic snmp_community public -# -# acl aclname maxconn number -# # This will be matched when the client's IP address has -# # more than HTTP connections established. -# -# acl aclname max_user_ip [-s] number -# # This will be matched when the user attempts to log in from more -# # than different ip addresses. The authenticate_ip_ttl -# # parameter controls the timeout on the ip entries. -# # If -s is specified the limit is strict, denying browsing -# # from any further IP addresses until the ttl has expired. Without -# # -s Squid will just annoy the user by "randomly" denying requests. -# # (the counter is reset each time the limit is reached and a -# # request is denied) -# # NOTE: in acceleration mode or where there is mesh of child proxies, -# # clients may appear to come from multiple addresses if they are -# # going through proxy farms, so a limit of 1 may cause user problems. -# -# acl aclname req_mime_type mime-type ... -# # regex match against the mime type of the request generated -# # by the client. Can be used to detect file upload or some -# # types HTTP tunneling requests. -# # NOTE: This does NOT match the reply. You cannot use this -# # to match the returned file type. -# -# acl aclname req_header header-name [-i] any\.regex\.here -# # regex match against any of the known request headers. May be -# # thought of as a superset of "browser", "referer" and "mime-type" -# # ACLs. -# -# acl aclname rep_mime_type mime-type ... -# # regex match against the mime type of the reply received by -# # squid. Can be used to detect file download or some -# # types HTTP tunneling requests. -# # NOTE: This has no effect in http_access rules. It only has -# # effect in rules that affect the reply data stream such as -# # http_reply_access. -# -# acl aclname rep_header header-name [-i] any\.regex\.here -# # regex match against any of the known reply headers. May be -# # thought of as a superset of "browser", "referer" and "mime-type" -# # ACLs. -# # -# # Example: -# # -# # acl many_spaces rep_header Content-Disposition -i [[:space:]]{3,} -# -# acl aclname external class_name [arguments...] -# # external ACL lookup via a helper class defined by the -# # external_acl_type directive. -# -# acl aclname urlgroup group1 ... -# # match against the urlgroup as indicated by redirectors -# -# acl aclname user_cert attribute values... -# # match against attributes in a user SSL certificate -# # attribute is one of DN/C/O/CN/L/ST -# -# acl aclname ca_cert attribute values... -# # match against attributes a users issuing CA SSL certificate -# # attribute is one of DN/C/O/CN/L/ST -# -# acl aclname ext_user username ... -# acl aclname ext_user_regex [-i] pattern ... -# # string match on username returned by external acl helper -# # use REQUIRED to accept any non-null user name. -# -#Examples: -#acl macaddress arp 09:00:2b:23:45:67 -#acl myexample dst_as 1241 -#acl password proxy_auth REQUIRED -#acl fileupload req_mime_type -i ^multipart/form-data$ -#acl javascript rep_mime_type -i ^application/x-javascript$ -# -#Recommended minimum configuration: -acl all src all -acl manager proto cache_object -acl localhost src 127.0.0.1/32 -acl to_localhost dst 127.0.0.0/8 -# -# Example rule allowing access from your local networks. -# Adapt to list your (internal) IP networks from where browsing -# should be allowed -acl localnet src 10.0.0.0/8 # RFC1918 possible internal network -acl localnet src 172.16.0.0/12 # RFC1918 possible internal network -acl localnet src 192.168.0.0/16 # RFC1918 possible internal network -# -acl SSL_ports port 443 -acl Safe_ports port 80 # http -acl Safe_ports port 21 # ftp -acl Safe_ports port 443 # https -acl Safe_ports port 70 # gopher -acl Safe_ports port 210 # wais -acl Safe_ports port 1025-65535 # unregistered ports -acl Safe_ports port 280 # http-mgmt -acl Safe_ports port 488 # gss-http -acl Safe_ports port 591 # filemaker -acl Safe_ports port 777 # multiling http -acl CONNECT method CONNECT - -# TAG: http_access -# Allowing or Denying access based on defined access lists -# -# Access to the HTTP port: -# http_access allow|deny [!]aclname ... -# -# NOTE on default values: -# -# If there are no "access" lines present, the default is to deny -# the request. -# -# If none of the "access" lines cause a match, the default is the -# opposite of the last line in the list. If the last line was -# deny, the default is allow. Conversely, if the last line -# is allow, the default will be deny. For these reasons, it is a -# good idea to have an "deny all" or "allow all" entry at the end -# of your access lists to avoid potential confusion. -# -#Default: -# http_access deny all -# -#Recommended minimum configuration: -# -# Only allow cachemgr access from localhost -http_access allow manager localhost -http_access deny manager -# Deny requests to unknown ports -http_access deny !Safe_ports -# Deny CONNECT to other than SSL ports -http_access deny CONNECT !SSL_ports -# -# We strongly recommend the following be uncommented to protect innocent -# web applications running on the proxy server who think the only -# one who can access services on "localhost" is a local user -#http_access deny to_localhost -# -# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS - -# Example rule allowing access from your local networks. -# Adapt localnet in the ACL section to list your (internal) IP networks -# from where browsing should be allowed -http_access allow localnet - -# And finally deny all other access to this proxy -http_access deny all - -# TAG: http_access2 -# Allowing or Denying access based on defined access lists -# -# Identical to http_access, but runs after redirectors. If not set -# then only http_access is used. -# -#Default: -# none - -# TAG: http_reply_access -# Allow replies to client requests. This is complementary to http_access. -# -# http_reply_access allow|deny [!] aclname ... -# -# NOTE: if there are no access lines present, the default is to allow -# all replies -# -# If none of the access lines cause a match the opposite of the -# last line will apply. Thus it is good practice to end the rules -# with an "allow all" or "deny all" entry. -# -#Default: -# http_reply_access allow all - -# TAG: icp_access -# Allowing or Denying access to the ICP port based on defined -# access lists -# -# icp_access allow|deny [!]aclname ... -# -# See http_access for details -# -#Default: -# icp_access deny all -# -#Allow ICP queries from local networks only -icp_access allow localnet -icp_access deny all - -# TAG: htcp_access -# Allowing or Denying access to the HTCP port based on defined -# access lists -# -# htcp_access allow|deny [!]aclname ... -# -# See http_access for details -# -# NOTE: The default if no htcp_access lines are present is to -# deny all traffic. This default may cause problems with peers -# using the htcp or htcp-oldsquid options. -# -#Default: -# htcp_access deny all -# -#Allow HTCP queries from local networks only -# htcp_access allow localnet -# htcp_access deny all - -# TAG: htcp_clr_access -# Allowing or Denying access to purge content using HTCP based -# on defined access lists -# -# htcp_clr_access allow|deny [!]aclname ... -# -# See http_access for details -# -##Allow HTCP CLR requests from trusted peers -#acl htcp_clr_peer src 172.16.1.2 -#htcp_clr_access allow htcp_clr_peer -# -#Default: -# htcp_clr_access deny all - -# TAG: miss_access -# Use to force your neighbors to use you as a sibling instead of -# a parent. For example: -# -# acl localclients src 172.16.0.0/16 -# miss_access allow localclients -# miss_access deny !localclients -# -# This means only your local clients are allowed to fetch -# MISSES and all other clients can only fetch HITS. -# -# By default, allow all clients who passed the http_access rules -# to fetch MISSES from us. -# -#Default setting: -# miss_access allow all - -# TAG: ident_lookup_access -# A list of ACL elements which, if matched, cause an ident -# (RFC931) lookup to be performed for this request. For -# example, you might choose to always perform ident lookups -# for your main multi-user Unix boxes, but not for your Macs -# and PCs. By default, ident lookups are not performed for -# any requests. -# -# To enable ident lookups for specific client addresses, you -# can follow this example: -# -# acl ident_aware_hosts src 198.168.1.0/255.255.255.0 -# ident_lookup_access allow ident_aware_hosts -# ident_lookup_access deny all -# -# Only src type ACL checks are fully supported. A src_domain -# ACL might work at times, but it will not always provide -# the correct result. -# -#Default: -# ident_lookup_access deny all - -# TAG: reply_body_max_size bytes allow|deny acl acl... -# This option specifies the maximum size of a reply body in bytes. -# It can be used to prevent users from downloading very large files, -# such as MP3's and movies. When the reply headers are received, -# the reply_body_max_size lines are processed, and the first line with -# a result of "allow" is used as the maximum body size for this reply. -# This size is checked twice. First when we get the reply headers, -# we check the content-length value. If the content length value exists -# and is larger than the allowed size, the request is denied and the -# user receives an error message that says "the request or reply -# is too large." If there is no content-length, and the reply -# size exceeds this limit, the client's connection is just closed -# and they will receive a partial reply. -# -# WARNING: downstream caches probably can not detect a partial reply -# if there is no content-length header, so they will cache -# partial responses and give them out as hits. You should NOT -# use this option if you have downstream caches. -# -# If you set this parameter to zero (the default), there will be -# no limit imposed. -# -#Default: -# reply_body_max_size 0 allow all - -# TAG: authenticate_ip_shortcircuit_access -# Access list determining when shortcicuiting the authentication process -# based on source IP cached credentials is acceptable. Use this to deny -# using the ip auth cache on requests from child proxies or other source -# ip's having multiple users. -# -# See also authenticate_ip_shortcircuit_ttl directive -# -#Default: -# none - - -# OPTIONS FOR X-Forwarded-For -# ----------------------------------------------------------------------------- - -# TAG: follow_x_forwarded_for -# Note: This option is only available if Squid is rebuilt with the -# -DFOLLOW_X_FORWARDED_FOR option -# -# Allowing or Denying the X-Forwarded-For header to be followed to -# find the original source of a request. -# -# Requests may pass through a chain of several other proxies -# before reaching us. The X-Forwarded-For header will contain a -# comma-separated list of the IP addresses in the chain, with the -# rightmost address being the most recent. -# -# If a request reaches us from a source that is allowed by this -# configuration item, then we consult the X-Forwarded-For header -# to see where that host received the request from. If the -# X-Forwarded-For header contains multiple addresses, and if -# acl_uses_indirect_client is on, then we continue backtracking -# until we reach an address for which we are not allowed to -# follow the X-Forwarded-For header, or until we reach the first -# address in the list. (If acl_uses_indirect_client is off, then -# it's impossible to backtrack through more than one level of -# X-Forwarded-For addresses.) -# -# The end result of this process is an IP address that we will -# refer to as the indirect client address. This address may -# be treated as the client address for access control, delay -# pools and logging, depending on the acl_uses_indirect_client, -# delay_pool_uses_indirect_client and log_uses_indirect_client -# options. -# -# SECURITY CONSIDERATIONS: -# -# Any host for which we follow the X-Forwarded-For header -# can place incorrect information in the header, and Squid -# will use the incorrect information as if it were the -# source address of the request. This may enable remote -# hosts to bypass any access control restrictions that are -# based on the client's source addresses. -# -# For example: -# -# acl localhost src 127.0.0.1 -# acl my_other_proxy srcdomain .proxy.example.com -# follow_x_forwarded_for allow localhost -# follow_x_forwarded_for allow my_other_proxy -# -#Default: -# follow_x_forwarded_for deny all - -# TAG: acl_uses_indirect_client on|off -# Note: This option is only available if Squid is rebuilt with the -# -DFOLLOW_X_FORWARDED_FOR option -# -# Controls whether the indirect client address -# (see follow_x_forwarded_for) is used instead of the -# direct client address in acl matching. -# -#Default: -# acl_uses_indirect_client on - -# TAG: delay_pool_uses_indirect_client on|off -# Note: This option is only available if Squid is rebuilt with the -# -DFOLLOW_X_FORWARDED_FOR option -# -# Controls whether the indirect client address -# (see follow_x_forwarded_for) is used instead of the -# direct client address in delay pools. -# -#Default: -# delay_pool_uses_indirect_client on - -# TAG: log_uses_indirect_client on|off -# Note: This option is only available if Squid is rebuilt with the -# -DFOLLOW_X_FORWARDED_FOR option -# -# Controls whether the indirect client address -# (see follow_x_forwarded_for) is used instead of the -# direct client address in the access log. -# -#Default: -# log_uses_indirect_client on - - -# SSL OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: ssl_unclean_shutdown -# Some browsers (especially MSIE) bugs out on SSL shutdown -# messages. -# -#Default: -# ssl_unclean_shutdown off - -# TAG: ssl_engine -# The OpenSSL engine to use. You will need to set this if you -# would like to use hardware SSL acceleration for example. -# -#Default: -# none - -# TAG: sslproxy_client_certificate -# Client SSL Certificate to use when proxying https:// URLs -# -#Default: -# none - -# TAG: sslproxy_client_key -# Client SSL Key to use when proxying https:// URLs -# -#Default: -# none - -# TAG: sslproxy_version -# SSL version level to use when proxying https:// URLs -# -#Default: -# sslproxy_version 1 - -# TAG: sslproxy_options -# SSL engine options to use when proxying https:// URLs -# -#Default: -# none - -# TAG: sslproxy_cipher -# SSL cipher list to use when proxying https:// URLs -# -#Default: -# none - -# TAG: sslproxy_cafile -# file containing CA certificates to use when verifying server -# certificates while proxying https:// URLs -# -#Default: -# none - -# TAG: sslproxy_capath -# directory containing CA certificates to use when verifying -# server certificates while proxying https:// URLs -# -#Default: -# none - -# TAG: sslproxy_flags -# Various flags modifying the use of SSL while proxying https:// URLs: -# DONT_VERIFY_PEER Accept certificates even if they fail to -# verify. -# NO_DEFAULT_CA Don't use the default CA list built in -# to OpenSSL. -# -#Default: -# none - -# TAG: sslpassword_program -# Specify a program used for entering SSL key passphrases -# when using encrypted SSL certificate keys. If not specified -# keys must either be unencrypted, or Squid started with the -N -# option to allow it to query interactively for the passphrase. -# -#Default: -# none - - -# NETWORK OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: http_port -# Usage: port [options] -# hostname:port [options] -# 1.2.3.4:port [options] -# -# The socket addresses where Squid will listen for HTTP client -# requests. You may specify multiple socket addresses. -# There are three forms: port alone, hostname with port, and -# IP address with port. If you specify a hostname or IP -# address, Squid binds the socket to that specific -# address. This replaces the old 'tcp_incoming_address' -# option. Most likely, you do not need to bind to a specific -# address, so you can use the port number alone. -# -# If you are running Squid in accelerator mode, you -# probably want to listen on port 80 also, or instead. -# -# The -I command line option will override the *first* port -# specified here. -# -# You may specify multiple socket addresses on multiple lines. -# -# Options: -# -# transparent Support for transparent interception of -# outgoing requests without browser settings. -# -# tproxy Support Linux TPROXY for spoofing outgoing -# connections using the client IP address. -# -# accel Accelerator mode. See also the related vhost, -# vport and defaultsite directives. -# -# defaultsite=domainname -# What to use for the Host: header if it is not present -# in a request. Determines what site (not origin server) -# accelerators should consider the default. -# Defaults to visible_hostname:port if not set -# May be combined with vport=NN to override the port number. -# Implies accel. -# -# vhost Accelerator mode using Host header for virtual -# domain support. Implies accel. -# -# vport Accelerator with IP based virtual host support. -# Implies accel. -# -# vport=NN As above, but uses specified port number rather -# than the http_port number. Implies accel. -# -# allow-direct Allow direct forwarding in accelerator mode. Normally -# accelerated requests is denied direct forwarding as it -# never_direct was used. -# -# urlgroup= Default urlgroup to mark requests with (see -# also acl urlgroup and url_rewrite_program) -# -# protocol= Protocol to reconstruct accelerated requests with. -# Defaults to http. -# -# no-connection-auth -# Prevent forwarding of Microsoft connection oriented -# authentication (NTLM, Negotiate and Kerberos) -# -# act-as-origin -# Act is if this Squid is the origin server. -# This currently means generate own Date: and -# Expires: headers. Implies accel. -# -# http11 Enables HTTP/1.1 support to clients. The HTTP/1.1 -# support is still incomplete with an internal HTTP/1.0 -# hop, but should work with most clients. The main -# HTTP/1.1 features missing due to this is forwarding -# of requests using chunked transfer encoding (results -# in 411) and forwarding of 1xx responses (silently -# dropped) -# -# name= Specifies a internal name for the port. Defaults to -# the port specification (port or addr:port) -# -# tcpkeepalive[=idle,interval,timeout] -# Enable TCP keepalive probes of idle connections -# idle is the initial time before TCP starts probing -# the connection, interval how often to probe, and -# timeout the time before giving up. -# -# If you run Squid on a dual-homed machine with an internal -# and an external interface we recommend you to specify the -# internal address:port in http_port. This way Squid will only be -# visible on the internal address. -# -# Squid normally listens to port 3128 -http_port 3128 - -# TAG: https_port -# Usage: [ip:]port cert=certificate.pem [key=key.pem] [options...] -# -# The socket address where Squid will listen for HTTPS client -# requests. -# -# This is really only useful for situations where you are running -# squid in accelerator mode and you want to do the SSL work at the -# accelerator level. -# -# You may specify multiple socket addresses on multiple lines, -# each with their own SSL certificate and/or options. -# -# Options: -# -# In addition to the options specified for http_port the folling -# SSL related options is supported: -# -# cert= Path to SSL certificate (PEM format). -# -# key= Path to SSL private key file (PEM format) -# if not specified, the certificate file is -# assumed to be a combined certificate and -# key file. -# -# version= The version of SSL/TLS supported -# 1 automatic (default) -# 2 SSLv2 only -# 3 SSLv3 only -# 4 TLSv1 only -# -# cipher= Colon separated list of supported ciphers. -# -# options= Various SSL engine options. The most important -# being: -# NO_SSLv2 Disallow the use of SSLv2 -# NO_SSLv3 Disallow the use of SSLv3 -# NO_TLSv1 Disallow the use of TLSv1 -# SINGLE_DH_USE Always create a new key when using -# temporary/ephemeral DH key exchanges -# See src/ssl_support.c or OpenSSL SSL_CTX_set_options -# documentation for a complete list of options. -# -# clientca= File containing the list of CAs to use when -# requesting a client certificate. -# -# cafile= File containing additional CA certificates to -# use when verifying client certificates. If unset -# clientca will be used. -# -# capath= Directory containing additional CA certificates -# and CRL lists to use when verifying client certificates. -# -# crlfile= File of additional CRL lists to use when verifying -# the client certificate, in addition to CRLs stored in -# the capath. Implies VERIFY_CRL flag below. -# -# dhparams= File containing DH parameters for temporary/ephemeral -# DH key exchanges. -# -# sslflags= Various flags modifying the use of SSL: -# DELAYED_AUTH -# Don't request client certificates -# immediately, but wait until acl processing -# requires a certificate (not yet implemented). -# NO_DEFAULT_CA -# Don't use the default CA lists built in -# to OpenSSL. -# NO_SESSION_REUSE -# Don't allow for session reuse. Each connection -# will result in a new SSL session. -# VERIFY_CRL -# Verify CRL lists when accepting client -# certificates. -# VERIFY_CRL_ALL -# Verify CRL lists for all certificates in the -# client certificate chain. -# -# sslcontext= SSL session ID context identifier. -# -# -#Default: -# none - -# TAG: tcp_outgoing_tos -# Allows you to select a TOS/Diffserv value to mark outgoing -# connections with, based on the username or source address -# making the request. -# -# tcp_outgoing_tos ds-field [!]aclname ... -# -# Example where normal_service_net uses the TOS value 0x00 -# and good_service_net uses 0x20 -# -# acl normal_service_net src 10.0.0.0/255.255.255.0 -# acl good_service_net src 10.0.1.0/255.255.255.0 -# tcp_outgoing_tos 0x00 normal_service_net -# tcp_outgoing_tos 0x20 good_service_net -# -# TOS/DSCP values really only have local significance - so you should -# know what you're specifying. For more information, see RFC2474 and -# RFC3260. -# -# The TOS/DSCP byte must be exactly that - a octet value 0 - 255, or -# "default" to use whatever default your host has. Note that in -# practice often only values 0 - 63 is usable as the two highest bits -# have been redefined for use by ECN (RFC3168). -# -# Processing proceeds in the order specified, and stops at first fully -# matching line. -# -# Note: The use of this directive using client dependent ACLs is -# incompatible with the use of server side persistent connections. To -# ensure correct results it is best to set server_persisten_connections -# to off when using this directive in such configurations. -# -#Default: -# none - -# TAG: tcp_outgoing_address -# Allows you to map requests to different outgoing IP addresses -# based on the username or source address of the user making -# the request. -# -# tcp_outgoing_address ipaddr [[!]aclname] ... -# -# Example where requests from 10.0.0.0/24 will be forwarded -# with source address 10.1.0.1, 10.0.2.0/24 forwarded with -# source address 10.1.0.2 and the rest will be forwarded with -# source address 10.1.0.3. -# -# acl normal_service_net src 10.0.0.0/24 -# acl good_service_net src 10.0.1.0/24 10.0.2.0/24 -# tcp_outgoing_address 10.1.0.1 normal_service_net -# tcp_outgoing_address 10.1.0.2 good_service_net -# tcp_outgoing_address 10.1.0.3 -# -# Processing proceeds in the order specified, and stops at first fully -# matching line. -# -# Note: The use of this directive using client dependent ACLs is -# incompatible with the use of server side persistent connections. To -# ensure correct results it is best to set server_persistent_connections -# to off when using this directive in such configurations. -# -#Default: -# none - -# TAG: zph_mode -# This option enables packet level marking of HIT/MISS responses, -# either using IP TOS or socket priority. -# off Feature disabled -# tos Set the IP TOS/Diffserv field -# priority Set the socket priority (may get mapped to TOS by OS, -# otherwise only usable in local rulesets) -# option Embed the mark in an IP option field. See also -# zph_option. -# -# See also tcp_outgoing_tos for details/requirements about TOS usage. -# -#Default: -# zph_mode off - -# TAG: zph_local -# Allows you to select a TOS/Diffserv/Priority value to mark local hits. -# Default: 0 (disabled). -# -#Default: -# zph_local 0 - -# TAG: zph_sibling -# Allows you to select a TOS/Diffserv/Priority value to mark sibling hits. -# Default: 0 (disabled). -# -#Default: -# zph_sibling 0 - -# TAG: zph_parent -# Allows you to select a TOS/Diffserv/Priority value to mark parent hits. -# Default: 0 (disabled). -# -#Default: -# zph_parent 0 - -# TAG: zph_option -# The IP option to use when zph_mode is set to "option". Defaults to -# 136 which is officially registered as "SATNET Stream ID". -# -#Default: -# zph_option 136 - - -# OPTIONS WHICH AFFECT THE NEIGHBOR SELECTION ALGORITHM -# ----------------------------------------------------------------------------- - -# TAG: cache_peer -# To specify other caches in a hierarchy, use the format: -# -# cache_peer hostname type http-port icp-port [options] -# -# For example, -# -# # proxy icp -# # hostname type port port options -# # -------------------- -------- ----- ----- ----------- -# cache_peer parent.foo.net parent 3128 3130 proxy-only default -# cache_peer sib1.foo.net sibling 3128 3130 proxy-only -# cache_peer sib2.foo.net sibling 3128 3130 proxy-only -# -# type: either 'parent', 'sibling', or 'multicast'. -# -# proxy-port: The port number where the cache listens for proxy -# requests. -# -# icp-port: Used for querying neighbor caches about -# objects. To have a non-ICP neighbor -# specify '7' for the ICP port and make sure the -# neighbor machine has the UDP echo port -# enabled in its /etc/inetd.conf file. -# NOTE: Also requires icp_port option enabled to send/receive -# requests via this method. -# -# options: proxy-only -# weight=n -# ttl=n -# no-query -# default -# round-robin -# carp -# multicast-responder -# multicast-siblings -# closest-only -# no-digest -# no-netdb-exchange -# no-delay -# login=user:password | PASS | *:password -# connect-timeout=nn -# digest-url=url -# allow-miss -# max-conn=n -# htcp -# htcp-oldsquid -# originserver -# userhash -# sourcehash -# name=xxx -# monitorurl=url -# monitorsize=sizespec -# monitorinterval=seconds -# monitortimeout=seconds -# forceddomain=name -# ssl -# sslcert=/path/to/ssl/certificate -# sslkey=/path/to/ssl/key -# sslversion=1|2|3|4 -# sslcipher=... -# ssloptions=... -# front-end-https[=on|auto] -# connection-auth[=on|off|auto] -# idle=n -# http11 -# -# use 'proxy-only' to specify objects fetched -# from this cache should not be saved locally. -# -# use 'weight=n' to affect the selection of a peer -# during any weighted peer-selection mechanisms. -# The weight must be an integer; default is 1, -# larger weights are favored more. -# This option does not affect parent selection if a peering -# protocol is not in use. -# -# use 'ttl=n' to specify a IP multicast TTL to use -# when sending an ICP queries to this address. -# Only useful when sending to a multicast group. -# Because we don't accept ICP replies from random -# hosts, you must configure other group members as -# peers with the 'multicast-responder' option below. -# -# use 'no-query' to NOT send ICP queries to this -# neighbor. -# -# use 'default' if this is a parent cache which can -# be used as a "last-resort" if a peer cannot be located -# by any of the peer-selection mechanisms. -# If specified more than once, only the first is used. -# -# use 'round-robin' to define a set of parents which -# should be used in a round-robin fashion in the -# absence of any ICP queries. -# -# use 'carp' to define a set of parents which should -# be used as a CARP array. The requests will be -# distributed among the parents based on the CARP load -# balancing hash function based on their weight. -# -# 'multicast-responder' indicates the named peer -# is a member of a multicast group. ICP queries will -# not be sent directly to the peer, but ICP replies -# will be accepted from it. -# -# the 'multicast-siblings' option is meant to be used -# only for cache peers of type "multicast". It instructs -# Squid that ALL members of this multicast group have -# "sibling" relationship with it, not "parent". This is -# an optimization that avoids useless multicast queries -# to a multicast group when the requested object would -# be fetched only from a "parent" cache, anyway. It's -# useful, e.g., when configuring a pool of redundant -# Squid proxies, being members of the same -# multicast group. -# -# 'closest-only' indicates that, for ICP_OP_MISS -# replies, we'll only forward CLOSEST_PARENT_MISSes -# and never FIRST_PARENT_MISSes. -# -# use 'no-digest' to NOT request cache digests from -# this neighbor. -# -# 'no-netdb-exchange' disables requesting ICMP -# RTT database (NetDB) from the neighbor. -# -# use 'no-delay' to prevent access to this neighbor -# from influencing the delay pools. -# -# use 'login=user:password' if this is a personal/workgroup -# proxy and your parent requires proxy authentication. -# Note: The string can include URL escapes (i.e. %20 for -# spaces). This also means % must be written as %%. -# -# use 'login=PASS' if users must authenticate against -# the upstream proxy or in the case of a reverse proxy -# configuration, the origin web server. This will pass -# the users credentials as they are to the peer. -# Note: To combine this with local authentication the Basic -# authentication scheme must be used, and both servers must -# share the same user database as HTTP only allows for -# a single login (one for proxy, one for origin server). -# Also be warned this will expose your users proxy -# password to the peer. USE WITH CAUTION -# -# use 'login=*:password' to pass the username to the -# upstream cache, but with a fixed password. This is meant -# to be used when the peer is in another administrative -# domain, but it is still needed to identify each user. -# The star can optionally be followed by some extra -# information which is added to the username. This can -# be used to identify this proxy to the peer, similar to -# the login=username:password option above. -# -# use 'connect-timeout=nn' to specify a peer -# specific connect timeout (also see the -# peer_connect_timeout directive) -# -# use 'digest-url=url' to tell Squid to fetch the cache -# digest (if digests are enabled) for this host from -# the specified URL rather than the Squid default -# location. -# -# use 'allow-miss' to disable Squid's use of only-if-cached -# when forwarding requests to siblings. This is primarily -# useful when icp_hit_stale is used by the sibling. To -# extensive use of this option may result in forwarding -# loops, and you should avoid having two-way peerings -# with this option. (for example to deny peer usage on -# requests from peer by denying cache_peer_access if the -# source is a peer) -# -# use 'max-conn=n' to limit the amount of connections Squid -# may open to this peer. -# -# use 'htcp' to send HTCP, instead of ICP, queries -# to the neighbor. You probably also want to -# set the "icp port" to 4827 instead of 3130. -# You must also allow this Squid htcp_access and -# http_access in the peer Squid configuration. -# -# use 'htcp-oldsquid' to send HTCP to old Squid versions -# You must also allow this Squid htcp_access and -# http_access in the peer Squid configuration. -# -# 'originserver' causes this parent peer to be contacted as -# a origin server. Meant to be used in accelerator setups. -# -# use 'userhash' to load-balance amongst a set of parents -# based on the client proxy_auth or ident username. -# -# use 'sourcehash' to load-balance amongst a set of parents -# based on the client source ip. -# -# use 'name=xxx' if you have multiple peers on the same -# host but different ports. This name can be used to -# differentiate the peers in cache_peer_access and similar -# directives. -# -# use 'monitorurl=url' to have periodically request a given -# URL from the peer, and only consider the peer as alive -# if this monitoring is successful (default none) -# -# use 'monitorsize=min[-max]' to limit the size range of -# 'monitorurl' replies considered valid. Defaults to 0 to -# accept any size replies as valid. -# -# use 'monitorinterval=seconds' to change frequency of -# how often the peer is monitored with 'monitorurl' -# (default 300 for a 5 minute interval). If set to 0 -# then monitoring is disabled even if a URL is defined. -# -# use 'monitortimeout=seconds' to change the timeout of -# 'monitorurl'. Defaults to 'monitorinterval'. -# -# use 'forceddomain=name' to forcibly set the Host header -# of requests forwarded to this peer. Useful in accelerator -# setups where the server (peer) expects a certain domain -# name and using redirectors to feed this domain name -# is not feasible. -# -# use 'ssl' to indicate connections to this peer should -# be SSL/TLS encrypted. -# -# use 'sslcert=/path/to/ssl/certificate' to specify a client -# SSL certificate to use when connecting to this peer. -# -# use 'sslkey=/path/to/ssl/key' to specify the private SSL -# key corresponding to sslcert above. If 'sslkey' is not -# specified 'sslcert' is assumed to reference a -# combined file containing both the certificate and the key. -# -# use sslversion=1|2|3|4 to specify the SSL version to use -# when connecting to this peer -# 1 = automatic (default) -# 2 = SSL v2 only -# 3 = SSL v3 only -# 4 = TLS v1 only -# -# use sslcipher=... to specify the list of valid SSL ciphers -# to use when connecting to this peer. -# -# use ssloptions=... to specify various SSL engine options: -# NO_SSLv2 Disallow the use of SSLv2 -# NO_SSLv3 Disallow the use of SSLv3 -# NO_TLSv1 Disallow the use of TLSv1 -# See src/ssl_support.c or the OpenSSL documentation for -# a more complete list. -# -# use sslcafile=... to specify a file containing -# additional CA certificates to use when verifying the -# peer certificate. -# -# use sslcapath=... to specify a directory containing -# additional CA certificates to use when verifying the -# peer certificate. -# -# use sslcrlfile=... to specify a certificate revocation -# list file to use when verifying the peer certificate. -# -# use sslflags=... to specify various flags modifying the -# SSL implementation: -# DONT_VERIFY_PEER -# Accept certificates even if they fail to -# verify. -# NO_DEFAULT_CA -# Don't use the default CA list built in -# to OpenSSL. -# -# use ssldomain= to specify the peer name as advertised -# in it's certificate. Used for verifying the correctness -# of the received peer certificate. If not specified the -# peer hostname will be used. -# -# use front-end-https to enable the "Front-End-Https: On" -# header needed when using Squid as a SSL frontend in front -# of Microsoft OWA. See MS KB document Q307347 for details -# on this header. If set to auto the header will -# only be added if the request is forwarded as a https:// -# URL. -# -# use connection-auth=off to tell Squid that this peer does -# not support Microsoft connection oriented authentication, -# and any such challenges received from there should be -# ignored. Default is auto to automatically determine the -# status of the peer. -# -# use idle=n to specify a minimum number of idle connections -# that should be kept open to this peer. -# -# use http11 to send requests using HTTP/1.1 to this peer. -# Note: The HTTP/1.1 support is still incomplete, with an -# internal HTTP/1.0 hop. As result 1xx responses will not -# be forwarded. -# -#Default: -# none - -# TAG: cache_peer_domain -# Use to limit the domains for which a neighbor cache will be -# queried. Usage: -# -# cache_peer_domain cache-host domain [domain ...] -# cache_peer_domain cache-host !domain -# -# For example, specifying -# -# cache_peer_domain parent.foo.net .edu -# -# has the effect such that UDP query packets are sent to -# 'bigserver' only when the requested object exists on a -# server in the .edu domain. Prefixing the domain name -# with '!' means the cache will be queried for objects -# NOT in that domain. -# -# NOTE: * Any number of domains may be given for a cache-host, -# either on the same or separate lines. -# * When multiple domains are given for a particular -# cache-host, the first matched domain is applied. -# * Cache hosts with no domain restrictions are queried -# for all requests. -# * There are no defaults. -# * There is also a 'cache_peer_access' tag in the ACL -# section. -# -#Default: -# none - -# TAG: cache_peer_access -# Similar to 'cache_peer_domain' but provides more flexibility by -# using ACL elements. -# -# cache_peer_access cache-host allow|deny [!]aclname ... -# -# The syntax is identical to 'http_access' and the other lists of -# ACL elements. See the comments for 'http_access' below, or -# the Squid FAQ (http://www.squid-cache.org/FAQ/FAQ-10.html). -# -#Default: -# none - -# TAG: neighbor_type_domain -# usage: neighbor_type_domain neighbor parent|sibling domain domain ... -# -# Modifying the neighbor type for specific domains is now -# possible. You can treat some domains differently than the the -# default neighbor type specified on the 'cache_peer' line. -# Normally it should only be necessary to list domains which -# should be treated differently because the default neighbor type -# applies for hostnames which do not match domains listed here. -# -#EXAMPLE: -# cache_peer cache.foo.org parent 3128 3130 -# neighbor_type_domain cache.foo.org sibling .com .net -# neighbor_type_domain cache.foo.org sibling .au .de -# -#Default: -# none - -# TAG: dead_peer_timeout (seconds) -# This controls how long Squid waits to declare a peer cache -# as "dead." If there are no ICP replies received in this -# amount of time, Squid will declare the peer dead and not -# expect to receive any further ICP replies. However, it -# continues to send ICP queries, and will mark the peer as -# alive upon receipt of the first subsequent ICP reply. -# -# This timeout also affects when Squid expects to receive ICP -# replies from peers. If more than 'dead_peer' seconds have -# passed since the last ICP reply was received, Squid will not -# expect to receive an ICP reply on the next query. Thus, if -# your time between requests is greater than this timeout, you -# will see a lot of requests sent DIRECT to origin servers -# instead of to your parents. -# -#Default: -# dead_peer_timeout 10 seconds - -# TAG: hierarchy_stoplist -# A list of words which, if found in a URL, cause the object to -# be handled directly by this cache. In other words, use this -# to not query neighbor caches for certain objects. You may -# list this option multiple times. Note: never_direct overrides -# this option. -#We recommend you to use at least the following line. -hierarchy_stoplist cgi-bin ? - - -# MEMORY CACHE OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: cache_mem (bytes) -# NOTE: THIS PARAMETER DOES NOT SPECIFY THE MAXIMUM PROCESS SIZE. -# IT ONLY PLACES A LIMIT ON HOW MUCH ADDITIONAL MEMORY SQUID WILL -# USE AS A MEMORY CACHE OF OBJECTS. SQUID USES MEMORY FOR OTHER -# THINGS AS WELL. SEE THE SQUID FAQ SECTION 8 FOR DETAILS. -# -# 'cache_mem' specifies the ideal amount of memory to be used -# for: -# * In-Transit objects -# * Hot Objects -# * Negative-Cached objects -# -# Data for these objects are stored in 4 KB blocks. This -# parameter specifies the ideal upper limit on the total size of -# 4 KB blocks allocated. In-Transit objects take the highest -# priority. -# -# In-transit objects have priority over the others. When -# additional space is needed for incoming data, negative-cached -# and hot objects will be released. In other words, the -# negative-cached and hot objects will fill up any unused space -# not needed for in-transit objects. -# -# If circumstances require, this limit will be exceeded. -# Specifically, if your incoming request rate requires more than -# 'cache_mem' of memory to hold in-transit objects, Squid will -# exceed this limit to satisfy the new requests. When the load -# decreases, blocks will be freed until the high-water mark is -# reached. Thereafter, blocks will be used to store hot -# objects. -# -#Default: -# cache_mem 8 MB - -# TAG: maximum_object_size_in_memory (bytes) -# Objects greater than this size will not be attempted to kept in -# the memory cache. This should be set high enough to keep objects -# accessed frequently in memory to improve performance whilst low -# enough to keep larger objects from hoarding cache_mem. -# -#Default: -# maximum_object_size_in_memory 8 KB - -# TAG: memory_replacement_policy -# The memory replacement policy parameter determines which -# objects are purged from memory when memory space is needed. -# -# See cache_replacement_policy for details. -# -#Default: -# memory_replacement_policy lru - - -# DISK CACHE OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: cache_replacement_policy -# The cache replacement policy parameter determines which -# objects are evicted (replaced) when disk space is needed. -# -# lru : Squid's original list based LRU policy -# heap GDSF : Greedy-Dual Size Frequency -# heap LFUDA: Least Frequently Used with Dynamic Aging -# heap LRU : LRU policy implemented using a heap -# -# Applies to any cache_dir lines listed below this. -# -# The LRU policies keeps recently referenced objects. -# -# The heap GDSF policy optimizes object hit rate by keeping smaller -# popular objects in cache so it has a better chance of getting a -# hit. It achieves a lower byte hit rate than LFUDA though since -# it evicts larger (possibly popular) objects. -# -# The heap LFUDA policy keeps popular objects in cache regardless of -# their size and thus optimizes byte hit rate at the expense of -# hit rate since one large, popular object will prevent many -# smaller, slightly less popular objects from being cached. -# -# Both policies utilize a dynamic aging mechanism that prevents -# cache pollution that can otherwise occur with frequency-based -# replacement policies. -# -# NOTE: if using the LFUDA replacement policy you should increase -# the value of maximum_object_size above its default of 4096 KB to -# to maximize the potential byte hit rate improvement of LFUDA. -# -# For more information about the GDSF and LFUDA cache replacement -# policies see http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html -# and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html. -# -#Default: -# cache_replacement_policy lru - -# TAG: cache_dir -# Usage: -# -# cache_dir Type Directory-Name Fs-specific-data [options] -# -# You can specify multiple cache_dir lines to spread the -# cache among different disk partitions. -# -# Type specifies the kind of storage system to use. Only "ufs" -# is built by default. To enable any of the other storage systems -# see the --enable-storeio configure option. -# -# 'Directory' is a top-level directory where cache swap -# files will be stored. If you want to use an entire disk -# for caching, this can be the mount-point directory. -# The directory must exist and be writable by the Squid -# process. Squid will NOT create this directory for you. -# Only using COSS, a raw disk device or a stripe file can -# be specified, but the configuration of the "cache_swap_log" -# tag is mandatory. -# -# The ufs store type: -# -# "ufs" is the old well-known Squid storage format that has always -# been there. -# -# cache_dir ufs Directory-Name Mbytes L1 L2 [options] -# -# 'Mbytes' is the amount of disk space (MB) to use under this -# directory. The default is 100 MB. Change this to suit your -# configuration. Do NOT put the size of your disk drive here. -# Instead, if you want Squid to use the entire disk drive, -# subtract 20% and use that value. -# -# 'Level-1' is the number of first-level subdirectories which -# will be created under the 'Directory'. The default is 16. -# -# 'Level-2' is the number of second-level subdirectories which -# will be created under each first-level directory. The default -# is 256. -# -# The aufs store type: -# -# "aufs" uses the same storage format as "ufs", utilizing -# POSIX-threads to avoid blocking the main Squid process on -# disk-I/O. This was formerly known in Squid as async-io. -# -# cache_dir aufs Directory-Name Mbytes L1 L2 [options] -# -# see argument descriptions under ufs above -# -# The diskd store type: -# -# "diskd" uses the same storage format as "ufs", utilizing a -# separate process to avoid blocking the main Squid process on -# disk-I/O. -# -# cache_dir diskd Directory-Name Mbytes L1 L2 [options] [Q1=n] [Q2=n] -# -# see argument descriptions under ufs above -# -# Q1 specifies the number of unacknowledged I/O requests when Squid -# stops opening new files. If this many messages are in the queues, -# Squid won't open new files. Default is 64 -# -# Q2 specifies the number of unacknowledged messages when Squid -# starts blocking. If this many messages are in the queues, -# Squid blocks until it receives some replies. Default is 72 -# -# When Q1 < Q2 (the default), the cache directory is optimized -# for lower response time at the expense of a decrease in hit -# ratio. If Q1 > Q2, the cache directory is optimized for -# higher hit ratio at the expense of an increase in response -# time. -# -# The coss store type: -# -# block-size=n defines the "block size" for COSS cache_dir's. -# Squid uses file numbers as block numbers. Since file numbers -# are limited to 24 bits, the block size determines the maximum -# size of the COSS partition. The default is 512 bytes, which -# leads to a maximum cache_dir size of 512<<24, or 8 GB. Note -# you should not change the COSS block size after Squid -# has written some objects to the cache_dir. -# -# overwrite-percent=n defines the percentage of disk that COSS -# must write to before a given object will be moved to the -# current stripe. A value of "n" closer to 100 will cause COSS -# to waste less disk space by having multiple copies of an object -# on disk, but will increase the chances of overwriting a popular -# object as COSS overwrites stripes. A value of "n" close to 0 -# will cause COSS to keep all current objects in the current COSS -# stripe at the expense of the hit rate. The default value of 50 -# will allow any given object to be stored on disk a maximum of -# 2 times. -# -# max-stripe-waste=n defines the maximum amount of space that COSS -# will waste in a given stripe (in bytes). When COSS writes data -# to disk, it will potentially waste up to "max-size" worth of disk -# space for each 1MB of data written. If "max-size" is set to a -# large value (ie >256k), this could potentially result in large -# amounts of wasted disk space. Setting this value to a lower value -# (ie 64k or 32k) will result in a COSS disk refusing to cache -# larger objects until the COSS stripe has been filled to within -# "max-stripe-waste" of the maximum size (1MB). -# -# membufs=n defines the number of "memory-only" stripes that COSS -# will use. When an cache hit is performed on a COSS stripe before -# COSS has reached the overwrite-percent value for that object, -# COSS will use a series of memory buffers to hold the object in -# while the data is sent to the client. This will define the maximum -# number of memory-only buffers that COSS will use. The default value -# is 10, which will use a maximum of 10MB of memory for buffers. -# -# maxfullbufs=n defines the maximum number of stripes a COSS partition -# will have in memory waiting to be freed (either because the disk is -# under load and the stripe is unwritten, or because clients are still -# transferring data from objects using the memory). In order to try -# and maintain a good hit rate under load, COSS will reserve the last -# 2 full stripes for object hits. (ie a COSS cache_dir will reject -# new objects when the number of full stripes is 2 less than maxfullbufs) -# -# The null store type: -# -# no options are allowed or required -# -# Common options: -# -# no-store, no new objects should be stored to this cache_dir -# -# min-size=n, refers to the min object size this storedir will accept. -# It's used to restrict a storedir to only store large objects -# (e.g. aufs) while other storedirs are optimized for smaller objects -# (e.g. COSS). Defaults to 0. -# -# max-size=n, refers to the max object size this storedir supports. -# It is used to initially choose the storedir to dump the object. -# Note: To make optimal use of the max-size limits you should order -# the cache_dir lines with the smallest max-size value first and the -# ones with no max-size specification last. -# -# Note that for coss, max-size must be less than COSS_MEMBUF_SZ -# (hard coded at 1 MB). -# -#Default: -cache_dir ufs /var/opt/csw/squid/cache 100 16 256 - -# TAG: store_dir_select_algorithm -# Set this to 'round-robin' as an alternative. -# -#Default: -# store_dir_select_algorithm least-load - -# TAG: max_open_disk_fds -# To avoid having disk as the I/O bottleneck Squid can optionally -# bypass the on-disk cache if more than this amount of disk file -# descriptors are open. -# -# A value of 0 indicates no limit. -# -#Default: -# max_open_disk_fds 0 - -# TAG: minimum_object_size (bytes) -# Objects smaller than this size will NOT be saved on disk. The -# value is specified in kilobytes, and the default is 0 KB, which -# means there is no minimum. -# -#Default: -# minimum_object_size 0 KB - -# TAG: maximum_object_size (bytes) -# Objects larger than this size will NOT be saved on disk. The -# value is specified in kilobytes, and the default is 4MB. If -# you wish to get a high BYTES hit ratio, you should probably -# increase this (one 32 MB object hit counts for 3200 10KB -# hits). If you wish to increase speed more than your want to -# save bandwidth you should leave this low. -# -# NOTE: if using the LFUDA replacement policy you should increase -# this value to maximize the byte hit rate improvement of LFUDA! -# See replacement_policy below for a discussion of this policy. -# -#Default: -# maximum_object_size 4096 KB - -# TAG: cache_swap_low (percent, 0-100) -# TAG: cache_swap_high (percent, 0-100) -# -# The low- and high-water marks for cache object replacement. -# Replacement begins when the swap (disk) usage is above the -# low-water mark and attempts to maintain utilization near the -# low-water mark. As swap utilization gets close to high-water -# mark object eviction becomes more aggressive. If utilization is -# close to the low-water mark less replacement is done each time. -# -# Defaults are 90% and 95%. If you have a large cache, 5% could be -# hundreds of MB. If this is the case you may wish to set these -# numbers closer together. -# -#Default: -# cache_swap_low 90 -# cache_swap_high 95 - -# TAG: update_headers on|off -# By default Squid updates stored HTTP headers when receiving -# a 304 response. Set this to off if you want to disable this -# for disk I/O performance reasons. Disabling this VIOLATES the -# HTTP standard, and could make you liable for problems which it -# causes. -# -#Default: -# update_headers on - - -# LOGFILE OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: logformat -# Usage: -# -# logformat -# -# Defines an access log format. -# -# The is a string with embedded % format codes -# -# % format codes all follow the same basic structure where all but -# the formatcode is optional. Output strings are automatically escaped -# as required according to their context and the output format -# modifiers are usually not needed, but can be specified if an explicit -# output format is desired. -# -# % ["|[|'|#] [-] [[0]width] [{argument}] formatcode -# -# " output in quoted string format -# [ output in squid text log format as used by log_mime_hdrs -# # output in URL quoted format -# ' output as-is -# -# - left aligned -# width field width. If starting with 0 the -# output is zero padded -# {arg} argument such as header name etc -# -# Format codes: -# -# >a Client source IP address -# >A Client FQDN -# >p Client source port -# h Request header. Optional header name argument -# on the format header[:[separator]element] -# h -# un User name -# ul User name from authentication -# ui User name from ident -# us User name from SSL -# ue User name from external acl helper -# Hs HTTP status code -# Ss Squid request status (TCP_MISS etc) -# Sh Squid hierarchy status (DEFAULT_PARENT etc) -# mt MIME content type -# rm Request method (GET/POST etc) -# ru Request URL -# rp Request URL-Path excluding hostname -# rv Request protocol version -# ea Log string returned by external acl -# st Request size including HTTP headers -# st Request+Reply size including HTTP headers -# sn Unique sequence number per log line entry -# % a literal % character -# -# The default formats available (which do not need re-defining) are: -# -#logformat squid %ts.%03tu %6tr %>a %Ss/%03Hs %a %Ss/%03Hs %h] [%a %ui %un [%tl] "%rm %ru HTTP/%rv" %Hs %a %ui %un [%tl] "%rm %ru HTTP/%rv" %Hs %h" "%{User-Agent}>h" %Ss:%Sh -# -#Default: -# none - -# TAG: access_log -# These files log client request activities. Has a line every HTTP or -# ICP request. The format is: -# access_log [ [acl acl ...]] -# access_log none [acl acl ...]] -# -# Will log to the specified file using the specified format (which -# must be defined in a logformat directive) those entries which match -# ALL the acl's specified (which must be defined in acl clauses). -# If no acl is specified, all requests will be logged to this file. -# -# To disable logging of a request use the filepath "none", in which case -# a logformat name should not be specified. -# -# To log the request via syslog specify a filepath of "syslog": -# -# access_log syslog[:facility.priority] [format [acl1 [acl2 ....]]] -# where facility could be any of: -# authpriv, daemon, local0 .. local7 or user. -# -# And priority could be any of: -# err, warning, notice, info, debug. -access_log /var/opt/csw/squid/logs/access.log squid - -# TAG: log_access allow|deny acl acl... -# This options allows you to control which requests gets logged -# to access.log (see access_log directive). Requests denied for -# logging will also not be accounted for in performance counters. -# -#Default: -# none - -# TAG: logfile_daemon -# Specify the path to the logfile-writing daemon. This daemon is -# used to write the access and store logs, if configured. -# -#Default: -# logfile_daemon /opt/csw/libexec/logfile-daemon - -# TAG: cache_log -# Cache logging file. This is where general information about -# your cache's behavior goes. You can increase the amount of data -# logged to this file with the "debug_options" tag below. -# -#Default: -cache_log /var/opt/csw/squid/logs/cache.log - -# TAG: cache_store_log -# Logs the activities of the storage manager. Shows which -# objects are ejected from the cache, and which objects are -# saved and for how long. To disable, enter "none". There are -# not really utilities to analyze this data, so you can safely -# disable it. -# -#Default: -cache_store_log /var/opt/csw/squid/logs/store.log - -# TAG: cache_swap_state -# Location for the cache "swap.state" file. This index file holds -# the metadata of objects saved on disk. It is used to rebuild -# the cache during startup. Normally this file resides in each -# 'cache_dir' directory, but you may specify an alternate -# pathname here. Note you must give a full filename, not just -# a directory. Since this is the index for the whole object -# list you CANNOT periodically rotate it! -# -# If %s can be used in the file name it will be replaced with a -# a representation of the cache_dir name where each / is replaced -# with '.'. This is needed to allow adding/removing cache_dir -# lines when cache_swap_log is being used. -# -# If have more than one 'cache_dir', and %s is not used in the name -# these swap logs will have names such as: -# -# cache_swap_log.00 -# cache_swap_log.01 -# cache_swap_log.02 -# -# The numbered extension (which is added automatically) -# corresponds to the order of the 'cache_dir' lines in this -# configuration file. If you change the order of the 'cache_dir' -# lines in this file, these index files will NOT correspond to -# the correct 'cache_dir' entry (unless you manually rename -# them). We recommend you do NOT use this option. It is -# better to keep these index files in each 'cache_dir' directory. -# -#Default: -# none - -# TAG: logfile_rotate -# Specifies the number of logfile rotations to make when you -# type 'squid -k rotate'. The default is 10, which will rotate -# with extensions 0 through 9. Setting logfile_rotate to 0 will -# disable the file name rotation, but the logfiles are still closed -# and re-opened. This will enable you to rename the logfiles -# yourself just before sending the rotate signal. -# -# Note, the 'squid -k rotate' command normally sends a USR1 -# signal to the running squid process. In certain situations -# (e.g. on Linux with Async I/O), USR1 is used for other -# purposes, so -k rotate uses another signal. It is best to get -# in the habit of using 'squid -k rotate' instead of 'kill -USR1 -# '. -# -#Default: -# logfile_rotate 10 - -# TAG: emulate_httpd_log on|off -# The Cache can emulate the log file format which many 'httpd' -# programs use. To disable/enable this emulation, set -# emulate_httpd_log to 'off' or 'on'. The default -# is to use the native log format since it includes useful -# information Squid-specific log analyzers use. -# -#Default: -# emulate_httpd_log off - -# TAG: log_ip_on_direct on|off -# Log the destination IP address in the hierarchy log tag when going -# direct. Earlier Squid versions logged the hostname here. If you -# prefer the old way set this to off. -# -#Default: -# log_ip_on_direct on - -# TAG: mime_table -# Pathname to Squid's MIME table. You shouldn't need to change -# this, but the default file contains examples and formatting -# information if you do. -# -#Default: -# mime_table /opt/csw/etc/mime.conf - -# TAG: log_mime_hdrs on|off -# The Cache can record both the request and the response MIME -# headers for each HTTP transaction. The headers are encoded -# safely and will appear as two bracketed fields at the end of -# the access log (for either the native or httpd-emulated log -# formats). To enable this logging set log_mime_hdrs to 'on'. -# -#Default: -# log_mime_hdrs off - -# TAG: useragent_log -# Squid will write the User-Agent field from HTTP requests -# to the filename specified here. By default useragent_log -# is disabled. -# -#Default: -# none - -# TAG: referer_log -# Squid will write the Referer field from HTTP requests to the -# filename specified here. By default referer_log is disabled. -# Note that "referer" is actually a misspelling of "referrer" -# however the misspelt version has been accepted into the HTTP RFCs -# and we accept both. -# -#Default: -# none - -# TAG: pid_filename -# A filename to write the process-id to. To disable, enter "none". -# -#Default: -pid_filename /var/opt/csw/squid/logs/squid.pid - -# TAG: debug_options -# Logging options are set as section,level where each source file -# is assigned a unique section. Lower levels result in less -# output, Full debugging (level 9) can result in a very large -# log file, so be careful. The magic word "ALL" sets debugging -# levels for all sections. We recommend normally running with -# "ALL,1". -# -#Default: -# debug_options ALL,1 - -# TAG: log_fqdn on|off -# Turn this on if you wish to log fully qualified domain names -# in the access.log. To do this Squid does a DNS lookup of all -# IP's connecting to it. This can (in some situations) increase -# latency, which makes your cache seem slower for interactive -# browsing. -# -#Default: -# log_fqdn off - -# TAG: client_netmask -# A netmask for client addresses in logfiles and cachemgr output. -# Change this to protect the privacy of your cache clients. -# A netmask of 255.255.255.0 will log all IP's in that range with -# the last digit set to '0'. -# -#Default: -# client_netmask 255.255.255.255 - -# TAG: forward_log -# Note: This option is only available if Squid is rebuilt with the -# --enable-forward-log option -# -# Logs the server-side requests. -# -# This is currently work in progress. -# -#Default: -# none - -# TAG: strip_query_terms -# By default, Squid strips query terms from requested URLs before -# logging. This protects your user's privacy. -# -#Default: -# strip_query_terms on - -# TAG: buffered_logs on|off -# cache.log log file is written with stdio functions, and as such -# it can be buffered or unbuffered. By default it will be unbuffered. -# Buffering it can speed up the writing slightly (though you are -# unlikely to need to worry unless you run with tons of debugging -# enabled in which case performance will suffer badly anyway..). -# -#Default: -# buffered_logs off - -# TAG: netdb_filename -# A filename where Squid stores it's netdb state between restarts. -# To disable, enter "none". -# -#Default: -# netdb_filename /var/opt/csw/squid/logs/netdb.state - - -# OPTIONS FOR FTP GATEWAYING -# ----------------------------------------------------------------------------- - -# TAG: ftp_user -# If you want the anonymous login password to be more informative -# (and enable the use of picky ftp servers), set this to something -# reasonable for your domain, like wwwuser at somewhere.net -# -# The reason why this is domainless by default is the -# request can be made on the behalf of a user in any domain, -# depending on how the cache is used. -# Some ftp server also validate the email address is valid -# (for example perl.com). -# -#Default: -# ftp_user Squid@ - -# TAG: ftp_list_width -# Sets the width of ftp listings. This should be set to fit in -# the width of a standard browser. Setting this too small -# can cut off long filenames when browsing ftp sites. -# -#Default: -# ftp_list_width 32 - -# TAG: ftp_passive -# If your firewall does not allow Squid to use passive -# connections, turn off this option. -# -#Default: -# ftp_passive on - -# TAG: ftp_sanitycheck -# For security and data integrity reasons Squid by default performs -# sanity checks of the addresses of FTP data connections ensure the -# data connection is to the requested server. If you need to allow -# FTP connections to servers using another IP address for the data -# connection turn this off. -# -#Default: -# ftp_sanitycheck on - -# TAG: ftp_telnet_protocol -# The FTP protocol is officially defined to use the telnet protocol -# as transport channel for the control connection. However, many -# implementations are broken and does not respect this aspect of -# the FTP protocol. -# -# If you have trouble accessing files with ASCII code 255 in the -# path or similar problems involving this ASCII code you can -# try setting this directive to off. If that helps, report to the -# operator of the FTP server in question that their FTP server -# is broken and does not follow the FTP standard. -# -#Default: -# ftp_telnet_protocol on - - -# OPTIONS FOR EXTERNAL SUPPORT PROGRAMS -# ----------------------------------------------------------------------------- - -# TAG: diskd_program -# Specify the location of the diskd executable. -# Note this is only useful if you have compiled in -# diskd as one of the store io modules. -# -#Default: -# diskd_program /opt/csw/libexec/diskd-daemon - -# TAG: unlinkd_program -# Specify the location of the executable for file deletion process. -# -#Default: -# unlinkd_program /opt/csw/libexec/unlinkd - -# TAG: pinger_program -# Specify the location of the executable for the pinger process. -# -#Default: -# pinger_program /opt/csw/libexec/pinger - - -# OPTIONS FOR URL REWRITING -# ----------------------------------------------------------------------------- - -# TAG: storeurl_rewrite_program -# Specify the location of the executable for the Store URL rewriter. -# The Store URL rewriter allows URLs to be "normalised" ; mapping -# multiple URLs to a single URL representation for cache operations. -# -# For example, if you request an object at: -# -# http://srv1.example.com/image.gif -# -# and a subsequent request for: -# -# http://srv2.example.com/image.gif -# -# then Squid will treat these both as different URLs and cache them -# seperately. -# -# This is almost the normal case, but an increasing number of sites -# distribute the same content between multiple frontend hosts. -# The Store URL rewriter allows you to rewrite these URLs to one URL -# to use for cache operations, but not -fetches-. Fetches are still -# made from the original site, but stored with the store URL rewritten -# URL as the store key. -# -# For each requested URL rewriter will receive on line with the format -# -# URL client_ip "/" fqdn user method urlgroup -# [ kvpairs] -# -# In the future, the rewriter interface will be extended with -# key=value pairs ("kvpairs" shown above). Rewriter programs -# should be prepared to receive and possibly ignore additional -# whitespace-separated tokens on each input line. -# -# And the rewriter may return a rewritten URL. The other components of -# the request line does not need to be returned (ignored if they are). -# -# By default, a Store URL rewriter is not used. -# -# Please note - the normal URL rewriter rewrites Squid's _destination_ -# URL - ie, what it fetches. The Store URL rewriter rewrites Squid's -# _store_ URL - ie, what it uses to store and retrieve objects. -# -#Default: -# none - -# TAG: storeurl_rewrite_children -# -# -#Default: -# storeurl_rewrite_children 5 - -# TAG: storeurl_rewrite_concurrency -# -# -#Default: -# storeurl_rewrite_concurrency 0 - -# TAG: url_rewrite_program -# Specify the location of the executable for the URL rewriter. -# Since they can perform almost any function there isn't one included. -# -# For each requested URL rewriter will receive on line with the format -# -# URL client_ip "/" fqdn user method urlgroup -# [ kvpairs] -# -# In the future, the rewriter interface will be extended with -# key=value pairs ("kvpairs" shown above). Rewriter programs -# should be prepared to receive and possibly ignore additional -# whitespace-separated tokens on each input line. -# -# And the rewriter may return a rewritten URL. The other components of -# the request line does not need to be returned (ignored if they are). -# -# The rewriter can also indicate that a client-side redirect should -# be performed to the new URL. This is done by prefixing the returned -# URL with "301:" (moved permanently) or 302: (moved temporarily). -# -# It can also return a "urlgroup" that can subsequently be matched -# in cache_peer_access and similar ACL driven rules. An urlgroup is -# returned by prefixing the returned URL with "!urlgroup!". -# -# By default, a URL rewriter is not used. -# -#Default: -# none - -# TAG: url_rewrite_children -# The number of redirector processes to spawn. If you start -# too few Squid will have to wait for them to process a backlog of -# URLs, slowing it down. If you start too many they will use RAM -# and other system resources. -# -#Default: -# url_rewrite_children 5 - -# TAG: url_rewrite_concurrency -# The number of requests each redirector helper can handle in -# parallel. Defaults to 0 which indicates the redirector -# is a old-style single threaded redirector. -# -# When this directive is set to a value >= 1 then the protocol -# used to communicate with the helper is modified to include -# a request ID in front of the request/response. The request -# ID from the request must be echoed back with the response -# to that request. -# -#Default: -# url_rewrite_concurrency 0 - -# TAG: url_rewrite_host_header -# By default Squid rewrites any Host: header in redirected -# requests. If you are running an accelerator this may -# not be a wanted effect of a redirector. -# -# WARNING: Entries are cached on the result of the URL rewriting -# process, so be careful if you have domain-virtual hosts. -# -#Default: -# url_rewrite_host_header on - -# TAG: url_rewrite_access -# If defined, this access list specifies which requests are -# sent to the redirector processes. By default all requests -# are sent. -# -#Default: -# none - -# TAG: storeurl_access -# -# -#Default: -# none - -# TAG: redirector_bypass -# When this is 'on', a request will not go through the -# redirector if all redirectors are busy. If this is 'off' -# and the redirector queue grows too large, Squid will exit -# with a FATAL error and ask you to increase the number of -# redirectors. You should only enable this if the redirectors -# are not critical to your caching system. If you use -# redirectors for access control, and you enable this option, -# users may have access to pages they should not -# be allowed to request. -# -#Default: -# redirector_bypass off - -# TAG: location_rewrite_program -# Specify the location of the executable for the Location rewriter, -# used to rewrite server generated redirects. Usually used in -# conjunction with a url_rewrite_program -# -# For each Location header received the location rewriter will receive -# one line with the format: -# -# location URL requested URL urlgroup -# -# And the rewriter may return a rewritten Location URL or a blank line. -# The other components of the request line does not need to be returned -# (ignored if they are). -# -# By default, a Location rewriter is not used. -# -#Default: -# none - -# TAG: location_rewrite_children -# The number of location rewriting processes to spawn. If you start -# too few Squid will have to wait for them to process a backlog of -# URLs, slowing it down. If you start too many they will use RAM -# and other system resources. -# -#Default: -# location_rewrite_children 5 - -# TAG: location_rewrite_concurrency -# The number of requests each Location rewriter helper can handle in -# parallel. Defaults to 0 which indicates that the helper -# is a old-style singlethreaded helper. -# -#Default: -# location_rewrite_concurrency 0 - -# TAG: location_rewrite_access -# If defined, this access list specifies which requests are -# sent to the location rewriting processes. By default all Location -# headers are sent. -# -#Default: -# none - - -# OPTIONS FOR TUNING THE CACHE -# ----------------------------------------------------------------------------- - -# TAG: cache -# A list of ACL elements which, if matched, cause the request to -# not be satisfied from the cache and the reply to not be cached. -# In other words, use this to force certain objects to never be cached. -# -# You must use the word 'DENY' to indicate the ACL names which should -# NOT be cached. -# -# Default is to allow all to be cached. -# -#Default: -# none - -# TAG: max_stale time-units -# This option puts an upper limit on how stale content Squid -# will serve from the cache if cache validation fails. -# -#Default: -# max_stale 1 week - -# TAG: refresh_pattern -# usage: refresh_pattern [-i] regex min percent max [options] -# -# By default, regular expressions are CASE-SENSITIVE. To make -# them case-insensitive, use the -i option. -# -# 'Min' is the time (in minutes) an object without an explicit -# expiry time should be considered fresh. The recommended -# value is 0, any higher values may cause dynamic applications -# to be erroneously cached unless the application designer -# has taken the appropriate actions. -# -# 'Percent' is a percentage of the objects age (time since last -# modification age) an object without explicit expiry time -# will be considered fresh. -# -# 'Max' is an upper limit on how long objects without an explicit -# expiry time will be considered fresh. -# -# options: override-expire -# override-lastmod -# reload-into-ims -# ignore-reload -# ignore-no-cache -# ignore-private -# ignore-auth -# stale-while-revalidate=NN -# ignore-stale-while-revalidate -# max-stale=NN -# negative-ttl=NN -# -# override-expire enforces min age even if the server -# sent an explicit expiry time (e.g., with the -# Expires: header or Cache-Control: max-age). Doing this -# VIOLATES the HTTP standard. Enabling this feature -# could make you liable for problems which it causes. -# -# Note: this does not enforce staleness - it only extends -# freshness / min. If the server returns a Expires time which -# is longer than your max time, Squid will still consider -# the object fresh for that period of time. -# -# override-lastmod enforces min age even on objects -# that were modified recently. -# -# reload-into-ims changes client no-cache or ``reload'' -# to If-Modified-Since requests. Doing this VIOLATES the -# HTTP standard. Enabling this feature could make you -# liable for problems which it causes. -# -# ignore-reload ignores a client no-cache or ``reload'' -# header. Doing this VIOLATES the HTTP standard. Enabling -# this feature could make you liable for problems which -# it causes. -# -# ignore-no-cache ignores any ``Pragma: no-cache'' and -# ``Cache-control: no-cache'' headers received from a server. -# The HTTP RFC never allows the use of this (Pragma) header -# from a server, only a client, though plenty of servers -# send it anyway. -# -# ignore-private ignores any ``Cache-control: private'' -# headers received from a server. Doing this VIOLATES -# the HTTP standard. Enabling this feature could make you -# liable for problems which it causes. -# @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 20 16:25:01 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Oct 2010 14:25:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[11351] csw/mgar/pkg/rapidsvn/trunk Message-ID: Revision: 11351 http://gar.svn.sourceforge.net/gar/?rev=11351&view=rev Author: dmichelsen Date: 2010-10-20 14:25:01 +0000 (Wed, 20 Oct 2010) Log Message: ----------- rapidsvn: Complete rework Modified Paths: -------------- csw/mgar/pkg/rapidsvn/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/rapidsvn/trunk/files/0001-Use-explicit-constructor-for-wxString.patch csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch Removed Paths: ------------- csw/mgar/pkg/rapidsvn/trunk/files/CSWrapidsvn.depend csw/mgar/pkg/rapidsvn/trunk/files/CSWrapidsvn.gspec csw/mgar/pkg/rapidsvn/trunk/files/CSWrapidsvn.prototype csw/mgar/pkg/rapidsvn/trunk/files/CSWsvncpp.depend csw/mgar/pkg/rapidsvn/trunk/files/CSWsvncpp.gspec csw/mgar/pkg/rapidsvn/trunk/files/CSWsvncpp.prototype csw/mgar/pkg/rapidsvn/trunk/files/configure.diff csw/mgar/pkg/rapidsvn/trunk/files/rapidsvn.xml Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/Makefile 2010-10-20 14:13:50 UTC (rev 11350) +++ csw/mgar/pkg/rapidsvn/trunk/Makefile 2010-10-20 14:25:01 UTC (rev 11351) @@ -1,5 +1,6 @@ GARNAME = rapidsvn GARVERSION = 0.12.0-1 +SPKG_VERSION = $(subst -,.,$(GARVERSION)) CATEGORIES = utils DESCRIPTION = GUI front-end for the Subversion revision system @@ -15,52 +16,67 @@ # DISTFILES += $(call admfiles,CSWrapidsvn,depend prototype) # DISTFILES += $(call admfiles,CSWsvncpp,depend prototype) +PATCHFILES = 0001-Use-explicit-constructor-for-wxString.patch +PATCHFILES += 0002-Make-sure-to-pass-norunpath-through-libtool.patch + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWrapidsvn CSWlibsvncpp3 + +CATALOGNAME_CSWrapidsvn = rapidsvn +CATALOGNAME_CSWlibsvncpp3 = libsvncpp3 + +SPKG_DESC_CSWrapidsvn = $(DESCRIPTION) +SPKG_DESC_CSWlibsvncpp3 = Subversion C++ language binding + SPKG_SOURCEURL = http://rapidsvn.tigris.org/ + BUILD_DEP_PKGS = CSWsvn-devel CSWapache2-devel -# RapidSVN 0.9.1 omits the manpage from the dist archive -# DISTFILES += rapidsvn.xml +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgetscommon +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWoldaprt +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWapr +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgetsgtk2 +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWexpat +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWbdb48 +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWncurses +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWapr-util +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWsunmath +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWiconv +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibsvncpp3 +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWsvn -# Remove gcc C/CXXFLAGS, and fix autoconf tests -# PATCHFILES += configure.diff +BUILD_DEP_PKGS += CSWdocbookxsl +DOCBOOK_MANPAGE = $(sharedstatedir)/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl -# This should be separated out of CSWkdelibsgcc -# KSGML = $(prefix)/kde-gcc/share/apps/ksgmltools2 -# DOCBOOK_MANPAGE = $(KSGML)/docbook/xsl/manpages/docbook.xsl +APR_CONFIG = $(bindir)/apr-1-config +APU_CONFIG = $(bindir)/apu-1-config +SVNLIBDIR = $(libdir)/svn CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-apr-config=$(prefix)/apache2/bin/apr-1-config -CONFIGURE_ARGS += --with-apu-config=$(prefix)/apache2/bin/apu-1-config -CONFIGURE_ARGS += --with-svn-lib=$(libdir)/svn +CONFIGURE_ARGS += --with-apr-config=$(APR_CONFIG) +CONFIGURE_ARGS += --with-apu-config=$(APU_CONFIG) +CONFIGURE_ARGS += --with-svn-lib=$(SVNLIBDIR) CONFIGURE_ARGS += --with-svn-include=$(includedir) -# CONFIGURE_ARGS += --with-docbook-xsl-manpages=$(DOCBOOK_MANPAGE) +CONFIGURE_ARGS += --with-docbook-xsl-manpages=$(DOCBOOK_MANPAGE) -# EXTRA_LIB = $(prefix)/bdb43/lib $(SVNLIB) -# EXTRA_INC = $(prefix)/bdb43/include +# This must match the apr bdb binding. We need this to make sure +# libdb.so is found at the correct place. +EXTRA_LIB = $(SVNLIBDIR) $(prefix)/bdb48/lib TEST_TARGET = check -include gar/category.mk +PKGFILES_CSWlibsvncpp3 = $(PKGFILES_RT) +PKGFILES_CSWlibsvncpp3 += $(PKGFILES_DEVEL) -# pre-configure: -# @echo " ==> Regenerating build tools..." -# @(cd $(WORKSRC) ; \ -# aclocal && \ -# autoconf && \ -# libtoolize --automake --force && \ -# aclocal && \ -# automake -a ) -# @$(MAKECOOKIE) +# We don't have a devel package +CHECKPKG_OVERRIDES_CSWlibsvncpp3 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libsvncpp.so -# pre-build: -# @cp $(WORKDIR)/rapidsvn.xml $(WORKSRC)/doc/manpage +include gar/category.mk -# post-install: -# install -d $(DESTDIR)$(mandir)/man1 -# ( cd $(WORKSRC)/doc/manpage ; make manpage-yes ) -# install $(WORKSRC)/doc/manpage/rapidsvn.1 $(DESTDIR)$(mandir)/man1 -# @$(MAKECOOKIE) +post-install-modulated: + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKSRC)/doc/manpage/rapidsvn.1 $(DESTDIR)$(mandir)/man1 + @$(MAKECOOKIE) Added: csw/mgar/pkg/rapidsvn/trunk/files/0001-Use-explicit-constructor-for-wxString.patch =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/0001-Use-explicit-constructor-for-wxString.patch (rev 0) +++ csw/mgar/pkg/rapidsvn/trunk/files/0001-Use-explicit-constructor-for-wxString.patch 2010-10-20 14:25:01 UTC (rev 11351) @@ -0,0 +1,25 @@ +From 8091f955a87fa70dbdd5427019378f1e3145d28a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 20 Oct 2010 12:48:10 +0200 +Subject: [PATCH] Use explicit constructor for wxString + +--- + src/verblist.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/verblist.cpp b/src/verblist.cpp +index 4cda14f..1a99e46 100644 +--- a/src/verblist.cpp ++++ b/src/verblist.cpp +@@ -71,7 +71,7 @@ VerbList::GetCount() const + const wxString & + VerbList::GetName(size_t /*index*/) const + { +- return wxT(""); ++ return wxString(wxT("")); + } + + +-- +1.7.3 + Added: csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch (rev 0) +++ csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch 2010-10-20 14:25:01 UTC (rev 11351) @@ -0,0 +1,25 @@ +From 1b25c39d53c48db42781fad4c4d8762949c91bba Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 20 Oct 2010 14:16:27 +0200 +Subject: [PATCH] Make sure to pass -norunpath through libtool + +--- + ltmain.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ltmain.sh b/ltmain.sh +index b612e9a..d5cf479 100755 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-norunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +-- +1.7.3 + Deleted: csw/mgar/pkg/rapidsvn/trunk/files/CSWrapidsvn.depend =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/CSWrapidsvn.depend 2010-10-20 14:13:50 UTC (rev 11350) +++ csw/mgar/pkg/rapidsvn/trunk/files/CSWrapidsvn.depend 2010-10-20 14:25:01 UTC (rev 11351) @@ -1,27 +0,0 @@ -P CSWcommon common - common files and dirs for CSW packages -P CSWapache2rt apache2rt - Apache 2.2 runtime libraries -P CSWbdb43 berkeleydb43 - embedded database libraries and utilities -P CSWexpat expat - XML Parser Toolkit -P CSWfconfig fontconfig - A library for configuring and customizing font access. -P CSWftype2 freetype2 - The free and portable high quality font engine -P CSWgdbm gdbm - GNU dbm -P CSWggettext ggettext - GNU gettext -P CSWglib2 glib2 - Low-level core library that forms the basis of GTK+ -P CSWgtk2 gtk2 - GTK+, The GIMP Toolkit -P CSWiconv libiconv - GNU iconv library -P CSWlibatk libatk - Accessibility toolkit for GNOME -P CSWlibcairo libcairo - The Cairo 2D Graphics Library -P CSWlibnet libnet - the libnet packet construction library -P CSWlibxrender libxrender - fontconfig.org Xrender library -P CSWoldaprt openldap_rt - ldap runtime libraries -P CSWossl openssl - The Open Source toolkit for SSL and TLS. -P CSWpango libpango - Library for laying out and rendering text -P CSWpng png - library for Portable Network Graphics format (PNG) -P CSWsasl sasl - Simple Authentication and Security Layer -P CSWsqlite sqlite - An embeddable SQL engine in a C library -P CSWsunmath libsunmath - Sun maths library -P CSWsvn subversion - Version control rethought -P CSWsvncpp svncpp - Subversion C++ language binding -P CSWwxwidgetscommon wxwidgets_common - common files for wxwidgets (no Unicode) -P CSWwxwidgetsgtk2 wxwidgets_gtk2 - gtk2 support for wxwidgets (no Unicode) -P CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/rapidsvn/trunk/files/CSWrapidsvn.gspec =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/CSWrapidsvn.gspec 2010-10-20 14:13:50 UTC (rev 11350) +++ csw/mgar/pkg/rapidsvn/trunk/files/CSWrapidsvn.gspec 2010-10-20 14:25:01 UTC (rev 11351) @@ -1,4 +0,0 @@ -%var bitname rapidsvn -%var pkgname CSWrapidsvn -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/rapidsvn/trunk/files/CSWrapidsvn.prototype =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/CSWrapidsvn.prototype 2010-10-20 14:13:50 UTC (rev 11350) +++ csw/mgar/pkg/rapidsvn/trunk/files/CSWrapidsvn.prototype 2010-10-20 14:25:01 UTC (rev 11351) @@ -1,6 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/rapidsvn 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/rapidsvn.1 0444 root bin Deleted: csw/mgar/pkg/rapidsvn/trunk/files/CSWsvncpp.depend =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/CSWsvncpp.depend 2010-10-20 14:13:50 UTC (rev 11350) +++ csw/mgar/pkg/rapidsvn/trunk/files/CSWsvncpp.depend 2010-10-20 14:25:01 UTC (rev 11351) @@ -1,2 +0,0 @@ -P CSWcommon common - common files and dirs for CSW packages -P CSWsvn subversion - Version control rethought Deleted: csw/mgar/pkg/rapidsvn/trunk/files/CSWsvncpp.gspec =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/CSWsvncpp.gspec 2010-10-20 14:13:50 UTC (rev 11350) +++ csw/mgar/pkg/rapidsvn/trunk/files/CSWsvncpp.gspec 2010-10-20 14:25:01 UTC (rev 11351) @@ -1,5 +0,0 @@ -%var bitname svncpp -%var pkgname CSWsvncpp -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Subversion C++ language binding -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/rapidsvn/trunk/files/CSWsvncpp.prototype =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/CSWsvncpp.prototype 2010-10-20 14:13:50 UTC (rev 11350) +++ csw/mgar/pkg/rapidsvn/trunk/files/CSWsvncpp.prototype 2010-10-20 14:25:01 UTC (rev 11351) @@ -1,27 +0,0 @@ -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/svncpp 0755 root bin -f none /opt/csw/include/svncpp/annotate_line.hpp 0644 root bin -f none /opt/csw/include/svncpp/apr.hpp 0644 root bin -f none /opt/csw/include/svncpp/check.hpp 0644 root bin -f none /opt/csw/include/svncpp/client.hpp 0644 root bin -f none /opt/csw/include/svncpp/context.hpp 0644 root bin -f none /opt/csw/include/svncpp/context_listener.hpp 0644 root bin -f none /opt/csw/include/svncpp/datetime.hpp 0644 root bin -f none /opt/csw/include/svncpp/dirent.hpp 0644 root bin -f none /opt/csw/include/svncpp/entry.hpp 0644 root bin -f none /opt/csw/include/svncpp/exception.hpp 0644 root bin -f none /opt/csw/include/svncpp/log_entry.hpp 0644 root bin -f none /opt/csw/include/svncpp/path.hpp 0644 root bin -f none /opt/csw/include/svncpp/pool.hpp 0644 root bin -f none /opt/csw/include/svncpp/property.hpp 0644 root bin -f none /opt/csw/include/svncpp/revision.hpp 0644 root bin -f none /opt/csw/include/svncpp/status.hpp 0644 root bin -f none /opt/csw/include/svncpp/targets.hpp 0644 root bin -f none /opt/csw/include/svncpp/url.hpp 0644 root bin -f none /opt/csw/include/svncpp/wc.hpp 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libsvncpp.a 0644 root bin -f none /opt/csw/lib/libsvncpp.la 0755 root bin -f none /opt/csw/lib/libsvncpp.so.0.0.0 0755 root bin -s none /opt/csw/lib/libsvncpp.so.0=libsvncpp.so.0.0.0 root bin -s none /opt/csw/lib/libsvncpp.so=libsvncpp.so.0.0.0 root bin Deleted: csw/mgar/pkg/rapidsvn/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/configure.diff 2010-10-20 14:13:50 UTC (rev 11350) +++ csw/mgar/pkg/rapidsvn/trunk/files/configure.diff 2010-10-20 14:25:01 UTC (rev 11351) @@ -1,77 +0,0 @@ -diff --speed-large-files --minimal -Nru rapidsvn-0.9.1.orig/configure.in rapidsvn-0.9.1/configure.in ---- rapidsvn-0.9.1.orig/configure.in 2006-02-12 17:20:59.569594000 -0500 -+++ rapidsvn-0.9.1/configure.in 2006-02-12 17:20:51.478193000 -0500 -@@ -7,8 +7,8 @@ - AC_PROG_LIBTOOL - - abs_srcdir="`cd $srcdir && pwd`" --CPPFLAGS="$CPPFLAGS -Wall -g -fexceptions -I$abs_srcdir/include" --CXXFLAGS="$CXXFLAGS -Wall -g -fexceptions" -+CPPFLAGS="$CPPFLAGS -I$abs_srcdir/include" -+CXXFLAGS="$CXXFLAGS" - - dnl - dnl APR -@@ -204,7 +204,7 @@ - when determining the cpp Unit configuration; - defaults to ""]], - [ -- if test "$withval" == "no"; then -+ if test "$withval" = "no"; then - CPPUNITCONFIG= - elif test "$withval" != "yes"; then - CPPUNITCONFIG=$withval -@@ -230,7 +230,7 @@ - [[ --with-xsltproc=FILE Use the given path to xsltproc; - defaults to "xsltproc"]], - [ -- if test "$withval" == "no"; then -+ if test "$withval" = "no"; then - XSLTPROC= - elif test "$withval" != "yes"; then - XSLTPROC=$withval -@@ -262,7 +262,7 @@ - otherwise you are using the wrong stylesheet - resulting in an invalid manpage]], - [ -- if test "$withval" == "no"; then -+ if test "$withval" = "no"; then - DOCBOOK_MANPAGES= - else - DOCBOOK_MANPAGES=$withval -@@ -274,7 +274,7 @@ - dnl a for .. do .. done loop since the line - dnl got too long (file not found error while - dnl executing) --if test "$DOCBOOK_MANPAGES" == "yes"; then -+if test "$DOCBOOK_MANPAGES" = "yes"; then - X1=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl - X2=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook/docbook.xsl - X3=/usr/share/sgml/docbook/yelp/docbook/manpages/docbook.xsl -@@ -329,7 +329,7 @@ - TARGET_MANPAGE=manpage-no - MAN_MANS= - AC_MSG_CHECKING([manpage creation]) --if test "$MANPAGE"=="no"; then -+if test "$MANPAGE" = "no"; then - AC_MSG_RESULT([no]) - elif test "$XSLTPROC" -a "$DOCBOOK_MANPAGES" ; then - AC_MSG_RESULT([yes]) -@@ -348,7 +348,7 @@ - Used for creating API documentation; - defaults to "doxygen"]], - [ -- if test "$withval" == "no"; then -+ if test "$withval" = "no"; then - DOXYGEN= - elif test "$withval" != "yes"; then - DOXYGEN=$withval -@@ -375,7 +375,7 @@ - This tool is needed by doxygen; - defaults to "dot"]], - [ -- if test "$withval" == "no"; then -+ if test "$withval" = "no"; then - DOT= - elif test "$withval" != "yes"; then - DOT=$withval Deleted: csw/mgar/pkg/rapidsvn/trunk/files/rapidsvn.xml =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/rapidsvn.xml 2010-10-20 14:13:50 UTC (rev 11350) +++ csw/mgar/pkg/rapidsvn/trunk/files/rapidsvn.xml 2010-10-20 14:25:01 UTC (rev 11351) @@ -1,75 +0,0 @@ - - - - RapidSVN: front-end for the Subversion revision system - - - - M?ller - - Alexander - - -
XelaRellum at tigris.org
- - - - - 2002-2003 - - The RapidSVN Group - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, Version - 1.1 or any later version published by the Free Software Foundation; with - no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover - Texts. A copy of the license is included in the section entitled - "GNU Free Documentation License". - - - - - - RapidSVN - - RapidSVN Reference - - - RapidSVN Reference - - - - rapidsvn - - - - rapidsvn - - 1 - - - - rapidsvn - - application providing a gui frontend for the subversion - version control system - - - - - rapidsvn - - - - - Description - - The application rapidsvn provides a cross - platform frontend for the subversion version control system. - - - - \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 20 17:27:40 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 20 Oct 2010 15:27:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11352] csw/mgar/pkg/cups/trunk Message-ID: Revision: 11352 http://gar.svn.sourceforge.net/gar/?rev=11352&view=rev Author: wahwah Date: 2010-10-20 15:27:40 +0000 (Wed, 20 Oct 2010) Log Message: ----------- cups: Upgrade to 1.4.4, and a split off of library packages. Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/cups/trunk/checksums Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2010-10-20 14:25:01 UTC (rev 11351) +++ csw/mgar/pkg/cups/trunk/Makefile 2010-10-20 15:27:40 UTC (rev 11352) @@ -3,7 +3,7 @@ # $Id$ GARNAME = cups -GARVERSION = 1.4.3 +GARVERSION = 1.4.4 CATEGORIES = net define BLURB @@ -71,7 +71,12 @@ UFILES_REGEX = cups-(\d+(?:\.\d+)*)-source.tar.bz2 -PACKAGES = CSWlibcups CSWcupsd CSWcupsclient CSWcupsdoc CSWcupsdev CSWcups +PACKAGES += CSWlibcups +PACKAGES += CSWcupsd +PACKAGES += CSWcupsclient +PACKAGES += CSWcupsdoc +PACKAGES += CSWcupsdev +PACKAGES += CSWcups PACKAGES += CSWcupslinks INCOMPATIBLE_PKGS_CSWcupslinks = SUNWpcr SUNWpcu @@ -80,25 +85,16 @@ ARCHALL_CSWcupslinks = 1 ARCHALL_CSWcupsdoc = 1 -RUNTIME_DEP_PKGS_CSWcups = CSWcupsd CSWcupsclient -RUNTIME_DEP_PKGS_CSWcupsclient += CSWgnutls -RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcups +RUNTIME_DEP_PKGS_CSWcups += CSWcupsd +RUNTIME_DEP_PKGS_CSWcups += CSWcupsclient RUNTIME_DEP_PKGS_CSWcupsclient += CSWzlib -RUNTIME_DEP_PKGS_CSWcupsd += CSWgnutls RUNTIME_DEP_PKGS_CSWcupsd += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcups RUNTIME_DEP_PKGS_CSWcupsd += CSWlibdbus -RUNTIME_DEP_PKGS_CSWcupsd += CSWoldaprt RUNTIME_DEP_PKGS_CSWcupsd += CSWzlib -RUNTIME_DEP_PKGS_CSWlibcups += CSWgnutls -RUNTIME_DEP_PKGS_CSWlibcups += CSWjpeg -RUNTIME_DEP_PKGS_CSWlibcups += CSWpng -RUNTIME_DEP_PKGS_CSWlibcups += CSWtiff -RUNTIME_DEP_PKGS_CSWlibcups += CSWzlib RUNTIME_DEP_PKGS_CSWcupsdev += CSWlibcups -PKGFILES_CSWlibcups = $(libdir)/libcups.* +PKGFILES_CSWlibcups = NONE PKGFILES_CSWcupsdoc = $(datadir)/doc PKGFILES_CSWcupsdoc += $(datadir)/doc/.* PKGFILES_CSWcupsdoc += $(datadir)/cups/examples.* @@ -107,6 +103,12 @@ PKGFILES_CSWcupsdev += $(bindir)/cups-config PKGFILES_CSWcupsdev += $(datadir)/cups/ppdc.* PKGFILES_CSWcupsdev += $(datadir)/cups/drv.* +PKGFILES_CSWcupsdev += $(libdir)/libcups.so +PKGFILES_CSWcupsdev += $(libdir)/libcupscgi.so +PKGFILES_CSWcupsdev += $(libdir)/libcupsdriver.so +PKGFILES_CSWcupsdev += $(libdir)/libcupsimage.so +PKGFILES_CSWcupsdev += $(libdir)/libcupsmime.so +PKGFILES_CSWcupsdev += $(libdir)/libcupsppdc.so PKGFILES_CSWcupsd += $(sysconfdir)/init\.d/.* PKGFILES_CSWcupsd += $(sysconfdir)/rc.* PKGFILES_CSWcupsd += $(sysconfdir)/cups/cupsd.* @@ -153,13 +155,106 @@ PKGFILES_CSWcupslinks += /usr/bin/.* SPKG_DESC_CSWcups = Common Unix Printing System -SPKG_DESC_CSWlibcups = CUPS libraries +SPKG_DESC_CSWlibcups = Empty transitional package (was: CUPS libraries) SPKG_DESC_CSWcupsd = CUPS daemon SPKG_DESC_CSWcupsclient = CUPS client binaries SPKG_DESC_CSWcupsdoc = CUPS documentation SPKG_DESC_CSWcupsdev = CUPS header files SPKG_DESC_CSWcupslinks = Drop-in replacement for SUNWpcu and SUNWpcr +# Packages compliant with the shared library policy. +PACKAGES += CSWlibcups2 +CATALOGNAME_CSWlibcups2 = libcups2 +PKGFILES_CSWlibcups2 += /opt/csw/lib/libcups.so.2 +PKGFILES_CSWlibcups2 += /opt/csw/lib/libcups.so.2\.[0-9\.]+ +SPKG_DESC_CSWlibcups2 += CUPS libraries, libcups.so.2 +RUNTIME_DEP_PKGS_CSWlibcups += CSWlibcups2 +PACKAGES += CSWlibcupscgi1 +CATALOGNAME_CSWlibcupscgi1 = libcupscgi1 +PKGFILES_CSWlibcupscgi1 += /opt/csw/lib/libcupscgi.so.1 +PKGFILES_CSWlibcupscgi1 += /opt/csw/lib/libcupscgi.so.1\.[0-9\.]+ +SPKG_DESC_CSWlibcupscgi1 += CUPS libraries, libcupscgi.so.1 +RUNTIME_DEP_PKGS_CSWlibcups += CSWlibcupscgi1 +PACKAGES += CSWlibcupsdriver1 +CATALOGNAME_CSWlibcupsdriver1 = libcupsdriver1 +PKGFILES_CSWlibcupsdriver1 += /opt/csw/lib/libcupsdriver.so.1 +PKGFILES_CSWlibcupsdriver1 += /opt/csw/lib/libcupsdriver.so.1\.[0-9\.]+ +SPKG_DESC_CSWlibcupsdriver1 += CUPS libraries, libcupsdriver.so.1 +RUNTIME_DEP_PKGS_CSWlibcups += CSWlibcupsdriver1 +PACKAGES += CSWlibcupsimage2 +CATALOGNAME_CSWlibcupsimage2 = libcupsimage2 +PKGFILES_CSWlibcupsimage2 += /opt/csw/lib/libcupsimage.so.2 +PKGFILES_CSWlibcupsimage2 += /opt/csw/lib/libcupsimage.so.2\.[0-9\.]+ +SPKG_DESC_CSWlibcupsimage2 += CUPS libraries, libcupsimage.so.2 +RUNTIME_DEP_PKGS_CSWlibcups += CSWlibcupsimage2 +PACKAGES += CSWlibcupsmime1 +CATALOGNAME_CSWlibcupsmime1 = libcupsmime1 +PKGFILES_CSWlibcupsmime1 += /opt/csw/lib/libcupsmime.so.1 +PKGFILES_CSWlibcupsmime1 += /opt/csw/lib/libcupsmime.so.1\.[0-9\.]+ +SPKG_DESC_CSWlibcupsmime1 += CUPS libraries, libcupsmime.so.1 +RUNTIME_DEP_PKGS_CSWlibcups += CSWlibcupsmime1 +PACKAGES += CSWlibcupsppdc1 +CATALOGNAME_CSWlibcupsppdc1 = libcupsppdc1 +PKGFILES_CSWlibcupsppdc1 += /opt/csw/lib/libcupsppdc.so.1 +PKGFILES_CSWlibcupsppdc1 += /opt/csw/lib/libcupsppdc.so.1\.[0-9\.]+ +SPKG_DESC_CSWlibcupsppdc1 += CUPS libraries, libcupsppdc.so.1 +RUNTIME_DEP_PKGS_CSWlibcups += CSWlibcupsppdc1 + +RUNTIME_DEP_PKGS_CSWlibcups += CSWosslrt +RUNTIME_DEP_PKGS_CSWcupsd += CSWosslrt +RUNTIME_DEP_PKGS_CSWcupsclient += CSWosslrt +RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcupsimage2 + +ARCHALL_CSWlibcups = 1 +RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsppdc1 +RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupscgi1 +RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsdriver1 +RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsmime1 +RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsimage2 +RUNTIME_DEP_PKGS_CSWlibcups2 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibcups2 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWtiff +RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWpng +RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWjpeg +RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibcups2 + +# Since CSWlibcups is an empty transitional package +CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWlibcupsppdc1 +CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWlibcupsdriver1 +CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWlibcups2 +CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWlibcupsmime1 +CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWlibcupsimage2 +CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWosslrt +CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWlibcupscgi1 + +# The development package needs all the libraries +RUNTIME_DEP_PKGS_CSWcupsdev += CSWlibcupsppdc1 +RUNTIME_DEP_PKGS_CSWcupsdev += CSWlibcupsdriver1 +RUNTIME_DEP_PKGS_CSWcupsdev += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWcupsdev += CSWlibcupsmime1 +RUNTIME_DEP_PKGS_CSWcupsdev += CSWlibcupsimage2 +RUNTIME_DEP_PKGS_CSWcupsdev += CSWlibcupscgi1 + +# ...and the overrides: +CHECKPKG_OVERRIDES_CSWcupsdev += surplus-dependency|CSWlibcupsppdc1 +CHECKPKG_OVERRIDES_CSWcupsdev += surplus-dependency|CSWlibcupsdriver1 +CHECKPKG_OVERRIDES_CSWcupsdev += surplus-dependency|CSWlibcups2 +CHECKPKG_OVERRIDES_CSWcupsdev += surplus-dependency|CSWlibcupsmime1 +CHECKPKG_OVERRIDES_CSWcupsdev += surplus-dependency|CSWlibcupsimage2 +CHECKPKG_OVERRIDES_CSWcupsdev += surplus-dependency|CSWlibcupscgi1 + # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html SAMPLECONF_CSWcupsd = $(sysconfdir)/cups/cupsd\.conf\.CSW SAMPLECONF_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW @@ -218,7 +313,7 @@ # The following overrides are necessary because of a bug in krb5-config, please # see bug http://www.opencsw.org/bugtrack/view.php?id=4384 CHECKPKG_OVERRIDES_CSWcupsd += bad-rpath-entry|/opt/csw/lib/|opt/csw/sbin/cupsd -CHECKPKG_OVERRIDES_CSWlibcups += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libcups.so.2 +CHECKPKG_OVERRIDES_CSWlibcups2 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libcups.so.2 include gar/category.mk Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2010-10-20 14:25:01 UTC (rev 11351) +++ csw/mgar/pkg/cups/trunk/checksums 2010-10-20 15:27:40 UTC (rev 11352) @@ -1,13 +1 @@ -1e5e54a2b503cfdeeda1b683bcccab83 0001-cswcups-for-service-name.patch -0da4ea6bf72d61adfc4316a738b90ab5 0002-Adding-the-refcount-member-to-mime_type_t.patch -a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch -0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch -44ff410e237d6f4f9f0fe650ba2c7fa0 0007-Solaris-zone-support-in-init-script.patch -9714ccb8b117c3eb57c0b4556480905f 0008-Adding-CFLAGS-and-CXXFLAGS-to-linker-calls.patch -c01746cdcc93635abf86df2179658f2e 0009-Add-workaround-for-krb5-config-outputting-CFLAGS.patch -e5a145b36404974a689ac694f679d1e1 CFLAGS-leaking-to-C++-compiler.patch -cf6a3fe902545aac1ab2303e41c08a3e CSWcupsclient.preinstall -ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove -cf6a3fe902545aac1ab2303e41c08a3e CSWcupsd.preinstall -4e6b68d829be4e88afd27ac4897957f4 client.conf.CSW -e70b1c3f60143d7310c1d74c111a21ab cups-1.4.3-source.tar.bz2 +8776403ad60fea9e85eab9c04d88560d cups-1.4.4-source.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gadavis at users.sourceforge.net Thu Oct 21 00:52:43 2010 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Wed, 20 Oct 2010 22:52:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11353] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 11353 http://gar.svn.sourceforge.net/gar/?rev=11353&view=rev Author: gadavis Date: 2010-10-20 22:52:43 +0000 (Wed, 20 Oct 2010) Log Message: ----------- openldap: Partial Fix Mantis bug 4521 to include openldaprc Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-10-20 15:27:40 UTC (rev 11352) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-10-20 22:52:43 UTC (rev 11353) @@ -54,7 +54,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -EXTRA_DOCS = README.CSW $(PATCHFILES) +EXTRA_DOCS = README.CSW $(PATCHFILES) openldaprc EXTRA_LIB_garversion-2.3.43 = $(prefix)/bdb44/lib EXTRA_INC_garversion-2.3.43 = $(prefix)/bdb44/include @@ -147,5 +147,5 @@ post-merge: ginstall -D $(DOWNLOADDIR)/cswopenldap \ $(PKGROOT)/opt/csw/etc/init.d/cswopenldap - $(foreach F,$(EXTRA_DOCS),ginstall -D $(DOWNLOADDIR)/$F $(PKGROOT)$(docdir)/$(GARNAME)/$F;) + $(foreach F,$(EXTRA_DOCS),ginstall --mode=644 -D $(DOWNLOADDIR)/$F $(PKGROOT)$(docdir)/$(GARNAME)/$F;) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gadavis at users.sourceforge.net Thu Oct 21 01:31:48 2010 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Wed, 20 Oct 2010 23:31:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[11354] csw/mgar/pkg/openldap/trunk/files Message-ID: Revision: 11354 http://gar.svn.sourceforge.net/gar/?rev=11354&view=rev Author: gadavis Date: 2010-10-20 23:31:48 +0000 (Wed, 20 Oct 2010) Log Message: ----------- Update various startup scripts to match migrateconf statement in Makefile Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall csw/mgar/pkg/openldap/trunk/files/cswopenldap csw/mgar/pkg/openldap/trunk/files/openldaprc Modified: csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall =================================================================== --- csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall 2010-10-20 22:52:43 UTC (rev 11353) +++ csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall 2010-10-20 23:31:48 UTC (rev 11354) @@ -78,8 +78,8 @@ [ -r $BASEDIR/opt/csw/etc/openldaprc ] && . $BASEDIR/opt/csw/etc/openldaprc [ -r $BASEDIR/etc/opt/csw/openldaprc ] && . $BASEDIR/etc/opt/csw/openldaprc - # Make sure required vars are set. Actually these are the compiled defaults - DEF_SLAPD_CONFIG_FILE=$BASEDIR/opt/csw/etc/openldap/slapd.conf + # Make sure required vars are set. Config directory is /etc/opt/csw/openldap + DEF_SLAPD_CONFIG_FILE=$BASEDIR/etc/opt/csw/openldap/slapd.conf SLAPD_CONFIG_FILE=${SLAPD_CONFIG_FILE:=$DEF_SLAPD_CONFIG_FILE} SLURPD_CONFIG_FILE=${SLURPD_CONFIG_FILE:=$DEF_SLAPD_CONFIG_FILE} Modified: csw/mgar/pkg/openldap/trunk/files/cswopenldap =================================================================== --- csw/mgar/pkg/openldap/trunk/files/cswopenldap 2010-10-20 22:52:43 UTC (rev 11353) +++ csw/mgar/pkg/openldap/trunk/files/cswopenldap 2010-10-20 23:31:48 UTC (rev 11354) @@ -39,8 +39,8 @@ [ -r /etc/opt/csw/openldaprc ] && . /etc/opt/csw/openldaprc # Make sure required vars are set. Actually these are the compiled defaults -DEF_SLAPD_CONFIG_FILE=/opt/csw/etc/openldap/slapd.conf -DEF_SLAPD_CONFIG_DIR=/opt/csw/etc/openldap/slapd.d +DEF_SLAPD_CONFIG_FILE=/etc/opt/csw/openldap/slapd.conf +DEF_SLAPD_CONFIG_DIR=/etc/opt/csw/openldap/slapd.d # If a conf file has been created, assume we should start up. Modified: csw/mgar/pkg/openldap/trunk/files/openldaprc =================================================================== --- csw/mgar/pkg/openldap/trunk/files/openldaprc 2010-10-20 22:52:43 UTC (rev 11353) +++ csw/mgar/pkg/openldap/trunk/files/openldaprc 2010-10-20 23:31:48 UTC (rev 11354) @@ -19,12 +19,12 @@ #SLAPD_DEBUG_LEVEL=0 # -f slapd-config-file. Specifies the slapd configuration file. -#SLAPD_CONFIG_FILE=/opt/csw/etc/openldap/slapd.conf +#SLAPD_CONFIG_FILE=/etc/opt/csw/openldap/slapd.conf # -F slapd-config-directory. Specifies the slapd configuration directory # for use with the cn=config backend. # You must create this directory yourself. -#SLAPD_CONFIG_DIR=/opt/csw/etc/openldap/slapd.d +#SLAPD_CONFIG_DIR=/etc/opt/csw/openldap/slapd.d # -g group. slapd will run with the specified group name or id. #SLAPD_GROUP=daemon @@ -60,13 +60,13 @@ #SLURPD_SYSLOG_LEVEL=0 # -f slapd-config-file. Specifies the slapd configuration file. -#SLURPD_CONFIG_FILE=/opt/csw/etc/openldap/slapd.conf +#SLURPD_CONFIG_FILE=/etc/opt/csw/openldap/slapd.conf # -r replication-log-file. Directory must be created. -#SLURPD_REPL_LOG_FILE=/opt/csw/var/openldap-slurp/log +#SLURPD_REPL_LOG_FILE=/var/opt/csw/openldap-slurp/log # -t tmp-dir. Directory must be created. -#SLURPD_TMP_DIR=/opt/csw/var/openldap-slurp/tmp +#SLURPD_TMP_DIR=/var/opt/csw/openldap-slurp/tmp # -o one-shot mode #SLURPD_ONE_SHOT=true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Oct 21 11:34:39 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 21 Oct 2010 09:34:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11355] csw/mgar/pkg/samba/trunk Message-ID: Revision: 11355 http://gar.svn.sourceforge.net/gar/?rev=11355&view=rev Author: janholzh Date: 2010-10-21 09:34:39 +0000 (Thu, 21 Oct 2010) Log Message: ----------- samba: update Version to 3.5.6 does not build yet Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile csw/mgar/pkg/samba/trunk/checksums Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2010-10-20 23:31:48 UTC (rev 11354) +++ csw/mgar/pkg/samba/trunk/Makefile 2010-10-21 09:34:39 UTC (rev 11355) @@ -1,5 +1,5 @@ GARNAME = samba -GARVERSION = 3.4.3 +GARVERSION = 3.5.6 CATEGORIES = apps DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) Modified: csw/mgar/pkg/samba/trunk/checksums =================================================================== --- csw/mgar/pkg/samba/trunk/checksums 2010-10-20 23:31:48 UTC (rev 11354) +++ csw/mgar/pkg/samba/trunk/checksums 2010-10-21 09:34:39 UTC (rev 11355) @@ -1 +1 @@ -322379680c12057f57685652a35a6b05 samba-3.4.3.tar.gz +bf6c09ea497a166df8bd672db1d8da8f samba-3.5.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 21 13:30:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 21 Oct 2010 11:30:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[11356] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 11356 http://gar.svn.sourceforge.net/gar/?rev=11356&view=rev Author: dmichelsen Date: 2010-10-21 11:30:26 +0000 (Thu, 21 Oct 2010) Log Message: ----------- mGAR v2: Add lzma support Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-10-21 09:34:39 UTC (rev 11355) +++ csw/mgar/gar/v2/gar.lib.mk 2010-10-21 11:30:26 UTC (rev 11356) @@ -339,6 +339,12 @@ @lzip -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) @$(MAKECOOKIE) +# rule to extract files with tar and lzma +tar-lzma-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @lzma -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + # extract compressed single files gz-extract-%: @echo " ==> Decompressing $(DOWNLOADDIR)/$*" @@ -364,6 +370,12 @@ @lzip -d $(WORKDIR)/$* @$(MAKECOOKIE) +lzma-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @lzma -d $(WORKDIR)/$* + @$(MAKECOOKIE) + # extra dependency rule for git repos, that will allow the user # to supply an alternate target at their discretion git-extract-%: @@ -431,6 +443,9 @@ extract-archive-%.tar.lz: tar-lz-extract-%.tar.lz @$(MAKECOOKIE) +extract-archive-%.tar.lzma: tar-lzma-extract-%.tar.lzma + @$(MAKECOOKIE) + extract-archive-%.zip: zip-extract-%.zip @$(MAKECOOKIE) @@ -452,6 +467,9 @@ extract-archive-%.lz: lz-extract-%.lz @$(MAKECOOKIE) +extract-archive-%.lzma: lzma-extract-%.lzma + @$(MAKECOOKIE) + extract-archive-%.git: git-extract-%.git @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 21 13:50:55 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 21 Oct 2010 11:50:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[11357] csw/mgar/pkg Message-ID: Revision: 11357 http://gar.svn.sourceforge.net/gar/?rev=11357&view=rev Author: dmichelsen Date: 2010-10-21 11:50:54 +0000 (Thu, 21 Oct 2010) Log Message: ----------- cpptest: Initial commit Added Paths: ----------- csw/mgar/pkg/cpptest/ csw/mgar/pkg/cpptest/branches/ csw/mgar/pkg/cpptest/tags/ csw/mgar/pkg/cpptest/trunk/ csw/mgar/pkg/cpptest/trunk/Makefile csw/mgar/pkg/cpptest/trunk/checksums csw/mgar/pkg/cpptest/trunk/files/ Property changes on: csw/mgar/pkg/cpptest/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpptest/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpptest/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpptest/trunk/Makefile 2010-10-21 11:50:54 UTC (rev 11357) @@ -0,0 +1,32 @@ +# $Id$ +GARNAME = cpptest +GARVERSION = 1.1.1 +CATEGORIES = utils + +DESCRIPTION = Unit testing framework for handling automated tests in C++ +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWlibcpptest0 CSWlibcpptestdevel + +CATALOGNAME_CSWlibcpptest0 = libcpptest0 +CATALOGNAME_CSWlibcpptestdevel = libcpptest_devel + +SPKG_DESC_CSWlibcpptest0 = $(DESCRIPTION) Runtime Library +SPKG_DESC_CSWlibcpptestdevel = $(DESCRIPTION) Development Files + +RUNTIME_DEP_PKGS_CSWlibcpptestdevel = CSWlibcpptest0 +CHECKPKG_OVERRIDES_CSWlibcpptestdevel += surplus-dependency|CSWlibcpptest0 + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +PKGFILES_CSWlibcpptest0 = $(call baseisadirs,$(libdir),[^/]*\.so\.\d+(\.\d+)*) + +include gar/category.mk Property changes on: csw/mgar/pkg/cpptest/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cpptest/trunk/checksums =================================================================== --- csw/mgar/pkg/cpptest/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpptest/trunk/checksums 2010-10-21 11:50:54 UTC (rev 11357) @@ -0,0 +1 @@ +b50379402d69d40417add19ef88f9938 cpptest-1.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 21 14:00:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 21 Oct 2010 12:00:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[11358] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 11358 http://gar.svn.sourceforge.net/gar/?rev=11358&view=rev Author: dmichelsen Date: 2010-10-21 12:00:17 +0000 (Thu, 21 Oct 2010) Log Message: ----------- mGAR v2: Move -xnorunpath and -norunpath to the compiler invocation circumventing stripping e.g. during libtool Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-10-21 11:50:54 UTC (rev 11357) +++ csw/mgar/gar/v2/gar.conf.mk 2010-10-21 12:00:17 UTC (rev 11358) @@ -467,25 +467,25 @@ GCC3_CC ?= $(GCC3_CC_HOME)/bin/gcc GCC4_CC ?= $(GCC4_CC_HOME)/bin/gcc - SOS11_CC ?= $(SOS11_CC_HOME)/bin/cc - SOS12_CC ?= $(SOS12_CC_HOME)/bin/cc - SOS12U1_CC ?= $(SOS12U1_CC_HOME)/bin/cc + SOS11_CC ?= $(SOS11_CC_HOME)/bin/cc -xnorunpath + SOS12_CC ?= $(SOS12_CC_HOME)/bin/cc -xnorunpath + SOS12U1_CC ?= $(SOS12U1_CC_HOME)/bin/cc -xnorunpath GCC3_CXX ?= $(GCC3_CC_HOME)/bin/g++ GCC4_CXX ?= $(GCC4_CC_HOME)/bin/g++ - SOS11_CXX ?= $(SOS11_CC_HOME)/bin/CC - SOS12_CXX ?= $(SOS12_CC_HOME)/bin/CC - SOS12U1_CXX ?= $(SOS12U1_CC_HOME)/bin/CC + SOS11_CXX ?= $(SOS11_CC_HOME)/bin/CC -norunpath + SOS12_CXX ?= $(SOS12_CC_HOME)/bin/CC -norunpath + SOS12U1_CXX ?= $(SOS12U1_CC_HOME)/bin/CC -norunpath GCC3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) GCC4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) - SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath - SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath - SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath + SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) + SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) + SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) GCC3_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) GCC4_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) - SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -norunpath - SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -norunpath -SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -norunpath + SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) + SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) +SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) GCC3_AS_FLAGS ?= $(EXTRA_GCC3_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) @@ -493,9 +493,9 @@ SOS12U1_AS_FLAGS ?= $(EXTRA_SOS12U1_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) - SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath -xnorunpath - SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath - SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath + SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) + SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) + SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) # Compiler version GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 21 14:25:12 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 21 Oct 2010 12:25:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[11359] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 11359 http://gar.svn.sourceforge.net/gar/?rev=11359&view=rev Author: bdwalton Date: 2010-10-21 12:25:11 +0000 (Thu, 21 Oct 2010) Log Message: ----------- gar_devel: add more deps; Mantis 4584 Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2010-10-21 12:00:17 UTC (rev 11358) +++ csw/mgar/pkg/gardev/trunk/Makefile 2010-10-21 12:25:11 UTC (rev 11359) @@ -20,6 +20,9 @@ RUNTIME_DEP_PKGS_CSWgardevel += CSWwget CSWfindutils CSWgsed CSWcoreutils RUNTIME_DEP_PKGS_CSWgardevel += CSWgawk CSWbzip2 CSWlftp CSWgit CSWnetcat RUNTIME_DEP_PKGS_CSWgardevel += CSWsvn CSWpython CSWpy-cheetah +RUNTIME_DEP_PKGS_CSWgardevel += CSWxz CSWgfile CSWpy-hachoir-core +RUNTIME_DEP_PKGS_CSWgardevel += CSWpy-hachoir-parser CSWpy-libmagic +RUNTIME_DEP_PKGS_CSWgardevel += CSWpy-progressbar CSWpy-sqlobject CSWpy-yaml MASTER_SITES = @@ -45,6 +48,14 @@ CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgawk CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWdiffutils CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWnetcat +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWxz +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgfile +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-hachoir-core +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-hachoir-parser +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-libmagic +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-progressbar +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-sqlobject +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-yaml include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 21 15:12:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 21 Oct 2010 13:12:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[11363] csw/mgar/pkg Message-ID: Revision: 11363 http://gar.svn.sourceforge.net/gar/?rev=11363&view=rev Author: dmichelsen Date: 2010-10-21 13:12:47 +0000 (Thu, 21 Oct 2010) Log Message: ----------- libxspf: Initial commit Added Paths: ----------- csw/mgar/pkg/libxspf/ csw/mgar/pkg/libxspf/branches/ csw/mgar/pkg/libxspf/tags/ csw/mgar/pkg/libxspf/trunk/ csw/mgar/pkg/libxspf/trunk/Makefile csw/mgar/pkg/libxspf/trunk/checksums csw/mgar/pkg/libxspf/trunk/files/ Property changes on: csw/mgar/pkg/libxspf/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libxspf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxspf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libxspf/trunk/Makefile 2010-10-21 13:12:47 UTC (rev 11363) @@ -0,0 +1,39 @@ +# $Id$ +GARNAME = libxspf +GARVERSION = 1.2.0 +CATEGORIES = lib + +DESCRIPTION = XSPF Playlist Reading and Writing Support for C++ Applications +define BLURB +endef + +SF_PROJ = libspiff +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.lzma + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.lzma + +PACKAGES = CSWlibxspf4 CSWlibxspfdevel + +CATALOGNAME_CSWlibxspf4 = libxspf4 +CATALOGNAME_CSWlibxspfdevel = libxspf_devel + +SPKG_DESC_CSWlibxspf4 = $(DESCRIPTION) Runtime Libraries +SPKG_DESC_CSWlibxspfdevel = $(DESCRIPTION) Development Files + +RUNTIME_DEP_PKGS_CSWlibxspf4 += CSWliburiparser1 +RUNTIME_DEP_PKGS_CSWlibxspf4 += CSWexpat +RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWlibxspf4 +RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWliburiparser1 +RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWexpat + +BUILD64 = 1 +NOISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +MERGE_DIRS_isa-extra = $(libdir) + +PKGFILES_CSWlibxspf4 = $(PKGFILES_RT) + +include gar/category.mk Property changes on: csw/mgar/pkg/libxspf/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libxspf/trunk/checksums =================================================================== --- csw/mgar/pkg/libxspf/trunk/checksums (rev 0) +++ csw/mgar/pkg/libxspf/trunk/checksums 2010-10-21 13:12:47 UTC (rev 11363) @@ -0,0 +1 @@ +751ded6addfbdaefb475b192b90304f2 libxspf-1.2.0.tar.lzma This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 21 14:34:56 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 21 Oct 2010 12:34:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[11361] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 11361 http://gar.svn.sourceforge.net/gar/?rev=11361&view=rev Author: bdwalton Date: 2010-10-21 12:34:56 +0000 (Thu, 21 Oct 2010) Log Message: ----------- gar_devel: remove unused checkpkg override, add archall-devel-package override Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2010-10-21 12:33:23 UTC (rev 11360) +++ csw/mgar/pkg/gardev/trunk/Makefile 2010-10-21 12:34:56 UTC (rev 11361) @@ -31,7 +31,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -CHECKPKG_OVERRIDES_CSWgardevel += unidentified-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWgardevel += archall-devel-package CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWlftp CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgmake CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgsed This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 21 14:41:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 21 Oct 2010 12:41:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[11362] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 11362 http://gar.svn.sourceforge.net/gar/?rev=11362&view=rev Author: dmichelsen Date: 2010-10-21 12:41:06 +0000 (Thu, 21 Oct 2010) Log Message: ----------- mGAR v2: Move plain .so from PKGFILES_RT to PKGFILES_DEVEL according to new package contents policy Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-10-21 12:34:56 UTC (rev 11361) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-10-21 12:41:06 UTC (rev 11362) @@ -286,10 +286,11 @@ baseisadirs = $(1)/$(2) $(call isadirs,$(1),$(2)) # PKGFILES_RT selects files belonging to a runtime package -PKGFILES_RT += $(call baseisadirs,$(libdir),[^/]*\.so(\.\d+)*) +PKGFILES_RT += $(call baseisadirs,$(libdir),[^/]*\.so\.\d+(\.\d+)*) # PKGFILES_DEVEL selects files belonging to a developer package PKGFILES_DEVEL += $(call baseisadirs,$(bindir),[^/]*-config) +PKGFILES_DEVEL += $(call baseisadirs,$(libdir),[^/]*\.so) PKGFILES_DEVEL += $(call baseisadirs,$(libdir),[^/]*\.(a|la)) PKGFILES_DEVEL += $(call baseisadirs,$(libdir),pkgconfig(/.*)?) PKGFILES_DEVEL += $(includedir)/.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 21 14:33:24 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 21 Oct 2010 12:33:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[11360] csw/mgar/pkg Message-ID: Revision: 11360 http://gar.svn.sourceforge.net/gar/?rev=11360&view=rev Author: dmichelsen Date: 2010-10-21 12:33:23 +0000 (Thu, 21 Oct 2010) Log Message: ----------- liburiparser: Initial commit Added Paths: ----------- csw/mgar/pkg/liburiparser/ csw/mgar/pkg/liburiparser/branches/ csw/mgar/pkg/liburiparser/tags/ csw/mgar/pkg/liburiparser/trunk/ csw/mgar/pkg/liburiparser/trunk/Makefile csw/mgar/pkg/liburiparser/trunk/checksums csw/mgar/pkg/liburiparser/trunk/files/ csw/mgar/pkg/liburiparser/trunk/files/0001-Remove-superflous-extension-breaking-install-with-th.patch Property changes on: csw/mgar/pkg/liburiparser/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/liburiparser/trunk/Makefile =================================================================== --- csw/mgar/pkg/liburiparser/trunk/Makefile (rev 0) +++ csw/mgar/pkg/liburiparser/trunk/Makefile 2010-10-21 12:33:23 UTC (rev 11360) @@ -0,0 +1,42 @@ +# $Id$ +GARNAME = liburiparser +GARVERSION = 0.7.5 +CATEGORIES = lib + +DESCRIPTION = RFC 3986 Compliant URI Parsing Library +define BLURB +endef + +SF_PROJ = uriparser +MASTER_SITES = $(SF_MIRROR) +DISTNAME = $(SF_PROJ)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.lzma + +PATCHFILES = 0001-Remove-superflous-extension-breaking-install-with-th.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD_DEP_PKGS = CSWlibcpptestdevel + +PACKAGES = CSWliburiparser1 CSWliburiparserdevel + +CATALOGNAME_CSWliburiparser1 = liburiparser1 +CATALOGNAME_CSWliburiparserdevel = liburiparser_devel + +SPKG_DESC_CSWliburiparser1 = $(DESCRIPTION) Runtime +SPKG_DESC_CSWliburiparserdevel = $(DESCRIPTION) Development Files + +RUNTIME_DEP_PKGS_CSWliburiparserdevel = CSWliburiparser1 +CHECKPKG_OVERRIDES_CSWliburiparserdevel += surplus-dependency|CSWliburiparser1 + +BUILD64 = 1 +CONFIGURE_SCRIPTS = $(WORKSRC)/configure +CONFIGURE_SCRIPTS += $(WORKSRC)/doc/configure + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --docdir=$(docdir)/$(GARNAME) + +PKGFILES_CSWliburiparser1 = $(PKGFILES_RT) + +include gar/category.mk Property changes on: csw/mgar/pkg/liburiparser/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/liburiparser/trunk/checksums =================================================================== --- csw/mgar/pkg/liburiparser/trunk/checksums (rev 0) +++ csw/mgar/pkg/liburiparser/trunk/checksums 2010-10-21 12:33:23 UTC (rev 11360) @@ -0,0 +1 @@ +a87b79caa1258cf9f232b55fce66ff22 uriparser-0.7.5.tar.lzma Added: csw/mgar/pkg/liburiparser/trunk/files/0001-Remove-superflous-extension-breaking-install-with-th.patch =================================================================== --- csw/mgar/pkg/liburiparser/trunk/files/0001-Remove-superflous-extension-breaking-install-with-th.patch (rev 0) +++ csw/mgar/pkg/liburiparser/trunk/files/0001-Remove-superflous-extension-breaking-install-with-th.patch 2010-10-21 12:33:23 UTC (rev 11360) @@ -0,0 +1,25 @@ +From b53c60334676b2dcbf5f4d3de3ead8a391b8a43c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 21 Oct 2010 14:12:56 +0200 +Subject: [PATCH] Remove superflous extension breaking install with the shell + +--- + doc/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/doc/Makefile.in b/doc/Makefile.in +index 63b4893..4393def 100644 +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -344,7 +344,7 @@ distclean-local: + + install-data-local: + $(MKDIR_P) "$(DESTDIR)$(docdir)/html" ## Didn't work with installdirs-local +- $(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/" ++ $(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/" + + uninstall-local: + -rm -Rf "$(DESTDIR)$(docdir)/html" +-- +1.7.2.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 21 18:03:50 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 21 Oct 2010 16:03:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11364] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 11364 http://gar.svn.sourceforge.net/gar/?rev=11364&view=rev Author: bonivart Date: 2010-10-21 16:03:50 +0000 (Thu, 21 Oct 2010) Log Message: ----------- pkgutil: update to 2.2 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2010-10-21 13:12:47 UTC (rev 11363) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2010-10-21 16:03:50 UTC (rev 11364) @@ -2,7 +2,7 @@ # svn co -r 9999 https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 gar GARNAME = pkgutil -GARVERSION = 2.2b1 +GARVERSION = 2.2 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2010-10-21 13:12:47 UTC (rev 11363) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2010-10-21 16:03:50 UTC (rev 11364) @@ -5,4 +5,4 @@ b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -7507e51c7e928fa769442f2427b53fda pkgutil-2.2b1.zip +5245c83cc44947736ecbfb9d22e1c640 pkgutil-2.2.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 09:57:23 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 07:57:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[11365] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11365 http://gar.svn.sourceforge.net/gar/?rev=11365&view=rev Author: wahwah Date: 2010-10-22 07:57:23 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, added support for more soname cases, the new check can now process the whole catalog. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-21 16:03:50 UTC (rev 11364) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-22 07:57:23 UTC (rev 11365) @@ -49,6 +49,14 @@ return c.join(parts).lower() + +def SanitizeWithChar(s, c): + parts = LEGIT_CHAR_RE.findall(s) + if "so" in parts: + parts.remove("so") + return c.join(parts).lower() + + def MakePackageNameBySoname(soname): """Find the package name based on the soname. Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-21 16:03:50 UTC (rev 11364) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-22 07:57:23 UTC (rev 11365) @@ -146,7 +146,55 @@ self.assertEqual(expected, su.MakePackageNameBySoname(soname)) + def testMakePackageNameBySonameMoreDot(self): + soname = "libgettextlib-0.14.1.so" + expected = ( + ['CSWlibgettextlib-0-14-1'], + ['libgettextlib_0_14_1'], + ) + self.assertEqual(expected, + su.MakePackageNameBySoname(soname)) + def testMakePackageNameBySonameComplexApr(self): + soname = "libapr-1.so.10.0.0" + expected = ( + ['CSWlibapr-110', 'CSWlibapr-1-10'], + ['libapr_110', 'libapr_1_10'] + ) + self.assertEqual(expected, + su.MakePackageNameBySoname(soname)) + + def testMakePackageNameBySonamePlus(self): + soname = "libstdc++.so.6" + expected = ( + ['CSWlibstdc++6', 'CSWlibstdc++-6'], + ['libstdc++6', 'libstdc++_6'] + ) + self.assertEqual(expected, + su.MakePackageNameBySoname(soname)) + + def testMakePackageNameBySonamePlus(self): + soname = "libdnet.1" + expected = ( + ['CSWlibdnet1', 'CSWlibdnet-1'], + ['libdnet1', 'libdnet_1'] + ) + self.assertEqual(expected, + su.MakePackageNameBySoname(soname)) + + def testMakePackageNameUppercase(self): + soname = "libUpperCase.so.1" + expected = ( + ['CSWlibuppercase1', 'CSWlibuppercase-1'], + ['libuppercase1', 'libuppercase_1'] + ) + self.assertEqual(expected, + su.MakePackageNameBySoname(soname)) + + def testSanitizeWithChar(self): + self.assertEqual("foo_0", su.SanitizeWithChar("foo-0", "_")) + + class MakePackageNameBySonameUnitTest(unittest.TestCase): def testSanitizeWithChar(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 09:57:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 07:57:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11366] csw/mgar/gar/v2/lib/python/sharedlib_utils.py Message-ID: Revision: 11366 http://gar.svn.sourceforge.net/gar/?rev=11366&view=rev Author: wahwah Date: 2010-10-22 07:57:43 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: Merged a weird conflict. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-22 07:57:23 UTC (rev 11365) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-22 07:57:43 UTC (rev 11366) @@ -57,6 +57,14 @@ return c.join(parts).lower() + +def SanitizeWithChar(s, c): + parts = LEGIT_CHAR_RE.findall(s) + if "so" in parts: + parts.remove("so") + return c.join(parts).lower() + + def MakePackageNameBySoname(soname): """Find the package name based on the soname. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 09:58:04 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 07:58:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[11367] csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Message-ID: Revision: 11367 http://gar.svn.sourceforge.net/gar/?rev=11367&view=rev Author: wahwah Date: 2010-10-22 07:58:04 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, small changes in unit tests. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-22 07:57:43 UTC (rev 11366) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-22 07:58:04 UTC (rev 11367) @@ -191,6 +191,9 @@ self.assertEqual(expected, su.MakePackageNameBySoname(soname)) + +class MakePackageNameBySonameUnitTest(unittest.TestCase): + def testSanitizeWithChar(self): self.assertEqual("foo_0", su.SanitizeWithChar("foo-0", "_")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 09:58:31 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 07:58:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[11368] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 11368 http://gar.svn.sourceforge.net/gar/?rev=11368&view=rev Author: wahwah Date: 2010-10-22 07:58:31 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: Notes about ideas for two potentially useful checks. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-22 07:58:04 UTC (rev 11367) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-22 07:58:31 UTC (rev 11368) @@ -10,6 +10,10 @@ # def CheckSomething(pkg_data, error_mgr, logger, messenger): # logger.debug("Checking something.") # error_mgr.ReportError("something-is-wrong") +# +# TODO(maciej): In general, the development package should depend on all the libraries. +# TODO(maciej): If foo.so links to foo.so.1, the devel package should depend on +# the library package. import copy import re This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 09:58:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 07:58:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[11369] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11369 http://gar.svn.sourceforge.net/gar/?rev=11369&view=rev Author: wahwah Date: 2010-10-22 07:58:57 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, first batch of code; extracts and patches. No working user interface yet. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/patch_package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2010-10-22 07:58:31 UTC (rev 11368) +++ csw/mgar/gar/v2/lib/python/package.py 2010-10-22 07:58:57 UTC (rev 11369) @@ -241,6 +241,9 @@ self.file_paths = None self.files_metadata = None + def __repr__(self): + return u"" % repr(self.directory) + def GetCatalogname(self): """Returns the catalog name of the package. Added: csw/mgar/gar/v2/lib/python/patch_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/patch_package.py (rev 0) +++ csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-22 07:58:57 UTC (rev 11369) @@ -0,0 +1,91 @@ +#!/usr/bin/env python2.6 +# +# A utility to patch an existing package. +# +# Usage: +# patchpkg --dir /tmp/foo --patch foo.patch --catalogname foo + +import optparse +import logging +import package +import subprocess +import shutil +import os.path +import pprint +import opencsw + +class PackageSurgeon(package.ShellMixin): + + def __init__(self, pkg_path, debug): + self.debug = debug + self.pkg_path = pkg_path + self.srv4 = package.CswSrv4File(pkg_path) + self.dir_pkg = None + self.exported_dir = None + self.parsed_filename = opencsw.ParsePackageFileName(self.pkg_path) + + def Transform(self): + if not self.dir_pkg: + self.dir_pkg = self.srv4.GetDirFormatPkg() + logging.debug(repr(self.dir_pkg)) + # subprocess.call(["tree", self.dir_pkg.directory]) + + def Export(self, dest_dir): + self.Transform() + if not self.exported_dir: + basedir, pkgname = os.path.split(self.dir_pkg.directory) + self.exported_dir = os.path.join(dest_dir, pkgname) + shutil.copytree( + self.dir_pkg.directory, + self.exported_dir) + subprocess.call(["git", "init"], cwd=self.exported_dir) + subprocess.call(["git", "add", "."], cwd=self.exported_dir) + subprocess.call(["git", "commit", "-a", "-m", "Initial commit"], + cwd=self.exported_dir) + else: + logging.warn("The package was already exported to %s", + self.exported_dir) + + def Patch(self, patch_file): + self.Transform() + args = ["gpatch", "-p", "1", "-d", self.dir_pkg.directory, "-i", patch_file] + logging.debug(args) + subprocess.call(args) + + def ToSrv4(self, dest_dir): + self.Transform() + pkginfo = self.dir_pkg.GetParsedPkginfo() + # version = pkginfo["VERSION"] + pprint.pprint(pkginfo) + pprint.pprint(self.parsed_filename) + + +def main(): + parser = optparse.OptionParser() + parser.add_option("--dir", "-d", dest="dir", + help="Directory with packages.") + parser.add_option("--patch", "-p", dest="patch", + help="Patch to apply") + parser.add_option("--patch-sparc", dest="patch_sparc", + help="Patch to apply (sparc specific)") + parser.add_option("--patch-x86", dest="patch_x86", + help="Patch to apply (x86 specific)") + parser.add_option("--catalogname", "-c", dest="catalogname", + help="Catalogname") + parser.add_option("--debug", dest="debug", + action="store_true", default=False, + help="Debug") + parser.add_option("--export", dest="export", + help="Export to a directory") + options, args = parser.parse_args() + logging_level = logging.DEBUG if options.debug else logging.INFO + logging.basicConfig(level=logging_level) + logging.debug("Start!") + ps = PackageSurgeon("/home/maciej/tmp/mozilla-1.7.5-SunOS5.8-sparc-CSW.pkg.gz", + debug=options.debug) + # ps.Export("/home/maciej/tmp") + ps.Patch("/home/maciej/tmp/0001-Removing-nspr.m4-and-headers.patch") + ps.ToSrv4("/home/maciej/tmp") + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/lib/python/patch_package.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 09:59:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 07:59:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11370] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11370 http://gar.svn.sourceforge.net/gar/?rev=11370&view=rev Author: wahwah Date: 2010-10-22 07:59:19 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, new function to compose package names. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py csw/mgar/gar/v2/lib/python/patch_package.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-22 07:58:57 UTC (rev 11369) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-22 07:59:19 UTC (rev 11370) @@ -116,6 +116,18 @@ return data +def ComposePackageFileName(parsed_filename): + file_name = 'mysql5client-5.0.87,REV=2010.02.28-SunOS5.8-i386-CSW.pkg.gz' + tmpl = "%(catalogname)s-%(new_version)s-%(osrel)s-%(arch)s-%(vendortag)s.pkg.gz" + version_string = parsed_filename["version"] + revision_info = parsed_filename["revision_info"] + for key in sorted(revision_info.keys()): + version_string += ",%s=%s" % (key, revision_info[key]) + new_data = copy.copy(parsed_filename) + new_data["new_version"] = version_string + return tmpl % new_data + + def ParseVersionString(s): version_bits = re.split("_|,", s) version_str = version_bits[0] Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-10-22 07:58:57 UTC (rev 11369) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-10-22 07:59:19 UTC (rev 11370) @@ -157,6 +157,14 @@ self.assertEqual("unspecified", parsed["osrel"]) +class ComposePackageFileNameUnitTest(unittest.TestCase): + + def testSimple(self): + file_name = 'mysql5client-5.0.87,REV=2010.02.28-SunOS5.8-i386-CSW.pkg.gz' + parsed = opencsw.ParsePackageFileName(file_name) + self.assertEquals(file_name, opencsw.ComposePackageFileName(parsed)) + + class ParseVersionStringTest(unittest.TestCase): def test_NoRev(self): Modified: csw/mgar/gar/v2/lib/python/patch_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-22 07:58:57 UTC (rev 11369) +++ csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-22 07:59:19 UTC (rev 11370) @@ -5,6 +5,7 @@ # Usage: # patchpkg --dir /tmp/foo --patch foo.patch --catalogname foo +import datetime import optparse import logging import package @@ -56,8 +57,11 @@ self.Transform() pkginfo = self.dir_pkg.GetParsedPkginfo() # version = pkginfo["VERSION"] - pprint.pprint(pkginfo) + date_str = datetime.datetime.now().strftime("%Y-%m-%d") + self.parsed_filename["revision_info"]["REV"] = date_str + new_filename = opencsw.ComposePackageFileName(self.parsed_filename) pprint.pprint(self.parsed_filename) + pprint.pprint(new_filename) def main(): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 09:59:37 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 07:59:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[11371] csw/mgar/gar/v2/lib/python/opencsw_test.py Message-ID: Revision: 11371 http://gar.svn.sourceforge.net/gar/?rev=11371&view=rev Author: wahwah Date: 2010-10-22 07:59:37 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, an additional test case for more REV entries. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-10-22 07:59:19 UTC (rev 11370) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-10-22 07:59:37 UTC (rev 11371) @@ -159,12 +159,28 @@ class ComposePackageFileNameUnitTest(unittest.TestCase): + def setUp(self): + self.parsed = {'arch': 'i386', + 'catalogname': 'mysql5client', + 'full_version_string': '5.0.87,REV=2010.02.28', + 'osrel': 'SunOS5.8', + 'revision_info': {'REV': '2010.02.28'}, + 'vendortag': 'CSW', + 'version': '5.0.87', + 'version_info': {'major version': '5', + 'minor version': '0', + 'patchlevel': '87'}} + def testSimple(self): file_name = 'mysql5client-5.0.87,REV=2010.02.28-SunOS5.8-i386-CSW.pkg.gz' - parsed = opencsw.ParsePackageFileName(file_name) - self.assertEquals(file_name, opencsw.ComposePackageFileName(parsed)) + self.assertEquals(file_name, opencsw.ComposePackageFileName(self.parsed)) + def testMoreRev(self): + file_name = 'mysql5client-5.0.87,REV=2010.02.28,foo=bar-SunOS5.8-i386-CSW.pkg.gz' + self.parsed["revision_info"]["foo"] = "bar" + self.assertEquals(file_name, opencsw.ComposePackageFileName(self.parsed)) + class ParseVersionStringTest(unittest.TestCase): def test_NoRev(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 09:59:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 07:59:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[11372] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11372 http://gar.svn.sourceforge.net/gar/?rev=11372&view=rev Author: wahwah Date: 2010-10-22 07:59:57 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, a docstring for the package name composer. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-22 07:59:37 UTC (rev 11371) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-22 07:59:57 UTC (rev 11372) @@ -117,8 +117,12 @@ def ComposePackageFileName(parsed_filename): - file_name = 'mysql5client-5.0.87,REV=2010.02.28-SunOS5.8-i386-CSW.pkg.gz' - tmpl = "%(catalogname)s-%(new_version)s-%(osrel)s-%(arch)s-%(vendortag)s.pkg.gz" + """Composes package name, based on a parsed filename data structure. + + Does not use the version_string property, but builds the version from + the basic version plus revision info. + """ + tmpl = "%(catalogname)s-%(new_version)s-%(osrel)s-%(arch)s-%(vendortag)s.pkg" version_string = parsed_filename["version"] revision_info = parsed_filename["revision_info"] for key in sorted(revision_info.keys()): Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-10-22 07:59:37 UTC (rev 11371) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-10-22 07:59:57 UTC (rev 11372) @@ -1,4 +1,4 @@ -#!/opt/csw/bin/python2.6 +#!/usr/bin/env python2.6 # $Id$ import copy This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 10:00:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 08:00:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[11373] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11373 http://gar.svn.sourceforge.net/gar/?rev=11373&view=rev Author: wahwah Date: 2010-10-22 08:00:18 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: opencsw.py, a correction for multiple revision tags in package names. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-22 07:59:57 UTC (rev 11372) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-22 08:00:18 UTC (rev 11373) @@ -125,8 +125,12 @@ tmpl = "%(catalogname)s-%(new_version)s-%(osrel)s-%(arch)s-%(vendortag)s.pkg" version_string = parsed_filename["version"] revision_info = parsed_filename["revision_info"] - for key in sorted(revision_info.keys()): - version_string += ",%s=%s" % (key, revision_info[key]) + if revision_info: + version_string += "," + rev_lst = [] + for key in sorted(revision_info.keys()): + rev_lst.append("%s=%s" % (key, revision_info[key])) + version_string += "_".join(rev_lst) new_data = copy.copy(parsed_filename) new_data["new_version"] = version_string return tmpl % new_data Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-10-22 07:59:57 UTC (rev 11372) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-10-22 08:00:18 UTC (rev 11373) @@ -172,11 +172,11 @@ 'patchlevel': '87'}} def testSimple(self): - file_name = 'mysql5client-5.0.87,REV=2010.02.28-SunOS5.8-i386-CSW.pkg.gz' + file_name = 'mysql5client-5.0.87,REV=2010.02.28-SunOS5.8-i386-CSW.pkg' self.assertEquals(file_name, opencsw.ComposePackageFileName(self.parsed)) def testMoreRev(self): - file_name = 'mysql5client-5.0.87,REV=2010.02.28,foo=bar-SunOS5.8-i386-CSW.pkg.gz' + file_name = 'mysql5client-5.0.87,REV=2010.02.28_foo=bar-SunOS5.8-i386-CSW.pkg' self.parsed["revision_info"]["foo"] = "bar" self.assertEquals(file_name, opencsw.ComposePackageFileName(self.parsed)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 10:00:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 08:00:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[11375] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11375 http://gar.svn.sourceforge.net/gar/?rev=11375&view=rev Author: wahwah Date: 2010-10-22 08:00:58 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, first version that actually does anything, but still has no user interface. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-22 08:00:39 UTC (rev 11374) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-10-22 08:00:58 UTC (rev 11375) @@ -116,6 +116,16 @@ return data +def ComposeVersionString(version, revision_info): + if revision_info: + version += "," + rev_lst = [] + for key in sorted(revision_info.keys()): + rev_lst.append("%s=%s" % (key, revision_info[key])) + version += "_".join(rev_lst) + return version + + def ComposePackageFileName(parsed_filename): """Composes package name, based on a parsed filename data structure. @@ -125,12 +135,7 @@ tmpl = "%(catalogname)s-%(new_version)s-%(osrel)s-%(arch)s-%(vendortag)s.pkg" version_string = parsed_filename["version"] revision_info = parsed_filename["revision_info"] - if revision_info: - version_string += "," - rev_lst = [] - for key in sorted(revision_info.keys()): - rev_lst.append("%s=%s" % (key, revision_info[key])) - version_string += "_".join(rev_lst) + version_string = ComposeVersionString(version_string, revision_info) new_data = copy.copy(parsed_filename) new_data["new_version"] = version_string return tmpl % new_data Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2010-10-22 08:00:39 UTC (rev 11374) +++ csw/mgar/gar/v2/lib/python/package.py 2010-10-22 08:00:58 UTC (rev 11375) @@ -100,7 +100,7 @@ pkg_suffix = ".pkg" if self.pkg_path.endswith("%s%s" % (pkg_suffix, gzip_suffix)): # Causing the class to stat the .gz file. This call throws away the - # result, but the result will be cached as a class instance member. + # result, but the result will be cached as a object member. self.GetMtime() base_name_gz = os.path.split(self.pkg_path)[1] shutil.copy(self.pkg_path, self.GetWorkDir()) @@ -264,8 +264,11 @@ """Guesses the Srv4FileName based on the package directory contents.""" return opencsw.PkginfoToSrv4Name(self.GetParsedPkginfo()) - def ToSrv4(self, target_dir): - target_file_name = self.GetSrv4FileName() + def ToSrv4(self, target_dir, file_name=None): + if not file_name: + target_file_name = self.GetSrv4FileName() + else: + target_file_name = file_name target_path = os.path.join(target_dir, target_file_name) if os.path.exists(target_path): return target_path @@ -637,11 +640,18 @@ def ToSrv4(self, dest_dir): self.Transform() pkginfo = self.dir_pkg.GetParsedPkginfo() - date_str = datetime.datetime.now().strftime("%Y-%m-%d") + date_str = datetime.datetime.now().strftime("%Y.%m.%d") self.parsed_filename["revision_info"]["REV"] = date_str new_filename = opencsw.ComposePackageFileName(self.parsed_filename) # Plan: # - Update the version in the pkginfo + version_string = opencsw.ComposeVersionString( + self.parsed_filename["version"], + self.parsed_filename["revision_info"]) + logging.debug("New version string: %s", repr(version_string)) + self.dir_pkg.SetPkginfoEntry("VERSION", version_string) # - Update the pkgmap file, setting the checksums # - Transform it back to the srv4 form - # - gzip it. + target_dir, old_path = os.path.split(self.pkg_path) + logging.debug("Transforming into %s", new_filename) + self.dir_pkg.ToSrv4(target_dir, new_filename) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 10:01:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 08:01:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[11376] csw/mgar/gar/v2/lib/python/patch_package.py Message-ID: Revision: 11376 http://gar.svn.sourceforge.net/gar/?rev=11376&view=rev Author: wahwah Date: 2010-10-22 08:01:18 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, the first version of the user interface. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/patch_package.py Modified: csw/mgar/gar/v2/lib/python/patch_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-22 08:00:58 UTC (rev 11375) +++ csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-22 08:01:18 UTC (rev 11376) @@ -3,7 +3,12 @@ # A utility to patch an existing package. # # Usage: -# patchpkg --dir /tmp/foo --patch foo.patch --catalogname foo +# patchpkg --srv4-file /tmp/foo-1.0-sparc-CSW.pkg.gz --export /work/dir +# cd /work/dir/CSWfoo +# vim ... +# git commit -a -m "Change description..." +# git format-patch HEAD^ +# patchpkg --srv4-file /tmp/foo-1.0-sparc-CSW.pkg.gz --patch /work/dir/0001-...patch import datetime import optparse @@ -17,16 +22,10 @@ def main(): parser = optparse.OptionParser() - parser.add_option("--dir", "-d", dest="dir", - help="Directory with packages.") + parser.add_option("--srv4-file", "-s", dest="srv4_file", + help="Package to modify, e.g. foo-1.0-sparc-CSW.pkg.gz") parser.add_option("--patch", "-p", dest="patch", help="Patch to apply") - parser.add_option("--patch-sparc", dest="patch_sparc", - help="Patch to apply (sparc specific)") - parser.add_option("--patch-x86", dest="patch_x86", - help="Patch to apply (x86 specific)") - parser.add_option("--catalogname", "-c", dest="catalogname", - help="Catalogname") parser.add_option("--debug", dest="debug", action="store_true", default=False, help="Debug") @@ -35,13 +34,20 @@ options, args = parser.parse_args() logging_level = logging.DEBUG if options.debug else logging.INFO logging.basicConfig(level=logging_level) - logging.debug("Start!") - ps = package.PackageSurgeon( - "/home/maciej/tmp/mozilla-1.7.5-SunOS5.8-sparc-CSW.pkg.gz", - debug=options.debug) - # ps.Export("/home/maciej/tmp") - ps.Patch("/home/maciej/tmp/0001-Removing-nspr.m4-and-headers.patch") - ps.ToSrv4("/home/maciej/tmp") + if options.export and options.srv4_file: + ps = package.PackageSurgeon( + options.srv4_file, + debug=options.debug) + ps.Export(options.export) + elif options.srv4_file and options.patch: + ps = package.PackageSurgeon( + options.srv4_file, + debug=options.debug) + ps.Patch(options.patch) + base_dir, pkg_basename = os.path.split(options.srv4_file) + ps.ToSrv4(base_dir) + else: + print "See --help for usage information" if __name__ == '__main__': main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 10:00:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 08:00:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11374] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11374 http://gar.svn.sourceforge.net/gar/?rev=11374&view=rev Author: wahwah Date: 2010-10-22 08:00:39 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, the surgeon class moved to package.py Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/patch_package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2010-10-22 08:00:18 UTC (rev 11373) +++ csw/mgar/gar/v2/lib/python/package.py 2010-10-22 08:00:39 UTC (rev 11374) @@ -590,3 +590,58 @@ less_proc.wait() else: print "No differences found." + + +class PackageSurgeon(ShellMixin): + """Takes an OpenCSW gzipped package and performs surgery on it. + + Sows it up, adjusts checksums, and puts it back together. + """ + + def __init__(self, pkg_path, debug): + self.debug = debug + self.pkg_path = pkg_path + self.srv4 = CswSrv4File(pkg_path) + self.dir_pkg = None + self.exported_dir = None + self.parsed_filename = opencsw.ParsePackageFileName(self.pkg_path) + + def Transform(self): + if not self.dir_pkg: + self.dir_pkg = self.srv4.GetDirFormatPkg() + logging.debug(repr(self.dir_pkg)) + # subprocess.call(["tree", self.dir_pkg.directory]) + + def Export(self, dest_dir): + self.Transform() + if not self.exported_dir: + basedir, pkgname = os.path.split(self.dir_pkg.directory) + self.exported_dir = os.path.join(dest_dir, pkgname) + shutil.copytree( + self.dir_pkg.directory, + self.exported_dir) + subprocess.call(["git", "init"], cwd=self.exported_dir) + subprocess.call(["git", "add", "."], cwd=self.exported_dir) + subprocess.call(["git", "commit", "-a", "-m", "Initial commit"], + cwd=self.exported_dir) + else: + logging.warn("The package was already exported to %s", + self.exported_dir) + + def Patch(self, patch_file): + self.Transform() + args = ["gpatch", "-p", "1", "-d", self.dir_pkg.directory, "-i", patch_file] + logging.debug(args) + subprocess.call(args) + + def ToSrv4(self, dest_dir): + self.Transform() + pkginfo = self.dir_pkg.GetParsedPkginfo() + date_str = datetime.datetime.now().strftime("%Y-%m-%d") + self.parsed_filename["revision_info"]["REV"] = date_str + new_filename = opencsw.ComposePackageFileName(self.parsed_filename) + # Plan: + # - Update the version in the pkginfo + # - Update the pkgmap file, setting the checksums + # - Transform it back to the srv4 form + # - gzip it. Modified: csw/mgar/gar/v2/lib/python/patch_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-22 08:00:18 UTC (rev 11373) +++ csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-22 08:00:39 UTC (rev 11374) @@ -15,55 +15,6 @@ import pprint import opencsw -class PackageSurgeon(package.ShellMixin): - - def __init__(self, pkg_path, debug): - self.debug = debug - self.pkg_path = pkg_path - self.srv4 = package.CswSrv4File(pkg_path) - self.dir_pkg = None - self.exported_dir = None - self.parsed_filename = opencsw.ParsePackageFileName(self.pkg_path) - - def Transform(self): - if not self.dir_pkg: - self.dir_pkg = self.srv4.GetDirFormatPkg() - logging.debug(repr(self.dir_pkg)) - # subprocess.call(["tree", self.dir_pkg.directory]) - - def Export(self, dest_dir): - self.Transform() - if not self.exported_dir: - basedir, pkgname = os.path.split(self.dir_pkg.directory) - self.exported_dir = os.path.join(dest_dir, pkgname) - shutil.copytree( - self.dir_pkg.directory, - self.exported_dir) - subprocess.call(["git", "init"], cwd=self.exported_dir) - subprocess.call(["git", "add", "."], cwd=self.exported_dir) - subprocess.call(["git", "commit", "-a", "-m", "Initial commit"], - cwd=self.exported_dir) - else: - logging.warn("The package was already exported to %s", - self.exported_dir) - - def Patch(self, patch_file): - self.Transform() - args = ["gpatch", "-p", "1", "-d", self.dir_pkg.directory, "-i", patch_file] - logging.debug(args) - subprocess.call(args) - - def ToSrv4(self, dest_dir): - self.Transform() - pkginfo = self.dir_pkg.GetParsedPkginfo() - # version = pkginfo["VERSION"] - date_str = datetime.datetime.now().strftime("%Y-%m-%d") - self.parsed_filename["revision_info"]["REV"] = date_str - new_filename = opencsw.ComposePackageFileName(self.parsed_filename) - pprint.pprint(self.parsed_filename) - pprint.pprint(new_filename) - - def main(): parser = optparse.OptionParser() parser.add_option("--dir", "-d", dest="dir", @@ -85,7 +36,8 @@ logging_level = logging.DEBUG if options.debug else logging.INFO logging.basicConfig(level=logging_level) logging.debug("Start!") - ps = PackageSurgeon("/home/maciej/tmp/mozilla-1.7.5-SunOS5.8-sparc-CSW.pkg.gz", + ps = package.PackageSurgeon( + "/home/maciej/tmp/mozilla-1.7.5-SunOS5.8-sparc-CSW.pkg.gz", debug=options.debug) # ps.Export("/home/maciej/tmp") ps.Patch("/home/maciej/tmp/0001-Removing-nspr.m4-and-headers.patch") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 10:47:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 08:47:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[11377] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 11377 http://gar.svn.sourceforge.net/gar/?rev=11377&view=rev Author: wahwah Date: 2010-10-22 08:46:59 +0000 (Fri, 22 Oct 2010) Log Message: ----------- Merge branch 'master' of file:///home/maciej/public_html/opencsw Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-22 08:01:18 UTC (rev 11376) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-10-22 08:46:59 UTC (rev 11377) @@ -1102,7 +1102,6 @@ % (binary_info["path"], policy_pkgname_list)) - def CheckSharedLibraryPkgDoesNotHaveTheSoFile(pkg_data, error_mgr, logger, messenger): """If it's a package with shared libraries, it should not contain the .so file. @@ -1137,16 +1136,31 @@ "the .so file together with the header files in the devel " "package." % entry["path"]) - def CheckPackagesWithHeaderFilesMustContainTheSoFile(pkg_data, error_mgr, logger, messenger): - """Generated two kinds of messages: + pkgname = pkg_data["basic_stats"]["pkgname"] + shared_libs = set(su.GetSharedLibs(pkg_data)) + shared_libs = filter(su.IsLibraryLinkable, shared_libs) + if shared_libs: + # If the package contains shared libraries, it must not contain + # corrersponding .so files, which are used during linking. + for entry in pkg_data["pkgmap"]: + if entry["path"]: + if entry["path"].endswith(".so") and entry["type"] == "s": + error_mgr.ReportError( + "shared-lib-package-contains-so-symlink", + "file=%s" % entry["path"]) + messenger.Message( + "The package contains shared libraries together with the " + "symlink of the form libfoo.so -> libfoo.so.1. " + "In this case: %s. " + "This kind of symlink should not be together with the shared " + "libraries; it is only used during compiling and linking. " + "The best practice " + "is to put the shared libraries into a separate package, and " + "the .so file together with the header files in the devel " + "package." % entry["path"]) - 1. Contains .h but not .so - 2. Contains .so but not .h - """ - pass - def CheckSharedLibraryNameMustBeAsubstringOfSoname( pkg_data, error_mgr, logger, messenger): pkgname = pkg_data["basic_stats"]["pkgname"] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 10:47:26 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 08:47:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[11378] csw/mgar/gar/v2/lib/python/sharedlib_utils.py Message-ID: Revision: 11378 http://gar.svn.sourceforge.net/gar/?rev=11378&view=rev Author: wahwah Date: 2010-10-22 08:47:25 +0000 (Fri, 22 Oct 2010) Log Message: ----------- mGAR v2: shared lib utils: Removing 2 duplicate functions (probably an artifact of weird merging while doing 'git svn rebase'. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-22 08:46:59 UTC (rev 11377) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-22 08:47:25 UTC (rev 11378) @@ -49,22 +49,6 @@ return c.join(parts).lower() - -def SanitizeWithChar(s, c): - parts = LEGIT_CHAR_RE.findall(s) - if "so" in parts: - parts.remove("so") - return c.join(parts).lower() - - - -def SanitizeWithChar(s, c): - parts = LEGIT_CHAR_RE.findall(s) - if "so" in parts: - parts.remove("so") - return c.join(parts).lower() - - def MakePackageNameBySoname(soname): """Find the package name based on the soname. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 22 13:57:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Oct 2010 11:57:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[11379] csw/mgar/pkg/lang-python/numpy/trunk Message-ID: Revision: 11379 http://gar.svn.sourceforge.net/gar/?rev=11379&view=rev Author: wahwah Date: 2010-10-22 11:57:58 +0000 (Fri, 22 Oct 2010) Log Message: ----------- numpy: Applied a patch from Oliver Kiddle, some issues still need resolution. Modified Paths: -------------- csw/mgar/pkg/lang-python/numpy/trunk/Makefile csw/mgar/pkg/lang-python/numpy/trunk/checksums Modified: csw/mgar/pkg/lang-python/numpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2010-10-22 08:47:25 UTC (rev 11378) +++ csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2010-10-22 11:57:58 UTC (rev 11379) @@ -3,17 +3,36 @@ # $Id$ GARNAME = numpy -GARVERSION = 1.4.1 +GARVERSION = 1.5.1rc1 CATEGORIES = python -DESCRIPTION = The fundamental package needed for scientific computing with Python + +DESCRIPTION = Standard numerical array library for python define BLURB + numpy is the standard numerical array library for python, the successor + to Numeric and numarray. numpy provides fast operations for homogeneous + data sets and common mathematical operations like correlations, standard + deviation, fourier transforms, and convolutions. endef + SPKG_SOURCEURL = http://numpy.scipy.org/ -PACKAGES = CSWpy-numpy -CATALOGNAME_CSWpy-numpy = py_numpy MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWpy-numpy +CATALOGNAME = py_numpy + +RUNTIME_DEP_PKGS_CSWpy-numpy += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-numpy += CSWss12f95rt +RUNTIME_DEP_PKGS_CSWpy-numpy += CSWsunmath + +LICENSE = LICENSE.txt + +export ATLAS = None +export BLAS = $(CC_HOME)/lib/libsunperf.so +export LAPACK = $(libdir)/libsunmath.so + TEST_SCRIPTS = -LICENSE = LICENSE.txt +INSTALL_ARGS += --root=$(DESTDIR) + include gar/category.mk Modified: csw/mgar/pkg/lang-python/numpy/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/numpy/trunk/checksums 2010-10-22 08:47:25 UTC (rev 11378) +++ csw/mgar/pkg/lang-python/numpy/trunk/checksums 2010-10-22 11:57:58 UTC (rev 11379) @@ -1 +1 @@ -5c7b5349dc3161763f7f366ceb96516b numpy-1.4.1.tar.gz +5b4f1827b1af4a75edaff59e86404297 numpy-1.5.1rc1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Oct 23 13:52:17 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 23 Oct 2010 11:52:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11380] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 11380 http://gar.svn.sourceforge.net/gar/?rev=11380&view=rev Author: rthurner Date: 2010-10-23 11:52:17 +0000 (Sat, 23 Oct 2010) Log Message: ----------- subversion: upgrade to svn-1.6.13 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-10-22 11:57:58 UTC (rev 11379) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-10-23 11:52:17 UTC (rev 11380) @@ -22,7 +22,7 @@ # http://subversion.apache.org/mailing-lists.html GARNAME = subversion -GARVERSION = 1.6.12 +GARVERSION = 1.6.13 CATEGORIES = utils DESCRIPTION = Version control rethought Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2010-10-22 11:57:58 UTC (rev 11379) +++ csw/mgar/pkg/subversion/trunk/checksums 2010-10-23 11:52:17 UTC (rev 11380) @@ -1,10 +1 @@ -5e2c9e1d117c41a0eb6c977c984e7c36 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch -32b2cc8a237404d160a5617ea2da53d8 CSWap2svn.postinstall -586b9c9924c1547d44451a84d2aca702 CSWap2svn.preremove -395ec6d1bfe07efadc1c0aa8816673fa CSWsvn.checkinstall -41ec540885de7c34625768aa1fb9682b fixme.sh -f107831ad0c702ff32e51df6a207237b httpd-svn.conf.CSW -f0aa58c145ae99f8e4d72499ab826169 javahl_headers_for_nested_classes.diff -a4b1d0d7f3a4587c59da9c1acf9dedd0 subversion-1.6.12.tar.bz2 -f7d05c59656dcf01fb844295c9912f78 subversion161.diff -1b532d3055708a97771f5cd959983628 svn_access.conf.CSW +7ae1c827689f21cf975804005be30aeb subversion-1.6.13.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Oct 23 14:03:46 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 23 Oct 2010 12:03:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[11381] csw/mgar/pkg/apr-util/trunk Message-ID: Revision: 11381 http://gar.svn.sourceforge.net/gar/?rev=11381&view=rev Author: rthurner Date: 2010-10-23 12:03:45 +0000 (Sat, 23 Oct 2010) Log Message: ----------- apr-util: upgrade to apr-util-1.3.10 Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile csw/mgar/pkg/apr-util/trunk/checksums Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2010-10-23 11:52:17 UTC (rev 11380) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2010-10-23 12:03:45 UTC (rev 11381) @@ -1,5 +1,5 @@ GARNAME = apr-util -GARVERSION = 1.3.9 +GARVERSION = 1.3.10 CATEGORIES = lib DESCRIPTION = Apache Portable Runtime Utilities Modified: csw/mgar/pkg/apr-util/trunk/checksums =================================================================== --- csw/mgar/pkg/apr-util/trunk/checksums 2010-10-23 11:52:17 UTC (rev 11380) +++ csw/mgar/pkg/apr-util/trunk/checksums 2010-10-23 12:03:45 UTC (rev 11381) @@ -1,2 +1 @@ -aed0c105d6c9c1afb7a14bd80ed0c173 0001-Make-sure-to-find-newly-built-libs-earlier.patch -cc2ec0ba4f01d88375f1170f762518fa apr-util-1.3.9.tar.gz +82acd25cf3df8c72eba44eaee8b80c19 apr-util-1.3.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Oct 23 14:09:51 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 23 Oct 2010 12:09:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[11382] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 11382 http://gar.svn.sourceforge.net/gar/?rev=11382&view=rev Author: idogan23 Date: 2010-10-23 12:09:51 +0000 (Sat, 23 Oct 2010) Log Message: ----------- unbound: patch to disable default cflags on sparc Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unbound/trunk/checksums Added Paths: ----------- csw/mgar/pkg/unbound/trunk/files/0001-disable-default-cflags-on-sparc.patch Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2010-10-23 12:03:45 UTC (rev 11381) +++ csw/mgar/pkg/unbound/trunk/Makefile 2010-10-23 12:09:51 UTC (rev 11382) @@ -18,6 +18,8 @@ DISTFILES += cswunbound DISTFILES += cswusergroup +PATCHFILES += 0001-disable-default-cflags-on-sparc.patch + SPKG_CLASSES = none cswusergroup cswcpsampleconf cswinitsmf PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswunbound$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/CSWunbound\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/unbound\/unbound.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' @@ -35,6 +37,7 @@ CONFIGURE_ARGS += --with-ldns=/opt/csw CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-libevent=/opt/csw +CONFIGURE_ARGS += --with-libexpat=/opt/csw CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2010-10-23 12:03:45 UTC (rev 11381) +++ csw/mgar/pkg/unbound/trunk/checksums 2010-10-23 12:09:51 UTC (rev 11382) @@ -1,3 +1 @@ -75867432e238f5afd48dfe5d138097e9 cswunbound -601effee1051487655f66790762b66fd cswusergroup 2cdcfe0ca45373c6b22e274560ae9943 unbound-1.4.6.tar.gz Added: csw/mgar/pkg/unbound/trunk/files/0001-disable-default-cflags-on-sparc.patch =================================================================== --- csw/mgar/pkg/unbound/trunk/files/0001-disable-default-cflags-on-sparc.patch (rev 0) +++ csw/mgar/pkg/unbound/trunk/files/0001-disable-default-cflags-on-sparc.patch 2010-10-23 12:09:51 UTC (rev 11382) @@ -0,0 +1,751 @@ +From b37f71e0473b23b92dc55238362c259bfbbe4e6c Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Sat, 23 Oct 2010 13:57:53 +0200 +Subject: [PATCH] disable default cflags on sparc + +--- + configure | 298 +++++++++++++++++++++++++++++++++++++++++----------------- + configure.ac | 111 ++++++++++++++++++++-- + doc/README | 15 +++- + 3 files changed, 326 insertions(+), 98 deletions(-) + +diff --git a/configure b/configure +index fa2b6df..6dc8502 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.65 for unbound 1.4.6. ++# Generated by GNU Autoconf 2.65 for unbound 1.4.7. + # + # Report bugs to . + # +@@ -701,8 +701,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='unbound' + PACKAGE_TARNAME='unbound' +-PACKAGE_VERSION='1.4.6' +-PACKAGE_STRING='unbound 1.4.6' ++PACKAGE_VERSION='1.4.7' ++PACKAGE_STRING='unbound 1.4.7' + PACKAGE_BUGREPORT='unbound-bugs at nlnetlabs.nl' + PACKAGE_URL='' + +@@ -797,6 +797,8 @@ LEX + debug_enabled + DEPFLAG + UNBOUND_USERNAME ++UNBOUND_ROOTCERT_FILE ++UNBOUND_ROOTKEY_FILE + UNBOUND_PIDFILE + UNBOUND_SHARE_DIR + UNBOUND_CHROOT_DIR +@@ -873,6 +875,8 @@ with_run_dir + with_chroot_dir + with_share_dir + with_pidfile ++with_rootkey_file ++with_rootcert_file + with_username + enable_checking + enable_debug +@@ -892,6 +896,7 @@ with_ssl + enable_sha2 + enable_gost + with_libevent ++with_libexpat + enable_staticexe + enable_lock_checks + enable_alloc_checks +@@ -1453,7 +1458,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures unbound 1.4.6 to adapt to many kinds of systems. ++\`configure' configures unbound 1.4.7 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1519,7 +1524,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of unbound 1.4.6:";; ++ short | recursive ) echo "Configuration of unbound 1.4.7:";; + esac + cat <<\_ACEOF + +@@ -1563,6 +1568,13 @@ Optional Packages: + same as share/unbound) + --with-pidfile=filename set default pathname to unbound pidfile (default + run-dir/unbound.pid) ++ --with-rootkey-file=filename ++ set default pathname to root key file (default ++ run-dir/root.key). This file is read and written. ++ --with-rootcert-file=filename ++ set default pathname to root update certificate file ++ (default run-dir/icannbundle.pem). This file need ++ not exist if you are content with the builtin. + --with-username=user set default user that unbound changes to (default + user is unbound) + --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1583,6 +1595,7 @@ Optional Packages: + /usr/lib /usr/pkg /usr/sfw /usr or you can specify + an explicit path). Slower, but allows use of large + outgoing port ranges. ++ --with-libexpat=path specify explicit path for libexpat. + --with-ldns=PATH specify prefix of path of ldns library to use + --with-ldns-builtin forces use of package included with this one + +@@ -1671,7 +1684,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-unbound configure 1.4.6 ++unbound configure 1.4.7 + generated by GNU Autoconf 2.65 + + Copyright (C) 2009 Free Software Foundation, Inc. +@@ -2135,7 +2148,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by unbound $as_me 1.4.6, which was ++It was created by unbound $as_me 1.4.7, which was + generated by GNU Autoconf 2.65. Invocation command line was + + $ $0 $@ +@@ -2484,7 +2497,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + LIBUNBOUND_CURRENT=2 +-LIBUNBOUND_REVISION=6 ++LIBUNBOUND_REVISION=7 + LIBUNBOUND_AGE=0 + # 1.0.0 had 0:12:0 + # 1.0.1 had 0:13:0 +@@ -2506,6 +2519,7 @@ LIBUNBOUND_AGE=0 + # 1.4.4 had 2:4:0 + # 1.4.5 had 2:5:0 + # 1.4.6 had 2:6:0 ++# 1.4.7 had 2:7:0 + + # Current -- the number of the binary API that we're implementing + # Revision -- which iteration of the implementation of the binary +@@ -4059,6 +4073,50 @@ _ACEOF + + + ++# Check whether --with-rootkey-file was given. ++if test "${with_rootkey_file+set}" = set; then : ++ withval=$with_rootkey_file; UNBOUND_ROOTKEY_FILE="$withval" ++else ++ if test $on_mingw = no; then ++ UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key" ++else ++ UNBOUND_ROOTKEY_FILE="C:\\Program Files\\Unbound\\root.key" ++fi ++ ++fi ++ ++ ++hdr_rkey="`echo $UNBOUND_ROOTKEY_FILE | sed -e 's/\\\\/\\\\\\\\/g'`" ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define ROOT_ANCHOR_FILE "$hdr_rkey" ++_ACEOF ++ ++ ++ ++# Check whether --with-rootcert-file was given. ++if test "${with_rootcert_file+set}" = set; then : ++ withval=$with_rootcert_file; UNBOUND_ROOTCERT_FILE="$withval" ++else ++ if test $on_mingw = no; then ++ UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem" ++else ++ UNBOUND_ROOTCERT_FILE="C:\\Program Files\\Unbound\\icannbundle.pem" ++fi ++ ++fi ++ ++ ++hdr_rpem="`echo $UNBOUND_ROOTCERT_FILE | sed -e 's/\\\\/\\\\\\\\/g'`" ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define ROOT_CERT_FILE "$hdr_rpem" ++_ACEOF ++ ++ ++ + # Check whether --with-username was given. + if test "${with_username+set}" = set; then : + withval=$with_username; UNBOUND_USERNAME="$withval" +@@ -5531,70 +5589,6 @@ fi + + + +-# for Sun studio 11. +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -xO4" >&5 +-$as_echo_n "checking whether $CC supports -xO4... " >&6; } +-cache=`echo xO4 | sed 'y%.=/+-%___p_%'` +-if { as_var=cv_prog_cc_flag_$cache; eval "test \"\${$as_var+set}\" = set"; }; then : +- $as_echo_n "(cached) " >&6 +-else +- +-echo 'void f(){}' >conftest.c +-if test -z "`$CC $CPPFLAGS $CFLAGS -xO4 -c conftest.c 2>&1`"; then +-eval "cv_prog_cc_flag_$cache=yes" +-else +-eval "cv_prog_cc_flag_$cache=no" +-fi +-rm -f conftest conftest.o conftest.c +- +-fi +- +-if eval "test \"`echo '$cv_prog_cc_flag_'$cache`\" = yes"; then +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +-: +-CFLAGS="$CFLAGS -xO4" +-else +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-: +- +-fi +- +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -xtarget=generic" >&5 +-$as_echo_n "checking whether $CC supports -xtarget=generic... " >&6; } +-cache=`echo xtarget=generic | sed 'y%.=/+-%___p_%'` +-if { as_var=cv_prog_cc_flag_$cache; eval "test \"\${$as_var+set}\" = set"; }; then : +- $as_echo_n "(cached) " >&6 +-else +- +-echo 'void f(){}' >conftest.c +-if test -z "`$CC $CPPFLAGS $CFLAGS -xtarget=generic -c conftest.c 2>&1`"; then +-eval "cv_prog_cc_flag_$cache=yes" +-else +-eval "cv_prog_cc_flag_$cache=no" +-fi +-rm -f conftest conftest.o conftest.c +- +-fi +- +-if eval "test \"`echo '$cv_prog_cc_flag_'$cache`\" = yes"; then +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +-: +-CFLAGS="$CFLAGS -xtarget=generic" +-else +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-: +- +-fi +- +- + # debug mode flags warnings + # Check whether --enable-checking was given. + if test "${enable_checking+set}" = set; then : +@@ -6818,13 +6812,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:6821: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6815: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6824: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6818: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6827: output\"" >&5) ++ (eval echo "\"\$as_me:6821: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -8029,7 +8023,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 8032 "configure"' > conftest.$ac_ext ++ echo '#line 8026 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -9289,11 +9283,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9292: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9286: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9296: \$? = $ac_status" >&5 ++ echo "$as_me:9290: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9628,11 +9622,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9631: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9625: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9635: \$? = $ac_status" >&5 ++ echo "$as_me:9629: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9733,11 +9727,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9736: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9730: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9740: \$? = $ac_status" >&5 ++ echo "$as_me:9734: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -9788,11 +9782,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9791: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9785: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9795: \$? = $ac_status" >&5 ++ echo "$as_me:9789: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -12158,7 +12152,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12161 "configure" ++#line 12155 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12254,7 +12248,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12257 "configure" ++#line 12251 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -15664,6 +15658,47 @@ $as_echo "#define USE_MINI_EVENT 1" >>confdefs.h + + fi + ++# check for libexpat ++ ++# Check whether --with-libexpat was given. ++if test "${with_libexpat+set}" = set; then : ++ withval=$with_libexpat; ++else ++ withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr" ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexpat" >&5 ++$as_echo_n "checking for libexpat... " >&6; } ++found_libexpat="no" ++for dir in $withval ; do ++ if test -f "$dir/include/expat.h"; then ++ found_libexpat="yes" ++ if test "$dir" != "/usr"; then ++ CPPFLAGS="$CPPFLAGS -I$dir/include" ++ LDFLAGS="$LDFLAGS -L$dir/lib" ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $dir" >&5 ++$as_echo "found in $dir" >&6; } ++ break; ++ fi ++done ++if test x_$found_libexpat != x_yes; then ++ as_fn_error "Could not find libexpat, expat.h" "$LINENO" 5 ++fi ++for ac_header in expat.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default ++" ++if test "x$ac_cv_header_expat_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_EXPAT_H 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ + # set static linking if requested + + staticexe="" +@@ -16096,6 +16131,73 @@ fi + + fi + ++# check wether strptime also works ++for ac_func in strptime ++do : ++ ac_fn_c_check_func "$LINENO" "strptime" "ac_cv_func_strptime" ++if test "x$ac_cv_func_strptime" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_STRPTIME 1 ++_ACEOF ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime works" >&5 ++$as_echo_n "checking whether strptime works... " >&6; } ++if test c${cross_compiling} = cno; then ++if test "$cross_compiling" = yes; then : ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot run test program while cross compiling ++See \`config.log' for more details." "$LINENO" 5; } ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#define _XOPEN_SOURCE ++#include ++int main(void) { struct tm tm; char *res; ++res = strptime("20070207111842", "%Y%m%d%H%M%S", &tm); ++if (!res) return 1; return 0; } ++ ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ eval "ac_cv_c_strptime_works=yes" ++else ++ eval "ac_cv_c_strptime_works=no" ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ ++else ++eval "ac_cv_c_strptime_works=maybe" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_strptime_works" >&5 ++$as_echo "$ac_cv_c_strptime_works" >&6; } ++if test $ac_cv_c_strptime_works = no; then ++case " $LIBOBJS " in ++ *" strptime.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS strptime.$ac_objext" ++ ;; ++esac ++ ++else ++ ++cat >>confdefs.h <<_ACEOF ++#define STRPTIME_WORKS 1 ++_ACEOF ++ ++fi ++ ++else ++ case " $LIBOBJS " in ++ *" strptime.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS strptime.$ac_objext" ++ ;; ++esac ++ ++fi ++done ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setusercontext" >&5 + $as_echo_n "checking for library containing setusercontext... " >&6; } + if test "${ac_cv_search_setusercontext+set}" = set; then : +@@ -16484,6 +16586,26 @@ done + for ac_header in ldns/ldns.h + do : + ac_fn_c_check_header_compile "$LINENO" "ldns/ldns.h" "ac_cv_header_ldns_ldns_h" "$ac_includes_default ++#ifdef HAVE_SYS_SOCKET_H ++#include ++#endif ++ ++#ifdef HAVE_NETINET_IN_H ++#include ++#endif ++ ++#ifdef HAVE_ARPA_INET_H ++#include ++#endif ++ ++#ifdef HAVE_WINSOCK2_H ++#include ++#endif ++ ++#ifdef HAVE_WS2TCPIP_H ++#include ++#endif ++ + " + if test "x$ac_cv_header_ldns_ldns_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +@@ -17114,7 +17236,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by unbound $as_me 1.4.6, which was ++This file was extended by unbound $as_me 1.4.7, which was + generated by GNU Autoconf 2.65. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17180,7 +17302,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-unbound config.status 1.4.6 ++unbound config.status 1.4.7 + configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" + +diff --git a/configure.ac b/configure.ac +index 304e876..6aadeb4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6,10 +6,10 @@ sinclude(acx_pthread.m4) + sinclude(acx_python.m4) + sinclude(ac_pkg_swig.m4) + +-AC_INIT(unbound, 1.4.6, unbound-bugs at nlnetlabs.nl, unbound) ++AC_INIT(unbound, 1.4.7, unbound-bugs at nlnetlabs.nl, unbound) + + LIBUNBOUND_CURRENT=2 +-LIBUNBOUND_REVISION=6 ++LIBUNBOUND_REVISION=7 + LIBUNBOUND_AGE=0 + # 1.0.0 had 0:12:0 + # 1.0.1 had 0:13:0 +@@ -31,6 +31,7 @@ LIBUNBOUND_AGE=0 + # 1.4.4 had 2:4:0 + # 1.4.5 had 2:5:0 + # 1.4.6 had 2:6:0 ++# 1.4.7 had 2:7:0 + + # Current -- the number of the binary API that we're implementing + # Revision -- which iteration of the implementation of the binary +@@ -153,6 +154,34 @@ AC_SUBST(UNBOUND_PIDFILE) + ACX_ESCAPE_BACKSLASH($UNBOUND_PIDFILE, hdr_pid) + AC_DEFINE_UNQUOTED(PIDFILE, ["$hdr_pid"], [default pidfile location]) + ++AC_ARG_WITH(rootkey-file, ++ AC_HELP_STRING([--with-rootkey-file=filename], ++ [set default pathname to root key file (default run-dir/root.key). This file is read and written.]), ++ UNBOUND_ROOTKEY_FILE="$withval", ++if test $on_mingw = no; then ++ UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key" ++else ++ UNBOUND_ROOTKEY_FILE="C:\\Program Files\\Unbound\\root.key" ++fi ++) ++AC_SUBST(UNBOUND_ROOTKEY_FILE) ++ACX_ESCAPE_BACKSLASH($UNBOUND_ROOTKEY_FILE, hdr_rkey) ++AC_DEFINE_UNQUOTED(ROOT_ANCHOR_FILE, ["$hdr_rkey"], [default rootkey location]) ++ ++AC_ARG_WITH(rootcert-file, ++ AC_HELP_STRING([--with-rootcert-file=filename], ++ [set default pathname to root update certificate file (default run-dir/icannbundle.pem). This file need not exist if you are content with the builtin.]), ++ UNBOUND_ROOTCERT_FILE="$withval", ++if test $on_mingw = no; then ++ UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem" ++else ++ UNBOUND_ROOTCERT_FILE="C:\\Program Files\\Unbound\\icannbundle.pem" ++fi ++) ++AC_SUBST(UNBOUND_ROOTCERT_FILE) ++ACX_ESCAPE_BACKSLASH($UNBOUND_ROOTCERT_FILE, hdr_rpem) ++AC_DEFINE_UNQUOTED(ROOT_CERT_FILE, ["$hdr_rpem"], [default rootcert location]) ++ + AC_ARG_WITH(username, + AC_HELP_STRING([--with-username=user], + [set default user that unbound changes to (default user is unbound)]), +@@ -174,10 +203,6 @@ AC_PROG_CC + ACX_DEPFLAG + ACX_DETERMINE_EXT_FLAGS_UNBOUND + +-# for Sun studio 11. +-ACX_CHECK_COMPILER_FLAG(xO4, [CFLAGS="$CFLAGS -xO4"]) +-ACX_CHECK_COMPILER_FLAG(xtarget=generic, [CFLAGS="$CFLAGS -xtarget=generic"]) +- + # debug mode flags warnings + AC_ARG_ENABLE(checking, AC_HELP_STRING([--enable-checking], [Enable warnings, asserts, makefile-dependencies])) + AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [same as enable-checking])) +@@ -531,6 +556,29 @@ else + AC_DEFINE(USE_MINI_EVENT, 1, [Define if you want to use internal select based events]) + fi + ++# check for libexpat ++AC_ARG_WITH(libexpat, AC_HELP_STRING([--with-libexpat=path], ++ [specify explicit path for libexpat.]), ++ [ ],[ withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr" ]) ++AC_MSG_CHECKING(for libexpat) ++found_libexpat="no" ++for dir in $withval ; do ++ if test -f "$dir/include/expat.h"; then ++ found_libexpat="yes" ++ dnl assume /usr is in default path. ++ if test "$dir" != "/usr"; then ++ CPPFLAGS="$CPPFLAGS -I$dir/include" ++ LDFLAGS="$LDFLAGS -L$dir/lib" ++ fi ++ AC_MSG_RESULT(found in $dir) ++ break; ++ fi ++done ++if test x_$found_libexpat != x_yes; then ++ AC_ERROR([Could not find libexpat, expat.h]) ++fi ++AC_CHECK_HEADERS([expat.h],,, [AC_INCLUDES_DEFAULT]) ++ + # set static linking if requested + AC_SUBST(staticexe) + staticexe="" +@@ -606,6 +654,29 @@ if test $ac_cv_func_daemon = yes; then + ]) + fi + ++# check wether strptime also works ++AC_DEFUN([AC_CHECK_STRPTIME_WORKS], ++[AC_REQUIRE([AC_PROG_CC]) ++AC_MSG_CHECKING(whether strptime works) ++if test c${cross_compiling} = cno; then ++AC_TRY_RUN([ ++#define _XOPEN_SOURCE ++#include ++int main(void) { struct tm tm; char *res; ++res = strptime("20070207111842", "%Y%m%d%H%M%S", &tm); ++if (!res) return 1; return 0; } ++] , [eval "ac_cv_c_strptime_works=yes"], [eval "ac_cv_c_strptime_works=no"]) ++else ++eval "ac_cv_c_strptime_works=maybe" ++fi ++AC_MSG_RESULT($ac_cv_c_strptime_works) ++if test $ac_cv_c_strptime_works = no; then ++AC_LIBOBJ(strptime) ++else ++AC_DEFINE_UNQUOTED([STRPTIME_WORKS], 1, [use default strptime.]) ++fi ++])dnl ++AC_CHECK_FUNCS([strptime],[AC_CHECK_STRPTIME_WORKS],[AC_LIBOBJ([strptime])]) + AC_SEARCH_LIBS([setusercontext], [util]) + AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam getrlimit setrlimit setsid sbrk chroot kill sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex]) + AC_CHECK_FUNCS([setresuid],,[AC_CHECK_FUNCS([setreuid])]) +@@ -655,7 +726,27 @@ if test "$use_ldns_builtin" = "no"; then + else + ac_cv_func_ldns_key_EVP_load_gost_id="yes" + fi +- AC_CHECK_HEADERS([ldns/ldns.h],,, [AC_INCLUDES_DEFAULT]) ++ AC_CHECK_HEADERS([ldns/ldns.h],,, [AC_INCLUDES_DEFAULT ++#ifdef HAVE_SYS_SOCKET_H ++#include ++#endif ++ ++#ifdef HAVE_NETINET_IN_H ++#include ++#endif ++ ++#ifdef HAVE_ARPA_INET_H ++#include ++#endif ++ ++#ifdef HAVE_WINSOCK2_H ++#include ++#endif ++ ++#ifdef HAVE_WS2TCPIP_H ++#include ++#endif ++]) + if test $ac_cv_lib_ldns_ldns_buffer_copy = yes \ + -a $ac_cv_func_ldns_key_buf2rsa_raw = yes \ + -a $ac_cv_header_ldns_ldns_h = yes \ +@@ -773,6 +864,12 @@ AHX_MEMCMP_BROKEN(unbound) + char *ctime_r(const time_t *timep, char *buf); + #endif + ++#if !defined(HAVE_STRPTIME) || !defined(STRPTIME_WORKS) ++#define strptime unbound_strptime ++struct tm; ++char *strptime(const char *s, const char *format, struct tm *tm); ++#endif ++ + #if defined(HAVE_EVENT_H) && !defined(HAVE_EVENT_BASE_ONCE) && (defined(HAVE_PTHREAD) || defined(HAVE_SOLARIS_THREADS)) + /* using version of libevent that is not threadsafe. */ + # define LIBEVENT_SIGNAL_PROBLEM 1 +diff --git a/doc/README b/doc/README +index a572250..5f13384 100644 +--- a/doc/README ++++ b/doc/README +@@ -1,4 +1,4 @@ +-README for Unbound 1.4.6 ++README for Unbound @version@ + Copyright 2007 NLnet Labs + http://unbound.net + +@@ -28,6 +28,8 @@ This software is under BSD license, see LICENSE for details. + of outgoing ports. This improves randomization and spoof + resistance. For the default of 16 ports the builtin alternative + works well and is a little faster. ++ * --with-libexpat=/path/to/libexpat ++ Can be set to the install directory of libexpat. + * --without-pthreads + This disables pthreads. Without this option the pthreads library + is detected automatically. Use this option to disable threading +@@ -59,6 +61,13 @@ This software is under BSD license, see LICENSE for details. + * --with-chroot-dir=path + Set default chroot directory, + the default is /usr/local/etc/unbound. ++ * --with-rootkey-file=path ++ Set the default root.key path. This file is read and written. ++ the default is /usr/local/etc/unbound/root.key ++ * --with-rootcert-file=path ++ Set the default root update certificate path. A builtin certificate ++ is used if this file is empty or does not exist. ++ the default is /usr/local/etc/unbound/icannbundle.pem + * --with-username=user + Set default user name to change to, + the default is the "unbound" user. +@@ -72,8 +81,7 @@ This software is under BSD license, see LICENSE for details. + * --disable-gost + Disable support for GOST crypto, RFC 5933. + +-* 'make test' attempts to run a series of tests, depending on the support +- programs that are installed. ++* 'make test' runs a series of self checks. + + Known issues + ------------ +@@ -97,6 +105,7 @@ o The warning 'openssl has no entropy, seeding with time', with chroot + o On Solaris 5.10 some libtool packages from repositories do not work with + gcc, showing errors gcc: unrecognized option `-KPIC' + To solve this do ./configure libtool=./libtool [your options...]. ++ On Solaris you may pass CFLAGS="-xO4 -xtarget=generic" if you use sun-cc. + o If unbound-control (or munin graphs) do not work, this can often be because + the unbound-control-setup script creates the keys with restricted + permissions, and the files need to be made readable or ownered by both the +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Oct 23 14:17:36 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 23 Oct 2010 12:17:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[11383] csw/mgar/pkg Message-ID: Revision: 11383 http://gar.svn.sourceforge.net/gar/?rev=11383&view=rev Author: rthurner Date: 2010-10-23 12:17:35 +0000 (Sat, 23 Oct 2010) Log Message: ----------- bdb50 will never go out Added Paths: ----------- csw/mgar/pkg/bdb51/ Removed Paths: ------------- csw/mgar/pkg/bdb50/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Oct 23 14:26:22 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 23 Oct 2010 12:26:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11384] csw/mgar/pkg/apr-util/trunk/Makefile Message-ID: Revision: 11384 http://gar.svn.sourceforge.net/gar/?rev=11384&view=rev Author: rthurner Date: 2010-10-23 12:26:21 +0000 (Sat, 23 Oct 2010) Log Message: ----------- apr-util: add checkpkg remarks Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2010-10-23 12:17:35 UTC (rev 11383) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2010-10-23 12:26:21 UTC (rev 11384) @@ -50,4 +50,18 @@ # http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/apr/apr-1.3/Makefile.sfw # for some unification. +# add new checkpkg remarks for the moment to get security fix out +CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbd_odbc.so +CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbd_sqlite3.so +CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbm_db.so +CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_ldap.so +CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libaprutil-1.so +CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-pkgname-mismatch|file=opt/csw/lib/libaprutil-1.so.0.3.10|soname=libaprutil-1.so.0|pkgname=CSWapr-util|expected=['CSWlibaprutil-10',|'CSWlibaprutil-1-0'] +CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbd_odbc.so +CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbd_sqlite3.so +CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbm_db.so +CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_ldap.so +CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libaprutil-1.so + + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Oct 23 14:30:19 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 23 Oct 2010 12:30:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11385] csw/mgar/pkg/bdb51/trunk/Makefile Message-ID: Revision: 11385 http://gar.svn.sourceforge.net/gar/?rev=11385&view=rev Author: rthurner Date: 2010-10-23 12:30:19 +0000 (Sat, 23 Oct 2010) Log Message: ----------- berkely-db: upgrade to bdb-5.1 Modified Paths: -------------- csw/mgar/pkg/bdb51/trunk/Makefile Modified: csw/mgar/pkg/bdb51/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb51/trunk/Makefile 2010-10-23 12:26:21 UTC (rev 11384) +++ csw/mgar/pkg/bdb51/trunk/Makefile 2010-10-23 12:30:19 UTC (rev 11385) @@ -1,8 +1,8 @@ GARNAME = db -GARVERSION = 5.0.26 +GARVERSION = 5.1.19 CATEGORIES = lib -DESCRIPTION = Berkeley DB 5.0 +DESCRIPTION = Berkeley DB 5.1 define BLURB Berkeley DB (libdb) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. It includes @@ -31,7 +31,7 @@ CONFIGURE_SCRIPTS = dist -prefix = $(BUILD_PREFIX)/bdb50 +prefix = $(BUILD_PREFIX)/bdb51 docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) @@ -49,23 +49,23 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb50 CSWbdb50devel CSWbdb50doc +PACKAGES = CSWbdb51 CSWbdb51devel CSWbdb51doc -CATALOGNAME_CSWbdb50 = berkeleydb50 -CATALOGNAME_CSWbdb50devel = berkeleydb50_devel -CATALOGNAME_CSWbdb50doc = berkeleydb50_doc +CATALOGNAME_CSWbdb51 = berkeleydb51 +CATALOGNAME_CSWbdb51devel = berkeleydb51_devel +CATALOGNAME_CSWbdb51doc = berkeleydb51_doc -ARCHALL_CSWbdb50doc = 1 +ARCHALL_CSWbdb51doc = 1 -SPKG_DESC_CSWbdb50 = BerkeleyDB 5.0 embedded database libraries and utilities -SPKG_DESC_CSWbdb50devel = BerkeleyDB 5.0 development support -SPKG_DESC_CSWbdb50doc = BerkeleyDB 5.0 documentation +SPKG_DESC_CSWbdb51 = BerkeleyDB 5.1 embedded database libraries and utilities +SPKG_DESC_CSWbdb51devel = BerkeleyDB 5.1 development support +SPKG_DESC_CSWbdb51doc = BerkeleyDB 5.1 documentation SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html LICENSE = LICENSE -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb50),' +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb51),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar @@ -73,18 +73,18 @@ # because GAR expects license to be a file instead of a directory EXTRA_MERGE_EXCLUDE_FILES = .*/license.* -PKGFILES_CSWbdb50doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb50devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb51doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb51devel = $(PKGFILES_DEVEL) -CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/lib|opt/csw/bdb50/lib/libdb_cxx-5.0.so -CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bdb50/lib/libdb_cxx-5.0.so -CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib|opt/csw/bdb50/lib/libdb_cxx-5.0.so -CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7|opt/csw/bdb50/lib/libdb_cxx-5.0.so -CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/lib/64|opt/csw/bdb50/lib/amd64/libdb_cxx-5.0.so -CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/amd64|opt/csw/bdb50/lib/amd64/libdb_cxx-5.0.so -CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/amd64|opt/csw/bdb50/lib/amd64/libdb_cxx-5.0.so -CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/usr/ccs/lib/amd64|opt/csw/bdb50/lib/amd64/libdb_cxx-5.0.so -CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/usr/lib/64|opt/csw/bdb50/lib/amd64/libdb_cxx-5.0.so +CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/lib|opt/csw/bdb51/lib/libdb_cxx-5.1.so +CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bdb51/lib/libdb_cxx-5.1.so +CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib|opt/csw/bdb51/lib/libdb_cxx-5.1.so +CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7|opt/csw/bdb51/lib/libdb_cxx-5.1.so +CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/lib/64|opt/csw/bdb51/lib/amd64/libdb_cxx-5.1.so +CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/amd64|opt/csw/bdb51/lib/amd64/libdb_cxx-5.1.so +CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/amd64|opt/csw/bdb51/lib/amd64/libdb_cxx-5.1.so +CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/usr/ccs/lib/amd64|opt/csw/bdb51/lib/amd64/libdb_cxx-5.1.so +CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/usr/lib/64|opt/csw/bdb51/lib/amd64/libdb_cxx-5.1.so include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Oct 23 14:33:59 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 23 Oct 2010 12:33:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11386] csw/mgar/pkg/bdb51/trunk/checksums Message-ID: Revision: 11386 http://gar.svn.sourceforge.net/gar/?rev=11386&view=rev Author: rthurner Date: 2010-10-23 12:33:59 +0000 (Sat, 23 Oct 2010) Log Message: ----------- bdb51: upgrade checksum Modified Paths: -------------- csw/mgar/pkg/bdb51/trunk/checksums Modified: csw/mgar/pkg/bdb51/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb51/trunk/checksums 2010-10-23 12:30:19 UTC (rev 11385) +++ csw/mgar/pkg/bdb51/trunk/checksums 2010-10-23 12:33:59 UTC (rev 11386) @@ -1 +1 @@ -8723c97c03d12c3afc8333df92d5089a db-5.0.26.tar.gz +76fcbfeebfcd09ba0b4d96bfdf8d884d db-5.1.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Oct 23 14:55:24 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 23 Oct 2010 12:55:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[11387] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11387 http://gar.svn.sourceforge.net/gar/?rev=11387&view=rev Author: rthurner Date: 2010-10-23 12:55:24 +0000 (Sat, 23 Oct 2010) Log Message: ----------- apache2: upgrade to httpd-2.2.17 Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/checksums Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-10-23 12:33:59 UTC (rev 11386) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-10-23 12:55:24 UTC (rev 11387) @@ -1,7 +1,7 @@ # $Id$ GARNAME = httpd -GARVERSION = 2.2.16 +GARVERSION = 2.2.17 CATEGORIES = server DESCRIPTION = A high performance HTTP server. Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2010-10-23 12:33:59 UTC (rev 11386) +++ csw/mgar/pkg/apache2/trunk/checksums 2010-10-23 12:55:24 UTC (rev 11387) @@ -1 +1 @@ -7f33f2c8b213ad758c009ae46d2795ed httpd-2.2.16.tar.gz +66d8e107f85acc039fd5e624e85728a9 httpd-2.2.17.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 24 15:16:31 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 24 Oct 2010 13:16:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[11388] csw/mgar/pkg/bdb51/trunk/Makefile Message-ID: Revision: 11388 http://gar.svn.sourceforge.net/gar/?rev=11388&view=rev Author: rthurner Date: 2010-10-24 13:16:31 +0000 (Sun, 24 Oct 2010) Log Message: ----------- bdb51: remove unused overrides Modified Paths: -------------- csw/mgar/pkg/bdb51/trunk/Makefile Modified: csw/mgar/pkg/bdb51/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb51/trunk/Makefile 2010-10-23 12:55:24 UTC (rev 11387) +++ csw/mgar/pkg/bdb51/trunk/Makefile 2010-10-24 13:16:31 UTC (rev 11388) @@ -76,17 +76,6 @@ PKGFILES_CSWbdb51doc = $(PKGFILES_DOC) PKGFILES_CSWbdb51devel = $(PKGFILES_DEVEL) -CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/lib|opt/csw/bdb51/lib/libdb_cxx-5.1.so -CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bdb51/lib/libdb_cxx-5.1.so -CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib|opt/csw/bdb51/lib/libdb_cxx-5.1.so -CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7|opt/csw/bdb51/lib/libdb_cxx-5.1.so -CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/lib/64|opt/csw/bdb51/lib/amd64/libdb_cxx-5.1.so -CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/amd64|opt/csw/bdb51/lib/amd64/libdb_cxx-5.1.so -CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/amd64|opt/csw/bdb51/lib/amd64/libdb_cxx-5.1.so -CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/usr/ccs/lib/amd64|opt/csw/bdb51/lib/amd64/libdb_cxx-5.1.so -CHECKPKG_OVERRIDES_CSWbdb51 += bad-rpath-entry|/usr/lib/64|opt/csw/bdb51/lib/amd64/libdb_cxx-5.1.so - - include gar/category.mk LIBS += -lnsl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 24 15:30:39 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 24 Oct 2010 13:30:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11389] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 11389 http://gar.svn.sourceforge.net/gar/?rev=11389&view=rev Author: rthurner Date: 2010-10-24 13:30:38 +0000 (Sun, 24 Oct 2010) Log Message: ----------- subversion: correct path to sun compiler Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-10-24 13:16:31 UTC (rev 11388) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-10-24 13:30:38 UTC (rev 11389) @@ -257,8 +257,8 @@ -e 's,-mt|*,,' \ -e 's,-xO3,-pipe -O2,' \ -e 's,KPIC,fPIC,' \ - -e 's,/opt/studio/SOS11/SUNWspro/bin/cc,/opt/csw/gcc4/bin/gcc,' \ - -e 's,/opt/studio/SOS11/SUNWspro/bin/CC,/opt/csw/gcc4/bin/g++,' \ + -e 's,/opt/SUNWspro/bin/cc,/opt/csw/gcc4/bin/gcc,' \ + -e 's,/opt/SUNWspro/bin/CC,/opt/csw/gcc4/bin/g++,' \ $(WORKSRC)/*.gcc gsed -i -e 's,libtool,libtool.gcc,' $(WORKSRC)/Makefile.gcc gsed -i -e 's,postdeps=.*,postdeps="",' $(WORKSRC)/libtool.gcc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Mon Oct 25 11:45:19 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Mon, 25 Oct 2010 09:45:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11390] csw/mgar/pkg/lang-python Message-ID: Revision: 11390 http://gar.svn.sourceforge.net/gar/?rev=11390&view=rev Author: khabermann Date: 2010-10-25 09:45:18 +0000 (Mon, 25 Oct 2010) Log Message: ----------- added python module xlrd Added Paths: ----------- csw/mgar/pkg/lang-python/xlrd/ csw/mgar/pkg/lang-python/xlrd/branches/ csw/mgar/pkg/lang-python/xlrd/tags/ csw/mgar/pkg/lang-python/xlrd/trunk/ csw/mgar/pkg/lang-python/xlrd/trunk/Makefile csw/mgar/pkg/lang-python/xlrd/trunk/checksums csw/mgar/pkg/lang-python/xlrd/trunk/files/ Property changes on: csw/mgar/pkg/lang-python/xlrd/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/lang-python/xlrd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/xlrd/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/xlrd/trunk/Makefile 2010-10-25 09:45:18 UTC (rev 11390) @@ -0,0 +1,24 @@ +GARNAME = xlrd +GARVERSION = 0.7.1 +CATEGORIES = python +PACKAGES = CSWpy-xlrd +CATALOGNAME = py_xlrd +LICENSE = xlrd/licences.py +ARCHALL_CSWpy-xlrd = 1 + +DESCRIPTION = Library for developers to extract data from Microsoft Excel (tm) spreadsheet files +define BLURB + Extract data from new and old Excel spreadsheets on any platform. + Pure Python (2.1 to 2.6). Strong support for Excel dates. Unicode-aware. +endef + +# 1st char of GARNAME is the directory name +MASTER_SITE_DIR = $(echo GARNAME | cut -c 1) +MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(GARNAME) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/xlrd/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/xlrd/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/xlrd/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/xlrd/trunk/checksums 2010-10-25 09:45:18 UTC (rev 11390) @@ -0,0 +1 @@ +d0439a7ad1ae583a6ba3942efd0189c8 xlrd-0.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Mon Oct 25 12:08:31 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Mon, 25 Oct 2010 10:08:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[11391] csw/mgar/pkg/lang-python/xlrd/trunk/Makefile Message-ID: Revision: 11391 http://gar.svn.sourceforge.net/gar/?rev=11391&view=rev Author: khabermann Date: 2010-10-25 10:08:31 +0000 (Mon, 25 Oct 2010) Log Message: ----------- fix master_site url Modified Paths: -------------- csw/mgar/pkg/lang-python/xlrd/trunk/Makefile Modified: csw/mgar/pkg/lang-python/xlrd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/xlrd/trunk/Makefile 2010-10-25 09:45:18 UTC (rev 11390) +++ csw/mgar/pkg/lang-python/xlrd/trunk/Makefile 2010-10-25 10:08:31 UTC (rev 11391) @@ -13,8 +13,8 @@ endef # 1st char of GARNAME is the directory name -MASTER_SITE_DIR = $(echo GARNAME | cut -c 1) -MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(GARNAME) +MASTER_SITE_DIR = $(shell echo $(GARNAME) | cut -c 1) +MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Mon Oct 25 13:23:15 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Mon, 25 Oct 2010 11:23:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11392] csw/mgar/pkg Message-ID: Revision: 11392 http://gar.svn.sourceforge.net/gar/?rev=11392&view=rev Author: opk Date: 2010-10-25 11:23:15 +0000 (Mon, 25 Oct 2010) Log Message: ----------- add nmh to gar Added Paths: ----------- csw/mgar/pkg/nmh/ csw/mgar/pkg/nmh/Makefile csw/mgar/pkg/nmh/branches/ csw/mgar/pkg/nmh/tags/ csw/mgar/pkg/nmh/trunk/ csw/mgar/pkg/nmh/trunk/Makefile csw/mgar/pkg/nmh/trunk/checksums csw/mgar/pkg/nmh/trunk/files/ csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch Added: csw/mgar/pkg/nmh/Makefile =================================================================== --- csw/mgar/pkg/nmh/Makefile (rev 0) +++ csw/mgar/pkg/nmh/Makefile 2010-10-25 11:23:15 UTC (rev 11392) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/nmh/Makefile ___________________________________________________________________ Added: svn:keywords + URL Id Property changes on: csw/mgar/pkg/nmh/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/nmh/trunk/Makefile =================================================================== --- csw/mgar/pkg/nmh/trunk/Makefile (rev 0) +++ csw/mgar/pkg/nmh/trunk/Makefile 2010-10-25 11:23:15 UTC (rev 11392) @@ -0,0 +1,29 @@ +# $Id$ +GARNAME = nmh +GARVERSION = 1.3 +CATEGORIES = apps + +DESCRIPTION = Powerful electronic mail handling system +define BLURB + This is the nmh mail user agent, a command-line based mail reader that + is powerful and extensible. Unlike most mail user agents, nmh is not a + single program, rather it is a set of programs that are run from the + shell. This allows the user to utilize the full power of the Unix + shell in conjunction with nmh. +endef + +MASTER_SITES = http://download.savannah.gnu.org/releases/$(GARNAME)/ +DISTFILES = nmh-$(GARVERSION).tar.gz +SPKG_SOURCEURL = http://www.nongnu.org/nmh/ +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +RUNTIME_DEP_PKGS += CSWiconv +PATCHFILES += 0000-skip-chgrp-of-inc.patch +LICENSE = COPYRIGHT + +CONFIGURE_ARGS = --enable-pop --enable-masquerade='' --with-mts=sendmail \ + --prefix=$(prefix) --mandir=$(mandir) --datadir=$(datadir)/nmh \ + --libdir=$(libdir)/nmh --sysconfdir=$(sysconfdir)/nmh +TEST_SCRIPTS = + +include gar/category.mk Property changes on: csw/mgar/pkg/nmh/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/nmh/trunk/checksums =================================================================== --- csw/mgar/pkg/nmh/trunk/checksums (rev 0) +++ csw/mgar/pkg/nmh/trunk/checksums 2010-10-25 11:23:15 UTC (rev 11392) @@ -0,0 +1 @@ +a52d1f93e780d7a045207451ce6c9a4e nmh-1.3.tar.gz Added: csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch =================================================================== --- csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch (rev 0) +++ csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch 2010-10-25 11:23:15 UTC (rev 11392) @@ -0,0 +1,29 @@ +From db3d12ec17a80fad52a5a463ad42bfbc6d70ad91 Mon Sep 17 00:00:00 2001 +From: Oliver Kiddle +Date: Mon, 25 Oct 2010 12:52:51 +0200 +Subject: [PATCH] skip chgrp of inc + +--- + uip/Makefile.in | 6 +----- + 1 files changed, 1 insertions(+), 5 deletions(-) + +diff --git a/uip/Makefile.in b/uip/Makefile.in +index b3c6717..2919bb9 100644 +--- a/uip/Makefile.in ++++ b/uip/Makefile.in +@@ -282,11 +282,7 @@ install-misc: + + # install commands with special installation needs (thus no $(SCMDS) use here) + install-scmds: +- if test x$(SETGID_MAIL) != x; then \ +- $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)$(bindir)/$$cmd; \ +- else \ +- $(INSTALL_PROGRAM) inc $(DESTDIR)$(bindir)/$$cmd; \ +- fi ++ $(INSTALL_PROGRAM) inc $(DESTDIR)$(bindir)/$$cmd + + uninstall: + for cmd in $(CMDS); do \ +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Mon Oct 25 14:28:49 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Mon, 25 Oct 2010 12:28:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[11393] csw/mgar/pkg/lang-python Message-ID: Revision: 11393 http://gar.svn.sourceforge.net/gar/?rev=11393&view=rev Author: khabermann Date: 2010-10-25 12:28:49 +0000 (Mon, 25 Oct 2010) Log Message: ----------- added package Added Paths: ----------- csw/mgar/pkg/lang-python/psycopg2/ csw/mgar/pkg/lang-python/psycopg2/branches/ csw/mgar/pkg/lang-python/psycopg2/tags/ csw/mgar/pkg/lang-python/psycopg2/trunk/ csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile csw/mgar/pkg/lang-python/psycopg2/trunk/checksums csw/mgar/pkg/lang-python/psycopg2/trunk/files/ Property changes on: csw/mgar/pkg/lang-python/psycopg2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile 2010-10-25 12:28:49 UTC (rev 11393) @@ -0,0 +1,35 @@ +# $Id$ +GARNAME = psycopg2 +GARVERSION = 2.2.2 +CATEGORIES = python + +DESCRIPTION = Psycopg2 is a PostgreSQL adapter for Python +define BLURB + Psycopg is the most used PostgreSQL adapter for the Python + programming language. At the core it fully implements the Python DB + API 2.0 specifications. Several extensions allow access to many of + the features offered by PostgreSQL. +endef + +PACKAGES = CSWpy-psycopg2 +CATALOGNAME = py_psycopg2 +LICENSE = LICENSE + +BUILD_DEP_PKGS = CSWpython-devel +RUNTIME_DEP_PKGS_CSWpy-psycopg2 = SUNWpostgr-libs +RUNTIME_DEP_PKGS_CSWpy-psycopg2 += CSWlibpython2-6-1-0 + +MASTER_SITES = http://initd.org/psycopg/tarballs/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/psycopg2/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/psycopg2/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/psycopg2/trunk/checksums 2010-10-25 12:28:49 UTC (rev 11393) @@ -0,0 +1 @@ +571af2ad9dfeb522ee5f8553278a4c38 psycopg2-2.2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Mon Oct 25 16:06:26 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Mon, 25 Oct 2010 14:06:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[11394] csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile Message-ID: Revision: 11394 http://gar.svn.sourceforge.net/gar/?rev=11394&view=rev Author: khabermann Date: 2010-10-25 14:06:26 +0000 (Mon, 25 Oct 2010) Log Message: ----------- use opencsw libpq and not version from Sun Modified Paths: -------------- csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile Modified: csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile 2010-10-25 12:28:49 UTC (rev 11393) +++ csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile 2010-10-25 14:06:26 UTC (rev 11394) @@ -15,9 +15,9 @@ CATALOGNAME = py_psycopg2 LICENSE = LICENSE -BUILD_DEP_PKGS = CSWpython-devel -RUNTIME_DEP_PKGS_CSWpy-psycopg2 = SUNWpostgr-libs -RUNTIME_DEP_PKGS_CSWpy-psycopg2 += CSWlibpython2-6-1-0 +BUILD_DEP_PKGS = CSWpython-devel CSWlibpq +RUNTIME_DEP_PKGS_CSWpy-psycopg2 = CSWlibpython2-6-1-0 CSWlibpq +CHECKPKG_OVERRIDES_CSWpy-psycopg2 += surplus-dependency|CSWlibpq MASTER_SITES = http://initd.org/psycopg/tarballs/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz @@ -29,6 +29,9 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +# for libpq-fe.h +EXTRA_CFLAGS = -I/opt/csw/postgresql/include + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Mon Oct 25 16:13:44 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Mon, 25 Oct 2010 14:13:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[11395] csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile Message-ID: Revision: 11395 http://gar.svn.sourceforge.net/gar/?rev=11395&view=rev Author: khabermann Date: 2010-10-25 14:13:44 +0000 (Mon, 25 Oct 2010) Log Message: ----------- another change to use OpenCSW libpq Modified Paths: -------------- csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile Modified: csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile 2010-10-25 14:06:26 UTC (rev 11394) +++ csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile 2010-10-25 14:13:44 UTC (rev 11395) @@ -29,8 +29,9 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -# for libpq-fe.h +# for libpq-fe.h and libpq EXTRA_CFLAGS = -I/opt/csw/postgresql/include +EXTRA_LDFLAGS = -L/opt/csw/postgresql/lib -R/opt/csw/postgresql/lib CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Mon Oct 25 16:21:29 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Mon, 25 Oct 2010 14:21:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[11396] csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile Message-ID: Revision: 11396 http://gar.svn.sourceforge.net/gar/?rev=11396&view=rev Author: khabermann Date: 2010-10-25 14:21:29 +0000 (Mon, 25 Oct 2010) Log Message: ----------- removed superfluous override Modified Paths: -------------- csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile Modified: csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile 2010-10-25 14:13:44 UTC (rev 11395) +++ csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile 2010-10-25 14:21:29 UTC (rev 11396) @@ -17,7 +17,6 @@ BUILD_DEP_PKGS = CSWpython-devel CSWlibpq RUNTIME_DEP_PKGS_CSWpy-psycopg2 = CSWlibpython2-6-1-0 CSWlibpq -CHECKPKG_OVERRIDES_CSWpy-psycopg2 += surplus-dependency|CSWlibpq MASTER_SITES = http://initd.org/psycopg/tarballs/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Oct 25 18:11:08 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 25 Oct 2010 16:11:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11397] csw/mgar/gar/v2/bin/upstream_watch Message-ID: Revision: 11397 http://gar.svn.sourceforge.net/gar/?rev=11397&view=rev Author: skayser Date: 2010-10-25 16:11:07 +0000 (Mon, 25 Oct 2010) Log Message: ----------- gar: add https support to upstream_watch Modified Paths: -------------- csw/mgar/gar/v2/bin/upstream_watch Modified: csw/mgar/gar/v2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2/bin/upstream_watch 2010-10-25 14:21:29 UTC (rev 11396) +++ csw/mgar/gar/v2/bin/upstream_watch 2010-10-25 16:11:07 UTC (rev 11397) @@ -89,8 +89,10 @@ $ftp_proxy_cmd = "set ftp:proxy $ENV{ftp_proxy};" if exists $ENV{ftp_proxy}; $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; + $https_proxy_cmd = "set https:proxy $ENV{HTTPS_PROXY};" if exists $ENV{HTTPS_PROXY}; + $https_proxy_cmd = "set https:proxy $ENV{https_proxy};" if exists $ENV{https_proxy}; - open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); + open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd $https_proxy_cmd open $url/ && ls\" 2>/dev/null |"); while (my $line = ) { my @cols = split (/\s+/, $line); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Oct 25 18:43:05 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 25 Oct 2010 16:43:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11398] csw/mgar/gar/v2/category.mk Message-ID: Revision: 11398 http://gar.svn.sourceforge.net/gar/?rev=11398&view=rev Author: skayser Date: 2010-10-25 16:43:05 +0000 (Mon, 25 Oct 2010) Log Message: ----------- gar: introduce an overridable GARDIR in category.mk to eventually get rid of the gar/ subdir in each build dir Modified Paths: -------------- csw/mgar/gar/v2/category.mk Modified: csw/mgar/gar/v2/category.mk =================================================================== --- csw/mgar/gar/v2/category.mk 2010-10-25 16:11:07 UTC (rev 11397) +++ csw/mgar/gar/v2/category.mk 2010-10-25 16:43:05 UTC (rev 11398) @@ -2,8 +2,10 @@ # This makefile is to be included from Makefiles in each category # directory. -ifeq (,$(wildcard gar/categories/$(CATEGORIES)/category.mk)) - $(error The category '$(CATEGORIES)' is invalid. Valid categories are $(patsubst gar/categories/%,%,$(wildcard gar/categories/*))) +GARDIR ?= gar/ + +ifeq (,$(wildcard $(GARDIR)/categories/$(CATEGORIES)/category.mk)) + $(error The category '$(CATEGORIES)' is invalid. Valid categories are: $(patsubst $(GARDIR)/categories/%,%,$(wildcard $(GARDIR)/categories/*))) endif -include gar/categories/$(CATEGORIES)/category.mk +include $(GARDIR)/categories/$(CATEGORIES)/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Oct 25 20:27:09 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 25 Oct 2010 18:27:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[11399] csw/mgar/gar/v2 Message-ID: Revision: 11399 http://gar.svn.sourceforge.net/gar/?rev=11399&view=rev Author: skayser Date: 2010-10-25 18:27:09 +0000 (Mon, 25 Oct 2010) Log Message: ----------- gar: make calls to mkpackage compatible with absolute GARDIRs Modified Paths: -------------- csw/mgar/gar/v2/category.mk csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/category.mk =================================================================== --- csw/mgar/gar/v2/category.mk 2010-10-25 16:43:05 UTC (rev 11398) +++ csw/mgar/gar/v2/category.mk 2010-10-25 18:27:09 UTC (rev 11399) @@ -2,7 +2,7 @@ # This makefile is to be included from Makefiles in each category # directory. -GARDIR ?= gar/ +GARDIR ?= $(abspath gar) ifeq (,$(wildcard $(GARDIR)/categories/$(CATEGORIES)/category.mk)) $(error The category '$(CATEGORIES)' is invalid. Valid categories are: $(patsubst $(GARDIR)/categories/%,%,$(wildcard $(GARDIR)/categories/*))) Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-10-25 16:43:05 UTC (rev 11398) +++ csw/mgar/gar/v2/gar.mk 2010-10-25 18:27:09 UTC (rev 11399) @@ -24,7 +24,7 @@ $(error Your version of 'make' is too old: $(MAKE_VERSION). Please make sure you are using at least 3.81) endif -GARDIR ?= gar +GARDIR ?= $(abspath gar) GARBIN = $(GARDIR)/bin DIRSTODOTS = $(subst . /,./,$(patsubst %,/..,$(subst /, ,/$(1)))) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-10-25 16:43:05 UTC (rev 11398) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-10-25 18:27:09 UTC (rev 11399) @@ -247,7 +247,7 @@ endif # Where we find our mkpackage global templates -PKGLIB = $(CURDIR)/$(GARDIR)/pkglib +PKGLIB = $(GARDIR)/pkglib PKG_EXPORTS = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN PKG_EXPORTS += CURDIR WORKDIR WORKDIR_FIRSTMOD WORKSRC WORKSRC_FIRSTMOD PKGROOT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 25 23:26:12 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 25 Oct 2010 21:26:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[11400] csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Message-ID: Revision: 11400 http://gar.svn.sourceforge.net/gar/?rev=11400&view=rev Author: wahwah Date: 2010-10-25 21:26:12 +0000 (Mon, 25 Oct 2010) Log Message: ----------- mGAR v2: sharedlib_utils, remove a completed TODO item. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-25 18:27:09 UTC (rev 11399) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-25 21:26:12 UTC (rev 11400) @@ -1,16 +1,8 @@ #!/usr/bin/env python2.6 # $Id$ -"""Tests for the shared library utilities. +"""Tests for the shared library utilities.""" -TODO: Implement infering library names in context, for example: - -opt/csw/lib/libboinc.so.6.7.4 -opt/csw/lib/libboinc_api.so.6.7.4 -opt/csw/lib/libboinc_graphics2.so.6.7.4 -opt/csw/lib/libboinc_zip.so.6.7.4 -""" - __author__ = "Maciej Blizinski " import re This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 25 23:26:40 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 25 Oct 2010 21:26:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11401] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11401 http://gar.svn.sourceforge.net/gar/?rev=11401&view=rev Author: wahwah Date: 2010-10-25 21:26:40 +0000 (Mon, 25 Oct 2010) Log Message: ----------- mGAR v2: merge of a conflict during git svn rebase. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-25 21:26:12 UTC (rev 11400) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-25 21:26:40 UTC (rev 11401) @@ -42,7 +42,39 @@ return False +def SonameToStringWithChar(s, c): + """Sanitization function tailored at package names. + + It only inserts separators where digits of letters would be jammed + togeher. For example, foo-0 becomes foo0, but foo-0-0 becomes foo0-0.""" + def CharType(mychar): + if mychar.isalpha(): + return "alpha" + elif mychar.isdigit(): + return "digit" + else: + return "unknown" + parts = LEGIT_CHAR_RE.findall(s) + if "so" in parts: + parts.remove("so") + prev_type = "unknown" + new_parts = [] + for part in parts: + first_type = CharType(part[0]) + need_sep = False + if (first_type == prev_type + and + (prev_type == "digit" or prev_type == "alpha")): + need_sep = True + if need_sep: + new_parts.append(c) + new_parts.append(part) + prev_type = first_type + return "".join(new_parts).lower() + + def SanitizeWithChar(s, c): + """Generic string sanitization function.""" parts = LEGIT_CHAR_RE.findall(s) if "so" in parts: parts.remove("so") @@ -74,8 +106,8 @@ keywords_catalogname = {} for key in parsed: if parsed[key]: - keywords_pkgname[key] = SanitizeWithChar(parsed[key], "-") - keywords_catalogname[key] = SanitizeWithChar(parsed[key], "_") + keywords_pkgname[key] = SonameToStringWithChar(parsed[key], "-") + keywords_catalogname[key] = SonameToStringWithChar(parsed[key], "_") else: keywords_pkgname[key] = "" keywords_catalogname[key] = "" @@ -143,15 +175,15 @@ common_substring_candidates.append(candidate) lcs = CollectionLongestCommonSubstring(copy.copy(common_substring_candidates)) pkgnames = [ - "CSW" + SanitizeWithChar("lib%s%s" % (lcs, common_version), "-"), + "CSW" + SonameToStringWithChar("lib%s%s" % (lcs, common_version), "-"), ] - dashed = "CSW" + SanitizeWithChar("lib%s-%s" % (lcs, common_version), "-") + dashed = "CSW" + SonameToStringWithChar("lib%s-%s" % (lcs, common_version), "-") if dashed not in pkgnames: pkgnames.append(dashed) catalognames = [ - SanitizeWithChar("lib%s%s" % (lcs, common_version), "_"), + SonameToStringWithChar("lib%s%s" % (lcs, common_version), "_"), ] - underscored = SanitizeWithChar("lib%s_%s" % (lcs, common_version), "_") + underscored = SonameToStringWithChar("lib%s_%s" % (lcs, common_version), "_") if underscored not in catalognames: catalognames.append(underscored) return pkgnames, catalognames Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-25 21:26:12 UTC (rev 11400) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-25 21:26:40 UTC (rev 11401) @@ -56,22 +56,30 @@ "opt/csw/share/Adobe/Reader8/Reader/sparcsolaris/lib" "/libcrypto.so.0.9.6")) + def testIsLibraryLinkableInPrefix(self): + """This could be considered linkable. + + Reason: It has the form of "/opt/csw/foo/lib/libfoo.so.1".""" + self.assertEqual(False, su.IsLibraryLinkable( + "opt/csw/boost-gcc/lib" + "/libboost_wserialization.so.1.44.0")) + class MakePackageNameBySonameUnitTest(unittest.TestCase): def testMakePackageNameBySonameSimple(self): soname = "libfoo.so.0" expected = ( - ["CSWlibfoo0", "CSWlibfoo-0"], - ["libfoo0", "libfoo_0"], + ["CSWlibfoo0"], + ["libfoo0"], ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) def testMakePackageNameBySonameMinorVersion(self): soname = "libfoo.so.0.1" expected = ( - ["CSWlibfoo0-1", "CSWlibfoo-0-1"], - ["libfoo0_1", "libfoo_0_1"], + ["CSWlibfoo0-1"], + ["libfoo0_1"], ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) @@ -143,6 +151,12 @@ expected = ( ['CSWlibgettextlib-0-14-1'], ['libgettextlib_0_14_1'], + + def testMakePackageNameDashesNoDashes(self): + soname = "libpyglib-2.0-python.so.0" + expected = ( + ['CSWlibpyglib2-0python0'], + ['libpyglib2_0python0'], ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) @@ -195,7 +209,16 @@ def testSanitizeWithChar(self): self.assertEqual("foo_0", su.SanitizeWithChar("foo-0", "_")) + def testSonameToStringWithCharAlphaDigit(self): + self.assertEqual("foo0", su.SonameToStringWithChar("foo-0", "_")) + def testSonameToStringWithCharDigitDigit(self): + self.assertEqual("foo0_0", su.SonameToStringWithChar("foo-0-0", "_")) + + def testSonameToStringWithCharDigitDigit(self): + self.assertEqual("foo_bar0_0", su.SonameToStringWithChar("foo-bar-0-0", "_")) + + class GetCommonVersionUnitTest(unittest.TestCase): def testGetCommonVersionSimple(self): @@ -220,24 +243,24 @@ def testMakePackageNameBySonameCollectionTwo(self): sonames = ["libfoo.so.0", "libfoo_util.so.0"] expected = ( - ["CSWlibfoo0", "CSWlibfoo-0"], - ["libfoo0", "libfoo_0"], + ["CSWlibfoo0"], + ["libfoo0"], ) self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames)) def testMakePackageNameBySonameCollectionRepeated(self): sonames = ["libfoo.so.0", "libfoo.so.0"] expected = ( - ["CSWlibfoo0", "CSWlibfoo-0"], - ["libfoo0", "libfoo_0"], + ["CSWlibfoo0"], + ["libfoo0"], ) self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames)) def testMakePackageNameBySonameCollectionBdb(self): sonames = ["libfoo.so.0", "libfoo_util.so.0"] expected = ( - ["CSWlibfoo0", "CSWlibfoo-0"], - ["libfoo0", "libfoo_0"], + ["CSWlibfoo0"], + ["libfoo0"], ) self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 25 23:27:14 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 25 Oct 2010 21:27:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[11402] csw/mgar/pkg/flac/trunk/bin Message-ID: Revision: 11402 http://gar.svn.sourceforge.net/gar/?rev=11402&view=rev Author: wahwah Date: 2010-10-25 21:27:14 +0000 (Mon, 25 Oct 2010) Log Message: ----------- flac: Renamed files that caused trouble on Mac OS X Added Paths: ----------- csw/mgar/pkg/flac/trunk/bin/README csw/mgar/pkg/flac/trunk/bin/c-compiler Removed Paths: ------------- csw/mgar/pkg/flac/trunk/bin/CC csw/mgar/pkg/flac/trunk/bin/cc Deleted: csw/mgar/pkg/flac/trunk/bin/CC =================================================================== --- csw/mgar/pkg/flac/trunk/bin/CC 2010-10-25 21:26:40 UTC (rev 11401) +++ csw/mgar/pkg/flac/trunk/bin/CC 2010-10-25 21:27:14 UTC (rev 11402) @@ -1 +0,0 @@ -link cc \ No newline at end of file Added: csw/mgar/pkg/flac/trunk/bin/README =================================================================== --- csw/mgar/pkg/flac/trunk/bin/README (rev 0) +++ csw/mgar/pkg/flac/trunk/bin/README 2010-10-25 21:27:14 UTC (rev 11402) @@ -0,0 +1,6 @@ +This directory was causing me trouble on Mac OS X, because apparently "cc" and +"CC" are the same file on OS X! + +I've renamed them; I'm sorry if your build is broken! + +--Maciej Copied: csw/mgar/pkg/flac/trunk/bin/c-compiler (from rev 11401, csw/mgar/pkg/flac/trunk/bin/cc) =================================================================== --- csw/mgar/pkg/flac/trunk/bin/c-compiler (rev 0) +++ csw/mgar/pkg/flac/trunk/bin/c-compiler 2010-10-25 21:27:14 UTC (rev 11402) @@ -0,0 +1,22 @@ +#!/opt/csw/bin/perl -w + +use strict; + +my @oargs; + +my @includes = grep { /^-I/ } @ARGV; + at includes = ((grep { /^-I[^\/]/ } @includes),(grep { /^-I[\/]/ } @includes)); +my @argswoincludes = grep { !/^-I/ } @ARGV; + +foreach (@ARGV) { + if( /^-I/ ) { + push @oargs, @includes, @argswoincludes; + last; + } + push @oargs, shift @argswoincludes; +} + +my $cc = "/opt/studio/SOS11/SUNWspro/bin/" . ($0 =~ /cc/ ? "cc" : "CC"); + +print "$cc ", join( " ", @oargs ), "\n"; +exec( $cc, @oargs ); Deleted: csw/mgar/pkg/flac/trunk/bin/cc =================================================================== --- csw/mgar/pkg/flac/trunk/bin/cc 2010-10-25 21:26:40 UTC (rev 11401) +++ csw/mgar/pkg/flac/trunk/bin/cc 2010-10-25 21:27:14 UTC (rev 11402) @@ -1,22 +0,0 @@ -#!/opt/csw/bin/perl -w - -use strict; - -my @oargs; - -my @includes = grep { /^-I/ } @ARGV; - at includes = ((grep { /^-I[^\/]/ } @includes),(grep { /^-I[\/]/ } @includes)); -my @argswoincludes = grep { !/^-I/ } @ARGV; - -foreach (@ARGV) { - if( /^-I/ ) { - push @oargs, @includes, @argswoincludes; - last; - } - push @oargs, shift @argswoincludes; -} - -my $cc = "/opt/studio/SOS11/SUNWspro/bin/" . ($0 =~ /cc/ ? "cc" : "CC"); - -print "$cc ", join( " ", @oargs ), "\n"; -exec( $cc, @oargs ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Oct 26 01:31:31 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 25 Oct 2010 23:31:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[11403] csw/mgar/pkg Message-ID: Revision: 11403 http://gar.svn.sourceforge.net/gar/?rev=11403&view=rev Author: skayser Date: 2010-10-25 23:31:31 +0000 (Mon, 25 Oct 2010) Log Message: ----------- "Initial Added Paths: ----------- csw/mgar/pkg/fio/ csw/mgar/pkg/fio/branches/ csw/mgar/pkg/fio/tags/ csw/mgar/pkg/fio/trunk/ csw/mgar/pkg/fio/trunk/Makefile csw/mgar/pkg/fio/trunk/checksums csw/mgar/pkg/fio/trunk/files/ csw/mgar/pkg/fio/trunk/files/0001-Honour-GAR-CFLAGS-and-use-inttypes.h-instead-of-stdi.patch csw/mgar/pkg/fio/trunk/files/0002-Honor-prefix-when-installing-fio.patch csw/mgar/pkg/fio/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/fio/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/fio/trunk/Makefile =================================================================== --- csw/mgar/pkg/fio/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fio/trunk/Makefile 2010-10-25 23:31:31 UTC (rev 11403) @@ -0,0 +1,51 @@ +# TODO (release-critical prefixed with !, non release-critical with *) + +GARNAME = fio +GARVERSION = 1.44 +CATEGORIES = apps + +DESCRIPTION = Flexible I/O Tester +define BLURB + fio is an I/O tool meant to be used both for benchmark and + stress/hardware verification. It has support for 13 different types of I/O + engines (sync, mmap, libaio, posixaio, SG v3, splice, null, network, + syslet, guasi, solarisaio, and more), I/O priorities (for newer Linux + kernels), rate I/O, forked or threaded jobs, and much more. It can work on + block devices as well as files. fio accepts job descriptions in a + simple-to-understand text format. Several example job files are included. + fio displays all sorts of I/O performance information. It supports Linux, + FreeBSD, NetBSD, OS X, and OpenSolaris. +endef + +VENDOR_URL = http://freshmeat.net/projects/fio +MASTER_SITES = http://brick.kernel.dk/snaps/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PATCHFILES += 0001-Honour-GAR-CFLAGS-and-use-inttypes.h-instead-of-stdi.patch +PATCHFILES += 0002-Honor-prefix-when-installing-fio.patch + +# CLOCK_MONOTONIC undefined / not present on Solaris 9 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +# fio compiler/compiler.h #errors out non gcc compilers +GARCOMPILER = GCC3 +# Required for PTHREAD_STACK_MIN +EXTRA_CFLAGS = -D__EXTENSIONS__ + +CONFIGURE_SCRIPTS = +BUILD_ARGS = -f Makefile.solaris +TEST_SCRIPTS = +INSTALL_ARGS = -f Makefile.solaris + +include gar/category.mk + +# install target requires ginstall as install +PATH := /opt/csw/gnu/:$(PATH) + +# Install changelog.CSW +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/fio/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/fio/trunk/checksums =================================================================== --- csw/mgar/pkg/fio/trunk/checksums (rev 0) +++ csw/mgar/pkg/fio/trunk/checksums 2010-10-25 23:31:31 UTC (rev 11403) @@ -0,0 +1 @@ +d89b1511edd8426f29aab8e17691583f fio-1.44.tar.gz Added: csw/mgar/pkg/fio/trunk/files/0001-Honour-GAR-CFLAGS-and-use-inttypes.h-instead-of-stdi.patch =================================================================== --- csw/mgar/pkg/fio/trunk/files/0001-Honour-GAR-CFLAGS-and-use-inttypes.h-instead-of-stdi.patch (rev 0) +++ csw/mgar/pkg/fio/trunk/files/0001-Honour-GAR-CFLAGS-and-use-inttypes.h-instead-of-stdi.patch 2010-10-25 23:31:31 UTC (rev 11403) @@ -0,0 +1,51 @@ +From 1cb080dfc54133ed065f877c8dc8a03296822003 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Mon, 25 Oct 2010 19:27:38 +0200 +Subject: [PATCH] Honour GAR CFLAGS and use inttypes.h instead of stdint.h (missing on Sol9) + +--- + Makefile.solaris | 2 +- + crc/md5.c | 2 +- + crc/md5.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.solaris b/Makefile.solaris +index e7ff53c..571bfb9 100644 +--- a/Makefile.solaris ++++ b/Makefile.solaris +@@ -1,5 +1,5 @@ + CC = gcc +-CFLAGS = -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFIO_INC_DEBUG ++CFLAGS := $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFIO_INC_DEBUG + PROGS = fio + SCRIPTS = fio_generate_plots + OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o \ +diff --git a/crc/md5.c b/crc/md5.c +index 8f9adb2..fd49cf1 100644 +--- a/crc/md5.c ++++ b/crc/md5.c +@@ -2,7 +2,7 @@ + * Shamelessly lifted from the 2.6 kernel (crypto/md5.c) + */ + #include +-#include ++#include + #include "md5.h" + + static void md5_transform(uint32_t *hash, uint32_t const *in) +diff --git a/crc/md5.h b/crc/md5.h +index 6747d30..04c8ad1 100644 +--- a/crc/md5.h ++++ b/crc/md5.h +@@ -1,7 +1,7 @@ + #ifndef MD5_H + #define MD5_H + +-#include ++#include + + #define MD5_DIGEST_SIZE 16 + #define MD5_HMAC_BLOCK_SIZE 64 +-- +1.7.3 + Added: csw/mgar/pkg/fio/trunk/files/0002-Honor-prefix-when-installing-fio.patch =================================================================== --- csw/mgar/pkg/fio/trunk/files/0002-Honor-prefix-when-installing-fio.patch (rev 0) +++ csw/mgar/pkg/fio/trunk/files/0002-Honor-prefix-when-installing-fio.patch 2010-10-25 23:31:31 UTC (rev 11403) @@ -0,0 +1,25 @@ +From 766ada911aafeaa51e5ce2197f20ec1b6028557c Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Tue, 26 Oct 2010 00:20:35 +0200 +Subject: [PATCH] Honor --prefix when installing fio + +--- + Makefile.solaris | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.solaris b/Makefile.solaris +index 571bfb9..6824e10 100644 +--- a/Makefile.solaris ++++ b/Makefile.solaris +@@ -31,7 +31,7 @@ OBJS += engines/net.o + OBJS += engines/solarisaio.o + + INSTALL = install +-prefix = /usr/local ++prefix ?= /usr/local + bindir = $(prefix)/bin + mandir = $(prefix)/man + +-- +1.7.3 + Added: csw/mgar/pkg/fio/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/fio/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/fio/trunk/files/changelog.CSW 2010-10-25 23:31:31 UTC (rev 11403) @@ -0,0 +1,5 @@ +fio (1.44,REV=2010.10.26) + + * Initial release. + + -- Sebastian Kayser Tue, 26 Oct 2010 00:44:25 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Oct 26 01:44:40 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 25 Oct 2010 23:44:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11404] csw/mgar/pkg/fio/trunk Message-ID: Revision: 11404 http://gar.svn.sourceforge.net/gar/?rev=11404&view=rev Author: skayser Date: 2010-10-25 23:44:40 +0000 (Mon, 25 Oct 2010) Log Message: ----------- fio: add man pages and example configurations Modified Paths: -------------- csw/mgar/pkg/fio/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/fio/trunk/files/0003-Install-man-pages.patch Modified: csw/mgar/pkg/fio/trunk/Makefile =================================================================== --- csw/mgar/pkg/fio/trunk/Makefile 2010-10-25 23:31:31 UTC (rev 11403) +++ csw/mgar/pkg/fio/trunk/Makefile 2010-10-25 23:44:40 UTC (rev 11404) @@ -24,6 +24,7 @@ PATCHFILES += 0001-Honour-GAR-CFLAGS-and-use-inttypes.h-instead-of-stdi.patch PATCHFILES += 0002-Honor-prefix-when-installing-fio.patch +PATCHFILES += 0003-Install-man-pages.patch # CLOCK_MONOTONIC undefined / not present on Solaris 9 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -43,6 +44,11 @@ # install target requires ginstall as install PATH := /opt/csw/gnu/:$(PATH) +post-install-modulated: + mkdir -p $(PKGROOT)$(docdir)/fio/examples + cp $(WORKSRC)/examples/* $(PKGROOT)$(docdir)/fio/examples/ + @$(MAKECOOKIE) + # Install changelog.CSW post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) install-changelog-%: Added: csw/mgar/pkg/fio/trunk/files/0003-Install-man-pages.patch =================================================================== --- csw/mgar/pkg/fio/trunk/files/0003-Install-man-pages.patch (rev 0) +++ csw/mgar/pkg/fio/trunk/files/0003-Install-man-pages.patch 2010-10-25 23:44:40 UTC (rev 11404) @@ -0,0 +1,23 @@ +From c65d23475d2bd592e9e6e6bbf7fa04f72bbec039 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Tue, 26 Oct 2010 01:36:57 +0200 +Subject: [PATCH] Install man pages + +--- + Makefile.solaris | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/Makefile.solaris b/Makefile.solaris +index d48453b..76b2ed5 100644 +--- a/Makefile.solaris ++++ b/Makefile.solaris +@@ -51,3 +51,6 @@ cscope: + install: $(PROGS) $(SCRIPTS) + $(INSTALL) -m755 -d $(DESTDIR)$(bindir) + $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 ++ $(INSTALL) -m 644 fio.1 $(DESTDIR)$(mandir)/man1 ++ $(INSTALL) -m 644 fio_generate_plots.1 $(DESTDIR)$(mandir)/man1 +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Oct 26 01:51:10 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 25 Oct 2010 23:51:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11405] csw/mgar/pkg/fio/trunk Message-ID: Revision: 11405 http://gar.svn.sourceforge.net/gar/?rev=11405&view=rev Author: skayser Date: 2010-10-25 23:51:10 +0000 (Mon, 25 Oct 2010) Log Message: ----------- fio: adjust man page location Modified Paths: -------------- csw/mgar/pkg/fio/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/fio/trunk/files/0004-Honor-GAR-provided-default-bindir-and-mandir.patch Modified: csw/mgar/pkg/fio/trunk/Makefile =================================================================== --- csw/mgar/pkg/fio/trunk/Makefile 2010-10-25 23:44:40 UTC (rev 11404) +++ csw/mgar/pkg/fio/trunk/Makefile 2010-10-25 23:51:10 UTC (rev 11405) @@ -25,6 +25,7 @@ PATCHFILES += 0001-Honour-GAR-CFLAGS-and-use-inttypes.h-instead-of-stdi.patch PATCHFILES += 0002-Honor-prefix-when-installing-fio.patch PATCHFILES += 0003-Install-man-pages.patch +PATCHFILES += 0004-Honor-GAR-provided-default-bindir-and-mandir.patch # CLOCK_MONOTONIC undefined / not present on Solaris 9 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Added: csw/mgar/pkg/fio/trunk/files/0004-Honor-GAR-provided-default-bindir-and-mandir.patch =================================================================== --- csw/mgar/pkg/fio/trunk/files/0004-Honor-GAR-provided-default-bindir-and-mandir.patch (rev 0) +++ csw/mgar/pkg/fio/trunk/files/0004-Honor-GAR-provided-default-bindir-and-mandir.patch 2010-10-25 23:51:10 UTC (rev 11405) @@ -0,0 +1,28 @@ +From 447f5383adbdb2f23496bebd1cd38a0bd0f4289b Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Tue, 26 Oct 2010 01:48:43 +0200 +Subject: [PATCH] Honor GAR-provided default bindir and mandir + +... in particular mandir was not set according to our standards. +--- + Makefile.solaris | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.solaris b/Makefile.solaris +index 76b2ed5..165a7a0 100644 +--- a/Makefile.solaris ++++ b/Makefile.solaris +@@ -32,8 +32,8 @@ OBJS += engines/solarisaio.o + + INSTALL = install + prefix ?= /usr/local +-bindir = $(prefix)/bin +-mandir = $(prefix)/man ++bindir ?= $(prefix)/bin ++mandir ?= $(prefix)/man + + %.o: %.c + $(CC) -o $*.o -c $(CFLAGS) $< +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 26 03:30:19 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 26 Oct 2010 01:30:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11406] csw/mgar/pkg/gtar/trunk Message-ID: Revision: 11406 http://gar.svn.sourceforge.net/gar/?rev=11406&view=rev Author: bdwalton Date: 2010-10-26 01:30:19 +0000 (Tue, 26 Oct 2010) Log Message: ----------- gtar: version bump Modified Paths: -------------- csw/mgar/pkg/gtar/trunk/Makefile csw/mgar/pkg/gtar/trunk/checksums Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2010-10-25 23:51:10 UTC (rev 11405) +++ csw/mgar/pkg/gtar/trunk/Makefile 2010-10-26 01:30:19 UTC (rev 11406) @@ -1,5 +1,5 @@ GARNAME = tar -GARVERSION = 1.23 +GARVERSION = 1.24 CATEGORIES = utils DESCRIPTION = GNU tape archiver Modified: csw/mgar/pkg/gtar/trunk/checksums =================================================================== --- csw/mgar/pkg/gtar/trunk/checksums 2010-10-25 23:51:10 UTC (rev 11405) +++ csw/mgar/pkg/gtar/trunk/checksums 2010-10-26 01:30:19 UTC (rev 11406) @@ -1 +1 @@ -fe81d950b61cb2f45619e1fcef97ce60 tar-1.23.tar.gz +6f84e44a332449844995874cf5245094 tar-1.24.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 26 04:18:40 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 26 Oct 2010 02:18:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11407] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswinitsmf Message-ID: Revision: 11407 http://gar.svn.sourceforge.net/gar/?rev=11407&view=rev Author: bdwalton Date: 2010-10-26 02:18:40 +0000 (Tue, 26 Oct 2010) Log Message: ----------- cswclassutils: cswinitsmf: correct grep used in FMRI validation; Mantis 4588 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf 2010-10-26 01:30:19 UTC (rev 11406) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf 2010-10-26 02:18:40 UTC (rev 11407) @@ -21,6 +21,7 @@ # Support custom manifests (Bug ID 0003636) # 2009-08-05 Set new timeout values for manifest (Bug ID 0003764) # 2009-08-10 Fix autoenable bug (Bug ID 0003785) +# 2010-10-25 Fix grep bug in FMRI 'dot in name' detection (Bug ID 0004588) DEBUG= # clear to disable debug, set to anything to enable SVCDIR=/var/opt/csw/svc @@ -92,7 +93,7 @@ FMRI= if [ "`grep '^#FMRI' $dest`" ]; then FMRI=`grep '^#FMRI' $dest | awk '{print $2}'` - if [ "`echo $FMRI | grep '.'`" ]; then + if [ "`echo $FMRI | grep '\.'`" ]; then echo "WARNING! FMRI path contained an illegal dot (removed)" FMRI=`echo $FMRI | sed 's/\.//g'` echo "New FMRI path: $FMRI" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 09:49:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 07:49:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[11408] csw/mgar/pkg/lang-python/python/branches/python-2.7 / Message-ID: Revision: 11408 http://gar.svn.sourceforge.net/gar/?rev=11408&view=rev Author: wahwah Date: 2010-10-26 07:49:48 +0000 (Tue, 26 Oct 2010) Log Message: ----------- python: Branching out to build 2.7 Added Paths: ----------- csw/mgar/pkg/lang-python/python/branches/python-2.7/ Property changes on: csw/mgar/pkg/lang-python/python/branches/python-2.7 ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: svn:mergeinfo + /csw/mgar/pkg/python/branches/python-2.6.4+patch7242:8407-9385 /csw/mgar/pkg/python/branches/soname-granularity:11052-11261 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Tue Oct 26 10:10:22 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Tue, 26 Oct 2010 08:10:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11409] csw/mgar/pkg/lang-python Message-ID: Revision: 11409 http://gar.svn.sourceforge.net/gar/?rev=11409&view=rev Author: khabermann Date: 2010-10-26 08:10:22 +0000 (Tue, 26 Oct 2010) Log Message: ----------- created package Added Paths: ----------- csw/mgar/pkg/lang-python/python-ldap/ csw/mgar/pkg/lang-python/python-ldap/branches/ csw/mgar/pkg/lang-python/python-ldap/tags/ csw/mgar/pkg/lang-python/python-ldap/trunk/ csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile csw/mgar/pkg/lang-python/python-ldap/trunk/checksums csw/mgar/pkg/lang-python/python-ldap/trunk/files/ csw/mgar/pkg/lang-python/python-ldap/trunk/files/0000-openldap-path.patch Property changes on: csw/mgar/pkg/lang-python/python-ldap/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile 2010-10-26 08:10:22 UTC (rev 11409) @@ -0,0 +1,38 @@ +# $Id$ +GARNAME = python-ldap +GARVERSION = 2.3.12 +CATEGORIES = python +PACKAGES = CSWpy-ldap +CATALOGNAME = py_ldap +LICENSE = LICENCE + +DESCRIPTION = LDAP bindings for Python +define BLURB + python-ldap provides an object-oriented API to access LDAP directory + servers from Python programs. Mainly it wraps the OpenLDAP 2.x libs + for that purpose. +endef + +BUILD_DEP_PKGS = CSWpython-devel CSWoldapdevel CSWossldevel +RUNTIME_DEP_PKGS_CSWpy-ldap += CSWsasl +RUNTIME_DEP_PKGS_CSWpy-ldap += CSWosslrt +RUNTIME_DEP_PKGS_CSWpy-ldap += CSWoldaprt +RUNTIME_DEP_PKGS_CSWpy-ldap += CSWlibpython2-6-1-0 + +MASTER_SITE_DIR = $(shell echo $(GARNAME) | cut -c 1) +MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(GARNAME)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +VENDOR_URL = http://www.python-ldap.org/ +PATCHFILES += 0000-openldap-path.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/python-ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-ldap/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/python-ldap/trunk/checksums 2010-10-26 08:10:22 UTC (rev 11409) @@ -0,0 +1 @@ +2dadc521b2c2590d9b033894ba5c6f31 python-ldap-2.3.12.tar.gz Added: csw/mgar/pkg/lang-python/python-ldap/trunk/files/0000-openldap-path.patch =================================================================== --- csw/mgar/pkg/lang-python/python-ldap/trunk/files/0000-openldap-path.patch (rev 0) +++ csw/mgar/pkg/lang-python/python-ldap/trunk/files/0000-openldap-path.patch 2010-10-26 08:10:22 UTC (rev 11409) @@ -0,0 +1,32 @@ +From c2685c786b9dd496fcebc9efab78942851e8bf1d Mon Sep 17 00:00:00 2001 +From: Kester Habermann +Date: Tue, 26 Oct 2010 10:02:40 +0200 +Subject: [PATCH] openldap-path + +--- + setup.cfg | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/setup.cfg b/setup.cfg +index cf765ab..3860a0f 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -2,8 +2,8 @@ + extra_objects = + extra_compile_args = + libs = ldap_r lber sasl2 ssl crypto +-library_dirs = /usr/local/openldap-2.3/lib +-include_dirs = /usr/local/openldap-2.3/include /usr/include/sasl ++library_dirs = /opt/csw/lib ++include_dirs = /opt/csw/include /usr/include/sasl + + [egg_info] + tag_build = +@@ -20,4 +20,3 @@ provides = python-ldap + release = 0 + packager = Michael Stroeder + requires = python libldap.so.2 +- +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Tue Oct 26 11:06:14 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Tue, 26 Oct 2010 09:06:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[11410] csw/mgar/pkg/lang-python/python-ldap/trunk Message-ID: Revision: 11410 http://gar.svn.sourceforge.net/gar/?rev=11410&view=rev Author: khabermann Date: 2010-10-26 09:06:14 +0000 (Tue, 26 Oct 2010) Log Message: ----------- use csw sasl instead of sun version Modified Paths: -------------- csw/mgar/pkg/lang-python/python-ldap/trunk/checksums csw/mgar/pkg/lang-python/python-ldap/trunk/files/0000-openldap-path.patch Modified: csw/mgar/pkg/lang-python/python-ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-ldap/trunk/checksums 2010-10-26 08:10:22 UTC (rev 11409) +++ csw/mgar/pkg/lang-python/python-ldap/trunk/checksums 2010-10-26 09:06:14 UTC (rev 11410) @@ -1 +1,2 @@ 2dadc521b2c2590d9b033894ba5c6f31 python-ldap-2.3.12.tar.gz +e6a99d92ac8869ff77754331f6673200 0000-openldap-path.patch Modified: csw/mgar/pkg/lang-python/python-ldap/trunk/files/0000-openldap-path.patch =================================================================== --- csw/mgar/pkg/lang-python/python-ldap/trunk/files/0000-openldap-path.patch 2010-10-26 08:10:22 UTC (rev 11409) +++ csw/mgar/pkg/lang-python/python-ldap/trunk/files/0000-openldap-path.patch 2010-10-26 09:06:14 UTC (rev 11410) @@ -1,6 +1,6 @@ -From c2685c786b9dd496fcebc9efab78942851e8bf1d Mon Sep 17 00:00:00 2001 +From 92b69bbbee79a5f80085290dacf8af607692740e Mon Sep 17 00:00:00 2001 From: Kester Habermann -Date: Tue, 26 Oct 2010 10:02:40 +0200 +Date: Tue, 26 Oct 2010 10:57:19 +0200 Subject: [PATCH] openldap-path --- @@ -8,7 +8,7 @@ 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg -index cf765ab..3860a0f 100644 +index cf765ab..f039820 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,8 +2,8 @@ @@ -18,7 +18,7 @@ -library_dirs = /usr/local/openldap-2.3/lib -include_dirs = /usr/local/openldap-2.3/include /usr/include/sasl +library_dirs = /opt/csw/lib -+include_dirs = /opt/csw/include /usr/include/sasl ++include_dirs = /opt/csw/include /opt/csw/include/sasl [egg_info] tag_build = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 11:32:22 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 09:32:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11411] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 11411 http://gar.svn.sourceforge.net/gar/?rev=11411&view=rev Author: wahwah Date: 2010-10-26 09:32:22 +0000 (Tue, 26 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, the surgeon class moved to package.py Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2010-10-26 09:06:14 UTC (rev 11410) +++ csw/mgar/gar/v2/lib/python/package.py 2010-10-26 09:32:22 UTC (rev 11411) @@ -655,3 +655,6 @@ target_dir, old_path = os.path.split(self.pkg_path) logging.debug("Transforming into %s", new_filename) self.dir_pkg.ToSrv4(target_dir, new_filename) + # - Update the pkgmap file, setting the checksums + # - Transform it back to the srv4 form + # - gzip it. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 11:32:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 09:32:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[11412] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 11412 http://gar.svn.sourceforge.net/gar/?rev=11412&view=rev Author: wahwah Date: 2010-10-26 09:32:48 +0000 (Tue, 26 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, first version that actually does anything, but still has no user interface. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2010-10-26 09:32:22 UTC (rev 11411) +++ csw/mgar/gar/v2/lib/python/package.py 2010-10-26 09:32:48 UTC (rev 11412) @@ -657,4 +657,6 @@ self.dir_pkg.ToSrv4(target_dir, new_filename) # - Update the pkgmap file, setting the checksums # - Transform it back to the srv4 form - # - gzip it. + target_dir, old_path = os.path.split(self.pkg_path) + logging.debug("Transforming into %s", new_filename) + self.dir_pkg.ToSrv4(target_dir, new_filename) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 11:33:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 09:33:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[11413] csw/mgar/gar/v2/lib/python/patch_package.py Message-ID: Revision: 11413 http://gar.svn.sourceforge.net/gar/?rev=11413&view=rev Author: wahwah Date: 2010-10-26 09:33:13 +0000 (Tue, 26 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, new function to compose package names. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/patch_package.py Modified: csw/mgar/gar/v2/lib/python/patch_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-26 09:32:48 UTC (rev 11412) +++ csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-26 09:33:13 UTC (rev 11413) @@ -20,6 +20,56 @@ import pprint import opencsw +class PackageSurgeon(package.ShellMixin): + + def __init__(self, pkg_path, debug): + self.debug = debug + self.pkg_path = pkg_path + self.srv4 = package.CswSrv4File(pkg_path) + self.dir_pkg = None + self.exported_dir = None + self.parsed_filename = opencsw.ParsePackageFileName(self.pkg_path) + + def Transform(self): + if not self.dir_pkg: + self.dir_pkg = self.srv4.GetDirFormatPkg() + logging.debug(repr(self.dir_pkg)) + # subprocess.call(["tree", self.dir_pkg.directory]) + + def Export(self, dest_dir): + self.Transform() + if not self.exported_dir: + basedir, pkgname = os.path.split(self.dir_pkg.directory) + self.exported_dir = os.path.join(dest_dir, pkgname) + shutil.copytree( + self.dir_pkg.directory, + self.exported_dir) + subprocess.call(["git", "init"], cwd=self.exported_dir) + subprocess.call(["git", "add", "."], cwd=self.exported_dir) + subprocess.call(["git", "commit", "-a", "-m", "Initial commit"], + cwd=self.exported_dir) + else: + logging.warn("The package was already exported to %s", + self.exported_dir) + + def Patch(self, patch_file): + self.Transform() + args = ["gpatch", "-p", "1", "-d", self.dir_pkg.directory, "-i", patch_file] + logging.debug(args) + subprocess.call(args) + + def ToSrv4(self, dest_dir): + self.Transform() + pkginfo = self.dir_pkg.GetParsedPkginfo() + # version = pkginfo["VERSION"] + date_str = datetime.datetime.now().strftime("%Y-%m-%d") + self.parsed_filename["revision_info"]["REV"] = date_str + new_filename = opencsw.ComposePackageFileName(self.parsed_filename) + pprint.pprint(self.parsed_filename) + pprint.pprint(new_filename) + + +>>>>>>> mGAR v2: patchpkg, new function to compose package names. def main(): parser = optparse.OptionParser() parser.add_option("--srv4-file", "-s", dest="srv4_file", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 11:33:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 09:33:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[11414] csw/mgar/gar/v2/lib/python/patch_package.py Message-ID: Revision: 11414 http://gar.svn.sourceforge.net/gar/?rev=11414&view=rev Author: wahwah Date: 2010-10-26 09:33:38 +0000 (Tue, 26 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, the surgeon class moved to package.py Modified Paths: -------------- csw/mgar/gar/v2/lib/python/patch_package.py Modified: csw/mgar/gar/v2/lib/python/patch_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-26 09:33:13 UTC (rev 11413) +++ csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-26 09:33:38 UTC (rev 11414) @@ -69,7 +69,6 @@ pprint.pprint(new_filename) ->>>>>>> mGAR v2: patchpkg, new function to compose package names. def main(): parser = optparse.OptionParser() parser.add_option("--srv4-file", "-s", dest="srv4_file", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 11:34:06 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 09:34:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[11415] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11415 http://gar.svn.sourceforge.net/gar/?rev=11415&view=rev Author: wahwah Date: 2010-10-26 09:34:06 +0000 (Tue, 26 Oct 2010) Log Message: ----------- mGAR v2: checkpkg libpolicy, try the version with custom prefixes checked as well. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-26 09:33:38 UTC (rev 11414) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-26 09:34:06 UTC (rev 11415) @@ -26,7 +26,7 @@ + INTEL_386_PATHS + AMD64_PATHS) # Need to escape the plus signs because of the regex usage below. arch_subdirs = [x.replace(r"+", r"\+") for x in arch_subdirs] - linkable_re = re.compile(r"^opt/csw/lib(/(%s))?$" + linkable_re = re.compile(r"^opt/csw(/[a-z-_]+)?/lib(/(%s))?$" % "|".join(arch_subdirs)) blacklist = [ # If it has two lib components, it's a private lib. Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-26 09:33:38 UTC (rev 11414) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-26 09:34:06 UTC (rev 11415) @@ -30,10 +30,6 @@ def testIsLibraryLinkableAmd64(self): self.assertTrue(su.IsLibraryLinkable("opt/csw/lib/amd64/libfoo.so.0.2")) - def testIsLibraryLinkablePrefix(self): - self.assertFalse( - su.IsLibraryLinkable("opt/csw/customprefix/lib/libfoo.so.0.2")) - def testIsLibraryLinkableLibexecFalse(self): p = "opt/csw/libexec/bar" self.assertEqual(False, su.IsLibraryLinkable(p)) @@ -47,20 +43,24 @@ self.assertEqual(False, su.IsLibraryLinkable(p)) def testIsLibraryLinkablePrivateLib(self): - self.assertEqual(False, su.IsLibraryLinkable( + self.assertFalse(su.IsLibraryLinkable( "opt/csw/lib/erlang/lib/megaco-3.6.0.1/priv/lib" "/megaco_flex_scanner_drv_mt.so")) def testIsLibraryLinkableInShared(self): - self.assertEqual(False, su.IsLibraryLinkable( + self.assertFalse(su.IsLibraryLinkable( "opt/csw/share/Adobe/Reader8/Reader/sparcsolaris/lib" "/libcrypto.so.0.9.6")) + def testIsLibraryLinkablePrefix(self): + self.assertTrue( + su.IsLibraryLinkable("opt/csw/customprefix/lib/libfoo.so.0.2")) + def testIsLibraryLinkableInPrefix(self): """This could be considered linkable. - + Reason: It has the form of "/opt/csw/foo/lib/libfoo.so.1".""" - self.assertEqual(False, su.IsLibraryLinkable( + self.assertTrue(su.IsLibraryLinkable( "opt/csw/boost-gcc/lib" "/libboost_wserialization.so.1.44.0")) @@ -151,6 +151,7 @@ expected = ( ['CSWlibgettextlib-0-14-1'], ['libgettextlib_0_14_1'], + ) def testMakePackageNameDashesNoDashes(self): soname = "libpyglib-2.0-python.so.0" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 11:34:33 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 09:34:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11416] csw/mgar/gar/v2/lib/sh/run_full_cat.sh Message-ID: Revision: 11416 http://gar.svn.sourceforge.net/gar/?rev=11416&view=rev Author: wahwah Date: 2010-10-26 09:34:32 +0000 (Tue, 26 Oct 2010) Log Message: ----------- mGAR v2: checkpkg libpolicy, add a sample script to run checkpkg against the whole catalog. Added Paths: ----------- csw/mgar/gar/v2/lib/sh/run_full_cat.sh Added: csw/mgar/gar/v2/lib/sh/run_full_cat.sh =================================================================== --- csw/mgar/gar/v2/lib/sh/run_full_cat.sh (rev 0) +++ csw/mgar/gar/v2/lib/sh/run_full_cat.sh 2010-10-26 09:34:32 UTC (rev 11416) @@ -0,0 +1,10 @@ +#!/opt/csw/bin/bash + +# A small script to run checkpkg against the whole catalog + +c="/home/mirror/opencsw/current/sparc/5.9" +bin/checkpkg \ + -q \ + -M "${c}/catalog" \ + "${c}/"*.pkg \ + "${c}/"*.pkg.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 11:34:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 09:34:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[11417] csw/mgar/gar/v2/lib/sh/run_full_cat.sh Message-ID: Revision: 11417 http://gar.svn.sourceforge.net/gar/?rev=11417&view=rev Author: wahwah Date: 2010-10-26 09:34:57 +0000 (Tue, 26 Oct 2010) Log Message: ----------- mGAR v2: checkpkg, updates to the script that runs against the whole catalog. Modified Paths: -------------- csw/mgar/gar/v2/lib/sh/run_full_cat.sh Modified: csw/mgar/gar/v2/lib/sh/run_full_cat.sh =================================================================== --- csw/mgar/gar/v2/lib/sh/run_full_cat.sh 2010-10-26 09:34:32 UTC (rev 11416) +++ csw/mgar/gar/v2/lib/sh/run_full_cat.sh 2010-10-26 09:34:57 UTC (rev 11417) @@ -1,8 +1,24 @@ #!/opt/csw/bin/bash +# +# A small script to run checkpkg against the whole catalog. The results are +# stored in a sqlite database in ~/.checkpkg. +# +# Architecture +# sparc, i386 +arch=sparc -# A small script to run checkpkg against the whole catalog +# Solaris version +# 5.9, 5.10 +ver=5.9 -c="/home/mirror/opencsw/current/sparc/5.9" +# OpenCSW release +# current, stable, testing, unstable +release=current + +c="/home/mirror/opencsw/${release}/${arch}/${ver}" +readonly c + +time \ bin/checkpkg \ -q \ -M "${c}/catalog" \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 11:35:24 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 09:35:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[11418] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11418 http://gar.svn.sourceforge.net/gar/?rev=11418&view=rev Author: wahwah Date: 2010-10-26 09:35:24 +0000 (Tue, 26 Oct 2010) Log Message: ----------- mGAR v2: checkpkg libpolicy, caught a bug in package name composer. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-26 09:34:57 UTC (rev 11417) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-26 09:35:24 UTC (rev 11418) @@ -69,7 +69,7 @@ if need_sep: new_parts.append(c) new_parts.append(part) - prev_type = first_type + prev_type = CharType(part[-1]) return "".join(new_parts).lower() @@ -86,6 +86,19 @@ Returns a pair of pkgname, catalogname. """ + def AddSeparator(d, sep): + "Adds a separator based on the neighboring of two digits." + dc = copy.copy(d) + if dc["version"]: + if (dc["basename"][-1].isdigit() + and + dc["version"][0].isdigit()): + dc["sep"] = sep + else: + dc["sep"] = "" + else: + dc["sep"] = "" + return dc soname_re = re.compile(r"(?P[\w\+]+([\.\-]+[\w\+]+)*)" r"\.so" r"(\.(?P[\d\.]+))?" @@ -111,17 +124,23 @@ else: keywords_pkgname[key] = "" keywords_catalogname[key] = "" - pkgname_list = [ - "CSW%(basename)s%(version)s" % keywords_pkgname, - ] + pkgname_list = [] + keywords_pkgname = AddSeparator(keywords_pkgname, "-") + pkgname_list.append( + "CSW%(basename)s%(sep)s%(version)s" % keywords_pkgname) + keywords_catalogname = AddSeparator(keywords_catalogname, "_") catalogname_list = [ - "%(basename)s%(version)s" % keywords_catalogname, + "%(basename)s%(sep)s%(version)s" % keywords_catalogname, ] - if keywords_pkgname["version"]: - catalogname_list.append( - "%(basename)s_%(version)s" % keywords_catalogname) - pkgname_list.append( - "CSW%(basename)s-%(version)s" % keywords_pkgname) + # if keywords_pkgname["version"]: + # candidate_catalogname = ( + # "%(basename)s%(version)s" % keywords_catalogname) + # if candidate_catalogname not in catalogname_list: + # pkgname_list.append(candidate_catalogname) + # candidate_pkgname = ( + # "CSW%(basename)s-%(version)s" % keywords_pkgname) + # if candidate_pkgname not in pkgname_list: + # pkgname_list.append(candidate_pkgname) return pkgname_list, catalogname_list Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-26 09:34:57 UTC (rev 11417) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2010-10-26 09:35:24 UTC (rev 11418) @@ -86,8 +86,8 @@ def testMakePackageNameBySonameApr(self): soname = "libapr-1.so.0" expected = ( - ['CSWlibapr-10', 'CSWlibapr-1-0'], - ['libapr_10', 'libapr_1_0'] + ['CSWlibapr1-0'], + ['libapr1_0'] ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) @@ -95,8 +95,8 @@ def testMakePackageNameBySonameDot(self): soname = "libbabl-0.1.so.0" expected = ( - ['CSWlibbabl-0-10', 'CSWlibbabl-0-1-0'], - ['libbabl_0_10', 'libbabl_0_1_0'] + ['CSWlibbabl0-1-0'], + ['libbabl0_1_0'] ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) @@ -104,8 +104,8 @@ def testMakePackageNameBySonameMoreDot(self): soname = "libgettextlib-0.14.1.so" expected = ( - ['CSWlibgettextlib-0-14-1'], - ['libgettextlib_0_14_1'], + ['CSWlibgettextlib0-14-1'], + ['libgettextlib0_14_1'], ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) @@ -122,17 +122,17 @@ def testMakePackageNameBySonamePlus(self): soname = "libstdc++.so.6" expected = ( - ['CSWlibstdc++6', 'CSWlibstdc++-6'], - ['libstdc++6', 'libstdc++_6'] + ['CSWlibstdc++6'], + ['libstdc++6'] ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) - def testMakePackageNameBySonamePlus(self): + def testMakePackageNameBySonameNoVersion(self): soname = "libdnet.1" expected = ( - ['CSWlibdnet1', 'CSWlibdnet-1'], - ['libdnet1', 'libdnet_1'] + ['CSWlibdnet1'], + ['libdnet1'] ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) @@ -140,19 +140,12 @@ def testMakePackageNameUppercase(self): soname = "libUpperCase.so.1" expected = ( - ['CSWlibuppercase1', 'CSWlibuppercase-1'], - ['libuppercase1', 'libuppercase_1'] + ['CSWlibuppercase1'], + ['libuppercase1'] ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) - def testMakePackageNameBySonameMoreDot(self): - soname = "libgettextlib-0.14.1.so" - expected = ( - ['CSWlibgettextlib-0-14-1'], - ['libgettextlib_0_14_1'], - ) - def testMakePackageNameDashesNoDashes(self): soname = "libpyglib-2.0-python.so.0" expected = ( @@ -162,51 +155,30 @@ self.assertEqual(expected, su.MakePackageNameBySoname(soname)) - def testMakePackageNameBySonameComplexApr(self): - soname = "libapr-1.so.10.0.0" + def testMakePackageNameDashesNoDashesPython(self): + soname = "libpython3.1.so.1.0" expected = ( - ['CSWlibapr-110', 'CSWlibapr-1-10'], - ['libapr_110', 'libapr_1_10'] + ['CSWlibpython3-1-1-0'], + ['libpython3_1_1_0'], ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) - def testMakePackageNameBySonamePlus(self): - soname = "libstdc++.so.6" + def testMakePackageNameBySonameComplexApr(self): + soname = "libapr-1.so.10.0.0" expected = ( - ['CSWlibstdc++6', 'CSWlibstdc++-6'], - ['libstdc++6', 'libstdc++_6'] + ['CSWlibapr1-10-0-0'], + ['libapr1_10_0_0'] ) self.assertEqual(expected, su.MakePackageNameBySoname(soname)) - def testMakePackageNameBySonamePlus(self): - soname = "libdnet.1" - expected = ( - ['CSWlibdnet1', 'CSWlibdnet-1'], - ['libdnet1', 'libdnet_1'] - ) - self.assertEqual(expected, - su.MakePackageNameBySoname(soname)) - def testMakePackageNameUppercase(self): - soname = "libUpperCase.so.1" - expected = ( - ['CSWlibuppercase1', 'CSWlibuppercase-1'], - ['libuppercase1', 'libuppercase_1'] - ) - self.assertEqual(expected, - su.MakePackageNameBySoname(soname)) +class SanitizationUnitTest(unittest.TestCase): - -class MakePackageNameBySonameUnitTest(unittest.TestCase): - def testSanitizeWithChar(self): self.assertEqual("foo_0", su.SanitizeWithChar("foo-0", "_")) - -class MakePackageNameBySonameUnitTest(unittest.TestCase): - def testSanitizeWithChar(self): self.assertEqual("foo_0", su.SanitizeWithChar("foo-0", "_")) @@ -219,7 +191,10 @@ def testSonameToStringWithCharDigitDigit(self): self.assertEqual("foo_bar0_0", su.SonameToStringWithChar("foo-bar-0-0", "_")) + def testSonameToStringWithCharPython(self): + self.assertEqual("libpython3_1_1_0", su.SonameToStringWithChar("libpython3.1.so.1.0", "_")) + class GetCommonVersionUnitTest(unittest.TestCase): def testGetCommonVersionSimple(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 11:49:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 09:49:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[11419] csw/mgar/gar/v2/lib/python/patch_package.py Message-ID: Revision: 11419 http://gar.svn.sourceforge.net/gar/?rev=11419&view=rev Author: wahwah Date: 2010-10-26 09:49:55 +0000 (Tue, 26 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, removed a class previously moved to a Python module. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/patch_package.py Modified: csw/mgar/gar/v2/lib/python/patch_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-26 09:35:24 UTC (rev 11418) +++ csw/mgar/gar/v2/lib/python/patch_package.py 2010-10-26 09:49:55 UTC (rev 11419) @@ -20,55 +20,6 @@ import pprint import opencsw -class PackageSurgeon(package.ShellMixin): - - def __init__(self, pkg_path, debug): - self.debug = debug - self.pkg_path = pkg_path - self.srv4 = package.CswSrv4File(pkg_path) - self.dir_pkg = None - self.exported_dir = None - self.parsed_filename = opencsw.ParsePackageFileName(self.pkg_path) - - def Transform(self): - if not self.dir_pkg: - self.dir_pkg = self.srv4.GetDirFormatPkg() - logging.debug(repr(self.dir_pkg)) - # subprocess.call(["tree", self.dir_pkg.directory]) - - def Export(self, dest_dir): - self.Transform() - if not self.exported_dir: - basedir, pkgname = os.path.split(self.dir_pkg.directory) - self.exported_dir = os.path.join(dest_dir, pkgname) - shutil.copytree( - self.dir_pkg.directory, - self.exported_dir) - subprocess.call(["git", "init"], cwd=self.exported_dir) - subprocess.call(["git", "add", "."], cwd=self.exported_dir) - subprocess.call(["git", "commit", "-a", "-m", "Initial commit"], - cwd=self.exported_dir) - else: - logging.warn("The package was already exported to %s", - self.exported_dir) - - def Patch(self, patch_file): - self.Transform() - args = ["gpatch", "-p", "1", "-d", self.dir_pkg.directory, "-i", patch_file] - logging.debug(args) - subprocess.call(args) - - def ToSrv4(self, dest_dir): - self.Transform() - pkginfo = self.dir_pkg.GetParsedPkginfo() - # version = pkginfo["VERSION"] - date_str = datetime.datetime.now().strftime("%Y-%m-%d") - self.parsed_filename["revision_info"]["REV"] = date_str - new_filename = opencsw.ComposePackageFileName(self.parsed_filename) - pprint.pprint(self.parsed_filename) - pprint.pprint(new_filename) - - def main(): parser = optparse.OptionParser() parser.add_option("--srv4-file", "-s", dest="srv4_file", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 12:01:36 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 10:01:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[11420] csw/mgar/gar/v2/lib/python/sharedlib_utils.py Message-ID: Revision: 11420 http://gar.svn.sourceforge.net/gar/?rev=11420&view=rev Author: wahwah Date: 2010-10-26 10:01:36 +0000 (Tue, 26 Oct 2010) Log Message: ----------- mGAR v2: patchpkg, removed a class previously moved to a Python module. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-26 09:49:55 UTC (rev 11419) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-10-26 10:01:36 UTC (rev 11420) @@ -132,15 +132,6 @@ catalogname_list = [ "%(basename)s%(sep)s%(version)s" % keywords_catalogname, ] - # if keywords_pkgname["version"]: - # candidate_catalogname = ( - # "%(basename)s%(version)s" % keywords_catalogname) - # if candidate_catalogname not in catalogname_list: - # pkgname_list.append(candidate_catalogname) - # candidate_pkgname = ( - # "CSW%(basename)s-%(version)s" % keywords_pkgname) - # if candidate_pkgname not in pkgname_list: - # pkgname_list.append(candidate_pkgname) return pkgname_list, catalogname_list This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 13:43:27 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 11:43:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[11421] csw/mgar/pkg/lang-python/python/branches/python-2.7 Message-ID: Revision: 11421 http://gar.svn.sourceforge.net/gar/?rev=11421&view=rev Author: wahwah Date: 2010-10-26 11:43:27 +0000 (Tue, 26 Oct 2010) Log Message: ----------- python-2.7: It builds. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2010-10-26 10:01:36 UTC (rev 11420) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2010-10-26 11:43:27 UTC (rev 11421) @@ -1,8 +1,13 @@ # $Id$ GARNAME = Python -GARVERSION = 2.6.6 +GARVERSION = 2.7 CATEGORIES = lang +VER = 2.7 +DVER = 2-7 +UVER = 2_7 +PVER = python$(VER) +CVER = 27 # Known issues: # @@ -30,7 +35,6 @@ DISTFILES = $(DISTNAME).tar.bz2 -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # Patches @@ -39,16 +43,17 @@ PATCHFILES += modules.diff PATCHFILES += multiprocess.diff PATCHFILES += pyport.diff -PATCHFILES += site.diff +# This patch needs to go away +# PATCHFILES += site.diff PATCHFILES += python-config-in.diff PATCHFILES += setup.diff -PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch +# PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch # Test for sunaudiodev fails. SKIPTEST = 1 -EXTRA_INC += $(prefix)/bdb47/include -EXTRA_LIB += $(prefix)/bdb47/lib +# EXTRA_INC += $(prefix)/bdb47/include +# EXTRA_LIB += $(prefix)/bdb47/lib BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS @@ -69,92 +74,97 @@ # use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -PACKAGES = CSWidle -PACKAGES += CSWpython -PACKAGES += CSWpython-devel -PACKAGES += CSWpython-test -PACKAGES += CSWpython-tk -PACKAGES += CSWlibpython2-6-1-0 +PACKAGES = CSWidle$(CVER) +PACKAGES += CSWpython$(CVER) +PACKAGES += CSWpython$(CVER)-devel +PACKAGES += CSWpython$(CVER)-test +PACKAGES += CSWpython$(CVER)-tk +PACKAGES += CSWlibpython$(DVER)-1-0 -INCOMPATIBLE_PKGS_CSWpython = CSWpydistutils +INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils -PKGFILES_CSWidle = $(libdir)/.*/idlelib/.* -PKGFILES_CSWidle += $(bindir)/idle -PKGFILES_CSWpython-devel = $(includedir)/.* -PKGFILES_CSWpython-devel += $(libdir)/.*/config/.* -PKGFILES_CSWpython-devel += $(bindir)/.*config.* -PKGFILES_CSWpython-devel += $(libdir)/libpython2.6.so +PKGFILES_CSWidle$(CVER) = $(libdir)/.*/idlelib/.* +PKGFILES_CSWidle$(CVER) += $(bindir)/idle +PKGFILES_CSWpython$(CVER)-devel = $(includedir)/.* +PKGFILES_CSWpython$(CVER)-devel += $(libdir)/.*/config/.* +PKGFILES_CSWpython$(CVER)-devel += $(bindir)/.*config.* +PKGFILES_CSWpython-devel += $(libdir)/libpython$(VER).so # No idea why would this be in CSWpython, and no good idea for a better package # to put it. -PKGFILES_CSWpython-devel += $(bindir)/smtpd.py -PKGFILES_CSWpython-tk = $(libdir)/.*/lib-tk/.* -PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* -PKGFILES_CSWpython-test = $(libdir)/python/test/.* -PKGFILES_CSWpython-test += $(libdir)/python/bsddb/test.* -PKGFILES_CSWpython-test += $(libdir)/python/ctypes/test.* -PKGFILES_CSWpython-test += $(libdir)/python/email/test.* -PKGFILES_CSWpython-test += $(libdir)/python/distutils/tests.* -PKGFILES_CSWpython-test += $(libdir)/python/json/tests.* -PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* -PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* -PKGFILES_CSWlibpython2-6-1-0 += $(libdir)/libpython2\.6\.so\..* +PKGFILES_CSWpython$(CVER)-devel += $(bindir)/smtpd.py +PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* +PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* +PKGFILES_CSWpython$(CVER)-test = $(libdir)/python/test/.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/bsddb/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/ctypes/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/email/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/distutils/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/json/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/lib2to3/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/sqlite3/test.* +PKGFILES_CSWlibpython$(DVER)-1-0 += $(libdir)/libpython$(VER)\.so\.([0-9\.]+) -ARCHALL_CSWpython-test = 1 -ARCHALL_CSWidle = 1 +ARCHALL_CSWpython$(CVER)-test = 1 +ARCHALL_CSWidle$(CVER) = 1 -RUNTIME_DEP_PKGS_CSWidle += CSWpython -RUNTIME_DEP_PKGS_CSWidle += CSWpython-tk -RUNTIME_DEP_PKGS_CSWpython += CSWbdb47 -RUNTIME_DEP_PKGS_CSWpython += CSWbzip2 -RUNTIME_DEP_PKGS_CSWpython += CSWgdbm -RUNTIME_DEP_PKGS_CSWpython += CSWggettextrt -RUNTIME_DEP_PKGS_CSWpython += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpython += CSWncurses -RUNTIME_DEP_PKGS_CSWpython += CSWosslrt -RUNTIME_DEP_PKGS_CSWpython += CSWreadline -RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt -RUNTIME_DEP_PKGS_CSWpython += CSWzlib -RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpython-tk += CSWpython -RUNTIME_DEP_PKGS_CSWpython-tk += CSWtcl -RUNTIME_DEP_PKGS_CSWpython-tk += CSWtk -RUNTIME_DEP_PKGS_CSWpython-devel += CSWpython -RUNTIME_DEP_PKGS_CSWpython-test += CSWpython +RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER)-tk +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbzip2 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWgdbm +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWggettextrt +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWncurses +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWosslrt +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWreadline +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWsqlite3rt +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWzlib +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtcl +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtk +RUNTIME_DEP_PKGS_CSWpython$(CVER)-devel += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) -# There are packages depending on libpython2.5, and listing CSWpython as the -# dependency. -RUNTIME_DEP_PKGS_CSWpython += CSWlibpython2-5-1-0 - # This could be handled by automatic dependency detection -CHECKPKG_OVERRIDES_CSWidle += surplus-dependency|CSWpython-tk +CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk -CATALOGNAME_CSWidle = idle -CATALOGNAME_CSWpython = python -CATALOGNAME_CSWpython-devel = python_devel -CATALOGNAME_CSWpython-tk = python_tk -CATALOGNAME_CSWpython-test = python_test -CATALOGNAME_CSWlibpython2-6-1-0 = libpython2_6_1_0 +CATALOGNAME_CSWidle$(CVER) = idle_$(CVER) +CATALOGNAME_CSWpython$(CVER) = python_$(CVER) +CATALOGNAME_CSWpython$(CVER)-devel = python_$(CVER)_devel +CATALOGNAME_CSWpython$(CVER)-tk = python_$(CVER)_tk +CATALOGNAME_CSWpython$(CVER)-test = python_$(CVER)_test +CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 -SPKG_DESC_CSWidle = Python IDE -SPKG_DESC_CSWpython = A high-level scripting language. -SPKG_DESC_CSWpython-devel = Development Files for Python -SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) -SPKG_DESC_CSWpython-test = Python Test modules -SPKG_DESC_CSWlibpython2-6-1-0 = Python shared library (2.6) +SPKG_DESC_CSWidle$(CVER) = Python IDE +SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series +SPKG_DESC_CSWpython$(CVER)-devel = Development Files for Python +SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) +SPKG_DESC_CSWpython$(CVER)-test = Python Test modules +SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) +CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += surplus-dependency|CSWpython$(CVER) +CHECKPKG_OVERRIDES_CSWidle$(CVER) += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER) +CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += surplus-dependency|CSWpython$(CVER) +CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += missing-dependency|CSWpython + LICENSE = LICENSE # This is an exception, since these are original Python packages. -CHECKPKG_OVERRIDES_CSWpython-test += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython-test += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython-tk += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython-tk += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWidle += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWidle += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython-devel += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython-devel += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWlibpython2-5-1-0 +CHECKPKG_OVERRIDES_CSWidle$(CVER) += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython$(CVER) include gar/category.mk Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums 2010-10-26 10:01:36 UTC (rev 11420) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums 2010-10-26 11:43:27 UTC (rev 11421) @@ -1,12 +1 @@ -62c1cbc3527d042195699edd2f4993b7 0001-FFI_DEFAULT_ABI-to-use-__i386.patch -cf4e6881bb84a7ce6089e4a307f71f14 Python-2.6.6.tar.bz2 -42dd6523beb94a805d5764ae1276091c faqwiz.diff -5664b3970307d7d39d8d4061e7dccbb0 libpython2.5.so.1.0-isa-i386 -a87896c48b2f61b32053e6d02b07b022 libpython2.5.so.1.0-isa-sparcv8 -33f4094ee46ce865d3973a197f3fb4a0 makesetup.diff -22c5f741b1744213eaef0818ab280ad5 modules.diff -afcc79a94e2f8a576c7906a9700e35a0 multiprocess.diff -05724da367b025ce525de2bb704af6e3 pyport.diff -a1d114e8a20870675649aeef007a9cac python-config-in.diff -1d2763e140ff30a491b3ce11d1a44f97 setup.diff -d6c86beae46033be70c44c8e0e4c1908 site.diff +0e8c9ec32abf5b732bea7d91b38c3339 Python-2.7.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 16:21:12 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 14:21:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[11422] csw/mgar/pkg Message-ID: Revision: 11422 http://gar.svn.sourceforge.net/gar/?rev=11422&view=rev Author: wahwah Date: 2010-10-26 14:21:12 +0000 (Tue, 26 Oct 2010) Log Message: ----------- django: Moving to lang-python. Added Paths: ----------- csw/mgar/pkg/lang-python/django/ Removed Paths: ------------- csw/mgar/pkg/django/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 26 17:13:50 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Oct 2010 15:13:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11423] csw/mgar/pkg/lang-python/django/trunk Message-ID: Revision: 11423 http://gar.svn.sourceforge.net/gar/?rev=11423&view=rev Author: wahwah Date: 2010-10-26 15:13:50 +0000 (Tue, 26 Oct 2010) Log Message: ----------- django: Upgrade to 1.2.3. Modified Paths: -------------- csw/mgar/pkg/lang-python/django/trunk/Makefile csw/mgar/pkg/lang-python/django/trunk/checksums Modified: csw/mgar/pkg/lang-python/django/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django/trunk/Makefile 2010-10-26 14:21:12 UTC (rev 11422) +++ csw/mgar/pkg/lang-python/django/trunk/Makefile 2010-10-26 15:13:50 UTC (rev 11423) @@ -7,7 +7,7 @@ # http://bugs.python.org/issue7208 GARNAME = django -GARVERSION = 1.1.1 +GARVERSION = 1.2.3 CATEGORIES = python DESCRIPTION = A high-level Python Web framework @@ -23,16 +23,17 @@ SPKG_SOURCEURL = http://www.djangoproject.com/ MASTER_SITES = http://www.djangoproject.com/download/$(GARVERSION)/tarball/ -DISTFILES = Django-$(GARVERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz PACKAGES = CSWpy-django CATALOGNAME_CSWpy-django = py_django ARCHALL = 1 UFILES_REGEX = Django-(\d+(?:\.\d+)*).tar.gz -WORKSRC = $(WORKDIR)/Django-$(GARVERSION) +DISTNAME = Django-$(GARVERSION) RUNTIME_DEP_PKGS = BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWpython-devel CONFIGURE_SCRIPTS = TEST_SCRIPTS = +LICENSE = LICENSE # There's a problem that the download URL of the Django source tarball does not # contain the file name. The browser is being redirected instead. Hard-coding # the URL and using a custom target to fit the rest of mGAR. Modified: csw/mgar/pkg/lang-python/django/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/django/trunk/checksums 2010-10-26 14:21:12 UTC (rev 11422) +++ csw/mgar/pkg/lang-python/django/trunk/checksums 2010-10-26 15:13:50 UTC (rev 11423) @@ -1 +1 @@ -d7839c192e115f9c4dd8777de24dc21c Django-1.1.1.tar.gz +10bfb5831bcb4d3b1e6298d0e41d6603 Django-1.2.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 26 21:43:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 26 Oct 2010 19:43:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11424] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 11424 http://gar.svn.sourceforge.net/gar/?rev=11424&view=rev Author: dmichelsen Date: 2010-10-26 19:43:05 +0000 (Tue, 26 Oct 2010) Log Message: ----------- mGAR v2: Fix issue with false error about identical SPKG_DESC strings where one is a word subset of the other Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-10-26 15:13:50 UTC (rev 11423) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-10-26 19:43:05 UTC (rev 11424) @@ -562,7 +562,7 @@ $(foreach P,$(SPKG_SPECS),\ $(foreach Q,$(filter-out $(P),$(SPKG_SPECS)),\ - $(if $(filter-out $(sort $(SPKG_DESC_$(P))),$(sort $(SPKG_DESC_$(P)) $(SPKG_DESC_$(Q)))),,$(error The package descriptions for $(P) [$(if $(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),)] and $(Q) [$(if $(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),)] are identical. Please make sure that all descriptions are unique by setting SPKG_DESC_ for each package.)))) + $(if $(filter-out $(subst ,_,$(SPKG_DESC_$(P))),$(subst ,_,$(SPKG_DESC_$(Q)))),,$(error The package descriptions for $(P) [$(if $(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),)] and $(Q) [$(if $(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),)] are identical. Please make sure that all descriptions are unique by setting SPKG_DESC_ for each package.)))) .PRECIOUS: $(WORKDIR)/%.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 27 04:17:55 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Oct 2010 02:17:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[11425] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 11425 http://gar.svn.sourceforge.net/gar/?rev=11425&view=rev Author: bdwalton Date: 2010-10-27 02:17:55 +0000 (Wed, 27 Oct 2010) Log Message: ----------- coreutils: version bump; drop patch that is now in upstream; use gcc again Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-10-26 19:43:05 UTC (rev 11424) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-10-27 02:17:55 UTC (rev 11425) @@ -1,5 +1,5 @@ GARNAME = coreutils -GARVERSION = 8.4 +GARVERSION = 8.6 CATEGORIES = utils # seq has issues related to the handling of long double's with -O2. @@ -8,7 +8,7 @@ # OPT_FLAGS_GCC = -O1 -pipe # building with gcc gets us extra tools (eg: stdbuf) -# GARCOMPILER = GCC4 +GARCOMPILER = GCC4 SHELL = /opt/csw/bin/bash @@ -28,7 +28,6 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Enhance-Solaris-ACL-error-handling.patch # We define upstream file regex so we can be notifed of new upstream # software release Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2010-10-26 19:43:05 UTC (rev 11424) +++ csw/mgar/pkg/coreutils/trunk/checksums 2010-10-27 02:17:55 UTC (rev 11425) @@ -1,2 +1 @@ -f3903b1c38fd72456ae73af39ac2fec6 0001-Enhance-Solaris-ACL-error-handling.patch -56f549854d723d9dcebb77919019df55 coreutils-8.4.tar.gz +164b3fd0dfc4fb65174f34aadc1de5fb coreutils-8.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 27 04:19:51 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Oct 2010 02:19:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[11426] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 11426 http://gar.svn.sourceforge.net/gar/?rev=11426&view=rev Author: bdwalton Date: 2010-10-27 02:19:50 +0000 (Wed, 27 Oct 2010) Log Message: ----------- coreutils: disable tests until next version bump Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-10-27 02:17:55 UTC (rev 11425) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-10-27 02:19:50 UTC (rev 11426) @@ -49,7 +49,7 @@ PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/bin/gsu" { $$$$4 = "4555" }; { print }' -ifneq ($(GARVERSION), 8.4) +ifneq ($(GARVERSION), 8.6) TEST_TARGET = check else TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 27 04:22:09 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Oct 2010 02:22:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[11427] csw/mgar/pkg/coreutils/trunk/files/ 0001-Enhance-Solaris-ACL-error-handling.patch Message-ID: Revision: 11427 http://gar.svn.sourceforge.net/gar/?rev=11427&view=rev Author: bdwalton Date: 2010-10-27 02:22:08 +0000 (Wed, 27 Oct 2010) Log Message: ----------- coreutils: drop patchfile that is no longer used Removed Paths: ------------- csw/mgar/pkg/coreutils/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch Deleted: csw/mgar/pkg/coreutils/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch 2010-10-27 02:19:50 UTC (rev 11426) +++ csw/mgar/pkg/coreutils/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch 2010-10-27 02:22:08 UTC (rev 11427) @@ -1,58 +0,0 @@ -From a06d449a84a393d2d764a0d7871840cb99f665d7 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Thu, 11 Feb 2010 04:43:29 +0100 -Subject: [PATCH] Enhance Solaris ACL error handling - -Gracefully handle EOPNOTSUPP in qcopy_acl and qset_acl. These -functions, as used in coreutils, were causing the test suite to fail -on Solaris 8 i386 with ZFS-backed NFSv3 mounts. The failures included -errors such as: - -FAIL: cp/backup-dir -cp: preserving permissions for `y/x': Operation not supported on -transport endpoint - -Signed-off-by: Ben Walton ---- - lib/copy-acl.c | 4 ++-- - lib/set-mode-acl.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/copy-acl.c b/lib/copy-acl.c -index 1e82240..e187cda 100644 ---- a/lib/copy-acl.c -+++ b/lib/copy-acl.c -@@ -294,7 +294,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, - - if (count < 0) - { -- if (errno == ENOSYS || errno == ENOTSUP) -+ if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP) - { - count = 0; - entries = NULL; -@@ -358,7 +358,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, - if (ret < 0 && saved_errno == 0) - { - saved_errno = errno; -- if (errno == ENOSYS && !acl_nontrivial (count, entries)) -+ if ((errno == ENOSYS || errno == EOPNOTSUPP) && !acl_nontrivial (count, entries)) - saved_errno = 0; - } - else -diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c -index c5b4726..2cd2c75 100644 ---- a/lib/set-mode-acl.c -+++ b/lib/set-mode-acl.c -@@ -387,7 +387,7 @@ qset_acl (char const *name, int desc, mode_t mode) - ret = acl (name, SETACL, sizeof (entries) / sizeof (aclent_t), entries); - if (ret < 0) - { -- if (errno == ENOSYS) -+ if (errno == ENOSYS || errno == EOPNOTSUPP) - return chmod_or_fchmod (name, desc, mode); - return -1; - } --- -1.6.6 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Wed Oct 27 12:08:45 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Wed, 27 Oct 2010 10:08:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[11428] csw/mgar/pkg/lang-python Message-ID: Revision: 11428 http://gar.svn.sourceforge.net/gar/?rev=11428&view=rev Author: khabermann Date: 2010-10-27 10:08:45 +0000 (Wed, 27 Oct 2010) Log Message: ----------- added package Added Paths: ----------- csw/mgar/pkg/lang-python/django-auth-ldap/ csw/mgar/pkg/lang-python/django-auth-ldap/branches/ csw/mgar/pkg/lang-python/django-auth-ldap/tags/ csw/mgar/pkg/lang-python/django-auth-ldap/trunk/ csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile csw/mgar/pkg/lang-python/django-auth-ldap/trunk/checksums csw/mgar/pkg/lang-python/django-auth-ldap/trunk/files/ Property changes on: csw/mgar/pkg/lang-python/django-auth-ldap/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile 2010-10-27 10:08:45 UTC (rev 11428) @@ -0,0 +1,35 @@ +# $Id$ +GARNAME = django-auth-ldap +GARVERSION = 1.0.6 +CATEGORIES = python +PACKAGES = CSWpy-django-auth-ldap +CATALOGNAME = py_django_auth_ldap +ARCHALL_CSWpy-django-auth-ldap = 1 +LICENSE = PKG-INFO +RUNTIME_DEP_PKGS += CSWpy-django +RUNTIME_DEP_PKGS += CSWpy-ldap + +CHECKPKG_OVERRIDES_CSWpy-django-auth-ldap += pkgname-too-long + +# checkpkg can't detect python run time dependencies +CHECKPKG_OVERRIDES_CSWpy-django-auth-ldap += surplus-dependency|CSWpy-ldap +CHECKPKG_OVERRIDES_CSWpy-django-auth-ldap += surplus-dependency|CSWpy-django + +DESCRIPTION = Django LDAP authentication backend +define BLURB + This is a Django authentication backend that authenticates against + an LDAP service. Configuration can be as simple as a single + distinguished name template, but there are many rich configuration + options for working with users, groups, and permissions. +endef + +# 1st char of GARNAME is the directory name +MASTER_SITE_DIR = $(shell echo $(GARNAME) | cut -c 1) +MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(GARNAME)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/django-auth-ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/django-auth-ldap/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/django-auth-ldap/trunk/checksums 2010-10-27 10:08:45 UTC (rev 11428) @@ -0,0 +1 @@ +d8a732728bf820942c05f57bb564ff78 django-auth-ldap-1.0.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Wed Oct 27 13:41:54 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Wed, 27 Oct 2010 11:41:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[11429] csw/mgar/pkg/lang-python/django-auth-ldap/trunk/ Makefile Message-ID: Revision: 11429 http://gar.svn.sourceforge.net/gar/?rev=11429&view=rev Author: khabermann Date: 2010-10-27 11:41:54 +0000 (Wed, 27 Oct 2010) Log Message: ----------- django-auth-ldap: GAR overrides Modified Paths: -------------- csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile Modified: csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile 2010-10-27 10:08:45 UTC (rev 11428) +++ csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile 2010-10-27 11:41:54 UTC (rev 11429) @@ -14,6 +14,7 @@ # checkpkg can't detect python run time dependencies CHECKPKG_OVERRIDES_CSWpy-django-auth-ldap += surplus-dependency|CSWpy-ldap CHECKPKG_OVERRIDES_CSWpy-django-auth-ldap += surplus-dependency|CSWpy-django +CHECKPKG_OVERRIDES_CSWpy-django-auth-ldap += unidentified-dependency|CSWpy-django DESCRIPTION = Django LDAP authentication backend define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Wed Oct 27 14:28:44 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Wed, 27 Oct 2010 12:28:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[11430] csw/mgar/pkg/lang-python Message-ID: Revision: 11430 http://gar.svn.sourceforge.net/gar/?rev=11430&view=rev Author: khabermann Date: 2010-10-27 12:28:44 +0000 (Wed, 27 Oct 2010) Log Message: ----------- django-sorting: Inital commit Added Paths: ----------- csw/mgar/pkg/lang-python/django-sorting/ csw/mgar/pkg/lang-python/django-sorting/branches/ csw/mgar/pkg/lang-python/django-sorting/tags/ csw/mgar/pkg/lang-python/django-sorting/trunk/ csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile csw/mgar/pkg/lang-python/django-sorting/trunk/checksums csw/mgar/pkg/lang-python/django-sorting/trunk/files/ Property changes on: csw/mgar/pkg/lang-python/django-sorting/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile 2010-10-27 12:28:44 UTC (rev 11430) @@ -0,0 +1,33 @@ +# $Id$ +GARNAME = django-sorting +GARVERSION = 0.1 +CATEGORIES = python +PACKAGES = CSWpy-django-sorting +CATALOGNAME = py_django_sorting +ARCHALL_CSWpy-django-sorting = 1 +LICENSE = LICENSE.txt + +BUILD_DEP_PKGS += CSWpysetuptools +RUNTIME_DEP_PKGS += CSWpy-django + +# checkpkg can't detect python run time dependencies +CHECKPKG_OVERRIDES_CSWpy-django-sorting += surplus-dependency|CSWpy-django + +DESCRIPTION = Django LDAP authentication backend +define BLURB + This is a Django authentication backend that authenticates against + an LDAP service. Configuration can be as simple as a single + distinguished name template, but there are many rich configuration + options for working with users, groups, and permissions. +endef + +# 1st char of GARNAME is the directory name +MASTER_SITE_DIR = $(shell echo $(GARNAME) | cut -c 1) +MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(GARNAME)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/django-sorting/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/django-sorting/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/django-sorting/trunk/checksums 2010-10-27 12:28:44 UTC (rev 11430) @@ -0,0 +1 @@ +6af1c5629362ee734e850e582efef740 django-sorting-0.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Wed Oct 27 14:31:50 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Wed, 27 Oct 2010 12:31:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11431] csw/mgar/pkg/lang-python/django-auth-ldap/trunk/ Makefile Message-ID: Revision: 11431 http://gar.svn.sourceforge.net/gar/?rev=11431&view=rev Author: khabermann Date: 2010-10-27 12:31:50 +0000 (Wed, 27 Oct 2010) Log Message: ----------- django-auth-ldap: removed superflous override Modified Paths: -------------- csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile Modified: csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile 2010-10-27 12:28:44 UTC (rev 11430) +++ csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile 2010-10-27 12:31:50 UTC (rev 11431) @@ -14,7 +14,6 @@ # checkpkg can't detect python run time dependencies CHECKPKG_OVERRIDES_CSWpy-django-auth-ldap += surplus-dependency|CSWpy-ldap CHECKPKG_OVERRIDES_CSWpy-django-auth-ldap += surplus-dependency|CSWpy-django -CHECKPKG_OVERRIDES_CSWpy-django-auth-ldap += unidentified-dependency|CSWpy-django DESCRIPTION = Django LDAP authentication backend define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Wed Oct 27 15:24:28 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Wed, 27 Oct 2010 13:24:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[11432] csw/mgar/pkg/lang-python/django-sorting/trunk/ Makefile Message-ID: Revision: 11432 http://gar.svn.sourceforge.net/gar/?rev=11432&view=rev Author: khabermann Date: 2010-10-27 13:24:27 +0000 (Wed, 27 Oct 2010) Log Message: ----------- django-sorting: updated description Modified Paths: -------------- csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile Modified: csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile 2010-10-27 12:31:50 UTC (rev 11431) +++ csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile 2010-10-27 13:24:27 UTC (rev 11432) @@ -13,12 +13,10 @@ # checkpkg can't detect python run time dependencies CHECKPKG_OVERRIDES_CSWpy-django-sorting += surplus-dependency|CSWpy-django -DESCRIPTION = Django LDAP authentication backend +DESCRIPTION = Django application to sort querysets define BLURB - This is a Django authentication backend that authenticates against - an LDAP service. Configuration can be as simple as a single - distinguished name template, but there are many rich configuration - options for working with users, groups, and permissions. + django-sorting allows for easy sorting, and tables headers + generation without modifying the views. endef # 1st char of GARNAME is the directory name This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Wed Oct 27 15:35:46 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Wed, 27 Oct 2010 13:35:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[11433] csw/mgar/pkg/lang-python Message-ID: Revision: 11433 http://gar.svn.sourceforge.net/gar/?rev=11433&view=rev Author: khabermann Date: 2010-10-27 13:35:46 +0000 (Wed, 27 Oct 2010) Log Message: ----------- django-filter: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/django-filter/ csw/mgar/pkg/lang-python/django-filter/branches/ csw/mgar/pkg/lang-python/django-filter/tags/ csw/mgar/pkg/lang-python/django-filter/trunk/ csw/mgar/pkg/lang-python/django-filter/trunk/Makefile csw/mgar/pkg/lang-python/django-filter/trunk/checksums csw/mgar/pkg/lang-python/django-filter/trunk/files/ Property changes on: csw/mgar/pkg/lang-python/django-filter/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/lang-python/django-filter/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-filter/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/django-filter/trunk/Makefile 2010-10-27 13:35:46 UTC (rev 11433) @@ -0,0 +1,31 @@ +# $Id$ +GARNAME = django-filter +GARVERSION = 0.5.3 +CATEGORIES = python +PACKAGES = CSWpy-django-filter +CATALOGNAME = py_django_filter +ARCHALL_CSWpy-django-filter = 1 +LICENSE = COPYRIGHT + +BUILD_DEP_PKGS += CSWpysetuptools +RUNTIME_DEP_PKGS += CSWpy-django + +# checkpkg can't detect python run time dependencies +CHECKPKG_OVERRIDES_CSWpy-django-filter += surplus-dependency|CSWpy-django + +DESCRIPTION = Django application to filter querysets +define BLURB + Django-filter is a reusable Django application for allowing users to + filter qu eryset dynamically. +endef + +# 1st char of GARNAME is the directory name +MASTER_SITE_DIR = $(shell echo $(GARNAME) | cut -c 1) +MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(GARNAME)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/django-filter/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/django-filter/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/django-filter/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/django-filter/trunk/checksums 2010-10-27 13:35:46 UTC (rev 11433) @@ -0,0 +1 @@ +2afb919bf8b7808186e19ef10d7bbfe0 django-filter-0.5.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Wed Oct 27 17:41:47 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Wed, 27 Oct 2010 15:41:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[11434] csw/mgar/pkg/lang-python/django-sorting/trunk/ Makefile Message-ID: Revision: 11434 http://gar.svn.sourceforge.net/gar/?rev=11434&view=rev Author: khabermann Date: 2010-10-27 15:41:46 +0000 (Wed, 27 Oct 2010) Log Message: ----------- django-sorting: use newer version Modified Paths: -------------- csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile Modified: csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile 2010-10-27 13:35:46 UTC (rev 11433) +++ csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile 2010-10-27 15:41:46 UTC (rev 11434) @@ -19,12 +19,17 @@ generation without modifying the views. endef -# 1st char of GARNAME is the directory name -MASTER_SITE_DIR = $(shell echo $(GARNAME) | cut -c 1) -MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(GARNAME)/ +MASTER_SITES = http://github.com/mirumee/$(GARNAME)/tarball/master/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# There's a problem that the download URL of the source tarball does not +# contain the file name. The browser is being redirected instead. Hard-coding +# the URL and using a custom target to fit the rest of mGAR. +http//github.com/mirumee/$(GARNAME)/tarball/master/$(GARNAME)-$(GARVERSION).tar.gz: + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) -O $(DISTFILES) http://github.com/mirumee/$(GARNAME)/tarball/master/ + + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Wed Oct 27 22:19:42 2010 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Wed, 27 Oct 2010 20:19:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11435] csw/mgar/pkg/cpan Message-ID: Revision: 11435 http://gar.svn.sourceforge.net/gar/?rev=11435&view=rev Author: jonbcraig Date: 2010-10-27 20:19:42 +0000 (Wed, 27 Oct 2010) Log Message: ----------- cpan/Net-Syslog: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-Syslog/ csw/mgar/pkg/cpan/Net-Syslog/branches/ csw/mgar/pkg/cpan/Net-Syslog/tags/ csw/mgar/pkg/cpan/Net-Syslog/trunk/ csw/mgar/pkg/cpan/Net-Syslog/trunk/Makefile csw/mgar/pkg/cpan/Net-Syslog/trunk/checksums csw/mgar/pkg/cpan/Net-Syslog/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-Syslog/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-Syslog/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Syslog/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-Syslog/trunk/Makefile 2010-10-27 20:19:42 UTC (rev 11435) @@ -0,0 +1,24 @@ +GARNAME = Net-Syslog +GARVERSION = 0.04 +CATEGORIES = cpan +AUTHOR = LHOWARD + +DESCRIPTION = Perl extension for sending syslog messages directly to a remote syslogd +define BLURB + Net::Syslog implements the intra-host syslog forwarding protocol. It is not intended + to replace the Sys::Syslog or Unix::Syslog modules, but instead to provide a method + of using syslog when a local syslogd is unavailable or when you don't want to write + syslog messages to the local syslog. +endef + +PACKAGES = CSWpmnetsyslog +CATALOGNAME = pm_netsyslog + +ARCHALL = 1 + +# No license specified by author for this perl module +LICENSE = + +CHECKPKG_OVERRIDES_CSWpmnetsyslog += license-missing|/opt/csw/share/doc/pm_netsyslog/license + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-Syslog/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Syslog/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-Syslog/trunk/checksums 2010-10-27 20:19:42 UTC (rev 11435) @@ -0,0 +1 @@ +5bec0d6e4e7c045bfe9129c34558817a Net-Syslog-0.04.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Wed Oct 27 22:36:17 2010 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Wed, 27 Oct 2010 20:36:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11436] csw/mgar/pkg/cpan/Net-Syslog/tags/Net-Syslog-0.04, REV=2010.10.27/ Message-ID: Revision: 11436 http://gar.svn.sourceforge.net/gar/?rev=11436&view=rev Author: jonbcraig Date: 2010-10-27 20:36:17 +0000 (Wed, 27 Oct 2010) Log Message: ----------- Net-Syslog: Tag as release 0.04,REV=2010.10.27 Added Paths: ----------- csw/mgar/pkg/cpan/Net-Syslog/tags/Net-Syslog-0.04,REV=2010.10.27/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 28 03:22:43 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Oct 2010 01:22:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11437] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 11437 http://gar.svn.sourceforge.net/gar/?rev=11437&view=rev Author: bdwalton Date: 2010-10-28 01:22:43 +0000 (Thu, 28 Oct 2010) Log Message: ----------- ruby: version bump Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2010-10-27 20:36:17 UTC (rev 11436) +++ csw/mgar/pkg/ruby/trunk/Makefile 2010-10-28 01:22:43 UTC (rev 11437) @@ -1,6 +1,6 @@ GARNAME = ruby DISTVERSION = 1.8.7 -PATCHLEVEL = p299 +PATCHLEVEL = p302 GARVERSION = $(DISTVERSION) CATEGORIES = lang This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 28 03:28:48 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Oct 2010 01:28:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[11438] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 11438 http://gar.svn.sourceforge.net/gar/?rev=11438&view=rev Author: bdwalton Date: 2010-10-28 01:28:47 +0000 (Thu, 28 Oct 2010) Log Message: ----------- ruby: add explicit description for CSWruby Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2010-10-28 01:22:43 UTC (rev 11437) +++ csw/mgar/pkg/ruby/trunk/Makefile 2010-10-28 01:28:47 UTC (rev 11438) @@ -42,6 +42,7 @@ closures. endef +SPKG_DESC_CSWruby = $(DESCRIPTION) SPKG_DESC_CSWrubydoc = Documentation for Ruby SPKG_DESC_CSWrubytk = Ruby Tcl/TK Extension This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 28 03:30:37 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Oct 2010 01:30:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[11439] csw/mgar/pkg/ruby/trunk/checksums Message-ID: Revision: 11439 http://gar.svn.sourceforge.net/gar/?rev=11439&view=rev Author: bdwalton Date: 2010-10-28 01:30:37 +0000 (Thu, 28 Oct 2010) Log Message: ----------- ruby: update checksums file Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/checksums Modified: csw/mgar/pkg/ruby/trunk/checksums =================================================================== --- csw/mgar/pkg/ruby/trunk/checksums 2010-10-28 01:28:47 UTC (rev 11438) +++ csw/mgar/pkg/ruby/trunk/checksums 2010-10-28 01:30:37 UTC (rev 11439) @@ -1,2 +1 @@ -36460ea6a145017c3ddd1173e903a511 rdoc_parse_order_fix.patch -244439a87d75ab24170a9c2b451ce351 ruby-1.8.7-p299.tar.bz2 +a6a9e37079ed8cf8726b455dad3de939 ruby-1.8.7-p302.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 28 03:53:17 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Oct 2010 01:53:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11440] csw/mgar/pkg/ruby/trunk Message-ID: Revision: 11440 http://gar.svn.sourceforge.net/gar/?rev=11440&view=rev Author: bdwalton Date: 2010-10-28 01:53:17 +0000 (Thu, 28 Oct 2010) Log Message: ----------- ruby: create new patch to (hopefully) address mantis 4399, a segfault problem Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby/trunk/files/0002-Correct-potential-segfault-caused-during-garbage-col.patch Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2010-10-28 01:30:37 UTC (rev 11439) +++ csw/mgar/pkg/ruby/trunk/Makefile 2010-10-28 01:53:17 UTC (rev 11440) @@ -76,8 +76,8 @@ # See: http://rubyforge.org/tracker/index.php?func=detail&aid=17607&group_id=426&atid=1698 PATCHFILES = rdoc_parse_order_fix.patch +PATCHFILES += 0002-Correct-potential-segfault-caused-during-garbage-col.patch - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pthread CONFIGURE_ARGS += --enable-shared Added: csw/mgar/pkg/ruby/trunk/files/0002-Correct-potential-segfault-caused-during-garbage-col.patch =================================================================== --- csw/mgar/pkg/ruby/trunk/files/0002-Correct-potential-segfault-caused-during-garbage-col.patch (rev 0) +++ csw/mgar/pkg/ruby/trunk/files/0002-Correct-potential-segfault-caused-during-garbage-col.patch 2010-10-28 01:53:17 UTC (rev 11440) @@ -0,0 +1,31 @@ +From 59b6ed9081932b52f0f5fb1be2fdd51d3d3cb3b4 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 28 Oct 2010 03:49:46 +0200 +Subject: [PATCH] Correct potential segfault caused during garbage collection + +This fix was suggested at: http://www.ruby-forum.com/topic/198545 + +It's an attempt to stop ruby from segfaulting during heavy object +allocation. This is in effort to resolve Mantis ID 4399. + +Signed-off-by: Ben Walton +--- + gc.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gc.c b/gc.c +index 4b1bd37..326c907 100644 +--- a/gc.c ++++ b/gc.c +@@ -433,7 +433,7 @@ rb_newobj() + if (during_gc) + rb_bug("object allocation during garbage collection phase"); + +- if (ruby_gc_stress || !freelist) garbage_collect(); ++ if (ruby_gc_stress || !freelist || !freelist->as.free.next) garbage_collect(); + + obj = (VALUE)freelist; + freelist = freelist->as.free.next; +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 28 04:36:32 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Oct 2010 02:36:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11441] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 11441 http://gar.svn.sourceforge.net/gar/?rev=11441&view=rev Author: bdwalton Date: 2010-10-28 02:36:31 +0000 (Thu, 28 Oct 2010) Log Message: ----------- ruby: split out CSWlibruby1, tweak the dev package Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2010-10-28 01:53:17 UTC (rev 11440) +++ csw/mgar/pkg/ruby/trunk/Makefile 2010-10-28 02:36:31 UTC (rev 11441) @@ -11,6 +11,7 @@ BUILD_DEP_PKGS += CSWreadline CSWzlib CSWossldevel PACKAGES = CSWruby CSWrubydoc CSWrubytk CSWrubydev CSWrubymode CSWrubymodeel +PACKAGES += CSWlibruby1 ARCHALL_CSWrubydoc = 1 ARCHALL_CSWrubymode = 1 @@ -43,6 +44,9 @@ endef SPKG_DESC_CSWruby = $(DESCRIPTION) + +SPKG_DESC_CSWlibruby1 = The libruby.so.1* files + SPKG_DESC_CSWrubydoc = Documentation for Ruby SPKG_DESC_CSWrubytk = Ruby Tcl/TK Extension @@ -58,11 +62,15 @@ PKGFILES_CSWrubytk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb PKGFILES_CSWrubydev = $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a +PKGFILES_CSWrubydev += /opt/csw/lib/libruby.so PKGFILES_CSWrubymode = $(datadir)/emacs/site-lisp/.*elc$ PKGFILES_CSWrubymodeel = $(datadir)/emacs/site-lisp/.*el$ +PKGFILES_CSWlibruby1 += /opt/csw/lib/libruby.so.1 +PKGFILES_CSWlibruby1 += /opt/csw/lib/libruby.so.1.* + CATALOGNAME_CSWrubymodeel = rubymode_el MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Oct 28 14:41:44 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 28 Oct 2010 12:41:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[11442] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 11442 http://gar.svn.sourceforge.net/gar/?rev=11442&view=rev Author: bonivart Date: 2010-10-28 12:41:44 +0000 (Thu, 28 Oct 2010) Log Message: ----------- clamav: update to 0.94 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2010-10-28 02:36:31 UTC (rev 11441) +++ csw/mgar/pkg/clamav/trunk/Makefile 2010-10-28 12:41:44 UTC (rev 11442) @@ -1,5 +1,5 @@ GARNAME = clamav -GARVERSION = 0.96.3 +GARVERSION = 0.96.4 #DISTNAME = $(GARNAME)-devel-latest CATEGORIES = apps @@ -18,11 +18,13 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz #DISTFILES = $(GARNAME)-devel-latest.tar.gz -PACKAGES = CSWclamav CSWlibclamav +PACKAGES = CSWclamav CSWlibclamav CSWlibclamav-devel CATALOGNAME_CSWclamav = clamav SPKG_DESC_CSWclamav = $(DESCRIPTION) CATALOGNAME_CSWlibclamav = libclamav SPKG_DESC_CSWlibclamav = $(DESCRIPTION) Library +CATALOGNAME_CSWlibclamav-devel = libclamav_devel +SPKG_DESC_CSWlibclamav-devel = $(DESCRIPTION) Development RUNTIME_DEP_PKGS_CSWclamav = CSWlibclamav CSWzlib CSWbzip2 CSWiconv CSWncurses CSWlibtoolrt RUNTIME_DEP_PKGS_CSWlibclamav = CSWzlib CSWbzip2 CSWiconv CSWlibtoolrt @@ -59,8 +61,8 @@ EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la -PKGFILES_CSWlibclamav = $(libdir)/.* -PKGFILES_CSWlibclamav += $(includedir)/.* +PKGFILES_CSWlibclamav-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibclamav = $(PKGFILES_RT) PKGFILES_CSWlibclamav += $(docdir)/libclamav/.* PROTOTYPE_MODIFIERS = 1 @@ -83,6 +85,8 @@ TEST_TARGET = check +CHECKPKG_OVERRIDES_CSWlibclamav += shared-lib-pkgname-mismatch + include gar/category.mk DOCS = AUTHORS BUGS ChangeLog Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2010-10-28 02:36:31 UTC (rev 11441) +++ csw/mgar/pkg/clamav/trunk/checksums 2010-10-28 12:41:44 UTC (rev 11442) @@ -1,3 +1 @@ -a3238ed54a098b66a8e3e9f8bb0ca399 CSWclamav.clamd.conf.p -6c37b881661bf28741bb69045a642790 CSWclamav.freshclam.conf.p -663274565c4da17abb112ff88895e510 clamav-0.96.3.tar.gz +7d47f73fe16b96544a4b5e41686e5060 clamav-0.96.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Thu Oct 28 15:56:23 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Thu, 28 Oct 2010 13:56:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[11443] csw/mgar/pkg/lang-python/django-sorting/trunk/ Makefile Message-ID: Revision: 11443 http://gar.svn.sourceforge.net/gar/?rev=11443&view=rev Author: khabermann Date: 2010-10-28 13:56:23 +0000 (Thu, 28 Oct 2010) Log Message: ----------- django-sorting: changed from git-hub version to latest release version Modified Paths: -------------- csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile Modified: csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile 2010-10-28 12:41:44 UTC (rev 11442) +++ csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile 2010-10-28 13:56:23 UTC (rev 11443) @@ -19,17 +19,12 @@ generation without modifying the views. endef -MASTER_SITES = http://github.com/mirumee/$(GARNAME)/tarball/master/ +# 1st char of GARNAME is the directory name +MASTER_SITE_DIR = $(shell echo $(GARNAME) | cut -c 1) +MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# There's a problem that the download URL of the source tarball does not -# contain the file name. The browser is being redirected instead. Hard-coding -# the URL and using a custom target to fit the rest of mGAR. -http//github.com/mirumee/$(GARNAME)/tarball/master/$(GARNAME)-$(GARVERSION).tar.gz: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) -O $(DISTFILES) http://github.com/mirumee/$(GARNAME)/tarball/master/ - - CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Oct 30 21:33:15 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 30 Oct 2010 19:33:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11444] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 11444 http://gar.svn.sourceforge.net/gar/?rev=11444&view=rev Author: aigoshin Date: 2010-10-30 19:33:15 +0000 (Sat, 30 Oct 2010) Log Message: ----------- nginx: package release 20101030 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-10-28 13:56:23 UTC (rev 11443) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-10-30 19:33:15 UTC (rev 11444) @@ -1,5 +1,5 @@ GARNAME = nginx -GARVERSION = 0.8.52 +GARVERSION = 0.8.53 CATEGORIES = server GARCOMPILER = SOS11 Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2010-10-28 13:56:23 UTC (rev 11443) +++ csw/mgar/pkg/nginx/trunk/checksums 2010-10-30 19:33:15 UTC (rev 11444) @@ -1 +1 @@ -8c1f0b6b9ad205b65248b1c55d3d801d nginx-0.8.52.tar.gz +717eaea1b34e8663849f64b9aa05a9da nginx-0.8.53.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 31 03:11:32 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 31 Oct 2010 02:11:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11445] csw/mgar/pkg/ruby/trunk Message-ID: Revision: 11445 http://gar.svn.sourceforge.net/gar/?rev=11445&view=rev Author: bdwalton Date: 2010-10-31 02:11:32 +0000 (Sun, 31 Oct 2010) Log Message: ----------- ruby: add patch to force proper SONAME in libruby.so.1 Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby/trunk/files/0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2010-10-30 19:33:15 UTC (rev 11444) +++ csw/mgar/pkg/ruby/trunk/Makefile 2010-10-31 02:11:32 UTC (rev 11445) @@ -85,6 +85,7 @@ # See: http://rubyforge.org/tracker/index.php?func=detail&aid=17607&group_id=426&atid=1698 PATCHFILES = rdoc_parse_order_fix.patch PATCHFILES += 0002-Correct-potential-segfault-caused-during-garbage-col.patch +PATCHFILES += 0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pthread Added: csw/mgar/pkg/ruby/trunk/files/0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch =================================================================== --- csw/mgar/pkg/ruby/trunk/files/0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch (rev 0) +++ csw/mgar/pkg/ruby/trunk/files/0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch 2010-10-31 02:11:32 UTC (rev 11445) @@ -0,0 +1,28 @@ +From c426b27d2b6a35acafc157182c21f15ebcb97a69 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 31 Oct 2010 02:43:48 +0100 +Subject: [PATCH] Force ld to embed the proper SONAME for libruby + +Set LIBRUBY_DLDFLAGS in the solaris section of the configure script +in order to force ld to pass the appropriate -h when building libruby. + +Signed-off-by: Ben Walton +--- + configure | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/configure b/configure +index 0badcbd..5753333 100755 +--- a/configure ++++ b/configure +@@ -10696,6 +10696,7 @@ if test "$enable_shared" = 'yes'; then + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)' + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so' ++ LIBRUBY_DLDFLAGS="-h ${LIBRUBY_SO}" + if test "$GCC" = yes; then + LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)' + fi +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 31 03:57:08 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 31 Oct 2010 02:57:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11446] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 11446 http://gar.svn.sourceforge.net/gar/?rev=11446&view=rev Author: bdwalton Date: 2010-10-31 02:57:07 +0000 (Sun, 31 Oct 2010) Log Message: ----------- ruby: add appropriate deps on CSWlibruby1 Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2010-10-31 02:11:32 UTC (rev 11445) +++ csw/mgar/pkg/ruby/trunk/Makefile 2010-10-31 02:57:07 UTC (rev 11446) @@ -1,4 +1,4 @@ -GARNAME = ruby +ARNAME = ruby DISTVERSION = 1.8.7 PATCHLEVEL = p302 GARVERSION = $(DISTVERSION) @@ -19,12 +19,12 @@ LICENSE = COPYING -RUNTIME_DEP_PKGS_CSWruby = CSWbdb48 CSWgdbm CSWiconv +RUNTIME_DEP_PKGS_CSWruby = CSWbdb48 CSWgdbm CSWiconv CSWlibruby1 RUNTIME_DEP_PKGS_CSWruby += CSWncurses CSWosslrt CSWreadline CSWzlib RUNTIME_DEP_PKGS_CSWrubydoc = CSWruby -RUNTIME_DEP_PKGS_CSWrubytk = CSWruby CSWtk CSWtcl +RUNTIME_DEP_PKGS_CSWrubytk = CSWruby CSWtk CSWtcl CSWlibruby1 RUNTIME_DEP_PKGS_CSWrubydev = CSWruby CSWcoreutils This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 31 04:09:17 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 31 Oct 2010 03:09:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11447] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 11447 http://gar.svn.sourceforge.net/gar/?rev=11447&view=rev Author: bdwalton Date: 2010-10-31 03:09:16 +0000 (Sun, 31 Oct 2010) Log Message: ----------- ruby: correct mistaken character deletion Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2010-10-31 02:57:07 UTC (rev 11446) +++ csw/mgar/pkg/ruby/trunk/Makefile 2010-10-31 03:09:16 UTC (rev 11447) @@ -1,4 +1,4 @@ -ARNAME = ruby +GARNAME = ruby DISTVERSION = 1.8.7 PATCHLEVEL = p302 GARVERSION = $(DISTVERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 31 06:47:40 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 31 Oct 2010 05:47:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11448] csw/mgar/pkg/curl/trunk Message-ID: Revision: 11448 http://gar.svn.sourceforge.net/gar/?rev=11448&view=rev Author: rthurner Date: 2010-10-31 05:47:39 +0000 (Sun, 31 Oct 2010) Log Message: ----------- curl: upgrade to 7.21.2 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-10-31 03:09:16 UTC (rev 11447) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-10-31 05:47:39 UTC (rev 11448) @@ -1,5 +1,5 @@ GARNAME = curl -GARVERSION = 7.21.0 +GARVERSION = 7.21.2 CATEGORIES = net DESCRIPTION = Command line tool and library for client-side URL transfers. Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2010-10-31 03:09:16 UTC (rev 11447) +++ csw/mgar/pkg/curl/trunk/checksums 2010-10-31 05:47:39 UTC (rev 11448) @@ -1,6 +1 @@ -e1a2a773e93a39f3c04cab92c55bf197 curl-7.21.0.tar.bz2 -f6e1a6d234d7f6811bb1c598ba9b7c8f curlbuild.h -a09fcad6dfcd9636061dfab7598357be libcurl.so.2.0.2.i -b46b41659b805013740eeb76e759af4b libcurl.so.2.0.2.s -30e826ef67b6ce799b32154250014dd9 libcurl.so.3.0.0.i -b63de55fb90feba487b1fd21e751d248 libcurl.so.3.0.0.s +ca96df88e044c7c25d19692ec8b250b2 curl-7.21.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 31 07:24:36 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 31 Oct 2010 06:24:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[11449] csw/mgar/pkg/sudo_ldap/trunk Message-ID: Revision: 11449 http://gar.svn.sourceforge.net/gar/?rev=11449&view=rev Author: rthurner Date: 2010-10-31 06:24:36 +0000 (Sun, 31 Oct 2010) Log Message: ----------- sudo_ldap: upgrade to 1.7.4p4 Modified Paths: -------------- csw/mgar/pkg/sudo_ldap/trunk/Makefile csw/mgar/pkg/sudo_ldap/trunk/checksums Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/Makefile 2010-10-31 05:47:39 UTC (rev 11448) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2010-10-31 06:24:36 UTC (rev 11449) @@ -1,5 +1,5 @@ GARNAME = sudo -GARVERSION = 1.7.2p5 +GARVERSION = 1.7.4p4 CATEGORIES = utils DESCRIPTION = Provides limited super user privileges (LDAP Enabled) Modified: csw/mgar/pkg/sudo_ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/checksums 2010-10-31 05:47:39 UTC (rev 11448) +++ csw/mgar/pkg/sudo_ldap/trunk/checksums 2010-10-31 06:24:36 UTC (rev 11449) @@ -1,2 +1 @@ -157b2e5e38ca54eb36e0364706bd0292 install.diff -398f584e831bd75b3c0179e28368c2a3 sudo-1.7.2p5.tar.gz +55d9906535d70a1de347cd3d3550ee87 sudo-1.7.4p4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 31 07:36:59 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 31 Oct 2010 06:36:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11450] csw/mgar/pkg/sudo_ldap/trunk/Makefile Message-ID: Revision: 11450 http://gar.svn.sourceforge.net/gar/?rev=11450&view=rev Author: rthurner Date: 2010-10-31 06:36:59 +0000 (Sun, 31 Oct 2010) Log Message: ----------- sudo_ldap: try to get rid of chkpkg warnings Modified Paths: -------------- csw/mgar/pkg/sudo_ldap/trunk/Makefile Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/Makefile 2010-10-31 06:24:36 UTC (rev 11449) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2010-10-31 06:36:59 UTC (rev 11450) @@ -23,9 +23,12 @@ CATALOGNAME_CSWsudoldap = sudo_ldap SPKG_DESC_CSWsudoldap = $(DESCRIPTION) SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws -RUNTIME_DEP_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt +RUNTIME_DEP_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt CSWzlib BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWsudoldap) CSWggettext +CHECKPKG_OVERRIDES_CSWsudoldap += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWsudoldap += surplus-dependency|CSWsudo-common + LOGPATH = /var/opt/csw/log/sudo CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 31 08:05:53 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 31 Oct 2010 07:05:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11451] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 11451 http://gar.svn.sourceforge.net/gar/?rev=11451&view=rev Author: rthurner Date: 2010-10-31 07:05:53 +0000 (Sun, 31 Oct 2010) Log Message: ----------- curl: make checkpkg happy, nothing in the package itself changed Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-10-31 06:36:59 UTC (rev 11450) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-10-31 07:05:53 UTC (rev 11451) @@ -97,6 +97,36 @@ PKGFILES_CSWcurlrt = $(PKGFILES_RT) PKGFILES_CSWcurlrtfull = .*-full.* +# recompile curl to link to new ldap, and temporarily include +# the following block to make checkpkg happy. nothing in the curl +# package changed, so it should be ok, no? +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibssh2 +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWoldaprt +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWsasl +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcares +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibnet +CHECKPKG_OVERRIDES_CSWcurldevel += surplus-dependency|CSWcurl +CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 +CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0 +CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 +CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0 +CHECKPKG_OVERRIDES_CSWcurlrt += non-uniform-lib-versions-in-package|sonames=['libcurl.so.2',|'libcurl.so.3',|'libcurl.so.4'] +CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull +CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull +CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibcares +CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibssh2 +CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibfbopenssl +CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWoldaprt +CHECKPKG_OVERRIDES_CSWcurlrt += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 +CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 +CHECKPKG_OVERRIDES_CSWcurlrtfull += shared-lib-pkgname-mismatch|sonames=['libcurl.so.4']|pkgname=CSWcurlrtfull|expected=['CSWlibcurl4']| +CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull +CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull +CHECKPKG_OVERRIDES_CSWcurlrtfull += surplus-dependency|CSWalternatives + +# end checkpkg happiness section + include gar/category.mk post-install-isa-sparcv8-features-minimal: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 31 08:40:43 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 31 Oct 2010 07:40:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11452] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 11452 http://gar.svn.sourceforge.net/gar/?rev=11452&view=rev Author: rthurner Date: 2010-10-31 07:40:43 +0000 (Sun, 31 Oct 2010) Log Message: ----------- openldap: ignore chkpkg warnings for the moment Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-10-31 07:05:53 UTC (rev 11451) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-10-31 07:40:43 UTC (rev 11452) @@ -137,8 +137,13 @@ CHECKPKG_OVERRIDES_CSWoldap += init-file-wrong-location|/opt/csw/etc/init.d/cswopenldap ARCHALL_CSWoldapdevel = 1 -CHECKPKG_OVERRIDES_CSWoldapdevel += archall-devel-package +#CHECKPKG_OVERRIDES_CSWoldapdevel += archall-devel-package +#CHECKPKG_OVERRIDES_CSWoldapdevel += archall-with-arch-paths|/opt/csw/lib/sparcv9/liblber.so +#CHECKPKG_OVERRIDES_CSWoldapdevel += archall-with-arch-paths|/opt/csw/lib/sparcv9/libldap.so +#CHECKPKG_OVERRIDES_CSWoldapdevel += archall-with-arch-paths|/opt/csw/lib/sparcv9/libldap_r.so +#CHECKPKG_OVERRIDES_CSWoldaprt += non-uniform-lib-versions-in-package|sonames=['liblber-2.3.so.0',|'liblber-2.4.so.2',|'libldap-2.3.so.0',|'libldap-2.4.so.2',|'libldap_r-2.3.so.0',|'libldap_r-2.4.so.2'] + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 31 09:11:22 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 31 Oct 2010 08:11:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11453] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 11453 http://gar.svn.sourceforge.net/gar/?rev=11453&view=rev Author: rthurner Date: 2010-10-31 08:11:21 +0000 (Sun, 31 Oct 2010) Log Message: ----------- curl: try to ignore checkpkg errors Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-10-31 07:40:43 UTC (rev 11452) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-10-31 08:11:21 UTC (rev 11453) @@ -120,10 +120,10 @@ CHECKPKG_OVERRIDES_CSWcurlrt += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrtfull += shared-lib-pkgname-mismatch|sonames=['libcurl.so.4']|pkgname=CSWcurlrtfull|expected=['CSWlibcurl4']| CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull CHECKPKG_OVERRIDES_CSWcurlrtfull += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWcurlrtfull += shared-lib-pkgname-mismatch|sonames=['libcurl.so.4']|pkgname=CSWcurlrtfull|expected=['CSWlibcurl4']| # end checkpkg happiness section This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sun Oct 31 12:12:10 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sun, 31 Oct 2010 11:12:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11454] csw/mgar/pkg/proftpd/trunk Message-ID: Revision: 11454 http://gar.svn.sourceforge.net/gar/?rev=11454&view=rev Author: aigoshin Date: 2010-10-31 11:12:09 +0000 (Sun, 31 Oct 2010) Log Message: ----------- proftpd: 20101031 rc1 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile csw/mgar/pkg/proftpd/trunk/checksums Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-31 08:11:21 UTC (rev 11453) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-31 11:12:09 UTC (rev 11454) @@ -1,5 +1,5 @@ GARNAME = proftpd -GARVERSION = 1.3.3b +GARVERSION = 1.3.3c CATEGORIES = server GARCOMPILER = GCC3 @@ -23,31 +23,40 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -RUNTIME_DEP_PKGS = CSWosslrt CSWggettextrt CSWiconv +RUNTIME_DEP_PKGS = CSWosslrt CSWggettextrt CSWiconv CSWgcc3corert CSWoldaprt CSWzlib CSWmysql5rt PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 EXTRA_BUILD_ISAS_i386 = pentium_pro -EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv9 +EXTRA_BUILD_ISAS_sparc = sparcv9 +MYSQLISA_pentium_pro = i386 +MYSQLISA_$(ISA) ?= $(ISA) +MYSQLISA = $(MYSQLISA_$(ISA)) + sysconfdir=/etc/opt/csw localstatedir=/var/opt/csw CONFIGURE_ENV = install_user=$(USER) install_group=csw CONFIGURE_ENV += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" +LD_OPTIONS += -R$(prefix)/mysql5/lib/mysql/\$$ISALIST CONFIGURE_ARGS += --prefix=$(prefix) CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) CONFIGURE_ARGS += --localstatedir=/var/run/proftpd CONFIGURE_ARGS += --mandir=$(prefix)/share/man +CONFIGURE_ARGS += --libexecdir=$(prefix)/lib/proftpd +CONFIGURE_ARGS += --enable-dso --disable-static CONFIGURE_ARGS += --enable-facl CONFIGURE_ARGS += --enable-openssl CONFIGURE_ARGS += --enable-sendfile CONFIGURE_ARGS += --enable-nls CONFIGURE_ARGS += --enable-ctrls CONFIGURE_ARGS += --enable-buffer-size=8192 -CONFIGURE_ARGS += --with-includes=$(prefix)/include:$(prefix)/include/openssl -CONFIGURE_ARGS += --with-modules=mod_rewrite:mod_ifsession:mod_ratio:mod_tls:mod_readme:mod_auth_pam:mod_radius:mod_ban:mod_wrap2:mod_wrap2_file +CONFIGURE_ARGS += --with-includes=$(prefix)/include:$(prefix)/include/openssl:$(prefix)/include/mysql +CONFIGURE_ARGS += --with-libraries=$(prefix)/lib/mysql/$(MYSQLISA) +CONFIGURE_ARGS += --with-modules=mod_auth_pam:mod_tls:mod_tls_shmcache:mod_wrap2 +CONFIGURE_ARGS += --with-shared=mod_ban:mod_ctrls_admin:mod_ifsession:mod_ldap:mod_radius:mod_ratio:mod_readme:mod_rewrite:mod_shaper:mod_sql:mod_sql_mysql:mod_wrap2_file TEST_SCRIPTS = Modified: csw/mgar/pkg/proftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/proftpd/trunk/checksums 2010-10-31 08:11:21 UTC (rev 11453) +++ csw/mgar/pkg/proftpd/trunk/checksums 2010-10-31 11:12:09 UTC (rev 11454) @@ -1 +1 @@ -721b8232fcac36317a6a1d29fa86250e proftpd-1.3.3b.tar.bz2 +8571bd78874b557e98480ed48e2df1d2 proftpd-1.3.3c.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 31 14:38:32 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 31 Oct 2010 13:38:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11455] csw/mgar/pkg/amanda/trunk Message-ID: Revision: 11455 http://gar.svn.sourceforge.net/gar/?rev=11455&view=rev Author: rthurner Date: 2010-10-31 13:38:32 +0000 (Sun, 31 Oct 2010) Log Message: ----------- amanda: upgrade to amanda-3.2.0 Modified Paths: -------------- csw/mgar/pkg/amanda/trunk/Makefile csw/mgar/pkg/amanda/trunk/checksums Modified: csw/mgar/pkg/amanda/trunk/Makefile =================================================================== --- csw/mgar/pkg/amanda/trunk/Makefile 2010-10-31 11:12:09 UTC (rev 11454) +++ csw/mgar/pkg/amanda/trunk/Makefile 2010-10-31 13:38:32 UTC (rev 11455) @@ -1,6 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ GARNAME = amanda -GARVERSION = 2.6.1p2 +GARVERSION = 3.2.0 CATEGORIES = apps DESCRIPTION = The Advanced Maryland Automatic Network Disk Archiver Modified: csw/mgar/pkg/amanda/trunk/checksums =================================================================== --- csw/mgar/pkg/amanda/trunk/checksums 2010-10-31 11:12:09 UTC (rev 11454) +++ csw/mgar/pkg/amanda/trunk/checksums 2010-10-31 13:38:32 UTC (rev 11455) @@ -1 +1 @@ -816ef0101b6d968c5df7d7d7e793caed amanda-2.6.1p2.tar.gz +df73a318af8f04e9ad2ecb4d59dc052c amanda-3.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 31 14:43:53 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 31 Oct 2010 13:43:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11456] csw/mgar/pkg/cmake/trunk Message-ID: Revision: 11456 http://gar.svn.sourceforge.net/gar/?rev=11456&view=rev Author: rthurner Date: 2010-10-31 13:43:53 +0000 (Sun, 31 Oct 2010) Log Message: ----------- cmake: upgrade to 2.8.2 Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile csw/mgar/pkg/cmake/trunk/checksums Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2010-10-31 13:38:32 UTC (rev 11455) +++ csw/mgar/pkg/cmake/trunk/Makefile 2010-10-31 13:43:53 UTC (rev 11456) @@ -1,5 +1,5 @@ GARNAME = cmake -GARVERSION = 2.8.1 +GARVERSION = 2.8.2 CATEGORIES = devel DESCRIPTION = Cross-platform make Modified: csw/mgar/pkg/cmake/trunk/checksums =================================================================== --- csw/mgar/pkg/cmake/trunk/checksums 2010-10-31 13:38:32 UTC (rev 11455) +++ csw/mgar/pkg/cmake/trunk/checksums 2010-10-31 13:43:53 UTC (rev 11456) @@ -1 +1 @@ -feadc2e5ebbfed0efc90178583503725 cmake-2.8.1.tar.gz +8c967d5264657a798f22ee23976ff0d9 cmake-2.8.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 31 14:49:38 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 31 Oct 2010 13:49:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[11457] csw/mgar/pkg/exim/trunk Message-ID: Revision: 11457 http://gar.svn.sourceforge.net/gar/?rev=11457&view=rev Author: rthurner Date: 2010-10-31 13:49:37 +0000 (Sun, 31 Oct 2010) Log Message: ----------- exim: upgrade to 4.72 Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile csw/mgar/pkg/exim/trunk/checksums Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2010-10-31 13:43:53 UTC (rev 11456) +++ csw/mgar/pkg/exim/trunk/Makefile 2010-10-31 13:49:37 UTC (rev 11457) @@ -1,5 +1,5 @@ GARNAME = exim -GARVERSION = 4.68 +GARVERSION = 4.72 CATEGORIES = server DESCRIPTION = The Exim Mail Transfer Agent Modified: csw/mgar/pkg/exim/trunk/checksums =================================================================== --- csw/mgar/pkg/exim/trunk/checksums 2010-10-31 13:43:53 UTC (rev 11456) +++ csw/mgar/pkg/exim/trunk/checksums 2010-10-31 13:49:37 UTC (rev 11457) @@ -1,20 +1 @@ -dde2d5f7106d51607409af94174db46c download/exim-4.63.tar.bz2 -01288e44919d8abdde5a7bd2c200449b download/exim-4.66.tar.bz2 -9ee83186d9ac99e5ff297112aa6fddf0 download/exim-4.67.tar.bz2 -94c46a8bc24b3ad4ad892228449f378b download/exim-4.68.tar.bz2 -9e26c18f14ea95b9b6ec1bd19ba60efc download/CSWexim.depend -5e30fed7ebdaf3556d58b6be39b7720b download/CSWexim.gspec -02b3efd9b0363ce924d4be8b6746dce6 download/CSWexim.postinstall -af6b81c1e3f14588cbabe44023b380cc download/CSWexim.postremove -8475607c59fa3d21a9e0bf3c543f9758 download/CSWexim.preinstall -7355027c4a108af6c1b0b10805360e74 download/CSWexim.preremove -60f82b8a8eac5a34123de73e40084acf download/CSWexim.prototype -50e3a68b66bd0bda7d8d42139197bb55 download/CSWexim.request -a386327223fbde1fe61bae4c4c387020 download/Makefile.patch -232afcbf096d506de840e81bbc40777d download/exim_install.patch -138bab395abd967bcd23a82dad753d4c download/spf2.patch -a771f405c0f0c9f31c871c46c28007ba download/i.smfyes -afcbc43344a24b5490df37cfcc3f8934 download/i.smfno -f49c3339aa897df97abf1baf54582fb8 download/CSWexim.space -59d05b2a6e7aadc3444c37cd3e1bd45a download/CSWexim.checkinstall -0bad1e35532d046b7aa367155c7cecb8 download/cswexim +ccc937b533568e5e8340f181a3b3d2ff exim-4.72.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 31 15:01:39 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 31 Oct 2010 14:01:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11458] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 11458 http://gar.svn.sourceforge.net/gar/?rev=11458&view=rev Author: rthurner Date: 2010-10-31 14:01:39 +0000 (Sun, 31 Oct 2010) Log Message: ----------- dovecot: update to 1.2.15 as recompiling to make it link against new openldap just failed Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2010-10-31 13:49:37 UTC (rev 11457) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2010-10-31 14:01:39 UTC (rev 11458) @@ -5,7 +5,7 @@ # - USERGROUP doesn't work yet, wrong usage? # - /var/run/dovecot instead of /var/opt/csw/run? GARNAME = dovecot -GARVERSION = 1.1.20 +GARVERSION = 1.2.15 CATEGORIES = server DESCRIPTION = Secure IMAP server @@ -17,7 +17,7 @@ endef SPKG_SOURCEURL = http://dovecot.org/ -MASTER_SITES = http://dovecot.org/releases/1.1/ +MASTER_SITES = http://dovecot.org/releases/1.2/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2010-10-31 13:49:37 UTC (rev 11457) +++ csw/mgar/pkg/dovecot/trunk/checksums 2010-10-31 14:01:39 UTC (rev 11458) @@ -1,2 +1 @@ -1b0ccfac7765d25f0d106489321a0764 dovecot-1.1.20.tar.gz -765a31bece26ed3cebee784dc4aa8216 patch-exampleconf.diff +15fe307fe85a87cb7a697655dbab29d0 dovecot-1.2.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.