From bdwalton at users.sourceforge.net Wed Feb 1 01:42:36 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 01 Feb 2012 00:42:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[16952] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 16952 http://gar.svn.sourceforge.net/gar/?rev=16952&view=rev Author: bdwalton Date: 2012-02-01 00:42:36 +0000 (Wed, 01 Feb 2012) Log Message: ----------- git/trunk: re-disable the git-svn tests Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-01-31 20:34:18 UTC (rev 16951) +++ csw/mgar/pkg/git/trunk/Makefile 2012-02-01 00:42:36 UTC (rev 16952) @@ -6,8 +6,8 @@ VENDOR_URL = http://git-scm.org/ -# NO_SVN_TESTS=YesPlease -# EXTRA_TEST_EXPORTS = NO_SVN_TESTS +NO_SVN_TESTS=YesPlease +EXTRA_TEST_EXPORTS = NO_SVN_TESTS # disable tests until next version bump (at the top so it stands out) # 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is 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 Feb 1 10:35:09 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 01 Feb 2012 09:35:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[16953] csw/mgar/pkg/cpan/Net-DNS/trunk Message-ID: Revision: 16953 http://gar.svn.sourceforge.net/gar/?rev=16953&view=rev Author: bonivart Date: 2012-02-01 09:35:08 +0000 (Wed, 01 Feb 2012) Log Message: ----------- cpan/Net-DNS/trunk: update to 0.68 Modified Paths: -------------- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile csw/mgar/pkg/cpan/Net-DNS/trunk/checksums Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2012-02-01 00:42:36 UTC (rev 16952) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2012-02-01 09:35:08 UTC (rev 16953) @@ -1,5 +1,5 @@ NAME = Net-DNS -VERSION = 0.67 +VERSION = 0.68 CATEGORIES = cpan GARTYPE = v2 AUTHOR = OLAF Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/checksums 2012-02-01 00:42:36 UTC (rev 16952) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/checksums 2012-02-01 09:35:08 UTC (rev 16953) @@ -1 +1 @@ -8caf473b6f74cae38ee18c162041a5db Net-DNS-0.67.tar.gz +05c0f6955747758bb5c9578d9bc6c3a5 Net-DNS-0.68.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 Wed Feb 1 10:58:38 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 01 Feb 2012 09:58:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16954] csw/mgar/pkg/jbigkit/trunk/Makefile Message-ID: Revision: 16954 http://gar.svn.sourceforge.net/gar/?rev=16954&view=rev Author: dmichelsen Date: 2012-02-01 09:58:38 +0000 (Wed, 01 Feb 2012) Log Message: ----------- jbigkit/trunk: Add T.85 library and development files Modified Paths: -------------- csw/mgar/pkg/jbigkit/trunk/Makefile Modified: csw/mgar/pkg/jbigkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/jbigkit/trunk/Makefile 2012-02-01 09:35:08 UTC (rev 16953) +++ csw/mgar/pkg/jbigkit/trunk/Makefile 2012-02-01 09:58:38 UTC (rev 16954) @@ -20,10 +20,16 @@ SPKG_DESC_CSWlibjbig2 = A data compression library for bi-level high-resolution images, libjbig.so.2 PKGFILES_CSWlibjbig2 += $(call pkgfiles_lib,libjbig.so.2) +PACKAGES += CSWlibjbig85-2 +SPKG_DESC_CSWlibjbig85-2 = T.85 light version of the libjbig.so.2 library, libjbig85.so.2 +PKGFILES_CSWlibjbig85-2 += $(call pkgfiles_lib,libjbig85.so.2) + PACKAGES += CSWlibjbig-dev -SPKG_DESC_CSWlibjbig-dev = Development files for libjbig.so.2 +SPKG_DESC_CSWlibjbig-dev = Development files for libjbig.so.2 and libjbig85.so.2 PKGFILES_CSWlibjbig-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibjbig-dev += $(docdir)/libjbig_dev/.* RUNTIME_DEP_PKGS_CSWlibjbig-dev += CSWlibjbig2 +RUNTIME_DEP_PKGS_CSWlibjbig-dev += CSWlibjbig85-2 PACKAGES += CSWjbigkit SPKG_DESC_CSWjbigkit = JBIG kit, a data compression algorithm for bi-level high-resolution images @@ -41,6 +47,9 @@ REINPLACE_FILES_gmake += Makefile REINPLACE_FILES_gmake += pbmtools/Makefile +# Generate position independent code for shared library +EXTRA_CFLAGS = -xcode=pic13 + # There is no configure CONFIGURE_SCRIPTS = @@ -56,13 +65,18 @@ install-custom: ginstall -d $(DESTDIR)$(includedir) - cd $(WORKSRC)/libjbig && ginstall jbig.h jbig_ar.h $(DESTDIR)$(includedir) + cd $(WORKSRC)/libjbig && ginstall jbig.h jbig_ar.h jbig85.h $(DESTDIR)$(includedir) ginstall -d $(DESTDIR)$(bindir) cd $(WORKSRC)/pbmtools && ginstall jbgtopbm jbgtopbm85 pbmtojbg pbmtojbg85 $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(libdir) - $(CC) $(LDFLAGS) -G -h libjbig.so.2 -o $(DESTDIR)$(libdir)/libjbig.so.2.0 $(WORKSRC)/libjbig/libjbig.a + $(CC) $(LDFLAGS) -z allextract -G -h libjbig.so.2 -o $(DESTDIR)$(libdir)/libjbig.so.2.0 $(WORKSRC)/libjbig/libjbig.a gln -s libjbig.so.2 $(DESTDIR)$(libdir)/libjbig.so gln -s libjbig.so.2.0 $(DESTDIR)$(libdir)/libjbig.so.2 + $(CC) $(LDFLAGS) -z allextract -G -h libjbig85.so.2 -o $(DESTDIR)$(libdir)/libjbig85.so.2.0 $(WORKSRC)/libjbig/libjbig85.a + gln -s libjbig85.so.2 $(DESTDIR)$(libdir)/libjbig85.so + gln -s libjbig85.so.2.0 $(DESTDIR)$(libdir)/libjbig85.so.2 + ginstall -d $(DESTDIR)$(docdir)/libjbig_dev + cd $(WORKSRC)/libjbig && ginstall jbig.txt jbig85.txt $(DESTDIR)$(docdir)/libjbig_dev ginstall -d $(DESTDIR)$(mandir)/man1 cd $(WORKSRC)/pbmtools && ginstall *.1 $(DESTDIR)$(mandir)/man1 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Feb 1 11:07:00 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 01 Feb 2012 10:07:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[16955] csw/mgar/pkg Message-ID: Revision: 16955 http://gar.svn.sourceforge.net/gar/?rev=16955&view=rev Author: janholzh Date: 2012-02-01 10:06:59 +0000 (Wed, 01 Feb 2012) Log Message: ----------- zabbix/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/zabbix/ csw/mgar/pkg/zabbix/Makefile csw/mgar/pkg/zabbix/branches/ csw/mgar/pkg/zabbix/tags/ csw/mgar/pkg/zabbix/trunk/ csw/mgar/pkg/zabbix/trunk/Makefile csw/mgar/pkg/zabbix/trunk/checksums csw/mgar/pkg/zabbix/trunk/files/ Added: csw/mgar/pkg/zabbix/Makefile =================================================================== --- csw/mgar/pkg/zabbix/Makefile (rev 0) +++ csw/mgar/pkg/zabbix/Makefile 2012-02-01 10:06:59 UTC (rev 16955) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/zabbix/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/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile (rev 0) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2012-02-01 10:06:59 UTC (rev 16955) @@ -0,0 +1,36 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = zabbix +VERSION = 1.8.10 +GARTYPE = v2 +CATEGORIES = server + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +#BUILD64 = 1 +#BUILD_ISA_i386 = amd64 +BUILD64_ONLY = 1 + + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\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) --with-mysql --with-libcurl --enable-server --enable-agent --enable-ipv6 + +include gar/category.mk + Property changes on: csw/mgar/pkg/zabbix/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/zabbix/trunk/checksums =================================================================== --- csw/mgar/pkg/zabbix/trunk/checksums (rev 0) +++ csw/mgar/pkg/zabbix/trunk/checksums 2012-02-01 10:06:59 UTC (rev 16955) @@ -0,0 +1 @@ +7e89f80c1822787c0831f7c0dbefcd7b zabbix-1.8.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Feb 1 11:40:18 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 01 Feb 2012 10:40:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[16956] csw/mgar/pkg Message-ID: Revision: 16956 http://gar.svn.sourceforge.net/gar/?rev=16956&view=rev Author: janholzh Date: 2012-02-01 10:40:18 +0000 (Wed, 01 Feb 2012) Log Message: ----------- collectd/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/collectd/ csw/mgar/pkg/collectd/Makefile csw/mgar/pkg/collectd/branches/ csw/mgar/pkg/collectd/tags/ csw/mgar/pkg/collectd/trunk/ csw/mgar/pkg/collectd/trunk/Makefile csw/mgar/pkg/collectd/trunk/checksums csw/mgar/pkg/collectd/trunk/files/ Added: csw/mgar/pkg/collectd/Makefile =================================================================== --- csw/mgar/pkg/collectd/Makefile (rev 0) +++ csw/mgar/pkg/collectd/Makefile 2012-02-01 10:40:18 UTC (rev 16956) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/collectd/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/collectd/trunk/Makefile =================================================================== --- csw/mgar/pkg/collectd/trunk/Makefile (rev 0) +++ csw/mgar/pkg/collectd/trunk/Makefile 2012-02-01 10:40:18 UTC (rev 16956) @@ -0,0 +1,31 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = collectd +VERSION = 5.0.2 +GARTYPE = v2 +CATEGORIES = server + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://collectd.org/files/ +DISTFILES = $(DISTNAME).tar.gz + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\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 + Property changes on: csw/mgar/pkg/collectd/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/collectd/trunk/checksums =================================================================== --- csw/mgar/pkg/collectd/trunk/checksums (rev 0) +++ csw/mgar/pkg/collectd/trunk/checksums 2012-02-01 10:40:18 UTC (rev 16956) @@ -0,0 +1 @@ +6612c9722552a603667caede17703073 collectd-5.0.2.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 Wed Feb 1 11:42:18 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 01 Feb 2012 10:42:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[16957] csw/mgar/pkg/zabbix/trunk/ Message-ID: Revision: 16957 http://gar.svn.sourceforge.net/gar/?rev=16957&view=rev Author: dmichelsen Date: 2012-02-01 10:42:18 +0000 (Wed, 01 Feb 2012) Log Message: ----------- zabbix: Remove external reference Property Changed: ---------------- csw/mgar/pkg/zabbix/trunk/ Property changes on: csw/mgar/pkg/zabbix/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 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 Feb 1 11:49:55 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 01 Feb 2012 10:49:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[16958] csw/mgar/pkg/openldap/branches/libs-2.3/ Message-ID: Revision: 16958 http://gar.svn.sourceforge.net/gar/?rev=16958&view=rev Author: wahwah Date: 2012-02-01 10:49:55 +0000 (Wed, 01 Feb 2012) Log Message: ----------- a branch to create legacy 2.3 lib packages Added Paths: ----------- csw/mgar/pkg/openldap/branches/libs-2.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 Wed Feb 1 13:06:58 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 01 Feb 2012 12:06:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[16959] csw/mgar/pkg/openldap/branches/libs-2.3 Message-ID: Revision: 16959 http://gar.svn.sourceforge.net/gar/?rev=16959&view=rev Author: wahwah Date: 2012-02-01 12:06:58 +0000 (Wed, 01 Feb 2012) Log Message: ----------- openldap/branches/libs-2.3: Legacy libraries Modified Paths: -------------- csw/mgar/pkg/openldap/branches/libs-2.3/Makefile Added Paths: ----------- csw/mgar/pkg/openldap/branches/libs-2.3/files/COPYRIGHT csw/mgar/pkg/openldap/branches/libs-2.3/files/install_legacy.sh csw/mgar/pkg/openldap/branches/libs-2.3/files/libs-2.3.tar.gz Removed Paths: ------------- csw/mgar/pkg/openldap/branches/libs-2.3/files/CSWoldap.postinstall csw/mgar/pkg/openldap/branches/libs-2.3/files/README.CSW csw/mgar/pkg/openldap/branches/libs-2.3/files/cswopenldap csw/mgar/pkg/openldap/branches/libs-2.3/files/old-CSWoldap.gspec csw/mgar/pkg/openldap/branches/libs-2.3/files/openldap.xml csw/mgar/pkg/openldap/branches/libs-2.3/files/openldaprc csw/mgar/pkg/openldap/branches/libs-2.3/files/patch-libtool-64bit.diff csw/mgar/pkg/openldap/branches/libs-2.3/files/patch-oldap-2.4.16-ntlm.diff Modified: csw/mgar/pkg/openldap/branches/libs-2.3/Makefile =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/Makefile 2012-02-01 10:49:55 UTC (rev 16958) +++ csw/mgar/pkg/openldap/branches/libs-2.3/Makefile 2012-02-01 12:06:58 UTC (rev 16959) @@ -1,11 +1,11 @@ # $Id$ NAME = openldap -VERSION = 2.4.28 +VERSION = 2.3-1 GARTYPE = v2 CATEGORIES = server -DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol +DESCRIPTION = OpenLDAP legacy files define BLURB The OpenLDAP Project is a collaborative effort to develop a robust, commercial-grade, fully featured, and open source LDAP suite of applications @@ -15,196 +15,65 @@ endef MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ -DISTFILES = $(DISTNAME).tgz -DISTFILES += CSWoldap.postinstall -DISTFILES += README.CSW openldaprc -DISTFILES += cswopenldap openldap.xml +DISTFILES = libs-2.3.tar.gz +DISTFILES += COPYRIGHT -EXPANDVARS = cswopenldap -EXPANDVARS += CSWoldap.postinstall - -PATCHFILES += patch-oldap-2.4.16-ntlm.diff -PATCHFILES += patch-libtool-64bit.diff -DISTFILES += patch-oldap-2.4.16-ntlm.diff - -# Maybe in -# /opt/csw/share/man/man5/ldap.conf.5 -# the string -# /usr/local/var/ldapi -# should be replaced by something more sane in the future. - VENDOR_URL = http://www.openldap.org LICENSE = COPYRIGHT -PACKAGES += CSWopenldap -SPKG_DESC_CSWopenldap = OpenLDAP server for Lightweight Directory Access Protocol -# PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWopenldap += CSWbdb48 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicudata48 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-2 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibltdl7 -# We do not want that dependency. -# RUNTIME_DEP_PKGS_CSWopenldap += CSWlibnet -# RUNTIME_DEP_PKGS_CSWopenldap += CSWlibnet1 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibodbc2 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibslp1 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibssl0-9-8 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibwrap1 -RUNTIME_DEP_PKGS_CSWopenldap += CSWperl -OBSOLETED_BY_CSWopenldap += CSWoldap -CATALOGNAME_CSWoldap = openldap_stub - -# Evaluate later -CHECKPKG_OVERRIDES_CSWopenldap += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/slapd.8 - -PACKAGES += CSWopenldap-client -SPKG_DESC_CSWopenldap-client = OpenLDAP client executables -PKGFILES_CSWopenldap-client += $(bindir)/.* -PKGFILES_CSWopenldap-client += $(mandir)/man1/.* -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibssl0-9-8 -OBSOLETED_BY_CSWopenldap-client += CSWoldapclient -CATALOGNAME_CSWoldapclient = openldap_client_stub - -PACKAGES += CSWopenldap-dev -SPKG_DESC_CSWopenldap-dev = OpenLDAP development files for libldap-2.4.so.2, libldap_r-2.4.so.2 and liblber-2.4.so.2 -PKGFILES_CSWopenldap-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWopenldap-dev += $(mandir)/man3/.* -RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap-r2-4-2 -RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap2-4-2 -OBSOLETED_BY_CSWopenldap-dev += CSWoldapdevel -CATALOGNAME_CSWoldapdevel = openldap_devel_stub - -PACKAGES += CSWliblber2-4-2 -SPKG_DESC_CSWliblber2-4-2 = OpenLDAP ASN.1 BER library, liblber-2.4.so.2 -PKGFILES_CSWliblber2-4-2 += $(call pkgfiles_lib,liblber-2.4.so.2) -RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibssl0-9-8 -OBSOLETED_BY_CSWliblber2-4-2 += CSWoldaprt -CATALOGNAME_CSWoldaprt = openldap_rt_stub - -PACKAGES += CSWlibldap2-4-2 -SPKG_DESC_CSWlibldap2-4-2 = OpenLDAP LDAP library, libldap-2.4.so.2 -PKGFILES_CSWlibldap2-4-2 += $(call pkgfiles_lib,libldap-2.4.so.2) -PKGFILES_CSWlibldap2-4-2 += $(sysconfdir)/ldap.conf -PKGFILES_CSWlibldap2-4-2 += $(mandir)/man5/ldap.conf.5 -RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWliblber2-4-2 -OBSOLETED_BY_CSWlibldap2-4-2 += CSWoldaprt - -# Evaluate later -CHECKPKG_OVERRIDES_CSWlibldap2-4-2 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/ldap.conf.5 - -PACKAGES += CSWlibldap-r2-4-2 -SPKG_DESC_CSWlibldap-r2-4-2 = OpenLDAP reentrant LDAP library, libldap_r-2.4.so.2 -PKGFILES_CSWlibldap-r2-4-2 += $(call pkgfiles_lib,libldap_r-2.4.so.2) -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibssl0-9-8 -OBSOLETED_BY_CSWlibldap-r2-4-2 += CSWoldaprt - -FOREIGN_PACKAGES += CSWliblber2-3-0 -OBSOLETED_BY_CSWliblber2-3-0 += CSWoldaprt - -FOREIGN_PACKAGES += CSWlibldap2-3-0 -OBSOLETED_BY_CSWlibldap2-3-0 += CSWoldaprt - -FOREIGN_PACKAGES += CSWlibldap-r2-3-0 -OBSOLETED_BY_CSWlibldap-r2-3-0 += CSWoldaprt - -EXTRA_DOCS = README.CSW $(PATCHFILES) openldaprc - -# This is also used during EXPANDVARS -bdbdir = $(prefix)/bdb48 - -EXTRA_LIB = $(bdbdir)/lib -EXTRA_INC = $(bdbdir)/include - -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw - -MIGRATE_FILES_CSWoldapclient = openldap - -# Is this causing this? -# https://www.opencsw.org/mantis/view.php?id=4555 -NOISALIST = 1 -LD_OPTIONS = -EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) - -NODIRPATHS = --docdir - BUILD64 = 1 -# This takes some more work, the sbin/ files should be linked to libexec but the linklevel is not deep enough -# ISAEXEC = 1 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = +TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-crypt -CONFIGURE_ARGS += --enable-lmpasswd -CONFIGURE_ARGS += --enable-modules -CONFIGURE_ARGS += --enable-rlookups -CONFIGURE_ARGS += --enable-slp -CONFIGURE_ARGS += --enable-wrappers -CONFIGURE_ARGS += --enable-backends=mod -CONFIGURE_ARGS += --enable-overlays=mod +PACKAGES += CSWliblber2-3-0 +CATALOGNAME_CSWliblber2-3-0 = liblber2_3_0 +PKGFILES_CSWliblber2-3-0 += $(call baseisadirs,$(libdir),liblber-2\.3\.so\.0(\.\d+)*) +SPKG_DESC_CSWliblber2-3-0 += $(DESCRIPTION), liblber-2.3.so.0 -# Is the absence of this arg causing https://www.opencsw.org/mantis/view.php?id=4468 ? -CONFIGURE_ARGS += --enable-dynamic +# Because of splitting of the CSWoldaprt package - it hasn't been done yet. +# It's a transient override, once 2.4 libs are released aond CSWoldaprt is +# split, these overrides can be removed. +CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/sparcv9/liblber-2.3.so.0.2.31|CSWliblber2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/liblber-2.3.so.0|CSWliblber2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/sparcv9/liblber-2.3.so.0|CSWliblber2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/liblber-2.3.so.0.2.31|CSWliblber2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/libldap_r-2.3.so.0|CSWlibldap-r2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/sparcv9/libldap_r-2.3.so.0|CSWlibldap-r2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/sparcv9/libldap_r-2.3.so.0.2.31|CSWlibldap-r2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/libldap_r-2.3.so.0.2.31|CSWlibldap-r2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/libldap-2.3.so.0.2.31|CSWlibldap2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/sparcv9/libldap-2.3.so.0.2.31|CSWlibldap2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/libldap-2.3.so.0|CSWlibldap2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/sparcv9/libldap-2.3.so.0|CSWlibldap2-3-0|CSWoldaprt -# Disable MySQL Cluster -CONFIGURE_ARGS += --disable-ndb +PACKAGES += CSWlibldap2-3-0 +CATALOGNAME_CSWlibldap2-3-0 = libldap2_3_0 +PKGFILES_CSWlibldap2-3-0 += $(call baseisadirs,$(libdir),libldap-2\.3\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibldap2-3-0 += $(DESCRIPTION), libldap-2.3.so.0 +RUNTIME_DEP_PKGS_CSWlibldap2-3-0 += CSWlibnet +RUNTIME_DEP_PKGS_CSWlibldap2-3-0 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibldap2-3-0 += CSWoldaprt +RUNTIME_DEP_PKGS_CSWlibldap2-3-0 += CSWlibsasl2-2 +# We aren't rebuilding this library, so we can't remove the linking. +CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += deprecated-library|file=opt/csw/lib/libldap-2.3.so.0.2.31|lib=/opt/csw/lib/libnet.so -# This libnet is meant to be provided for BeOS only, the libnet.so picked up from OpenCSW -# is completely unrelated. Disable the linkage until this is fixed: -# http://www.openldap.org/its/index.cgi?findid=7071 -CONFIGURE_ARGS += ac_cv_lib_net_main=no -CONFIGURE_ARGS += ac_cv_lib_net_socket=no +PACKAGES += CSWlibldap-r2-3-0 +CATALOGNAME_CSWlibldap-r2-3-0 = libldap_r2_3_0 +PKGFILES_CSWlibldap-r2-3-0 += $(call baseisadirs,$(libdir),libldap_r-2\.3\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibldap-r2-3-0 += $(DESCRIPTION), libldap_r-2.3.so.0 +RUNTIME_DEP_PKGS_CSWlibldap-r2-3-0 += CSWlibnet +RUNTIME_DEP_PKGS_CSWlibldap-r2-3-0 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibldap-r2-3-0 += CSWlibsasl2-2 +# Because of a file collision at the moment. +CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += missing-dependency|CSWoldaprt +# We aren't rebuilding this library, so we can't remove the linking. +CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += deprecated-library|file=opt/csw/lib/libldap_r-2.3.so.0.2.31|lib=/opt/csw/lib/libnet.so -# spasswd requires Cyrus SASL -CONFIGURE_ARGS_32 += --enable-spasswd - -# Disable Cyrus SASL in 64 bit until the libraries are available -# -CONFIGURE_ARGS_64 += --without-cyrus-sasl - -# We have Perl only for 32 bit: -# -CONFIGURE_ARGS_32 += --enable-perl=mod -CONFIGURE_ARGS_64 += --enable-perl=no - -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL)) - -# The testsuite takes a couple of hours -SKIPTEST ?= 1 - -# Perl backend is built, although it has been told not to. -EXTRA_PAX_ARGS = -s ,.*/opt/csw/libexec/sparcv9/openldap/back_perl.*,, -EXTRA_PAX_ARGS = -s ,.*/opt/csw/libexec/amd64/openldap/back_perl.*,, - -# These are the config templates. As we have preserveconf which takes -# care of this we exclude them in the package. -EXTRA_MERGE_EXCLUDE_FILES = .*\.default - -PRESERVECONF = /etc/opt/csw/openldap/ldap.conf -PRESERVECONF += /etc/opt/csw/openldap/slapd.conf - -INITSMF = /etc/opt/csw/init.d/cswopenldap - include gar/category.mk -CFLAGS := $(filter-out -I%,$(CFLAGS)) -DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) - post-merge-modulated: - ginstall -D $(WORKDIR)/cswopenldap \ - $(PKGROOT)/etc/opt/csw/init.d/cswopenldap - $(foreach F,$(EXTRA_DOCS),ginstall --mode=644 -D $(WORKDIR)/$F $(PKGROOT)$(docdir)/$(NAME)/$F;) - @# Enable BDB backend so OpenLDAP can start - perl -pi -e 's/#\s*(modulepath)/$$1/; s/#\s*(moduleload\s*back_bdb.la)/$$1/' $(PKGROOT)$(sysconfdir)/openldap/slapd.conf - @$(MAKECOOKIE) + $(FILEDIR)/install_legacy.sh "$(GARCH)" "$(WORKDIR)" "$(PKGROOT)" Added: csw/mgar/pkg/openldap/branches/libs-2.3/files/COPYRIGHT =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/files/COPYRIGHT (rev 0) +++ csw/mgar/pkg/openldap/branches/libs-2.3/files/COPYRIGHT 2012-02-01 12:06:58 UTC (rev 16959) @@ -0,0 +1,64 @@ +Copyright 1998-2011 The OpenLDAP Foundation +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted only as authorized by the OpenLDAP +Public License. + +A copy of this license is available in the file LICENSE in the +top-level directory of the distribution or, alternatively, at +. + +OpenLDAP is a registered trademark of the OpenLDAP Foundation. + +Individual files and/or contributed packages may be copyright by +other parties and/or subject to additional restrictions. + +This work is derived from the University of Michigan LDAP v3.3 +distribution. Information concerning this software is available +at . + +This work also contains materials derived from public sources. + +Additional information about OpenLDAP can be obtained at +. + +--- + +Portions Copyright 1998-2011 Kurt D. Zeilenga. +Portions Copyright 1998-2006 Net Boolean Incorporated. +Portions Copyright 2001-2006 IBM Corporation. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted only as authorized by the OpenLDAP +Public License. + +--- + +Portions Copyright 1999-2008 Howard Y.H. Chu. +Portions Copyright 1999-2008 Symas Corporation. +Portions Copyright 1998-2003 Hallvard B. Furuseth. +Portions Copyright 2007-2011 Gavin Henry. +Portions Copyright 2007-2011 Suretec Systems Ltd. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that this notice is preserved. +The names of the copyright holders may not be used to endorse or +promote products derived from this software without their specific +prior written permission. This software is provided ``as is'' +without express or implied warranty. + +--- + +Portions Copyright (c) 1992-1996 Regents of the University of Michigan. +All rights reserved. + +Redistribution and use in source and binary forms are permitted +provided that this notice is preserved and that due credit is given +to the University of Michigan at Ann Arbor. The name of the +University may not be used to endorse or promote products derived +from this software without specific prior written permission. This +software is provided ``as is'' without express or implied warranty. + Deleted: csw/mgar/pkg/openldap/branches/libs-2.3/files/CSWoldap.postinstall =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/files/CSWoldap.postinstall 2012-02-01 10:49:55 UTC (rev 16958) +++ csw/mgar/pkg/openldap/branches/libs-2.3/files/CSWoldap.postinstall 2012-02-01 12:06:58 UTC (rev 16959) @@ -1,98 +0,0 @@ -# Postinstall script for openldap -# 2006-02-03 Add SMF capability -# 2007-01-07 Add csw.conf support. Specific name is openldap -# -if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi - -# Build log file name -installdir=${BASEDIR}@localstatedir@/openldap -installlog=${installdir}/install-`date '+%Y%m%d%H%M%S'` -mkdir -p ${installdir} - -# Upgrade and verify bdb database files for openldap. -# -DB_HOME=${BASEDIR}@localstatedir@/openldap-data - -if [ -f ${BASEDIR}$DB_HOME/*.bdb ] ; then - cd ${BASEDIR}$DB_HOME - - # Update the database environment to the new value - echo "Running db_recover on $DB_HOME" >>$installlog - chroot $PKG_INSTALL_ROOT @bdbdir@/bin/db_recover -h $DB_HOME >>$installlog 2>&1 - - # Upgrade each file. This does nothing if no upgrade is needed. - echo "Running db_upgrade on $DB_HOME" >>$installlog - for each_db in `ls *.bdb` - do - chroot $PKG_INSTALL_ROOT @bdbdir@/bin/db_upgrade -h $DB_HOME $each_db >>$installlog 2>&1 - done - - # Verify each file - echo "Running db_verify on $DB_HOME" >>$installlog - for each_db in `ls *.bdb` - do - chroot $PKG_INSTALL_ROOT @bdbdir@/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 - done -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_openldap" = "no" ] ; then - enable_daemon=no -elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_openldap" ] ; then - enable_daemon=no -fi - -# Set variable for the availability of SMF -smf=no -if [ -f $BASEDIR/usr/sbin/svccfg -a -f $BASEDIR/usr/sbin/svcadm ] - then - smf=yes -fi - -if [ $smf = yes ] -then - # Register with SMF - echo "Configuring service in SMF" - chroot $PKG_INSTALL_ROOT /usr/sbin/svccfg import /opt/csw/var/svc/manifest/network/openldap.xml >>$installlog 2>&1 - chroot $PKG_INSTALL_ROOT /usr/sbin/svcadm disable svc:network/cswopenldap >>$installlog 2>&1 - echo "Openldap is using Service Management Facility. The FMRI is:" - echo " svc:network/cswopenldap:default" -fi - -# Start openldap if it is configured to start. -# -if [ "$enable_daemon" = "yes" ] ; then - # Source startup options - [ -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. 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} - - # If a conf file has been created, assume we should start up. - - if [ -r $SLAPD_CONFIG_FILE ] ; then - echo "Starting openldap" - if [ $smf = no ] - then - chroot $PKG_INSTALL_ROOT /etc/init.d/cswopenldap start >>$installlog 2>&1 - else - chroot $PKG_INSTALL_ROOT /usr/sbin/svcadm enable svc:network/cswopenldap >>$installlog 2>&1 - fi - fi -fi - -exit 0 Deleted: csw/mgar/pkg/openldap/branches/libs-2.3/files/README.CSW =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/files/README.CSW 2012-02-01 10:49:55 UTC (rev 16958) +++ csw/mgar/pkg/openldap/branches/libs-2.3/files/README.CSW 2012-02-01 12:06:58 UTC (rev 16959) @@ -1,139 +0,0 @@ -2007-01-07 -This update adds support for csw.conf. See the following url for details. -http://www.blastwave.org/standards/csw.conf.html -The daemon specific name for the scripts is openldap. - -2006-06-11 -Along with the update to 2.3.24, a patch from Ben Klang is added to allow - slapd to start with either a configuration file or a configuration - directory. The configuration directory is the new 'config' backend - cn=config. - -Thanks to Ben Klang for this patch! - -The option SLAPD_CONFIG_DIR is added to openldaprc to support a 'cn=config' - setup. The init scripts, cswopenldap (Solaris 8 and Solaris 9) and - svc-openldap (Solaris 10 and later) are changed to support the new options. - -*** IMPORTANT *** -If you already have a openldaprc file defined, the package installation - will NOT overwrite your file. So you need to add the option yourself. - Define either SLAPD_CONFIG_FILE or SLAPD_CONFIG_DIR. To use the cn=config - backend, you must create this directory yourself. The default openldaprc - file is still located in /opt/csw/share/doc/openldap/. - -The option SLAPD_EXTRA is added to the default openldaprc and init scripts - to allow you to pass arbitrary flags to slapd. - -Added /opt/csw/var/run to the prototype to fix a bugreport that allows the - default setup to run. However, please note that you should read the - following notes dated 2005-04-02 and setup slapd/slurpd to run as a - non-root user. - -I am working on a quick_start-csw script for first-time setup. This should - be finished by the next release. - -2006-01-14 -With the update to 2.3.17, Service Management Facility (SMF) processing - is added for Solaris 10 and later. The FMRI is network/cswopenldap:default - -2005-11-25 -With the version change to 2.3, you must have a backup of your 2.1 - slapd server data and restore that data into 2.3. See the - openldap site if you need more detail. -Here is the short version that I use. However, I do not use all - of openldap's feature set, so you may have different needs. - 1) With the older version running, `slapcat -b -l /tmp/slapcat.out` - 2) Install the new version and stop it with `/etc/init.d/cswopenldap stop` - 3) Restore your data with `slapadd -b -l /tmp/slapcat.out` - 4) Check permissions on files in /opt/csw/var/openldap-data. - 5) Start slapd and run your testing procedures. - 6) If you have multiple suffixes, or replication is involved, please - see the openldap site for procedures. - 7) If you are using aci's, please test them as well. The format may - have changed. - 8) If you need old versions of CSWoldap* packages, the archive is at - http://blastwave.informatik.uni-erlangen.de/oldpkgs/ - Just be sure to match any secondary packages by version or date. - For example, openldap-2.1.30 was published as standalone. The - openldap_rt and openldap_client packages are newer than 2.1.30. - So, do not mix incorrect versions. - -2005-08-13 -Applied patch from Martin Foster to fix the problem when multiple - uri are on the -h option for slapd. -On pkgrm, preremove was stopping slapd/sluprd if the daemons were - running. Now, if berkeleydb is used, preremove also runs db_recover. - -2005-06-11 -This update adds the configure option --enable-aci - -2005-04-30 -This update to openldap provides an important change to berkeleydb4 - version 4.2.52 plus the four patches. This is the berkeleydb4 - version needed for the next openldap release, which will be the - latest of the 2.2.x series. -If you are using berkeleydb4 for the back-end database for openldap, - you should be running db_checkpoint periodically. The postinstall - script for this openldap update should upgrade the database if - required. The postinstall script also runs db_verify. Output - from the postinstall script is in /opt/csw/var/openldap/install- - for your review. During one of my tests, I had a log file with - improper ownership (I use daemon to run openldap). Be sure to check - for this in /opt/csw/var/openldap-data/. - --- - -2005-04-02 -I am the new maintainer for this package. - -Besides the version update, a startup script with options that you - can configure are included. Now, the default setup copies - /opt/csw/etc/openldap/ldap.conf.default to /opt/csw/etc/openldap/ldap.conf - if the file does not already exist. This file is needed to make the - host a client. The old package may have removed your ldap.conf, so I - hope you have a backup copy available. There was nothing that I could do - about this. Future updates will not remove your ldap.conf file. - -To setup slapd, copy /opt/csw/share/doc/openldap/openldaprc to either - /opt/csw/etc or /etc/opt/csw and make any changes to that file. Also, - copy slapd.conf.default in /opt/csw/etc/openldap to slapd.conf and - make the necessary changes for your environment. Startup options for - the daemon are customized by changing the openldaprc resource file. The - startup script cswopenldap was added to /etc/init.d/ and /etc/rc?.d/ - when the package was installed. - -To setup slurpd, make any needed changes in openldaprc and slapd.conf - and create the necessary directories and replica entries. See the - OpenLDAP documentation for setting up and using slurpd. - -If you want to run the daemon(s) with a non-root user, this may be the - steps required. The list is definetly a start, but may not be complete. - I will use user=daemon and group=daemon for the example. - 1) After package installation, change the openldap-data directory - permissions with `chown -R daemon:daemon /opt/csw/var/openldap-data` - 2) After creating slapd.conf, change the permissions with - `chown daemon:daemon /opt/csw/etc/openldap/slapd.conf` - 3) If you are using slurpd, change the openldap-slurp permissions with - `chown -R daemon:daemon /opt/csw/var/openldap-slurp` - 4) Create a directory for pid file and args file as follows: - `mkdir /opt/csw/var/openldap` - `chown daemon:daemon /opt/csw/var/openldap` - 5) Change the entry in slapd.conf for pidfile and argsfile as follows. - change pidfile to /opt/csw/var/openldap/slapd.pid - change argsfile to /opt/csw/var/openldap/slapd.args -NOTE: If you change permissions on a directory installed by pkg-get, - be sure to add a file to the directory to keep the directory - from being removed on package upgrades. --- - -Alex Moore - ----Previous text of this file -This slapd was patched so it would return 'namingContexts' when querying - the root DSE. This is a violation of the RFC's as operational attributes - should not be returned unless specifically asked for, so the environment - variable "SOLARISROOTDSE" has be set before starting slapd to enable this - behavior. The patch is included as /opt/csw/docs/openldap/patch-slapd - -Anthony Dean Deleted: csw/mgar/pkg/openldap/branches/libs-2.3/files/cswopenldap =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/files/cswopenldap 2012-02-01 10:49:55 UTC (rev 16958) +++ csw/mgar/pkg/openldap/branches/libs-2.3/files/cswopenldap 2012-02-01 12:06:58 UTC (rev 16959) @@ -1,173 +0,0 @@ -#!/bin/sh -# Start script for CSW www.blastwave.org package of Openldap. -# slapd and slurpd can be started by this script. -# For either daemon to start, the minimum requirement is that -# /opt/csw/etc/openldap/slapd.conf must exist. It does not -# exist after the initial package installation, since you may -# only be using openldap as a client. -# -# Startup options may be overriden by creating and editing either -# /opt/csw/etc/openldaprc or /etc/opt/csw/openldaprc. The template -# for openldaprc is in /opt/csw/share/doc/openldap. You must use -# this template. -# -# For example, -# mkdir -p /etc/opt/csw -# cp /opt/csw/share/doc/openldap/openldaprc /etc/opt/csw/ -# -# If no openldaprc file is available, the daemon starts with defaults -# and slurpd is not started. -# -# To start slurpd, set SLURPD_START=true in openldaprc -# -# 2005-08-11 Applied patch from Martin Foster to fix the problem -# when multiple uri are on the -h option. -# 2006-06-11 Included patch from Ben Klang. This update allows you -# to define use a configuration directory for the 'config' -# backend, cn=config. The option to use a configuration file -# is still enabled, if you do not want to use a the new backend. -# The option SLAPD_EXTRA is added to openldaprc to pass -# arbitrary flags to slapd. - -RETVAL=0 -SLAPD=@libexecdir@/slapd -SLURPD=@libexecdir@/slurpd - -# Source startup options -[ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh -[ -r /opt/csw/etc/openldaprc ] && . /opt/csw/etc/openldaprc -[ -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=/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. - -start_it() { - # If none of the default or defined configuration files or directories - # exist, exit this script. - ([ ! -r "$DEF_SLAPD_CONFIG_FILE" ] && [ ! -x "$DEF_SLAPD_CONFIG_DIR" ] && [ ! -r "$SLAPD_CONFIG_FILE" ] && [ ! -x "$SLAPD_CONFIG_DIR" ]) && \ - return 1 - - if kill -0 `pgrep -x slapd` > /dev/null 2>&1 ; then - echo "openldap-slapd (`pgrep -x slapd`) seems to be running." - return 1 - fi - - printf "%-60s" "Starting openldap-slapd: " - START="$SLAPD" - - if [ -n "$SLAPD_IPV4_ONLY" ] ; then START="$START -4"; fi - if [ -n "$SLAPD_IPV6_ONLY" ] ; then START="$START -6"; fi - if [ -n "$SLAPD_DEBUG_LEVEL" ] ; then START="$START -d $SLAPD_DEBUG_LEVEL"; fi - if [ -n "$SLAPD_CONFIG_FILE" ] ; then START="$START -f $SLAPD_CONFIG_FILE"; fi - if [ -n "$SLAPD_CONFIG_DIR" ] ; then START="$START -F $SLAPD_CONFIG_DIR"; fi - if [ -n "$SLAPD_GROUP" ] ; then START="$START -g $SLAPD_GROUP"; fi - if [ -n "$SLAPD_URL_LIST" ] ; then START="$START -h \"$SLAPD_URL_LIST\""; fi - if [ -n "$SLAPD_SYSLOG_FACILITY" ] ; then START="$START -l $SLAPD_SYSLOG_FACILITY"; fi - if [ -n "$SLAPD_SERVICE_NAME" ] ; then START="$START -n $SLAPD_SERVICE_NAME"; fi - if [ -n "$SLAPD_DIRECTORY" ] ; then START="$START -r $SLAPD_DIRECTORY"; fi - if [ -n "$SLAPD_SYSLOG_LEVEL" ] ; then START="$START -s $SLAPD_SYSLOG_LEVEL"; fi - if [ -n "$SLAPD_SYNTAX_CHECK" ] ; then START="$START -t"; fi - if [ -n "$SLAPD_USER" ] ; then START="$START -u $SLAPD_USER"; fi - if [ -n "$SLAPD_EXTRA" ] ; then START="$START $SLAPD_EXTRA"; fi - - # Run it - sh -c "$START" - - RETVAL=$? - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - return 1 - fi - - [ -z "$SLURPD_START" ] && return 0 - - if kill -0 `pgrep -x slurpd` > /dev/null 2>&1 ; then - echo "openldap-slurpd (`pgrep -x slurpd`) seems to be running." - return 1 - fi - - printf "%-60s" "Starting openldap-slurpd: " - $SLURPD \ - `[ -n "$SLURPD_DEBUG_LEVEL" ] && echo "-d $SLURPD_DEBUG_LEVEL"` \ - `[ -n "$SLURPD_SYSLOG_LEVEL" ] && echo "-s $SLURPD_SYSLOG_LEVEL"` \ - `[ -n "$SLURPD_CONFIG_FILE" ] && echo "-f $SLURPD_CONFIG_FILE"` \ - `[ -n "$SLURPD_REPL_LOG_FILE" ] && echo "-r $SLURPD_REPL_LOG_FILE"` \ - `[ -n "$SLURPD_TMP_DIR" ] && echo "-t $SLURPD_TMP_DIR"` \ - `[ -n "$SLURPD_ONE_SHOT" ] && echo "-o"` \ - `[ -n "$SLURPD_SERVICE_NAME" ] && echo "-n $SLURPD_SERVICE_NAME"` \ - >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - return 1 - fi - - return 0 -} - -stop_it() { - - [ "`pgrep -x slapd`x" = "x" ] && echo "openldap-slapd is not running." && return 1 - - printf "%-60s" "Shutting down openldap-slapd: " - if test -n "`pgrep -x slapd`" ; then - kill `pgrep -x slapd` >/dev/null 2>&1 - RETVAL=$? - else - RETVAL=1 - fi - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - fi - - [ -z "$SLURPD_START" ] && return 0 - printf "%-60s" "Shutting down openldap-slurpd: " - if test -n "`pgrep -x slurpd`" ; then - kill `pgrep -x slurpd` >/dev/null 2>&1 - RETVAL=$? - else - RETVAL=1 - fi - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - fi - - echo "" - return 0 -} - -case $1 in - start) - start_it - ;; - - stop) - stop_it - ;; - - restart) - stop_it - while pgrep -x slapd > /dev/null - do - sleep 3 - done - start_it - ;; - - *) - echo "Usage: $0 { start | stop | restart } " - ;; -esac - -exit $RETVAL Added: csw/mgar/pkg/openldap/branches/libs-2.3/files/install_legacy.sh =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/files/install_legacy.sh (rev 0) +++ csw/mgar/pkg/openldap/branches/libs-2.3/files/install_legacy.sh 2012-02-01 12:06:58 UTC (rev 16959) @@ -0,0 +1,57 @@ +#!/opt/csw/bin/bash + +set -x +set -u +set -e + +readonly arch=$1 +readonly workdir=$2 +readonly pkgroot=$3 +readonly libdir="/opt/csw/lib" +readonly v="2.3.so.0.2.31" +readonly libnames=(liblber libldap libldap_r) + +function get_soname { + /usr/ccs/bin/dump -Lv "${1}" \ + | gawk '$2 == "SONAME" {print $3}' +} + +ginstall -d -m 755 ${pkgroot}${libdir} +if [[ "$arch" == i386 ]]; then + ginstall -d -m 755 ${pkgroot}${libdir}/amd64 + for l in "${libnames[@]}"; do + destf="${pkgroot}${libdir}/${l}-${v}" + ginstall -m 755 "${workdir}/${l}-${v}-i386" "${destf}" + soname=$(get_soname "${destf}") + if [[ ! -h "${pkgroot}${libdir}/${soname}" ]]; then + gln -sv "${l}-${v}" "${pkgroot}${libdir}/${soname}" + fi + [[ -h "${pkgroot}${libdir}/${soname}" ]] + + ginstall -m 755 "${workdir}/${l}-${v}-amd64" "${pkgroot}${libdir}/amd64/${l}-${v}" + if [[ ! -h "${pkgroot}${libdir}/amd64/${soname}" ]]; then + gln -sv "${l}-${v}" "${pkgroot}${libdir}/amd64/${soname}" + fi + [[ -h "${pkgroot}${libdir}/amd64/${soname}" ]] + done +elif [[ "$arch" == sparc ]]; then + ginstall -d -m 755 ${pkgroot}${libdir}/sparcv9 + for l in "${libnames[@]}"; do + destf="${pkgroot}${libdir}/${l}-${v}" + ginstall -m 755 ${workdir}/${l}-${v}-sparcv8 ${pkgroot}${libdir}/${l}-${v} + soname=$(get_soname "${destf}") + if [[ ! -h "${pkgroot}${libdir}/${soname}" ]]; then + gln -sv "${l}-${v}" "${pkgroot}${libdir}/${soname}" + fi + [[ -h "${pkgroot}${libdir}/${soname}" ]] + + ginstall -m 755 ${workdir}/${l}-${v}-sparcv9 ${pkgroot}${libdir}/sparcv9/${l}-${v} + if [[ ! -h "${pkgroot}${libdir}/sparcv9/${soname}" ]]; then + gln -sv "${l}-${v}" "${pkgroot}${libdir}/sparcv9/${soname}" + fi + [[ -h "${pkgroot}${libdir}/sparcv9/${soname}" ]] + done +else + echo "Wrong architecture '$arch'." + exit 1 +fi Added: csw/mgar/pkg/openldap/branches/libs-2.3/files/libs-2.3.tar.gz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/openldap/branches/libs-2.3/files/libs-2.3.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/x-gzip Deleted: csw/mgar/pkg/openldap/branches/libs-2.3/files/old-CSWoldap.gspec =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/files/old-CSWoldap.gspec 2012-02-01 10:49:55 UTC (rev 16958) +++ csw/mgar/pkg/openldap/branches/libs-2.3/files/old-CSWoldap.gspec 2012-02-01 12:06:58 UTC (rev 16959) @@ -1,12 +0,0 @@ -%var bitname openldap -%var pkgname CSWoldap -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc OpenLDAP standalone server and update replication daemons (oldap) -%var INIT_KILL_PRIO 15 -%var INIT_START_PRIO 40 -%var SERVICE_NAME openldap -%var SERVICE_CONF_FILES /opt/csw/share/doc/openldap/openldaprc -%var SMF_MANIFEST openldap.xml -%var SMF_SCRIPT svc-openldap -%include url file://%{PKGLIB}/smf_enabled.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/openldap/branches/libs-2.3/files/openldap.xml =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/files/openldap.xml 2012-02-01 10:49:55 UTC (rev 16958) +++ csw/mgar/pkg/openldap/branches/libs-2.3/files/openldap.xml 2012-02-01 12:06:58 UTC (rev 16959) @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: csw/mgar/pkg/openldap/branches/libs-2.3/files/openldaprc =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/files/openldaprc 2012-02-01 10:49:55 UTC (rev 16958) +++ csw/mgar/pkg/openldap/branches/libs-2.3/files/openldaprc 2012-02-01 12:06:58 UTC (rev 16959) @@ -1,75 +0,0 @@ -# Change this file for your startup options. -# For environment variables that are not a '=' assignment, I have -# added the word true to allow the use of the variable. Uncomment -# the line with the environment variable to activate. -# See man slapd for more detail. -# -# slurpd options are listed after the slapd options. -# -# With the 2.3.x versions, the slapd patch to allow SOLARISROOTDSE -# is no longer needed and removed. -# -# -4 Listen on IPv4 addresses only. -#SLAPD_IPV4_ONLY=true - -# -6 Listen on IPv6 addresses only. -#SLAPD_IPV6_ONLY=true - -# -d debug-level. Enter only the number below. -#SLAPD_DEBUG_LEVEL=0 - -# -f slapd-config-file. Specifies the slapd configuration file. -#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=/etc/opt/csw/openldap/slapd.d - -# -g group. slapd will run with the specified group name or id. -#SLAPD_GROUP=daemon - -# -h URLlist. Specify LDAP (and other scheme) URLS to serve. -#SLAPD_URL_LIST=ldap:/// - -# -l facility. Selects the syslog(8) facility. -#SLAPD_SYSLOG_FACILITY=LOCAL4 - -# -n service-name. Defaults to "slapd". -#SLAPD_SERVICE_NAME=slapd - -# -r directory. Specifies a chroot "jail" directory. -#SLAPD_DIRECTORY=directory - -# -s syslog-level. Enter only the number below. -#SLAPD_SYSLOG_LEVEL=0 - -# -t. slapd will read the configuration file and check its syntax only. -#SLAPD_SYNTAX_CHECK=true - -# -u user. slapd will run slapd with the specified user name or id. -#SLAPD_USER=daemon - -# Set to true to start slurpd -#SLURPD_START=true - -# -d debug-level. Enter only the number below. -#SLURPD_DEBUG_LEVEL=255 - -# -s syslog-level. Enter only the number below. -#SLURPD_SYSLOG_LEVEL=0 - -# -f slapd-config-file. Specifies the slapd configuration file. -#SLURPD_CONFIG_FILE=/etc/opt/csw/openldap/slapd.conf - -# -r replication-log-file. Directory must be created. -#SLURPD_REPL_LOG_FILE=/var/opt/csw/openldap-slurp/log - -# -t tmp-dir. Directory must be created. -#SLURPD_TMP_DIR=/var/opt/csw/openldap-slurp/tmp - -# -o one-shot mode -#SLURPD_ONE_SHOT=true - -# -n service-name. Defaults to "slurpd". -#SLURPD_SERVICE_NAME=slurpd Deleted: csw/mgar/pkg/openldap/branches/libs-2.3/files/patch-libtool-64bit.diff =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/files/patch-libtool-64bit.diff 2012-02-01 10:49:55 UTC (rev 16958) +++ csw/mgar/pkg/openldap/branches/libs-2.3/files/patch-libtool-64bit.diff 2012-02-01 12:06:58 UTC (rev 16959) @@ -1,15 +0,0 @@ -diff -Naur openldap-2.4.17.orig/build/ltmain.sh openldap-2.4.17.patched/build/ltmain.sh ---- openldap-2.4.17.orig/build/ltmain.sh 2009-01-22 01:00:41.000000000 +0100 -+++ openldap-2.4.17.patched/build/ltmain.sh 2009-09-11 14:26:06.136891084 +0200 -@@ -4745,7 +4745,10 @@ - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag";; -- esac -+ esac;; -+ *-*-solaris*) -+ LTCFLAGS="$compiler_flags" -+ ;; - esac - - # Now compile the dynamic symbol file. Deleted: csw/mgar/pkg/openldap/branches/libs-2.3/files/patch-oldap-2.4.16-ntlm.diff =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/files/patch-oldap-2.4.16-ntlm.diff 2012-02-01 10:49:55 UTC (rev 16958) +++ csw/mgar/pkg/openldap/branches/libs-2.3/files/patch-oldap-2.4.16-ntlm.diff 2012-02-01 12:06:58 UTC (rev 16959) @@ -1,188 +0,0 @@ ---- openldap-2.4.16/include/ldap.h.o 2009-05-26 13:22:52.647989500 -0500 -+++ openldap-2.4.16/include/ldap.h 2009-05-26 13:25:07.020609500 -0500 -@@ -2478,5 +2478,25 @@ - LDAPControl **ctrls, - LDAPDerefRes **drp )); - -+/* -+ * hacks for NTLM -+ */ -+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) -+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) -+LDAP_F( int ) -+ldap_ntlm_bind LDAP_P(( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp )); -+LDAP_F( int ) -+ldap_parse_ntlm_bind_result LDAP_P(( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge)); -+ - LDAP_END_DECL - #endif /* _LDAP_H */ ---- openldap-2.4.16/libraries/libldap/Makefile.in.o 2009-05-26 13:25:25.012445100 -0500 -+++ openldap-2.4.16/libraries/libldap/Makefile.in 2009-05-26 13:26:22.377603200 -0500 -@@ -20,7 +20,7 @@ - SRCS = bind.c open.c result.c error.c compare.c search.c \ - controls.c messages.c references.c extended.c cyrus.c \ - modify.c add.c modrdn.c delete.c abandon.c \ -- sasl.c gssapi.c sbind.c unbind.c cancel.c \ -+ sasl.c ntlm.c gssapi.c sbind.c unbind.c cancel.c \ - filter.c free.c sort.c passwd.c whoami.c \ - getdn.c getentry.c getattr.c getvalues.c addentry.c \ - request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \ -@@ -33,7 +33,7 @@ - OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ - controls.lo messages.lo references.lo extended.lo cyrus.lo \ - modify.lo add.lo modrdn.lo delete.lo abandon.lo \ -- sasl.lo gssapi.lo sbind.lo unbind.lo cancel.lo \ -+ sasl.lo ntlm.lo gssapi.lo sbind.lo unbind.lo cancel.lo \ - filter.lo free.lo sort.lo passwd.lo whoami.lo \ - getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \ - request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \ ---- /dev/null 2009-05-26 13:31:57.000000000 -0500 -+++ openldap-2.4.16/libraries/libldap/ntlm.c 2009-05-26 13:28:07.845816300 -0500 -@@ -0,0 +1,137 @@ -+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ -+/* -+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. -+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file -+ */ -+ -+/* Mostly copied from sasl.c */ -+ -+#include "portable.h" -+ -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#include "ldap-int.h" -+ -+int -+ldap_ntlm_bind( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp ) -+{ -+ BerElement *ber; -+ int rc; -+ ber_int_t id; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( msgidp != NULL ); -+ -+ if( msgidp == NULL ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ /* create a message to send */ -+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ assert( LBER_VALID( ber ) ); -+ -+ LDAP_NEXT_MSGID( ld, id ); -+ rc = ber_printf( ber, "{it{istON}" /*}*/, -+ id, LDAP_REQ_BIND, -+ ld->ld_version, dn, tag, -+ cred ); -+ -+ /* Put Server Controls */ -+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { -+ ld->ld_errno = LDAP_ENCODING_ERROR; -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ /* send the message */ -+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); -+ -+ if(*msgidp < 0) -+ return ld->ld_errno; -+ -+ return LDAP_SUCCESS; -+} -+ -+int -+ldap_parse_ntlm_bind_result( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge) -+{ -+ ber_int_t errcode; -+ ber_tag_t tag; -+ BerElement *ber; -+ ber_len_t len; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( res != NULL ); -+ -+ if ( ld == NULL || res == NULL ) { -+ return LDAP_PARAM_ERROR; -+ } -+ -+ if( res->lm_msgtype != LDAP_RES_BIND ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ if ( ld->ld_error ) { -+ LDAP_FREE( ld->ld_error ); -+ ld->ld_error = NULL; -+ } -+ if ( ld->ld_matched ) { -+ LDAP_FREE( ld->ld_matched ); -+ ld->ld_matched = NULL; -+ } -+ -+ /* parse results */ -+ -+ ber = ber_dup( res->lm_ber ); -+ -+ if( ber == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ tag = ber_scanf( ber, "{ioa" /*}*/, -+ &errcode, challenge, &ld->ld_error ); -+ ber_free( ber, 0 ); -+ -+ if( tag == LBER_ERROR ) { -+ ld->ld_errno = LDAP_DECODING_ERROR; -+ return ld->ld_errno; -+ } -+ -+ ld->ld_errno = errcode; -+ -+ return( ld->ld_errno ); -+} 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 Feb 1 13:09:59 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 01 Feb 2012 12:09:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[16960] csw/mgar/pkg/openldap/branches/libs-2.3/files/ install_legacy.sh Message-ID: Revision: 16960 http://gar.svn.sourceforge.net/gar/?rev=16960&view=rev Author: wahwah Date: 2012-02-01 12:09:59 +0000 (Wed, 01 Feb 2012) Log Message: ----------- openldap/branches/libs-2.3: Making the files/install_legacy.sh script executable Property Changed: ---------------- csw/mgar/pkg/openldap/branches/libs-2.3/files/install_legacy.sh Property changes on: csw/mgar/pkg/openldap/branches/libs-2.3/files/install_legacy.sh ___________________________________________________________________ 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 Wed Feb 1 13:14:09 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 01 Feb 2012 12:14:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[16961] csw/mgar/pkg/openldap/branches/libs-2.3/Makefile Message-ID: Revision: 16961 http://gar.svn.sourceforge.net/gar/?rev=16961&view=rev Author: wahwah Date: 2012-02-01 12:14:09 +0000 (Wed, 01 Feb 2012) Log Message: ----------- openldap/branches/libs-2.3: amd64-specific overrides Modified Paths: -------------- csw/mgar/pkg/openldap/branches/libs-2.3/Makefile Modified: csw/mgar/pkg/openldap/branches/libs-2.3/Makefile =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/Makefile 2012-02-01 12:09:59 UTC (rev 16960) +++ csw/mgar/pkg/openldap/branches/libs-2.3/Makefile 2012-02-01 12:14:09 UTC (rev 16961) @@ -34,22 +34,6 @@ PKGFILES_CSWliblber2-3-0 += $(call baseisadirs,$(libdir),liblber-2\.3\.so\.0(\.\d+)*) SPKG_DESC_CSWliblber2-3-0 += $(DESCRIPTION), liblber-2.3.so.0 -# Because of splitting of the CSWoldaprt package - it hasn't been done yet. -# It's a transient override, once 2.4 libs are released aond CSWoldaprt is -# split, these overrides can be removed. -CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/sparcv9/liblber-2.3.so.0.2.31|CSWliblber2-3-0|CSWoldaprt -CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/liblber-2.3.so.0|CSWliblber2-3-0|CSWoldaprt -CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/sparcv9/liblber-2.3.so.0|CSWliblber2-3-0|CSWoldaprt -CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/liblber-2.3.so.0.2.31|CSWliblber2-3-0|CSWoldaprt -CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/libldap_r-2.3.so.0|CSWlibldap-r2-3-0|CSWoldaprt -CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/sparcv9/libldap_r-2.3.so.0|CSWlibldap-r2-3-0|CSWoldaprt -CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/sparcv9/libldap_r-2.3.so.0.2.31|CSWlibldap-r2-3-0|CSWoldaprt -CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/libldap_r-2.3.so.0.2.31|CSWlibldap-r2-3-0|CSWoldaprt -CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/libldap-2.3.so.0.2.31|CSWlibldap2-3-0|CSWoldaprt -CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/sparcv9/libldap-2.3.so.0.2.31|CSWlibldap2-3-0|CSWoldaprt -CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/libldap-2.3.so.0|CSWlibldap2-3-0|CSWoldaprt -CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/sparcv9/libldap-2.3.so.0|CSWlibldap2-3-0|CSWoldaprt - PACKAGES += CSWlibldap2-3-0 CATALOGNAME_CSWlibldap2-3-0 = libldap2_3_0 PKGFILES_CSWlibldap2-3-0 += $(call baseisadirs,$(libdir),libldap-2\.3\.so\.0(\.\d+)*) @@ -73,6 +57,28 @@ # We aren't rebuilding this library, so we can't remove the linking. CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += deprecated-library|file=opt/csw/lib/libldap_r-2.3.so.0.2.31|lib=/opt/csw/lib/libnet.so +# Because of splitting of the CSWoldaprt package - it hasn't been done yet. +# It's a transient override, once 2.4 libs are released aond CSWoldaprt is +# split, these overrides can be removed. +CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/sparcv9/liblber-2.3.so.0.2.31|CSWliblber2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/liblber-2.3.so.0|CSWliblber2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/sparcv9/liblber-2.3.so.0|CSWliblber2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/liblber-2.3.so.0.2.31|CSWliblber2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/libldap_r-2.3.so.0|CSWlibldap-r2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/sparcv9/libldap_r-2.3.so.0|CSWlibldap-r2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/sparcv9/libldap_r-2.3.so.0.2.31|CSWlibldap-r2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/libldap_r-2.3.so.0.2.31|CSWlibldap-r2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/libldap-2.3.so.0.2.31|CSWlibldap2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/sparcv9/libldap-2.3.so.0.2.31|CSWlibldap2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/libldap-2.3.so.0|CSWlibldap2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/sparcv9/libldap-2.3.so.0|CSWlibldap2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/amd64/libldap-2.3.so.0|CSWlibldap2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += file-collision|/opt/csw/lib/amd64/libldap-2.3.so.0.2.31|CSWlibldap2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/amd64/libldap_r-2.3.so.0.2.31|CSWlibldap-r2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWlibldap-r2-3-0 += file-collision|/opt/csw/lib/amd64/libldap_r-2.3.so.0|CSWlibldap-r2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/amd64/liblber-2.3.so.0|CSWliblber2-3-0|CSWoldaprt +CHECKPKG_OVERRIDES_CSWliblber2-3-0 += file-collision|/opt/csw/lib/amd64/liblber-2.3.so.0.2.31|CSWliblber2-3-0|CSWoldaprt + include gar/category.mk post-merge-modulated: 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 Feb 1 13:25:19 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 01 Feb 2012 12:25:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[16962] csw/mgar/pkg/openldap24/ Message-ID: Revision: 16962 http://gar.svn.sourceforge.net/gar/?rev=16962&view=rev Author: dmichelsen Date: 2012-02-01 12:25:19 +0000 (Wed, 01 Feb 2012) Log Message: ----------- openldap: Remove unused tree as contents is in openldap/ Removed Paths: ------------- csw/mgar/pkg/openldap24/ 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 Feb 1 13:29:57 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 01 Feb 2012 12:29:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[16963] csw/mgar/pkg/collectd/trunk/ Message-ID: Revision: 16963 http://gar.svn.sourceforge.net/gar/?rev=16963&view=rev Author: dmichelsen Date: 2012-02-01 12:29:57 +0000 (Wed, 01 Feb 2012) Log Message: ----------- collectd/trunk: Remove svn:externals Property Changed: ---------------- csw/mgar/pkg/collectd/trunk/ Property changes on: csw/mgar/pkg/collectd/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 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 Feb 1 14:03:20 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 01 Feb 2012 13:03:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[16964] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 16964 http://gar.svn.sourceforge.net/gar/?rev=16964&view=rev Author: wahwah Date: 2012-02-01 13:03:19 +0000 (Wed, 01 Feb 2012) Log Message: ----------- pkgdb-web: Eliminate db reconnects. This cuts some of the request latency, at the risk of permanently losing the db connection. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-02-01 12:29:57 UTC (rev 16963) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-02-01 13:03:19 UTC (rev 16964) @@ -13,6 +13,8 @@ import datetime from sqlobject import sqlbuilder +connected_to_db = False + urls_html = ( r'/', 'index', r'/srv4/', 'Srv4List', @@ -48,9 +50,17 @@ 'lib/web/templates/') def ConnectToDatabase(): - configuration.SetUpSqlobjectConnection() + """Connect to the database only if necessary. + One problem with this approach might be that if the connection is lost, the + script will never try to reconnect (unless it's done by the ORM). + """ + global connected_to_db + if not connected_to_db: + configuration.SetUpSqlobjectConnection() + connected_to_db = True + class index(object): def GET(self): return render.index() 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 Feb 1 14:44:27 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 01 Feb 2012 13:44:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[16965] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 16965 http://gar.svn.sourceforge.net/gar/?rev=16965&view=rev Author: dmichelsen Date: 2012-02-01 13:44:27 +0000 (Wed, 01 Feb 2012) Log Message: ----------- mGAR v2: Use only 64 bit ISA in BUILD64_ONLY Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2012-02-01 13:03:19 UTC (rev 16964) +++ csw/mgar/gar/v2/gar.conf.mk 2012-02-01 13:44:27 UTC (rev 16965) @@ -503,7 +503,7 @@ # Just keeps the first appearance of each word remove-duplicates = $(if $1,$(firstword $1) $(call remove-duplicates,$(filter-out $(firstword $1),$1))) -REQUESTED_ISAS ?= $(strip $(call remove-duplicates,$(foreach A,$(GARCHLIST),$(ISA_DEFAULT_$A) $(if $(or $(BUILD64),$(BUILD64_LIBS_ONLY)),$(ISA_DEFAULT64_$A)) $(EXTRA_BUILD_ISAS_$A)) $(EXTRA_BUILD_ISAS))) +REQUESTED_ISAS ?= $(strip $(call remove-duplicates,$(foreach A,$(GARCHLIST),$(if $(BUILD64_ONLY),,$(ISA_DEFAULT_$A)) $(if $(or $(BUILD64),$(BUILD64_LIBS_ONLY)),$(ISA_DEFAULT64_$A)) $(EXTRA_BUILD_ISAS_$A)) $(EXTRA_BUILD_ISAS))) NEEDED_ISAS ?= $(strip $(filter $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))) \ $(filter-out $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS)))) BUILD_ISAS ?= $(filter $(ISALIST_$(KERNELISA)),$(NEEDED_ISAS)) 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 Feb 1 15:39:58 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 01 Feb 2012 14:39:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[16966] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ cswmysql5.tpl Message-ID: Revision: 16966 http://gar.svn.sourceforge.net/gar/?rev=16966&view=rev Author: wahwah Date: 2012-02-01 14:39:58 +0000 (Wed, 01 Feb 2012) Log Message: ----------- mysql5/branches/mysql-5.0.x: port changes from 5.5 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2012-02-01 13:44:27 UTC (rev 16965) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2012-02-01 14:39:58 UTC (rev 16966) @@ -79,12 +79,12 @@ start_it() { if test -r $MYSQLD_PID_FILE ; then if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then - echo "mysqld-${BASE_VERSION} (`cat $MYSQLD_PID_FILE`) seems to be running." + echo "${MYSQLD_PROG} (`cat $MYSQLD_PID_FILE`) seems to be running." return 1 fi fi - printf "%-60s" "Starting mysqld-${BASE_VERSION}: " + printf "%-60s" "Starting ${MYSQLD_PROG}: " # 2006-03-11 # This script no longer creates the default database. You may create the @@ -193,7 +193,7 @@ restart) stop_it - while pgrep `pgrep_opts` mysqld-${BASE_VERSION} > /dev/null + while pgrep `pgrep_opts` ${MYSQLD_PROG} > /dev/null do sleep 1 done 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 Feb 1 16:08:44 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 01 Feb 2012 15:08:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[16967] csw/mgar/pkg/openldap/branches/libs-2.3/Makefile Message-ID: Revision: 16967 http://gar.svn.sourceforge.net/gar/?rev=16967&view=rev Author: wahwah Date: 2012-02-01 15:08:43 +0000 (Wed, 01 Feb 2012) Log Message: ----------- openldap/branches/libs-2.3: remove a cyclic dependency Modified Paths: -------------- csw/mgar/pkg/openldap/branches/libs-2.3/Makefile Modified: csw/mgar/pkg/openldap/branches/libs-2.3/Makefile =================================================================== --- csw/mgar/pkg/openldap/branches/libs-2.3/Makefile 2012-02-01 14:39:58 UTC (rev 16966) +++ csw/mgar/pkg/openldap/branches/libs-2.3/Makefile 2012-02-01 15:08:43 UTC (rev 16967) @@ -40,8 +40,9 @@ SPKG_DESC_CSWlibldap2-3-0 += $(DESCRIPTION), libldap-2.3.so.0 RUNTIME_DEP_PKGS_CSWlibldap2-3-0 += CSWlibnet RUNTIME_DEP_PKGS_CSWlibldap2-3-0 += CSWlibssl0-9-8 -RUNTIME_DEP_PKGS_CSWlibldap2-3-0 += CSWoldaprt RUNTIME_DEP_PKGS_CSWlibldap2-3-0 += CSWlibsasl2-2 +# Because of a file collision at the moment. +CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += missing-dependency|CSWoldaprt # We aren't rebuilding this library, so we can't remove the linking. CHECKPKG_OVERRIDES_CSWlibldap2-3-0 += deprecated-library|file=opt/csw/lib/libldap-2.3.so.0.2.31|lib=/opt/csw/lib/libnet.so 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 Feb 1 19:13:42 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 01 Feb 2012 18:13:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[16968] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 16968 http://gar.svn.sourceforge.net/gar/?rev=16968&view=rev Author: bonivart Date: 2012-02-01 18:13:41 +0000 (Wed, 01 Feb 2012) Log Message: ----------- sendmail/trunk: add sendmail.mc, solaris9csw.m4 and a symlink Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/files/site.config.m4 Added Paths: ----------- csw/mgar/pkg/sendmail/trunk/files/0003-fix-Makefile-in-cf-dir.patch csw/mgar/pkg/sendmail/trunk/files/sendmail.mc csw/mgar/pkg/sendmail/trunk/files/solaris9csw.m4 Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2012-02-01 15:08:43 UTC (rev 16967) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2012-02-01 18:13:41 UTC (rev 16968) @@ -4,6 +4,10 @@ # - Build separate 9/10 packages? # - One big "mta" switch in alternatives between sendmail/postfix +# + add symlink from /etc/opt/csw/mail/cf to /opt/csw/share/mail/cf/cf +# + add ostype solaris9csw.m4 +# + add sendmail.mc in cf dir +# + /opt/csw/lib/sendmail 2555 root smmsp (Rafael Ostertag) # + remove statistics # + csw-sm-client.pid, csw-sendmail.pid # + smmsp:smmsp /var/opt/csw/spool/clientmqueue @@ -45,6 +49,7 @@ DISTFILES += README.CSW sendmail.schema site.config.m4 DISTFILES += oracle-sendmail-deactivate.sh oracle-sendmail-reactivate.sh DISTFILES += cswsendmail cswusergroup +DISTFILES += sendmail.mc solaris9csw.m4 LICENSE = LICENSE @@ -106,9 +111,10 @@ # Do not remove the static libs from libmilter MERGE_EXCLUDE_STATICLIBS = -# Patch away GNUism +# Patches PATCHFILES += 0001-add-libmilter-to-the-Makefile.patch PATCHFILES += 0002-no-gnuism.patch +PATCHFILES += 0003-fix-Makefile-in-cf-dir.patch MIGRATE_FILES_CSWsendmail = aliases helpfile local-host-names sendmail.cf MIGRATE_FILES_CSWsendmail += submit.cf trusted-users @@ -139,30 +145,30 @@ ALTERNATIVE_sendmail += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail # Look thru these to see if they are harmless, e.g. examples -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/README -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/share|root/opt/csw/share/mail/cf/README -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smrsh.8 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sendmail.8 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/ostype/freebsd6.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/ostype/freebsd5.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/ostype/powerux.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/ostype/dragonfly.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/feature/local_procmail.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/cf/mail.cs.mc -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/cf/mail.eecs.mc -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/cf/knecht.mc -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/qpage.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/fax.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/procmail.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/phquery.m4 CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/etc/opt/csw/movemail.conf -CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sendmail_contrib/mmuegel +CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/bounce-resender.pl CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/etrn.pl +CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/re-mqueue.pl +CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/movemail.pl CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/doublebounce.pl -CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/movemail.pl CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/expn.pl -CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/bounce-resender.pl -CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/re-mqueue.pl +CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sendmail_contrib/mmuegel +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/README +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/mailer/fax.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/mailer/qpage.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/mailer/procmail.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/mailer/phquery.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/ostype/dragonfly.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/ostype/freebsd5.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/ostype/freebsd6.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/ostype/powerux.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/cf/mail.cs.mc +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/cf/mail.eecs.mc +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/cf/knecht.mc +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/feature/local_procmail.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sendmail.8 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smrsh.8 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/share|root/opt/csw/share/sendmail/cf/README # The static libs from libmilter CHECKPKG_OVERRIDES_CSWlibmilter += discouraged-path-in-pkgmap|/opt/csw/lib/libsmutil.a @@ -224,7 +230,7 @@ ginstall -d $(DESTDIR)$(mandir)/man5 ginstall -d $(DESTDIR)$(mandir)/man8 ginstall -d $(DESTDIR)/var/opt/csw/spool/clientmqueue - ginstall -d $(DESTDIR)$(sharedstatedir)/mail + ginstall -d $(DESTDIR)$(sharedstatedir)/sendmail ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -d $(DESTDIR)$(sysconfdir)/mail ginstall -d $(DESTDIR)/opt/csw/include @@ -274,7 +280,9 @@ @# Install m4/cf macros find $(WORKSRC)/cf -type f -exec chmod 644 {} + - cp -r $(WORKSRC)/cf $(DESTDIR)$(sharedstatedir)/mail + cp -r $(WORKSRC)/cf $(DESTDIR)$(sharedstatedir)/sendmail + cp -p $(DOWNLOADDIR)/sendmail.mc $(DESTDIR)$(sharedstatedir)/sendmail/cf/cf/ + cp -p $(DOWNLOADDIR)/solaris9csw.m4 $(DESTDIR)$(sharedstatedir)/sendmail/cf/ostype/ @# Install startup script chmod +x $(DOWNLOADDIR)/cswsendmail && \ @@ -285,6 +293,7 @@ ginstall -m 644 $(DOWNLOADDIR)/$$file \ $(DESTDIR)$(sysconfdir)/mail/$$file; \ done ) + ln -s $(sharedstatedir)/sendmail/cf $(DESTDIR)$(sysconfdir)/mail/cf @# usergroup ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/ Added: csw/mgar/pkg/sendmail/trunk/files/0003-fix-Makefile-in-cf-dir.patch =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/0003-fix-Makefile-in-cf-dir.patch (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/0003-fix-Makefile-in-cf-dir.patch 2012-02-01 18:13:41 UTC (rev 16968) @@ -0,0 +1,34 @@ +From 921cb8295bd8d0e17a067f0782e20437e4b11d53 Mon Sep 17 00:00:00 2001 +From: Peter Bonivart +Date: Wed, 1 Feb 2012 17:40:08 +0100 +Subject: [PATCH] fix-Makefile-in-cf-dir + +--- + cf/cf/Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cf/cf/Makefile b/cf/cf/Makefile +index 2b0f4b3..6e25162 100644 +--- a/cf/cf/Makefile ++++ b/cf/cf/Makefile +@@ -16,7 +16,7 @@ CF= sendmail + # name of source for submit.cf (without extension) + SUBMIT= submit + # directory for .cf files +-MAILDIR=/etc/mail ++MAILDIR=/etc/opt/csw/mail + M4= m4 + CFDIR= .. + SED= sed +@@ -25,7 +25,7 @@ CHMOD= chmod + ROMODE= 444 + RM= rm -f + # use our own install program; should be really confINSTALL +-INSTALL=../../devtools/bin/install.sh ++INSTALL=/usr/sbin/install + # CF file ownership/permissions + CFOWN=root + CFGRP=bin +-- +1.7.8.3 + Added: csw/mgar/pkg/sendmail/trunk/files/sendmail.mc =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/sendmail.mc (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/sendmail.mc 2012-02-01 18:13:41 UTC (rev 16968) @@ -0,0 +1,19 @@ +VERSIONID(`$Id: sendmail.mc,v 1.0 2012/02/01 15:19:30 bonivart Exp $') +OSTYPE(`solaris9csw') +DOMAIN(`generic') +define(`SMART_HOST',`smarthost.mydomain.com') +define(`STATUS_FILE',`/etc/opt/csw/mail/statistics') +define(`MAIL_SETTINGS_DIR',`/etc/opt/csw/mail/') +FEATURE(`mailertable', `hash -o /etc/opt/csw/mail/mailertable') +FEATURE(`genericstable', `hash -o /etc/opt/csw/mail/genericstable') +FEATURE(`access_db', `hash -T /etc/opt/csw/mail/access') +FEATURE(`virtusertable', `hash /etc/opt/csw/mail/virtusertable') +MASQUERADE_AS(`mydomain.com') +MASQUERADE_DOMAIN(`mydomain.com') +FEATURE(`masquerade_entire_domain') +FEATURE(`masquerade_envelope') +define(`confSMTP_LOGIN_MSG', `$j server ready at $b') +define(`confTO_IDENT', `0') +define(`confBIND_OPTS', `WorkAroundBrokenAAAA') +MAILER(`local')dnl +MAILER(`smtp')dnl Modified: csw/mgar/pkg/sendmail/trunk/files/site.config.m4 =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2012-02-01 15:08:43 UTC (rev 16967) +++ csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2012-02-01 18:13:41 UTC (rev 16968) @@ -15,7 +15,7 @@ dnl define(`confMANROOT', `/opt/csw/share/man/cat') dnl define(`confMANROOTMAN', `/opt/csw/share/man/man') define(`confNO_STATISTICS_INSTALL',`True') -define(`confHFDIR', `/opt/csw/share/mail') +define(`confHFDIR', `/opt/csw/share/sendmail') define(`confMSP_QUEUE_DIR', `/var/opt/csw/spool/clientmqueue') dnl ### add OpenCSW lib and include directories APPENDDEF(`confLIBDIRS', `-L/opt/csw/lib -R/opt/csw/lib') Added: csw/mgar/pkg/sendmail/trunk/files/solaris9csw.m4 =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/solaris9csw.m4 (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/solaris9csw.m4 2012-02-01 18:13:41 UTC (rev 16968) @@ -0,0 +1,12 @@ +divert(-1) +# +# Copyright (c) 2012 OpenCSW. +# + +divert(0) +VERSIONID(`$Id: solaris9csw.m4,v 1.0 2012/02/01 15:04:08 bonivart Exp $') +divert(-1) + +define(`confEBINDIR', `/opt/csw/lib')dnl +define(`confPID_FILE', `/var/run/csw-sendmail.pid')dnl +define(`_NETINET6_')dnl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Feb 2 13:57:05 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 02 Feb 2012 12:57:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[16969] csw/mgar/pkg/squid/branches/squid3/Makefile Message-ID: Revision: 16969 http://gar.svn.sourceforge.net/gar/?rev=16969&view=rev Author: wilbury Date: 2012-02-02 12:57:05 +0000 (Thu, 02 Feb 2012) Log Message: ----------- squid/branches/squid3: Update to 3.1.18 Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid3/Makefile Modified: csw/mgar/pkg/squid/branches/squid3/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-01 18:13:41 UTC (rev 16968) +++ csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 12:57:05 UTC (rev 16969) @@ -4,7 +4,7 @@ NAME = squid VERSION = 3.1 CATEGORIES = server -RELEASE = 15 +RELEASE = 18 DISTVERSION = $(VERSION).$(RELEASE) DISTNAME = squid-$(DISTVERSION) RELVER = $(shell echo $(VERSION) |gsed 's/\(^[0-9]\).*\.[0-9]*/\1/') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Feb 2 13:57:57 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 02 Feb 2012 12:57:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[16970] csw/mgar/pkg/squid/branches/squid3/Makefile Message-ID: Revision: 16970 http://gar.svn.sourceforge.net/gar/?rev=16970&view=rev Author: wilbury Date: 2012-02-02 12:57:57 +0000 (Thu, 02 Feb 2012) Log Message: ----------- squid/branches/squid3: Update PACKAGING_PLATFORMS Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid3/Makefile Modified: csw/mgar/pkg/squid/branches/squid3/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 12:57:05 UTC (rev 16969) +++ csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 12:57:57 UTC (rev 16970) @@ -25,7 +25,7 @@ RUNTIME_DEP_PKGS += CSWlibltdl7 RUNTIME_DEP_PKGS += CSWsambacommon -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 INITSMF = /etc/opt/csw/init.d/csw$(NAME) PRESERVECONF = /etc/opt/csw/$(NAME)/cachemgr.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Feb 2 14:18:54 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 02 Feb 2012 13:18:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[16971] csw/mgar/pkg/squid/branches/squid3 Message-ID: Revision: 16971 http://gar.svn.sourceforge.net/gar/?rev=16971&view=rev Author: wilbury Date: 2012-02-02 13:18:54 +0000 (Thu, 02 Feb 2012) Log Message: ----------- squid/branches/squid3: Update runtime deps Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid3/Makefile csw/mgar/pkg/squid/branches/squid3/checksums Modified: csw/mgar/pkg/squid/branches/squid3/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 12:57:57 UTC (rev 16970) +++ csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 13:18:54 UTC (rev 16971) @@ -19,8 +19,8 @@ PACKAGES = CSWsquid RUNTIME_DEP_PKGS = CSWoldaprt -RUNTIME_DEP_PKGS += CSWosslrt -RUNTIME_DEP_PKGS += CSWsasl +RUNTIME_DEP_PKGS += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS += CSWlibsasl2-2 RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWlibltdl7 RUNTIME_DEP_PKGS += CSWsambacommon Modified: csw/mgar/pkg/squid/branches/squid3/checksums =================================================================== --- csw/mgar/pkg/squid/branches/squid3/checksums 2012-02-02 12:57:57 UTC (rev 16970) +++ csw/mgar/pkg/squid/branches/squid3/checksums 2012-02-02 13:18:54 UTC (rev 16971) @@ -1 +1 @@ -73d47363ddccc400bc0fb2f814c63a92 squid-3.1.15.tar.bz2 +b53f8fb6e22551c2a7376292df5b6ec7 squid-3.1.18.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Feb 2 14:51:41 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 02 Feb 2012 13:51:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[16972] csw/mgar/pkg/squid/branches/squid3/Makefile Message-ID: Revision: 16972 http://gar.svn.sourceforge.net/gar/?rev=16972&view=rev Author: wilbury Date: 2012-02-02 13:51:41 +0000 (Thu, 02 Feb 2012) Log Message: ----------- squid/branches/squid3: Update runtime deps. Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid3/Makefile Modified: csw/mgar/pkg/squid/branches/squid3/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 13:18:54 UTC (rev 16971) +++ csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 13:51:41 UTC (rev 16972) @@ -18,7 +18,8 @@ endef PACKAGES = CSWsquid -RUNTIME_DEP_PKGS = CSWoldaprt +RUNTIME_DEP_PKGS += CSWliblber2-4-2 +RUNTIME_DEP_PKGS += CSWlibldapr2-4-2 RUNTIME_DEP_PKGS += CSWlibssl0-9-8 RUNTIME_DEP_PKGS += CSWlibsasl2-2 RUNTIME_DEP_PKGS += CSWperl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Feb 2 14:56:10 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 02 Feb 2012 13:56:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[16973] csw/mgar/pkg/squid/branches/squid3/Makefile Message-ID: Revision: 16973 http://gar.svn.sourceforge.net/gar/?rev=16973&view=rev Author: wilbury Date: 2012-02-02 13:56:09 +0000 (Thu, 02 Feb 2012) Log Message: ----------- squid/branches/squid3: Update runtime deps Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid3/Makefile Modified: csw/mgar/pkg/squid/branches/squid3/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 13:51:41 UTC (rev 16972) +++ csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 13:56:09 UTC (rev 16973) @@ -19,7 +19,7 @@ PACKAGES = CSWsquid RUNTIME_DEP_PKGS += CSWliblber2-4-2 -RUNTIME_DEP_PKGS += CSWlibldapr2-4-2 +RUNTIME_DEP_PKGS += CSWlibldap2-4-2 RUNTIME_DEP_PKGS += CSWlibssl0-9-8 RUNTIME_DEP_PKGS += CSWlibsasl2-2 RUNTIME_DEP_PKGS += CSWperl 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 Feb 2 15:25:57 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 02 Feb 2012 14:25:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[16974] csw/mgar/pkg/ghostscript/trunk Message-ID: Revision: 16974 http://gar.svn.sourceforge.net/gar/?rev=16974&view=rev Author: wahwah Date: 2012-02-02 14:25:57 +0000 (Thu, 02 Feb 2012) Log Message: ----------- ghostscript/trunk: A reckless update to 9.04 Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile csw/mgar/pkg/ghostscript/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2012-02-02 13:56:09 UTC (rev 16973) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2012-02-02 14:25:57 UTC (rev 16974) @@ -1,9 +1,11 @@ +# $Id$ + NAME = ghostscript -VERSION = 8.70 +VERSION = 9.04 CATEGORIES = apps GARTYPE = v2 -DESCRIPTION = Ghostscript, a PostScript and PDF interpreter for previewing, conversion and printing +DESCRIPTION = PostScript and PDF interpreter define BLURB endef @@ -12,17 +14,46 @@ PACKAGES = CSWgs CATALOGNAME_CSWgs = ghostscript -SPKG_DESC_CSWgs = Ghostscript, a PostScript and PDF interpreter for previewing, conversion and printing +SPKG_DESC_CSWgs = PostScript and PDF interpreter -RUNTIME_DEP_PKGS_CSWgs += CSWfconfig CSWjpeg CSWlibcairo CSWgsfonts -RUNTIME_DEP_PKGS_CSWgs += CSWftype2 CSWggettextrt CSWglib2 CSWgnutls CSWgtk2 -RUNTIME_DEP_PKGS_CSWgs += CSWkrb5lib CSWlibatk CSWlibcups CSWpango CSWperl CSWzlib + +RUNTIME_DEP_PKGS_CSWgs += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWgs += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgs += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWgs += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWgs += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWgs += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWgs += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWgs += CSWlibcupsimage2 +RUNTIME_DEP_PKGS_CSWgs += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWgs += CSWlibk5crypto3 + +RUNTIME_DEP_PKGS_CSWgs += CSWfconfig +RUNTIME_DEP_PKGS_CSWgs += CSWgnutls +RUNTIME_DEP_PKGS_CSWgs += CSWgtk2 +RUNTIME_DEP_PKGS_CSWgs += CSWjpeg +RUNTIME_DEP_PKGS_CSWgs += CSWpango +RUNTIME_DEP_PKGS_CSWgs += CSWperl +RUNTIME_DEP_PKGS_CSWgs += CSWgsfonts RUNTIME_DEP_PKGS_CSWgs += CSWjbig2dec + +# I'm dubious about this one. Maybe unnecessary? +# RUNTIME_DEP_PKGS_CSWgs += CSWlibcairo + +CHECKPKG_OVERRIDES_CSWgs += surplus-dependency|CSWperl +# Fonts are definitely necessary. +CHECKPKG_OVERRIDES_CSWgs += surplus-dependency|CSWgsfonts + +# Only docs and man pages. +CHECKPKG_OVERRIDES_CSWgs += file-with-bad-content +# Historical reasons. +CHECKPKG_OVERRIDES_CSWgs += catalogname-does-not-match-pkgname|pkgname=CSWgs|catalogname=ghostscript|expected-catalogname=gs + # Pending release of libpaper #RUNTIME_DEP_PKGS_CSWgs += CSWlibpaper -CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsc -CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsx +# CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsc +# CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsx SPKG_SOURCEURL = http://www.ghostscript.com @@ -30,33 +61,34 @@ UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)= UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) -#PATCHFILES += 0001-Support-libjpeg7.patch +# PATCHFILES += 0001-Support-libjpeg7.patch PATCHFILES += 0002-Rearrange-compiler-flags.patch PATCHFILES += 0003-Change-gcc-flags-to-sun.patch -PATCHFILES += 0004-PLATFORM-is-used-by-GAR.patch +# PATCHFILES += 0004-PLATFORM-is-used-by-GAR.patch PATCHFILES += 0005-Fix-pathes-according-to-old-package.patch -PATCHFILES += 0006-Fix-dynamic-link-flag.patch +# PATCHFILES += 0006-Fix-dynamic-link-flag.patch +PATCHFILES += 0007-libidn-needs-L-opt-csw-lib.patch +PATCHFILES += 0008-Wrong-place-in-configure.patch # Not until libcupsimage.so libcups.so libkrb5.so libk5crypto.so # libcom_err.so libkrb5support.so are 64-bit -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +# EXTRA_INC = $(prefix)/X11/include +# EXTRA_LIB = $(prefix)/X11/lib +# EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib # We want to be linked with Xrender from $(prefix)/X11/lib not # $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4 -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +# EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro+mmx +# EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro+mmx CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic CONFIGURE_ARGS += --enable-cups CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts -CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib +# CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +# CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib # This fails due to ghostscript using PLATFORM for internal use which gets set # by GAR @@ -65,12 +97,12 @@ include gar/category.mk -BUILD_ARGS = std so -INSTALL_ARGS = install install-so +# BUILD_ARGS = std so +# INSTALL_ARGS = install install-so # Use CSW build packages instead of bundled stuff pre-configure-$(MODULATION): - @(echo "~~~ Removing bundled stuff ~~~") - @rm -rf $(WORKSRC)/jpeg - @rm -rf $(WORKSRC)/jbig2dec + @(echo "~~~ Removing bundled binaries ~~~") + rm -rf $(WORKSRC)/jpeg + rm -rf $(WORKSRC)/jbig2dec # @rm -rf $(WORKSRC)/jasper Modified: csw/mgar/pkg/ghostscript/trunk/checksums =================================================================== --- csw/mgar/pkg/ghostscript/trunk/checksums 2012-02-02 13:56:09 UTC (rev 16973) +++ csw/mgar/pkg/ghostscript/trunk/checksums 2012-02-02 14:25:57 UTC (rev 16974) @@ -1,7 +1 @@ -251419464651542627742f241455a935 0001-Support-libjpeg7.patch -5ebe8476ccc2170e4f2d620fe284f875 0002-Rearrange-compiler-flags.patch -5c142b23f91c2b2f48ba1f354e26346f 0003-Change-gcc-flags-to-sun.patch -c3b8108ba2a09ce9473e785cdea12662 0004-PLATFORM-is-used-by-GAR.patch -b4957c4667d2bf767c2a18707429477d 0005-Fix-pathes-according-to-old-package.patch -0ac8a3bc8cc018a695c892328f65f2cf 0006-Fix-dynamic-link-flag.patch -526366f8cb4fda0d3d293597cc5b984b ghostscript-8.70.tar.bz2 +9f6899e821ab6d78ab2c856f10fa3023 ghostscript-9.04.tar.bz2 Added: csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch 2012-02-02 14:25:57 UTC (rev 16974) @@ -0,0 +1,25 @@ +From ded20c08df2aee8ab5cc43cbe2287784c7f82162 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 2 Feb 2012 14:43:12 +0100 +Subject: [PATCH] libidn needs -L/opt/csw/lib + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 9ccd15d..ecd8317 100755 +--- a/configure ++++ b/configure +@@ -5116,7 +5116,7 @@ if test "${ac_cv_lib_idn_stringprep+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lidn $LIBS" ++LIBS="-L/opt/csw/lib -lidn $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-- +1.7.8.3 + Added: csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch 2012-02-02 14:25:57 UTC (rev 16974) @@ -0,0 +1,25 @@ +From f44f599849020abd2cbff12de84f36e4087316f6 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 2 Feb 2012 14:56:52 +0100 +Subject: [PATCH] Wrong place in configure + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index ecd8317..e98175e 100755 +--- a/configure ++++ b/configure +@@ -5170,7 +5170,7 @@ HAVE_LIBIDN='' + UTF8DEVS='' + if test x$with_libidn != xno; then + HAVE_LIBIDN=-DHAVE_LIBIDN +- LIBS="$LIBS -lidn" ++ LIBS="$LIBS -L/opt/csw/lib -lidn" + + if test x$found_iconv != xno; then + UTF8DEVS='$(PSD)utf8.dev' +-- +1.7.8.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Feb 2 15:35:08 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 02 Feb 2012 14:35:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[16975] csw/mgar/pkg/squid/branches/squid3/Makefile Message-ID: Revision: 16975 http://gar.svn.sourceforge.net/gar/?rev=16975&view=rev Author: wilbury Date: 2012-02-02 14:35:08 +0000 (Thu, 02 Feb 2012) Log Message: ----------- squid/branches/squid3: Update runtime deps Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid3/Makefile Modified: csw/mgar/pkg/squid/branches/squid3/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 14:25:57 UTC (rev 16974) +++ csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 14:35:08 UTC (rev 16975) @@ -24,7 +24,7 @@ RUNTIME_DEP_PKGS += CSWlibsasl2-2 RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWlibltdl7 -RUNTIME_DEP_PKGS += CSWsambacommon +RUNTIME_DEP_PKGS += CSWlibsmbclient0 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Feb 2 15:39:36 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 02 Feb 2012 14:39:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[16976] csw/mgar/pkg/squid/branches/squid3/Makefile Message-ID: Revision: 16976 http://gar.svn.sourceforge.net/gar/?rev=16976&view=rev Author: wilbury Date: 2012-02-02 14:39:36 +0000 (Thu, 02 Feb 2012) Log Message: ----------- squid/branches/squid3: Update runtime deps Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid3/Makefile Modified: csw/mgar/pkg/squid/branches/squid3/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 14:35:08 UTC (rev 16975) +++ csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 14:39:36 UTC (rev 16976) @@ -95,7 +95,7 @@ PROTOTYPE_GROUP_varuser = $(NAME) # Needed for CSWsambacommon: ntlm_auth and winbindd -CHECKPKG_OVERRIDES_CSWsquid += surplus-dependency|CSWsambacommon +CHECKPKG_OVERRIDES_CSWsquid += surplus-dependency|CSWlibsmbclient0 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 Feb 2 15:41:38 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Feb 2012 14:41:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16977] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 16977 http://gar.svn.sourceforge.net/gar/?rev=16977&view=rev Author: dmichelsen Date: 2012-02-02 14:41:37 +0000 (Thu, 02 Feb 2012) Log Message: ----------- mysql5/branches/mysql-5.0.x: Add alternative links for 64 bit fixing #4890 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-02-02 14:39:36 UTC (rev 16976) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-02-02 14:41:37 UTC (rev 16977) @@ -55,8 +55,10 @@ CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config-$(BASE_VERSION).1 ALTERNATIVES_CSWmysql-dev = mysql_dev ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs))-$(BASE_VERSION) $(ALTS_PRIO) +ALTERNATIVE_mysql_dev += $(bindir)/$(ISA_DEFAULT64)/$(firstword $(CSWmysql-dev_programs)) mysql_dev64 $(bindir)/$(ISA_DEFAULT64)/$(firstword $(CSWmysql-dev_programs))-$(BASE_VERSION) $(ALTS_PRIO) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ - $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) + $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION) \ + $(bindir)/$(ISA_DEFAULT64)/$(C)64 $C $(bindir)/$(ISA_DEFAULT64)/$C-$(BASE_VERSION)) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) @@ -246,13 +248,17 @@ ALTERNATIVES_CSW$(NAME) = mysql$(BASE_VERSION)_main ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) $(ALTS_PRIO) +ALTERNATIVE_mysql$(BASE_VERSION)_main += $(bindir)/$(ISA_DEFAULT64)/$(firstword $(EXECUTABLES)) mysql_main64 $(bindir)/$(ISA_DEFAULT64)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) $(ALTS_PRIO) ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\ - $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) + $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION) \ + $(bindir)/$(ISA_DEFAULT64)/$C $(C)64 $(bindir)/$(ISA_DEFAULT64)/$C-$(BASE_VERSION)) ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)_client ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(client_programs)) mysql_client $(bindir)/$(firstword $(client_programs)) $(ALTS_PRIO) +ALTERNATIVE_mysql$(BASE_VERSION)_client += $(bindir)/$(ISA_DEFAULT64)/$(firstword $(client_programs)) mysql_client64 $(bindir)/$(ISA_DEFAULT64)/$(firstword $(client_programs)) $(ALTS_PRIO) ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ - $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) + $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION) \ + $(bindir)/$(ISA_DEFAULT64)/$C $(C)64 $(bindir)/$(ISA_DEFAULT64)/$C-$(BASE_VERSION)) ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Feb 2 15:52:28 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 02 Feb 2012 14:52:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[16978] csw/mgar/pkg/squid/branches/squid3/Makefile Message-ID: Revision: 16978 http://gar.svn.sourceforge.net/gar/?rev=16978&view=rev Author: wilbury Date: 2012-02-02 14:52:28 +0000 (Thu, 02 Feb 2012) Log Message: ----------- squid/branches/squid3: Update runtime deps Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid3/Makefile Modified: csw/mgar/pkg/squid/branches/squid3/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 14:41:37 UTC (rev 16977) +++ csw/mgar/pkg/squid/branches/squid3/Makefile 2012-02-02 14:52:28 UTC (rev 16978) @@ -24,7 +24,6 @@ RUNTIME_DEP_PKGS += CSWlibsasl2-2 RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWlibltdl7 -RUNTIME_DEP_PKGS += CSWlibsmbclient0 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -94,8 +93,8 @@ PROTOTYPE_USER_varuser = $(NAME) PROTOTYPE_GROUP_varuser = $(NAME) -# Needed for CSWsambacommon: ntlm_auth and winbindd -CHECKPKG_OVERRIDES_CSWsquid += surplus-dependency|CSWlibsmbclient0 +# Needed for CSWlibsmbclient0: ntlm_auth and winbindd +# CHECKPKG_OVERRIDES_CSWsquid += surplus-dependency|CSWlibsmbclient0 include gar/category.mk 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 Feb 2 15:57:44 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 02 Feb 2012 14:57:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[16979] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 16979 http://gar.svn.sourceforge.net/gar/?rev=16979&view=rev Author: janholzh Date: 2012-02-02 14:57:43 +0000 (Thu, 02 Feb 2012) Log Message: ----------- sudo/trunk: update to 1.8.3p2 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-02-02 14:52:28 UTC (rev 16978) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-02-02 14:57:43 UTC (rev 16979) @@ -1,9 +1,8 @@ # $Id$ NAME = sudo -VERSION = 1.8.3p1 +VERSION = 1.8.3p2 CATEGORIES = utils -GARTYPE = v2 DESCRIPTION = Provides limited super user privileges define BLURB @@ -15,51 +14,58 @@ MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ DISTFILES = $(NAME)-$(VERSION).tar.gz -#PATCHFILES = install.diff +PATCHFILES = install.diff # We define upstream file regex so we can be notifed of new # upstream software release UFILES_REGEX = $(NAME)-((\d+(?:\.\d+)*)(p\d+)?).tar.gz - PACKAGES += CSWsudo PACKAGES += CSWsudo-common CATALOGNAME_CSWsudo = sudo SPKG_DESC_CSWsudo = $(DESCRIPTION) SPKG_SOURCEURL_CSWsudo = http://www.sudo.ws/sudo/ +RUNTIME_DEP_PKGS_CSWsudo += CSWsudo-common +RUNTIME_DEP_PKGS_CSWsudo += CSWggettextrt RUNTIME_DEP_PKGS_CSWsudo += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsudo += CSWsudo-common CATALOGNAME_CSWsudo-common = sudo_common SPKG_DESC_CSWsudo-common = Common files for sudo SPKG_SOURCEURL_CSWsudo-common = http://www.sudo.ws +RUNTIME_DEP_PKGS_CSWsudo-common = CSWggettextrt RUNTIME_DEP_PKGS_CSWsudo-common += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsudo-common += CSWlibz1 DISTFILES += CSWsudo-common.postinstall -LOGPATH = /var/opt/csw/log/sudo +# sysconfdir to be enabled later +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +LOGPATH = $(localstatedir)/log/sudo +TIMEPATH = $(localstatedir)/sudo +IOLOGPATH = $(LOGPATH)/io + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-pam CONFIGURE_ARGS += --with-logging=both CONFIGURE_ARGS += --with-ignore-dot CONFIGURE_ARGS += --with-env-editor +CONFIGURE_ARGS += --enable-zlib=/opt/csw/lib CONFIGURE_ARGS += --disable-path-info +CONFIGURE_ARGS += --with-logpath=$(LOGPATH)/sudolog +CONFIGURE_ARGS += --with-iologdir=$(IOLOGPATH) +CONFIGURE_ARGS += --with-timedir=$(TIMEPATH) +CONFIGURE_ARGS += --disable-root-sudo -# Not sure if this is good for timedir and iologdir -CONFIGURE_ARGS += --with-timedir=/var/opt/csw/sudo -CONFIGURE_ARGS += --with-iologdir=$(LOGPATH)/sudolog -CONFIGURE_ARGS += --with-logpath=$(LOGPATH)/sudolog ifneq ($(shell uname -r),5.8) CONFIGURE_ARGS += --with-project endif -# sysconfdir to be enabled later needs migrate conf stuff -#sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw +TEST_TARGET = check FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) PKGFILES_CSWsudo = $(bindir)/sudo\.minimal @@ -69,6 +75,17 @@ PROTOTYPE_FILES_sudo = $(bindir)/sudo(edit)?.minimal PROTOTYPE_PERMS_sudo = 4755 + +PROTOTYPE_FILES_timedir = $(TIMEPATH) # a normal Perl regexp. Watch out for links! +PROTOTYPE_PERMS_timedir = 0700 +PROTOTYPE_USER_timedir = root +PROTOTYPE_GROUP_timedir = bin + +PROTOTYPE_FILES_iodir = $(IOLOGPATH) # a normal Perl regexp. Watch out for links! +PROTOTYPE_PERMS_iodir = 0700 +PROTOTYPE_USER_iodir = root +PROTOTYPE_GROUP_iodir = bin + LICENSE = doc/LICENSE ALTERNATIVES_CSWsudo = minimal ALTERNATIVE_minimal = $(bindir)/sudo sudo $(bindir)/sudo.minimal 50 @@ -77,11 +94,25 @@ CHECKPKG_OVERRIDES_CSWsudo += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWsudo += surplus-dependency|CSWsudo-common + +CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/ChangeLog +CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/sample.sudoers +CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/UPGRADE +CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/TROUBLESHOOTING +CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudo.1m +CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/opt/csw/share/man/man4/sudoers.4 +CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/etc/opt/csw/sudoers.CSW +CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/share|root/opt/csw/share/doc/sudo/ChangeLog + +CHECKPKG_OVERRIDES_CSWsudo-common += soname-not-part-of-filename|soname=libsudo_noexec.so|filename=sudo_noexec.so + include gar/category.mk + post-install-modulated: @( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.minimal ) @( cd $(DESTDIR)$(bindir) ; gmv sudoedit sudoedit.minimal ) @( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW ) - install -m 755 -d $(DESTDIR)$(LOGPATH)/logs + @ginstall -d $(DESTDIR)$(IOLOGPATH) + @ginstall -d $(DESTDIR)$(TIMEPATH) @$(MAKECOOKIE) Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2012-02-02 14:52:28 UTC (rev 16978) +++ csw/mgar/pkg/sudo/trunk/checksums 2012-02-02 14:57:43 UTC (rev 16979) @@ -1 +1 @@ -7becc572fa97f94cf721a2ee8299c45b sudo-1.8.3p1.tar.gz +6d4282a1530c541f7900fa8dfcf2a882 sudo-1.8.3p2.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 Feb 2 17:26:57 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Feb 2012 16:26:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[16980] csw/mgar/pkg/samba/trunk Message-ID: Revision: 16980 http://gar.svn.sourceforge.net/gar/?rev=16980&view=rev Author: dmichelsen Date: 2012-02-02 16:26:57 +0000 (Thu, 02 Feb 2012) Log Message: ----------- samba/trunk: Update to 3.6.3 and splitted OpenLDAP libs 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 2012-02-02 14:57:43 UTC (rev 16979) +++ csw/mgar/pkg/samba/trunk/Makefile 2012-02-02 16:26:57 UTC (rev 16980) @@ -3,7 +3,7 @@ # - secrets.tdb is searched in /opt/csw/private/secrets.tdb instead of /etc/opt/csw/samba/private/secrets.tdb NAME = samba -VERSION = 3.6.1 +VERSION = 3.6.3 CATEGORIES = apps GARTYPE = v2 @@ -48,7 +48,8 @@ RUNTIME_DEP_PKGS_CSWsamba += CSWlibcups2 RUNTIME_DEP_PKGS_CSWsamba += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWsamba += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsamba += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba += CSWlibwbclient0 # Just docs override for now @@ -82,7 +83,8 @@ RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsamba-client += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibtdb1 OBSOLETED_BY_CSWsamba-client += CSWsambaclient @@ -113,7 +115,8 @@ RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWoldaprt +RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibtalloc2 @@ -155,7 +158,8 @@ RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWoldaprt +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibldap2-4-2 PACKAGES += CSWlibsmbsharemodes0 PKGFILES_CSWlibsmbsharemodes0 += $(call pkgfiles_lib,libsmbsharemodes.so.0) @@ -197,7 +201,8 @@ RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibcups2 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsamba-swat += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibtdb1 OBSOLETED_BY_CSWsamba-swat = CSWsambaswat @@ -269,7 +274,8 @@ RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibldap2-4-2 OBSOLETED_BY_CSWsamba-winbind += CSWsambawb CATALOGNAME_CSWsambawb = samba_wb_stub Modified: csw/mgar/pkg/samba/trunk/checksums =================================================================== --- csw/mgar/pkg/samba/trunk/checksums 2012-02-02 14:57:43 UTC (rev 16979) +++ csw/mgar/pkg/samba/trunk/checksums 2012-02-02 16:26:57 UTC (rev 16980) @@ -1 +1 @@ -5291717be0734e07dc07b6110e162e87 samba-3.6.1.tar.gz +98ac9db9f4b6ebfc3f013aa193ffb0d1 samba-3.6.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 Thu Feb 2 17:57:11 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Feb 2012 16:57:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[16981] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 16981 http://gar.svn.sourceforge.net/gar/?rev=16981&view=rev Author: dmichelsen Date: 2012-02-02 16:57:11 +0000 (Thu, 02 Feb 2012) Log Message: ----------- sudo: Unification with minimal and ldap as modulation, obsolete common, unfinished Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/sudo/trunk/files/ Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-02-02 16:26:57 UTC (rev 16980) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-02-02 16:57:11 UTC (rev 16981) @@ -1,9 +1,15 @@ # $Id$ +# +# Make sudo-ldap with AUXV-linkage of /opt/csw/libexec/sudoers.so, which is the file differing between minimal and ldap NAME = sudo VERSION = 1.8.3p2 CATEGORIES = utils +GARTYPE = v2 +EXTRA_MODULATORS = LDAP +MODULATIONS_LDAP = disabled enabled + DESCRIPTION = Provides limited super user privileges define BLURB Sudo (superuser do) allows a system administrator to give certain users (or @@ -13,106 +19,124 @@ endef MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES = install.diff +DISTFILES += $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new -# upstream software release -UFILES_REGEX = $(NAME)-((\d+(?:\.\d+)*)(p\d+)?).tar.gz +LICENSE = doc/LICENSE -PACKAGES += CSWsudo -PACKAGES += CSWsudo-common +VENDOR_URL = http://www.sudo.ws -CATALOGNAME_CSWsudo = sudo -SPKG_DESC_CSWsudo = $(DESCRIPTION) -SPKG_SOURCEURL_CSWsudo = http://www.sudo.ws/sudo/ -RUNTIME_DEP_PKGS_CSWsudo += CSWsudo-common -RUNTIME_DEP_PKGS_CSWsudo += CSWggettextrt -RUNTIME_DEP_PKGS_CSWsudo += CSWlibintl8 +LDAP_DOCFILES += $(docdir)/sudo/README.LDAP +LDAP_DOCFILES += $(docdir)/sudo/schema.ActiveDirectory +LDAP_DOCFILES += $(docdir)/sudo/schema.OpenLDAP +LDAP_DOCFILES += $(docdir)/sudo/schema.iPlanet +LDAP_DOCFILES += $(docdir)/sudo/sudoers2ldif -CATALOGNAME_CSWsudo-common = sudo_common -SPKG_DESC_CSWsudo-common = Common files for sudo -SPKG_SOURCEURL_CSWsudo-common = http://www.sudo.ws -RUNTIME_DEP_PKGS_CSWsudo-common = CSWggettextrt -RUNTIME_DEP_PKGS_CSWsudo-common += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsudo-common += CSWlibz1 +LDAP_MANFILES += $(mandir)/man4/sudoers.ldap.4 -DISTFILES += CSWsudo-common.postinstall +PACKAGES += CSWsudo +SPKG_DESC_CSWsudo = Provides limited super user privileges +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWsudo += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsudo += CSWlibz1 +# Logical dependency, no tracking via checkpkg +RUNTIME_DEP_PKGS_CSWsudo += CSWsudo-common +CHECKPKG_OVERRIDES_CSWsudo += surplus-dependency|CSWsudo-common +OBSOLETED_BY_CSWsudo = CSWsudo-common +# These are just docs +CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudoedit.1m +CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man4/sudoers.4 +CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/UPGRADE +CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/sample.sudoers +CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/TROUBLESHOOTING +CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/ChangeLog +CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/etc/opt/csw/sudoers.CSW +CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/share|root/opt/csw/share/doc/sudo/ChangeLog +CHECKPKG_OVERRIDES_CSWsudo += pkginfo-opencsw-repository-uncommitted +CHECKPKG_OVERRIDES_CSWsudo += soname-not-part-of-filename|soname=libsudo_noexec.so|filename=sudo_noexec.so -# sysconfdir to be enabled later -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw +PACKAGES += CSWsudo-ldap +SPKG_DESC_CSWsudo-ldap = LDAP bindings for SUDO +PKGFILES_CSWsudo-ldap = $(bindir)/sudo\.ldap +PKGFILES_CSWsudo-ldap += $(bindir)/sudoedit\.ldap +PKGFILES_CSWsudo-ldap += $(LDAP_MANFILES) +PKGFILES_CSWsudo-ldap += $(LDAP_DOCFILES) +RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWsudo +OBSOLETED_BY_CSWsudo-ldap += CSWsudoldap +CATALOGNAME_CSWsudoldap = sudo_ldap_stub LOGPATH = $(localstatedir)/log/sudo TIMEPATH = $(localstatedir)/sudo IOLOGPATH = $(LOGPATH)/io +REINPLACE_USRLOCAL += plugins/sudoers/sudoers + +EXTRA_INC += $(includedir)/sasl + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-pam CONFIGURE_ARGS += --with-logging=both CONFIGURE_ARGS += --with-ignore-dot CONFIGURE_ARGS += --with-env-editor -CONFIGURE_ARGS += --enable-zlib=/opt/csw/lib +CONFIGURE_ARGS += --enable-zlib=$(libdir) CONFIGURE_ARGS += --disable-path-info CONFIGURE_ARGS += --with-logpath=$(LOGPATH)/sudolog CONFIGURE_ARGS += --with-iologdir=$(IOLOGPATH) CONFIGURE_ARGS += --with-timedir=$(TIMEPATH) CONFIGURE_ARGS += --disable-root-sudo +CONFIGURE_ARGS += --with-project -ifneq ($(shell uname -r),5.8) - CONFIGURE_ARGS += --with-project -endif +CONFIGURE_ARGS_LDAP-enabled += --with-ldap=$(prefix) +CONFIGURE_ARGS_LDAP-enabled += --with-ldap-conf-file=$(sysconfdir)/ldap.conf +CONFIGURE_ARGS += $(CONFIGURE_ARGS_LDAP-$(LDAP)) -TEST_TARGET = check FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) -PKGFILES_CSWsudo = $(bindir)/sudo\.minimal -PKGFILES_CSWsudo += $(bindir)/sudoedit\.minimal - -PROTOTYPE_MODIFIERS = sudo -PROTOTYPE_FILES_sudo = $(bindir)/sudo(edit)?.minimal +PROTOTYPE_MODIFIERS += sudo +PROTOTYPE_FILES_sudo = $(bindir)/sudo.* PROTOTYPE_PERMS_sudo = 4755 - +PROTOTYPE_MODIFIERS += timedir PROTOTYPE_FILES_timedir = $(TIMEPATH) # a normal Perl regexp. Watch out for links! PROTOTYPE_PERMS_timedir = 0700 PROTOTYPE_USER_timedir = root PROTOTYPE_GROUP_timedir = bin +PROTOTYPE_MODIFIERS += iodir PROTOTYPE_FILES_iodir = $(IOLOGPATH) # a normal Perl regexp. Watch out for links! PROTOTYPE_PERMS_iodir = 0700 PROTOTYPE_USER_iodir = root PROTOTYPE_GROUP_iodir = bin -LICENSE = doc/LICENSE -ALTERNATIVES_CSWsudo = minimal -ALTERNATIVE_minimal = $(bindir)/sudo sudo $(bindir)/sudo.minimal 50 -ALTERNATIVE_minimal += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.minimal +# Just copy the stuff together, the ldap modulations contains some more file, +# apart from that they are the same. +MERGE_SCRIPTS_isa-default-ldap-disabled = copy-all +MERGE_SCRIPTS_isa-default-ldap-enabled = copy-all -CHECKPKG_OVERRIDES_CSWsudo += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWsudo += surplus-dependency|CSWsudo-common +EXTRA_PAX_ARGS_LDAP-disabled += -s ',($(bindir)/sudo.*),$$1.minimal,' +EXTRA_PAX_ARGS_LDAP-enabled += -s ',($(bindir)/sudo.*),$$1.ldap,' +EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_LDAP-$(LDAP)) +MIGRATE_FILES_CSWsudo += sudoers -CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/ChangeLog -CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/sample.sudoers -CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/UPGRADE -CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/TROUBLESHOOTING -CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudo.1m -CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/opt/csw/share/man/man4/sudoers.4 -CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/local|root/etc/opt/csw/sudoers.CSW -CHECKPKG_OVERRIDES_CSWsudo-common += file-with-bad-content|/usr/share|root/opt/csw/share/doc/sudo/ChangeLog +PRESERVECONF += $(sysconfdir)/sudoers -CHECKPKG_OVERRIDES_CSWsudo-common += soname-not-part-of-filename|soname=libsudo_noexec.so|filename=sudo_noexec.so +ALTERNATIVES_CSWsudo += minimal +ALTERNATIVE_minimal += $(bindir)/sudo sudo $(bindir)/sudo.minimal 50 +ALTERNATIVE_minimal += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.minimal +ALTERNATIVES_CSWsudo-ldap += ldap +ALTERNATIVE_ldap += $(bindir)/sudo sudo $(bindir)/sudo.ldap 60 +ALTERNATIVE_ldap += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.ldap + include gar/category.mk - post-install-modulated: - @( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.minimal ) - @( cd $(DESTDIR)$(bindir) ; gmv sudoedit sudoedit.minimal ) - @( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW ) + #@( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.minimal ) + #@( cd $(DESTDIR)$(bindir) ; gmv sudoedit sudoedit.minimal ) @ginstall -d $(DESTDIR)$(IOLOGPATH) @ginstall -d $(DESTDIR)$(TIMEPATH) @$(MAKECOOKIE) + 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 Feb 2 18:51:13 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 02 Feb 2012 17:51:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[16982] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 16982 http://gar.svn.sourceforge.net/gar/?rev=16982&view=rev Author: bonivart Date: 2012-02-02 17:51:13 +0000 (Thu, 02 Feb 2012) Log Message: ----------- pkgutil/trunk: update to 2.6.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 2012-02-02 16:57:11 UTC (rev 16981) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2012-02-02 17:51:13 UTC (rev 16982) @@ -1,5 +1,5 @@ NAME = pkgutil -VERSION = 2.6.1 +VERSION = 2.6.2b1 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2012-02-02 16:57:11 UTC (rev 16981) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2012-02-02 17:51:13 UTC (rev 16982) @@ -1 +1 @@ -bbde8296d2b679664e887f8621527c4f pkgutil-2.6.1.zip +0072d6d1bf2dacc1779366df7be9f9b3 pkgutil-2.6.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 Thu Feb 2 20:59:25 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 02 Feb 2012 19:59:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[16983] csw/mgar/pkg/sendmail/trunk/Makefile Message-ID: Revision: 16983 http://gar.svn.sourceforge.net/gar/?rev=16983&view=rev Author: bonivart Date: 2012-02-02 19:59:25 +0000 (Thu, 02 Feb 2012) Log Message: ----------- sendmail/trunk: update ldap deps Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2012-02-02 17:51:13 UTC (rev 16982) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2012-02-02 19:59:25 UTC (rev 16983) @@ -56,11 +56,12 @@ PACKAGES = CSWsendmail CATALOGNAME_CSWsendmail = sendmail SPKG_DESC_CSWsendmail = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWsendmail = CSWoldaprt RUNTIME_DEP_PKGS_CSWsendmail += CSWbdb48 RUNTIME_DEP_PKGS_CSWsendmail += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWsendmail += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWsendmail += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWsendmail += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsendmail += CSWlibldap2-4-2 PACKAGES += CSWlibmilter CATALOGNAME_CSWlibmilter = libmilter 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 Feb 3 05:02:49 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 03 Feb 2012 04:02:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[16984] csw/mgar/pkg/git/trunk Message-ID: Revision: 16984 http://gar.svn.sourceforge.net/gar/?rev=16984&view=rev Author: bdwalton Date: 2012-02-03 04:02:49 +0000 (Fri, 03 Feb 2012) Log Message: ----------- git/trunk: patch around a /bin/sh bug Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0008-t0300-credentials-Word-around-a-solaris-bin-sh-bug.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-02-02 19:59:25 UTC (rev 16983) +++ csw/mgar/pkg/git/trunk/Makefile 2012-02-03 04:02:49 UTC (rev 16984) @@ -112,6 +112,7 @@ PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch PATCHFILES += 0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch +PATCHFILES += 0008-t0300-credentials-Word-around-a-solaris-bin-sh-bug.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0008-t0300-credentials-Word-around-a-solaris-bin-sh-bug.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0008-t0300-credentials-Word-around-a-solaris-bin-sh-bug.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0008-t0300-credentials-Word-around-a-solaris-bin-sh-bug.patch 2012-02-03 04:02:49 UTC (rev 16984) @@ -0,0 +1,38 @@ +From a00449982532825591137ab59a25456e9b1d6d87 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 2 Feb 2012 15:40:36 +0100 +Subject: [PATCH] t0300-credentials: Word around a solaris /bin/sh bug + +Solaris' /bin/sh was making the IFS setting permanent instead of +temporary when using it to slurp in credentials in the generated +'dump' script of the 'setup helper scripts' test in t0300-credentials. + +To avoid this bug, capture the original IFS and force it to be reset +after its use is no longer required. For now, this is lighter weight +than altering which shell these scripts use as their shebang. + +Signed-off-by: Ben Walton +--- + t/t0300-credentials.sh | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh +index 885af8f..1be3fe2 100755 +--- a/t/t0300-credentials.sh ++++ b/t/t0300-credentials.sh +@@ -8,10 +8,12 @@ test_expect_success 'setup helper scripts' ' + cat >dump <<-\EOF && + whoami=`echo $0 | sed s/.*git-credential-//` + echo >&2 "$whoami: $*" ++ OIFS=$IFS + while IFS== read key value; do + echo >&2 "$whoami: $key=$value" + eval "$key=$value" + done ++ IFS=$OIFS + EOF + + cat >git-credential-useless <<-\EOF && +-- +1.7.8.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 Fri Feb 3 05:16:05 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 03 Feb 2012 04:16:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[16985] csw/mgar/pkg/php5/trunk Message-ID: Revision: 16985 http://gar.svn.sourceforge.net/gar/?rev=16985&view=rev Author: bdwalton Date: 2012-02-03 04:16:05 +0000 (Fri, 03 Feb 2012) Log Message: ----------- php5/trunk: version bump; remote exploit Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-02-03 04:02:49 UTC (rev 16984) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-02-03 04:16:05 UTC (rev 16985) @@ -1,5 +1,5 @@ NAME = php5 -VERSION = 5.3.9 +VERSION = 5.3.10 CATEGORIES = lang GARTYPE = v2 SF_PROJ = $(shell echo $(NAME) | sed -e 's/[0-9]//g') @@ -334,7 +334,7 @@ # Disable Tests (report submitted to PHP QA) -SKIPTEST = 1 +#SKIPTEST = 1 #ENABLE_CHECK = 0 TEST_TARGET = test Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2012-02-03 04:02:49 UTC (rev 16984) +++ csw/mgar/pkg/php5/trunk/checksums 2012-02-03 04:16:05 UTC (rev 16985) @@ -1 +1 @@ -dd3288ed5c08cd61ac5bf619cb357521 php-5.3.9.tar.bz2 +816259e5ca7d0a7e943e56a3bb32b17f php-5.3.10.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Fri Feb 3 13:43:14 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Fri, 3 Feb 2012 13:43:14 +0100 Subject: [csw-devel] [PATCH] mGAR v2: background some of the directory deleting Message-ID: <1328272994-24247-1-git-send-email-maciej@opencsw.org> Targets like 'spotless' can take time on large builds, let's background them and return the prompt. --- gar/v2/gar.mk | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gar/v2/gar.mk b/gar/v2/gar.mk index 37d28e7..243e47c 100644 --- a/gar/v2/gar.mk +++ b/gar/v2/gar.mk @@ -999,11 +999,15 @@ imageclean: @echo " ==> Removing $(COOKIEDIR)" @-rm -rf $(COOKIEDIR) @echo " ==> Removing $(WORKDIR)" - @-rm -rf $(WORKDIR) + @-rm -rf tmp-deleteme-workdir + @-mv $(WORKDIR) tmp-deleteme-workdir + @-rm -rf tmp-deleteme-workdir & spotless: imageclean @echo " ==> Removing $(DESTDIR)" - @-rm -rf work + @-rm -rf work-old + @-mv work work-old + @-rm -rf work-old & # Print package dependencies PKGDEP_LIST = $(filter-out $(BUILDDEPS),$(DEPEND_LIST)) -- 1.7.5.4 From bwalton at opencsw.org Fri Feb 3 14:45:59 2012 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 03 Feb 2012 08:45:59 -0500 Subject: [csw-devel] [PATCH] mGAR v2: background some of the directory deleting In-Reply-To: <1328272994-24247-1-git-send-email-maciej@opencsw.org> References: <1328272994-24247-1-git-send-email-maciej@opencsw.org> Message-ID: <1328276745-sup-1131@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizinski's message of Fri Feb 03 07:43:14 -0500 2012: > Targets like 'spotless' can take time on large builds, let's > background them and return the prompt. +1 Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bonivart at users.sourceforge.net Fri Feb 3 17:11:38 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 03 Feb 2012 16:11:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16986] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 16986 http://gar.svn.sourceforge.net/gar/?rev=16986&view=rev Author: bonivart Date: 2012-02-03 16:11:38 +0000 (Fri, 03 Feb 2012) Log Message: ----------- sendmail/trunk: fix perms on client queue and install used in Makefile (Rafi) Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/files/0003-fix-Makefile-in-cf-dir.patch Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2012-02-03 04:16:05 UTC (rev 16985) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2012-02-03 16:11:38 UTC (rev 16986) @@ -126,7 +126,7 @@ PROTOTYPE_FILES_1 = /var/opt/csw/spool/clientmqueue PROTOTYPE_USER_1 = smmsp PROTOTYPE_GROUP_1 = smmsp -PROTOTYPE_PERMS_1 = 0750 +PROTOTYPE_PERMS_1 = 0770 PROTOTYPE_FILES_2 = /opt/csw/lib/sendmail PROTOTYPE_USER_2 = root PROTOTYPE_GROUP_2 = smmsp Modified: csw/mgar/pkg/sendmail/trunk/files/0003-fix-Makefile-in-cf-dir.patch =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/0003-fix-Makefile-in-cf-dir.patch 2012-02-03 04:16:05 UTC (rev 16985) +++ csw/mgar/pkg/sendmail/trunk/files/0003-fix-Makefile-in-cf-dir.patch 2012-02-03 16:11:38 UTC (rev 16986) @@ -25,7 +25,7 @@ RM= rm -f # use our own install program; should be really confINSTALL -INSTALL=../../devtools/bin/install.sh -+INSTALL=/usr/sbin/install ++INSTALL=/usr/ucb/install # CF file ownership/permissions CFOWN=root CFGRP=bin 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 Feb 4 03:08:53 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 04 Feb 2012 02:08:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[16987] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 16987 http://gar.svn.sourceforge.net/gar/?rev=16987&view=rev Author: bdwalton Date: 2012-02-04 02:08:53 +0000 (Sat, 04 Feb 2012) Log Message: ----------- git/trunk: update deps (add intl, update ssl) Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-02-03 16:11:38 UTC (rev 16986) +++ csw/mgar/pkg/git/trunk/Makefile 2012-02-04 02:08:53 UTC (rev 16987) @@ -57,10 +57,12 @@ BUILD_DEP_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs BUILD_DEP_PKGS += CSWpython -RUNTIME_DEP_PKGS_CSWgit = CSWlibz1 CSWperl CSWrsync CSWlibcurl4 CSWosslrt +RUNTIME_DEP_PKGS_CSWgit = CSWlibz1 CSWperl CSWrsync CSWlibcurl4 RUNTIME_DEP_PKGS_CSWgit += CSWosshclient CSWlibiconv2 CSWlibexpat1 RUNTIME_DEP_PKGS_CSWgit += CSWbash CSWpmerror CSWpmtermreadkey RUNTIME_DEP_PKGS_CSWgit += CSWpmnetsmtpssl CSWless +RUNTIME_DEP_PKGS_CSWgit += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgit += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWgitk = CSWgit CSWtk 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 Feb 4 04:33:47 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 04 Feb 2012 03:33:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[16988] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 16988 http://gar.svn.sourceforge.net/gar/?rev=16988&view=rev Author: bdwalton Date: 2012-02-04 03:33:47 +0000 (Sat, 04 Feb 2012) Log Message: ----------- php5/trunk: update ldap package deps Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-02-04 02:08:53 UTC (rev 16987) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-02-04 03:33:47 UTC (rev 16988) @@ -162,7 +162,7 @@ PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* $(eval $(call php5_subpackage,imap,CSWimaprt CSWlibk5crypto3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWlibkrb5-3 CSWlibssl0-9-8 CSWlibz1)) $(eval $(call php5_subpackage,json,CSWlibz1)) -$(eval $(call php5_subpackage,ldap,CSWoldaprt CSWlibsasl2-2 CSWlibz1)) +$(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2 CSWlibsasl2-2 CSWlibz1)) $(eval $(call php5_subpackage,mbstring,CSWlibz1)) PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* $(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4 CSWlibltdl7 CSWlibz1)) 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 Feb 4 11:00:59 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 04 Feb 2012 10:00:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[16989] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 16989 http://gar.svn.sourceforge.net/gar/?rev=16989&view=rev Author: rthurner Date: 2012-02-04 10:00:58 +0000 (Sat, 04 Feb 2012) Log Message: ----------- mercurial: upgrade from hg-2.0.2 to hg-2.1 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 2012-02-04 03:33:47 UTC (rev 16988) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2012-02-04 10:00:58 UTC (rev 16989) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.0.2 +VERSION = 2.1 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2012-02-04 03:33:47 UTC (rev 16988) +++ csw/mgar/pkg/mercurial/trunk/checksums 2012-02-04 10:00:58 UTC (rev 16989) @@ -1 +1 @@ -226b45f19bebf73446fcd73ccb678c52 mercurial-2.0.2.tar.gz +d2ca44f8d0129ab50639143af99d9363 mercurial-2.1.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 Sat Feb 4 15:31:18 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 04 Feb 2012 14:31:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[16990] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 16990 http://gar.svn.sourceforge.net/gar/?rev=16990&view=rev Author: bonivart Date: 2012-02-04 14:31:17 +0000 (Sat, 04 Feb 2012) Log Message: ----------- pkgutil/trunk: 2.6.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 2012-02-04 10:00:58 UTC (rev 16989) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2012-02-04 14:31:17 UTC (rev 16990) @@ -1,5 +1,5 @@ NAME = pkgutil -VERSION = 2.6.2b1 +VERSION = 2.6.2 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2012-02-04 10:00:58 UTC (rev 16989) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2012-02-04 14:31:17 UTC (rev 16990) @@ -1 +1 @@ -0072d6d1bf2dacc1779366df7be9f9b3 pkgutil-2.6.2b1.zip +88a8ea5a5c00610fc7a350fe6548d34d pkgutil-2.6.2.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Feb 4 21:28:38 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 04 Feb 2012 20:28:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16991] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 16991 http://gar.svn.sourceforge.net/gar/?rev=16991&view=rev Author: chninkel Date: 2012-02-04 20:28:37 +0000 (Sat, 04 Feb 2012) Log Message: ----------- openssl: keep pentium_pro in the same location for 5.9 and 5.10 Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2012-02-04 14:31:17 UTC (rev 16990) +++ csw/mgar/pkg/openssl/trunk/Makefile 2012-02-04 20:28:37 UTC (rev 16991) @@ -152,9 +152,16 @@ # The list of instructions set for which we will # provide optimized libraries and binaries -EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 -EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9 +BUILD64 = 1 +BUILD64_LIBS_ONLY = 1 +EXTRA_BUILD_ISAS_i386 = pentium_pro +EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis +# we keep building the i386 even under 5.10 to keep the +# same prototype file for Solaris 9 and Solaris 10 packages +# (could switch to dynamic prototype to avoid that) +ISA_DEFAULT_i386-5.10 = i386 + # GAR wants and puts sparcv9 in lib/64 but openssl build system # isn't the standard autoconf/automake one so we disable this # relocation for now 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 Feb 5 00:05:58 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 04 Feb 2012 23:05:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[16992] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 16992 http://gar.svn.sourceforge.net/gar/?rev=16992&view=rev Author: dmichelsen Date: 2012-02-04 23:05:58 +0000 (Sat, 04 Feb 2012) Log Message: ----------- pcre/trunk: Update to 8.30, move to new libpcre16-0 library for 16 bit chars, introduce libpcre.so.1, drop pcre_rt Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pcre/trunk/files/0002-Remove-bashism.patch Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2012-02-04 20:28:37 UTC (rev 16991) +++ csw/mgar/pkg/pcre/trunk/Makefile 2012-02-04 23:05:58 UTC (rev 16992) @@ -1,5 +1,5 @@ NAME = pcre -VERSION = 8.21 +VERSION = 8.30 CATEGORIES = lib GARTYPE = v2 @@ -15,20 +15,26 @@ DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES = 0001-Allow-norunpath-for-libtool.patch +# Use patch until this is fixed: +# http://bugs.exim.org/show_bug.cgi?id=1206 +PATCHFILES += 0002-Remove-bashism.patch + VENDOR_URL = http://www.pcre.org PACKAGES = CSWpcre CATALOGNAME_CSWpcre = pcre SPKG_DESC_CSWpcre = Perl-compatible regular expression tools RUNTIME_DEP_PKGS_CSWpcre += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre16-0 RUNTIME_DEP_PKGS_CSWpcre += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWpcre += CSWlibz1 RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcreposix0 PACKAGES += CSWlibpcre-dev -SPKG_DESC_CSWlibpcre-dev = Development files for libpcre.so.0, libpcrecpp.so.0 and libpcreposix.so.0 -RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcre0 +SPKG_DESC_CSWlibpcre-dev = Development files for libpcre.so.1, libpcre16.so.0, libpcrecpp.so.0 and libpcreposix.so.0 +RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcre16-0 RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcreposix0 RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcrecpp0 PKGFILES_CSWlibpcre-dev += $(PKGFILES_DEVEL) @@ -42,26 +48,23 @@ CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcresample.html CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcredemo.html -PACKAGES += CSWlibpcre0 -CATALOGNAME_CSWlibpcre0 = libpcre0 -SPKG_DESC_CSWlibpcre0 = Perl-compatible regular expression tools, libpcre.so.0 -PKGFILES_CSWlibpcre0 = $(call pkgfiles_lib,libpcre.so.0) -OBSOLETED_BY_CSWlibpcre0 += CSWpcrert -CATALOGNAME_CSWpcrert = pcre_rt_stub +PACKAGES += CSWlibpcre1 +SPKG_DESC_CSWlibpcre1 = Perl-compatible regular expression tools, libpcre.so.1 +PKGFILES_CSWlibpcre1 = $(call pkgfiles_lib,libpcre.so.1) +PACKAGES += CSWlibpcre16-0 +SPKG_DESC_CSWlibpcre16-0 = Perl-compatible regular expression tools, libpcre16.so.0 +PKGFILES_CSWlibpcre16-0 = $(call pkgfiles_lib,libpcre16.so.0) + PACKAGES += CSWlibpcrecpp0 -CATALOGNAME_CSWlibpcrecpp0 = libpcrecpp0 SPKG_DESC_CSWlibpcrecpp0 += Perl-compatible regular expression tools, libpcrecpp.so.0 PKGFILES_CSWlibpcrecpp0 += $(call pkgfiles_lib,libpcrecpp.so.0) RUNTIME_DEP_PKGS_CSWlibpcrecpp0 += CSWlibpcre0 -OBSOLETED_BY_CSWlibpcrecpp0 += CSWpcrert PACKAGES += CSWlibpcreposix0 -CATALOGNAME_CSWlibpcreposix0 = libpcreposix0 SPKG_DESC_CSWlibpcreposix0 += Perl-compatible regular expression tools, libpcreposix.so.0 PKGFILES_CSWlibpcreposix0 += $(call pkgfiles_lib,libpcreposix.so.0) RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWlibpcre0 -OBSOLETED_BY_CSWlibpcreposix0 += CSWpcrert REINPLACE_USRLOCAL += doc/pcre-config.1 REINPLACE_USRLOCAL += doc/pcresample.3 @@ -75,12 +78,22 @@ CONFIGURE_ARGS += --enable-pcregrep-libz CONFIGURE_ARGS += --enable-pcregrep-libbz2 CONFIGURE_ARGS += --enable-pcretest-libreadline +CONFIGURE_ARGS += --enable-pcre16 # No JIT for Sparc, may try for x86 at some later time #CONFIGURE_ARGS += --enable-jit +# We need more than the default 8 MB of stack space +TEST_SCRIPTS = custom + include gar/category.mk # The testcases need 'diff -u' which Solaris 8 diff does not have, # but we need Solaris strip, otherwise pcregrep is broken and 200m in size... PATH := /usr/ccs/bin:/opt/csw/gnu:$(PATH) + +test-custom: + @echo " ==> Running make $(TEST_TARGET) in $*" + cd $(WORKSRC) && /usr/bin/ulimit -s 16384 && /usr/bin/env -i $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) + @$(MAKECOOKIE) + Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2012-02-04 20:28:37 UTC (rev 16991) +++ csw/mgar/pkg/pcre/trunk/checksums 2012-02-04 23:05:58 UTC (rev 16992) @@ -1 +1 @@ -0a7b592bea64b7aa7f4011fc7171a730 pcre-8.21.tar.bz2 +98e8928cccc945d04279581e778fbdff pcre-8.30.tar.bz2 Added: csw/mgar/pkg/pcre/trunk/files/0002-Remove-bashism.patch =================================================================== --- csw/mgar/pkg/pcre/trunk/files/0002-Remove-bashism.patch (rev 0) +++ csw/mgar/pkg/pcre/trunk/files/0002-Remove-bashism.patch 2012-02-04 23:05:58 UTC (rev 16992) @@ -0,0 +1,25 @@ +From 3fea8bd4c59e4efa53cc9cf842c8836dacdcba89 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 4 Feb 2012 23:19:53 +0100 +Subject: [PATCH] Remove bashism + +--- + RunTest | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/RunTest b/RunTest +index aae292e..0d542f9 100755 +--- a/RunTest ++++ b/RunTest +@@ -135,7 +135,7 @@ $sim ./pcretest -C pcre8 >/dev/null + support8=$? + $sim ./pcretest -C pcre16 >/dev/null + support16=$? +-if [ $(( $support8 + $support16 )) -eq 2 ] ; then ++if [ `expr $support8 + $support16` -eq 2 ] ; then + test8= + test16=-16 + if [ "$arg8" = yes -a "$arg16" != yes ] ; then +-- +1.7.8.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 Sun Feb 5 01:53:40 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 05 Feb 2012 00:53:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[16993] csw/mgar/gar/v2/lib/python/models.py Message-ID: Revision: 16993 http://gar.svn.sourceforge.net/gar/?rev=16993&view=rev Author: wahwah Date: 2012-02-05 00:53:40 +0000 (Sun, 05 Feb 2012) Log Message: ----------- checkpkg: Add performance related comments When querying for catalog metadata, the whole catalog gets unpickled, which is woefully slow. These fields should be stored directly in tables to speed up operations. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2012-02-04 23:05:58 UTC (rev 16992) +++ csw/mgar/gar/v2/lib/python/models.py 2012-02-05 00:53:40 UTC (rev 16993) @@ -260,6 +260,13 @@ def GetRestRepr(self): mimetype = "application/x-vnd.opencsw.pkg;type=srv4-detail" + # Slow subqueries, could be solved by caching in the db schema: + # - self.pkginst.pkgname + # - self.maintainer.full_name + # - self.maintainer_email + # - self.maintainer_id + # - GetVendorUrl unpickles the object (very slow) + # - GetSvnUrl unpickles the object (very slow) data = { 'arch': self.arch.name, 'basename': self.basename, 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 Feb 5 01:58:09 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 05 Feb 2012 00:58:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[16994] csw/mgar/gar/v2/lib/python/pkgmap.py Message-ID: Revision: 16994 http://gar.svn.sourceforge.net/gar/?rev=16994&view=rev Author: wahwah Date: 2012-02-05 00:58:08 +0000 (Sun, 05 Feb 2012) Log Message: ----------- checkpkg: Add a safeguard against a broken link If there's an "s" or an "l" pkgmap entry without the "=" sign, indexing of the package would break. Adding a safeguard against it. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgmap.py Modified: csw/mgar/gar/v2/lib/python/pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgmap.py 2012-02-05 00:53:40 UTC (rev 16993) +++ csw/mgar/gar/v2/lib/python/pkgmap.py 2012-02-05 00:58:08 UTC (rev 16994) @@ -86,11 +86,15 @@ prototype_class = fields[2] elif line_type in ('s', 'l'): # soft- and hardlinks - link_from, link_to = fields[3].split("=") - installed_path = link_from - line_to_add = "%s --> %s" % (link_from, link_to) - target = struct_util.ResolveSymlink(link_from, link_to) - prototype_class = fields[2] + # This breaks if PAX is broken. A rare case, but can happen. + if "=" not in fields[3]: + line_to_add = "broken link entry: %s" % fields[3] + else: + link_from, link_to = fields[3].split("=") + installed_path = link_from + line_to_add = "%s --> %s" % (link_from, link_to) + target = struct_util.ResolveSymlink(link_from, link_to) + prototype_class = fields[2] if line_to_add: self.paths.add(line_to_add) entry = { 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 Feb 5 01:58:42 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 05 Feb 2012 00:58:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[16995] csw/mgar/gar/v2/lib Message-ID: Revision: 16995 http://gar.svn.sourceforge.net/gar/?rev=16995&view=rev Author: wahwah Date: 2012-02-05 00:58:42 +0000 (Sun, 05 Feb 2012) Log Message: ----------- pkgdb-web: Sanitize pkg stats at earlier stage Don't sanitize just before pickling, but before returning the data structure. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2012-02-05 00:58:08 UTC (rev 16994) +++ csw/mgar/gar/v2/lib/python/models.py 2012-02-05 00:58:42 UTC (rev 16995) @@ -222,9 +222,34 @@ u"Package: %s-%s, %s" % (self.catalogname, self.version_string, self.arch.name)) + def GetUnicodeOrNone(self, s): + """Tries to decode UTF-8""" + if s is None: + return None + if type(s) != unicode: + try: + s = unicode(s, 'utf-8') + except UnicodeDecodeError, e: + s = s.decode("utf-8", "ignore") + s = s + u" (bad unicode detected)" + return s + def GetStatsStruct(self): if not self._cached_pkgstats: self._cached_pkgstats = cPickle.loads(str(self.data_obj.pickle)) + # There was a problem with bad utf-8 in the VENDOR field. + # This is a workaround. + if "VENDOR" in self._cached_pkgstats["pkginfo"]: + self._cached_pkgstats["pkginfo"]["VENDOR"] = self.GetUnicodeOrNone( + self._cached_pkgstats["pkginfo"]["VENDOR"]) + # The end of the hack. + # + # One more workaround + for d in self._cached_pkgstats["pkgmap"]: + if "path" in d: + d["path"] = self.GetUnicodeOrNone(d["path"]) + d["line"] = self.GetUnicodeOrNone(d["line"]) + # End of the workaround return self._cached_pkgstats def _GetBuildSource(self): Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-02-05 00:58:08 UTC (rev 16994) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-02-05 00:58:42 UTC (rev 16995) @@ -49,6 +49,19 @@ render = web.template.render('/home/maciej/src/opencsw-git/gar/v2/' 'lib/web/templates/') + +class PkgStatsEncoder(json.JSONEncoder): + """Maps frozensets to lists.""" + def default(self, obj): + if isinstance(obj, frozenset): + # Python 2.6 doesn't have the dictionary comprehension + # return {x: None for x in obj} + return list(obj) + if isinstance(obj, datetime.datetime): + return obj.isoformat() + return json.JSONEncoder.default(self, obj) + + def ConnectToDatabase(): """Connect to the database only if necessary. @@ -328,46 +341,12 @@ class RestSrv4FullStats(object): - def GetUnicodeOrNone(self, s): - """Tries to decode UTF-8""" - if s is None: - return None - if type(s) != unicode: - try: - s = unicode(s, 'utf-8') - except UnicodeDecodeError, e: - s = s.decode("utf-8", "ignore") - s = s + u" (bad unicode detected)" - return s - def GET(self, md5_sum): ConnectToDatabase() - class PkgStatsEncoder(json.JSONEncoder): - def default(self, obj): - if isinstance(obj, frozenset): - # Python 2.6 doesn't have the dictionary comprehension - # return {x: None for x in obj} - return list(obj) - if isinstance(obj, datetime.datetime): - return obj.isoformat() - return json.JSONEncoder.default(self, obj) try: pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() data_structure = pkg.GetStatsStruct() web.header('Content-type', 'application/x-vnd.opencsw.pkg;type=pkg-stats') - # There was a problem with bad utf-8 in the VENDOR field. - # This is a workaround. - if "VENDOR" in data_structure["pkginfo"]: - data_structure["pkginfo"]["VENDOR"] = self.GetUnicodeOrNone( - data_structure["pkginfo"]["VENDOR"]) - # The end of the hack. - # - # One more workaround - for d in data_structure["pkgmap"]: - if "path" in d: - d["path"] = self.GetUnicodeOrNone(d["path"]) - d["line"] = self.GetUnicodeOrNone(d["line"]) - # End of the workaround return json.dumps(data_structure, cls=PkgStatsEncoder) except sqlobject.main.SQLObjectNotFound, e: raise web.notfound() 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 Feb 5 01:59:16 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 05 Feb 2012 00:59:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[16996] csw/mgar/gar/v2/lib Message-ID: Revision: 16996 http://gar.svn.sourceforge.net/gar/?rev=16996&view=rev Author: wahwah Date: 2012-02-05 00:59:16 +0000 (Sun, 05 Feb 2012) Log Message: ----------- pkgdb-web: Quick catalogs Allow to pass ?quick=true to get a catalog with less data, and get it quicker. Testing shows times ~20s -- ~60s. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2012-02-05 00:58:42 UTC (rev 16995) +++ csw/mgar/gar/v2/lib/python/models.py 2012-02-05 00:59:16 UTC (rev 16996) @@ -293,28 +293,29 @@ # - GetVendorUrl unpickles the object (very slow) # - GetSvnUrl unpickles the object (very slow) data = { - 'arch': self.arch.name, 'basename': self.basename, # For compatibility with the catalog parser from catalog.py 'file_basename': self.basename, 'catalogname': self.catalogname, - 'filename_arch': self.filename_arch.name, - 'maintainer_email': self.maintainer.email, - 'maintainer_full_name': self.maintainer.full_name, - 'maintainer_id': self.maintainer.id, 'md5_sum': self.md5_sum, 'mtime': unicode(self.mtime), - 'osrel': self.os_rel.short_name, - 'pkgname': self.pkginst.pkgname, 'rev': self.rev, 'size': self.size, 'version_string': self.version_string, # For compatibility with the catalog parser from catalog.py 'version': self.version_string, - # 'in_catalogs': unicode([unicode(x) for x in self.in_catalogs]), - 'vendor_url': self.GetVendorUrl(), - 'repository_url': self.GetSvnUrl(), } + if not quick: + data['arch'] = self.arch.name + data['filename_arch'] = self.filename_arch.name + data['maintainer_email'] = self.maintainer.email + data['maintainer_full_name'] = self.maintainer.full_name + data['maintainer_id'] = self.maintainer.id + data['osrel'] = self.os_rel.short_name + data['pkgname'] = self.pkginst.pkgname + data['vendor_url'] = self.GetVendorUrl() + data['repository_url'] = self.GetSvnUrl() + # 'in_catalogs': unicode([unicode(x) for x in self.in_catalogs]), return mimetype, data Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-02-05 00:58:42 UTC (rev 16995) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-02-05 00:59:16 UTC (rev 16996) @@ -277,10 +277,12 @@ sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad( osrel_name, arch_name, catrel_name) pkgs = list(models.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel)) + user_data = web.input(quick='') + quick = (user_data.quick == "true") if not len(pkgs): raise web.notfound() web.header('Content-type', 'application/x-vnd.opencsw.pkg;type=srv4-list') - pkgs_data = [x.GetRestRepr()[1] for x in pkgs] + pkgs_data = [p.GetRestRepr(quick)[1] for p in pkgs] return json.dumps(pkgs_data) 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 Feb 5 14:06:21 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 05 Feb 2012 13:06:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[16997] csw/mgar/pkg/lang-python Message-ID: Revision: 16997 http://gar.svn.sourceforge.net/gar/?rev=16997&view=rev Author: dmichelsen Date: 2012-02-05 13:06:21 +0000 (Sun, 05 Feb 2012) Log Message: ----------- lang-python/python-markdown: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile csw/mgar/pkg/lang-python/python-markdown/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/python-markdown/ Modified: csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygments/trunk/Makefile 2012-02-01 18:13:41 UTC (rev 16968) +++ csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile 2012-02-05 13:06:21 UTC (rev 16997) @@ -2,16 +2,22 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = Pygments -VERSION = 1.4 +NAME = Markdown +VERSION = 2.1.1 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Syntax highlighting for Python -PACKAGES = CSWpy-pygments -ARCHALL_CSWpy-pygments = 1 + +DESCRIPTION = Python implementation of Markdown define BLURB endef + MASTER_SITES = $(PYPI_MIRROR) DISTFILES = $(DISTNAME).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) + +PACKAGES = CSWpy-markdown +ARCHALL_CSWpy-markdown = 1 + +# There is no testsuite +TEST_SCRIPTS = + include gar/category.mk Modified: csw/mgar/pkg/lang-python/python-markdown/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pygments/trunk/checksums 2012-02-01 18:13:41 UTC (rev 16968) +++ csw/mgar/pkg/lang-python/python-markdown/trunk/checksums 2012-02-05 13:06:21 UTC (rev 16997) @@ -1 +1 @@ -d77ac8c93a7fb27545f2522abe9cc462 Pygments-1.4.tar.gz +3f82d30c488e4b88b8f86eb1c9ad0da7 Markdown-2.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 Sun Feb 5 14:07:10 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 05 Feb 2012 13:07:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[16998] csw/mgar/pkg/lang-python Message-ID: Revision: 16998 http://gar.svn.sourceforge.net/gar/?rev=16998&view=rev Author: dmichelsen Date: 2012-02-05 13:07:10 +0000 (Sun, 05 Feb 2012) Log Message: ----------- lang-python/html5lib: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/html5lib/trunk/Makefile csw/mgar/pkg/lang-python/html5lib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/html5lib/ Modified: csw/mgar/pkg/lang-python/html5lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-graph/trunk/Makefile 2012-02-01 18:13:41 UTC (rev 16968) +++ csw/mgar/pkg/lang-python/html5lib/trunk/Makefile 2012-02-05 13:07:10 UTC (rev 16998) @@ -2,24 +2,23 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = python-graph -VERSION = 1.8.0 +NAME = html5lib +VERSION = 0.90 CATEGORIES = python GARTYPE = v2 + DESCRIPTION = A library for working with graphs in Python define BLURB endef -SPKG_SOURCEURL = http://pypi.python.org/pypi/python-graph + MASTER_SITES = $(GOOGLE_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 -PACKAGES = CSWpy-graph -CATALOGNAME_CSWpy-graph = py_graph -BUILD_SCRIPTS = -TEST_SCRIPTS = -BUILD_SCRIPTS ?= $(WORKSRC)/core/setup.py -INSTALL_SCRIPTS ?= $(WORKSRC)/core/setup.py -LICENSE = COPYING +DISTFILES = $(NAME)-$(VERSION).zip -ARCHALL_CSWpy-graph = 1 +VENDOR_URL = http://code.google.com/p/html5lib/ +LICENSE = README + +PACKAGES += CSWpy-html5lib +ARCHALL_CSWpy-html5lib = 1 + include gar/category.mk Modified: csw/mgar/pkg/lang-python/html5lib/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-graph/trunk/checksums 2012-02-01 18:13:41 UTC (rev 16968) +++ csw/mgar/pkg/lang-python/html5lib/trunk/checksums 2012-02-05 13:07:10 UTC (rev 16998) @@ -1 +1 @@ -8c5fbf993244c39ce42506425b5f30ac python-graph-1.8.0.tar.bz2 +691e6b9ebe15b333a28280974b2ce432 html5lib-0.90.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 Sun Feb 5 14:26:21 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 05 Feb 2012 13:26:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[16999] csw/mgar/pkg/lang-python Message-ID: Revision: 16999 http://gar.svn.sourceforge.net/gar/?rev=16999&view=rev Author: dmichelsen Date: 2012-02-05 13:26:21 +0000 (Sun, 05 Feb 2012) Log Message: ----------- lang-python/south: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/south/trunk/Makefile csw/mgar/pkg/lang-python/south/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/south/ Modified: csw/mgar/pkg/lang-python/south/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/html5lib/trunk/Makefile 2012-02-05 13:07:10 UTC (rev 16998) +++ csw/mgar/pkg/lang-python/south/trunk/Makefile 2012-02-05 13:26:21 UTC (rev 16999) @@ -2,23 +2,25 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = html5lib -VERSION = 0.90 +NAME = south +VERSION = 0.7.3 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = A library for working with graphs in Python +DESCRIPTION = Intelligent schema and data migrations for Django projects define BLURB endef -MASTER_SITES = $(GOOGLE_MIRROR) -DISTFILES = $(NAME)-$(VERSION).zip +MASTER_SITES = http://www.aeracode.org/releases/south/ +DISTFILES = $(NAME)-$(VERSION).tar.gz -VENDOR_URL = http://code.google.com/p/html5lib/ +VENDOR_URL = http://south.aeracode.org/ -LICENSE = README +LICENSE = LICENSE -PACKAGES += CSWpy-html5lib -ARCHALL_CSWpy-html5lib = 1 +PACKAGES += CSWpy-south +ARCHALL_CSWpy-south = 1 +DISTNAME = south + include gar/category.mk Modified: csw/mgar/pkg/lang-python/south/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/html5lib/trunk/checksums 2012-02-05 13:07:10 UTC (rev 16998) +++ csw/mgar/pkg/lang-python/south/trunk/checksums 2012-02-05 13:26:21 UTC (rev 16999) @@ -1 +1 @@ -691e6b9ebe15b333a28280974b2ce432 html5lib-0.90.zip +693a2a7a57b29c49bc177fe951e04767 south-0.7.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 Sun Feb 5 14:35:07 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 05 Feb 2012 13:35:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17000] csw/mgar/pkg/lang-python/python-markdown/trunk/ Makefile Message-ID: Revision: 17000 http://gar.svn.sourceforge.net/gar/?rev=17000&view=rev Author: dmichelsen Date: 2012-02-05 13:35:06 +0000 (Sun, 05 Feb 2012) Log Message: ----------- lang-python/python-markdown/trunk: Add vendor url Modified Paths: -------------- csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile 2012-02-05 13:26:21 UTC (rev 16999) +++ csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile 2012-02-05 13:35:06 UTC (rev 17000) @@ -14,6 +14,8 @@ MASTER_SITES = $(PYPI_MIRROR) DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = http://www.freewisdom.org/projects/python-markdown/ + PACKAGES = CSWpy-markdown ARCHALL_CSWpy-markdown = 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 Feb 5 14:35:54 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 05 Feb 2012 13:35:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17001] csw/mgar/pkg/lang-python Message-ID: Revision: 17001 http://gar.svn.sourceforge.net/gar/?rev=17001&view=rev Author: dmichelsen Date: 2012-02-05 13:35:54 +0000 (Sun, 05 Feb 2012) Log Message: ----------- lang-python/python-openid: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/python-openid/trunk/Makefile csw/mgar/pkg/lang-python/python-openid/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/python-openid/ Modified: csw/mgar/pkg/lang-python/python-openid/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-graph/trunk/Makefile 2012-02-01 18:13:41 UTC (rev 16968) +++ csw/mgar/pkg/lang-python/python-openid/trunk/Makefile 2012-02-05 13:35:54 UTC (rev 17001) @@ -2,24 +2,30 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = python-graph -VERSION = 1.8.0 +NAME = python-openid +VERSION = 2.2.5 CATEGORIES = python GARTYPE = v2 + DESCRIPTION = A library for working with graphs in Python define BLURB endef -SPKG_SOURCEURL = http://pypi.python.org/pypi/python-graph -MASTER_SITES = $(GOOGLE_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 -PACKAGES = CSWpy-graph -CATALOGNAME_CSWpy-graph = py_graph -BUILD_SCRIPTS = + +# Github is not trusted by default +WGET_OPTS = --no-check-certificate -O $(NAME)-$(VERSION).tar.gz +MASTER_SITES = https://github.com/openid/python-openid/tarball/ +DISTFILES += $(NAME)-$(VERSION).tar.gz + +DISTNAME = openid-python-openid-b666238 + +VENDOR_URL = https://github.com/openid/python-openid + +LICENSE = LICENSE + +PACKAGES = CSWpy-openid +ARCHALL_CSWpy-openid = 1 + +# There is no testsuite TEST_SCRIPTS = -BUILD_SCRIPTS ?= $(WORKSRC)/core/setup.py -INSTALL_SCRIPTS ?= $(WORKSRC)/core/setup.py -LICENSE = COPYING -ARCHALL_CSWpy-graph = 1 - include gar/category.mk Modified: csw/mgar/pkg/lang-python/python-openid/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-graph/trunk/checksums 2012-02-01 18:13:41 UTC (rev 16968) +++ csw/mgar/pkg/lang-python/python-openid/trunk/checksums 2012-02-05 13:35:54 UTC (rev 17001) @@ -1 +1 @@ -8c5fbf993244c39ce42506425b5f30ac python-graph-1.8.0.tar.bz2 +7bb24dc6abd941ebff6a83c1ac7e4370 python-openid-2.2.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Feb 5 15:21:25 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 05 Feb 2012 14:21:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17002] csw/mgar/pkg/spamass-milter/trunk Message-ID: Revision: 17002 http://gar.svn.sourceforge.net/gar/?rev=17002&view=rev Author: guengel Date: 2012-02-05 14:21:24 +0000 (Sun, 05 Feb 2012) Log Message: ----------- spamass-milter/trunk: Added patch to make it compile on solaris. Startup script and startup script config added. Minimalistic README.CSW and changelog.CSW added. Modified Paths: -------------- csw/mgar/pkg/spamass-milter/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/spamass-milter/trunk/files/0000-Workaround-for-missing-paths.h.patch csw/mgar/pkg/spamass-milter/trunk/files/README.CSW csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.CSW Property Changed: ---------------- csw/mgar/pkg/spamass-milter/trunk/Makefile Modified: csw/mgar/pkg/spamass-milter/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/Makefile 2012-02-05 13:35:54 UTC (rev 17001) +++ csw/mgar/pkg/spamass-milter/trunk/Makefile 2012-02-05 14:21:24 UTC (rev 17002) @@ -10,28 +10,46 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/spamass-milt/ DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += COPYING +DISTFILES += cswspamass-milter +DISTFILES += spamass-milter.CSW +DISTFILES += README.CSW +DISTFILES += changelog.CSW +PATCHFILES = 0000-Workaround-for-missing-paths.h.patch + +INITSMF = $(sysconfdir)/init.d/cswspamass-milter +PRESERVECONF = $(sysconfdir)/spamass-milter + PACKAGES = CSWspamass-milter CATALOGNAME = spamass_milter RUNTIME_DEP_PKGS = CSWspamassassin +BUILD_DEP_PKGS = CSWspamassassin +BUILD_DEP_PKGS += CSWsendmail +BUILD_DEP_PKGS += CSWlibmilter + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -TEST_SCRIPTS = -INSTALL_SCRIPTS = custom +SENDMAIL = $(libdir)/sendmail +EXTRA_CONFIGURE_ENV = SENDMAIL=$(SENDMAIL) + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk -DOCLIST = AUTHORS Changelog NEWS README TODO +DOCLIST = AUTHORS ChangeLog NEWS README TODO -install-custom: +post-merge-modulated: @echo " ==> Installing $(NAME) (custom)" - @( cd $(WORKSRC) ; \ - gmake DESTDIR=$(DESTDIR) install ) - @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME) - @$(foreach DOC,$(DOCLIST),ginstall -m 444 $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(NAME);) + @ginstall -m 755 -d $(PKGROOT)$(docdir)/$(NAME) + @$(foreach DOC,$(DOCLIST),ginstall -m 444 $(WORKSRC)/$(DOC) $(PKGROOT)$(docdir)/$(NAME);) @$(MAKECOOKIE) + +post-merge: + @echo " ==> Installing startup script" + @ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/init.d + @ginstall -m 755 $(FILEDIR)/cswspamass-milter $(PKGROOT)$(sysconfdir)/init.d/ + @ginstall -m 755 $(FILEDIR)/spamass-milter.CSW $(PKGROOT)$(sysconfdir)/ + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/spamass-milter/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/spamass-milter/trunk/files/0000-Workaround-for-missing-paths.h.patch =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/0000-Workaround-for-missing-paths.h.patch (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/files/0000-Workaround-for-missing-paths.h.patch 2012-02-05 14:21:24 UTC (rev 17002) @@ -0,0 +1,28 @@ +From 76a4a08fce40dab85084d56686e34b37e3b70ffd Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 5 Feb 2012 12:01:08 +0100 +Subject: [PATCH] Workaround for missing paths.h + +--- + daemon.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/daemon.c b/daemon.c +index dd54571..d1245f6 100644 +--- a/daemon.c ++++ b/daemon.c +@@ -39,7 +39,11 @@ static char sccsid[] = "@(#)daemon.c 8.1 (Berkeley) 6/4/93"; + /* $Id: daemon.c,v 1.1 2003/10/21 21:40:32 dnelson Exp $ */ + + #include ++#ifndef __sun + #include ++#else ++#define _PATH_DEVNULL "/dev/null" ++#endif + #include + + int +-- +1.7.9 + Added: csw/mgar/pkg/spamass-milter/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/files/README.CSW 2012-02-05 14:21:24 UTC (rev 17002) @@ -0,0 +1,10 @@ +spamass-milter README.CSW +========================= + +You can customize spamass-milter startup options by editing +/etc/opt/csw/spamass-milter. Please see /etc/opt/csw/spamass-milter.CSW for +more information. + +Site wide configuration can be put into +/opt/csw/etc/spamass-milter. Configuration in /etc/opt/csw/spamass-milter takes +precedence over /opt/csw/etc/spamass-milter, though. Added: csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW 2012-02-05 14:21:24 UTC (rev 17002) @@ -0,0 +1,7 @@ +spamass-milter (0.3.2,REV=2012.02.05) + + * New upstream release 0.3.2 + + * Added startup script and configuration file for startup script + + -- Rafael Ostertag Sun, 05 Feb 2012 15:10:36 +0100 Added: csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter 2012-02-05 14:21:24 UTC (rev 17002) @@ -0,0 +1,243 @@ +#!/sbin/sh +#RC_KNUM 20 # Number used for kill script symlink, e.g. K20cswfoo +#RC_SNUM 80 # Number used for start script symlink, e.g. S80cswfoo +#RC_KLEV 0,1,2,S # Run levels that should have a kill script symlink +#RC_SLEV 3 # Run levels that should have a start script symlink +#FMRI network # FMRI path for service (S10+), default is /network. +# Changing the value here, yields a generated FMRI of +# "svc:/somethingelse/cswfoo:default" +#AUTOENABLE no # If set to no will not enable service regardless of +# local csw.conf, use when a package needs setup before +# being useful, would otherwise leave service in +# maintenance mode +# +# /etc/init.d/ sample script for Solaris +# Modified for CSW +# $Id$ + +# The defaults. They can be overwritten by /opt/csw/etc/spamass-milter +# or /etc/opt/csw/spamass-milter. The latter takes precedence over the +# former. +SPAMASS_SOCK=/var/run/spamass.sock +SPAMASS_PID=/var/opt/csw/run/spamass-milter.pid +DONTMODIFY=ignore +MAILADDR_EXPANSION=no +PREFIX=/opt/csw + +if [ -n "${SMF_FMRI}" ] +then + . /lib/svc/share/smf_include.sh +fi + +warning() { + if [ -n "${SMF_FMRI}" ] + then + /usr/bin/logger -p daemon.warning "$@" + else + echo "WARNING: $@" + fi + return 0 +} + +error() { + if [ -n "${SMF_FMRI}" ] + then + /usr/bin/logger -p daemon.error "$@" + else + echo "ERROR: $@" + fi + return 0 +} + +start() { + if [ -f "${SPAMASS_PID}" ] + then + kill -0 "`cat ${SPAMASS_PID}`" + if [ $? -eq 0 ] + then + warning "spamass-milter already running with pid `cat ${SPAMASS_PID}`" + exit 0 + else + warning "Removing stale pid file ${SPAMASS_PID}" + rm -f "${SPAMASS_PID}" + fi + fi + rm -f "${SPAMASS_SOCK}" > /dev/null 2>&1 + if [ ! -n "${SMF_FMRI}" ] + then + printf "%-60s" "Starting spamass-milter: " + fi + ${PREFIX}/sbin/spamass-milter ${BASE_ARGS} ${ARGS} + RETVAL=$? + if [ ${RETVAL} -eq 0 ] ; then + if [ ! -n "${SMF_FMRI}" ] + then + echo "[ OK ]" + fi + else + if [ -n "${SMF_FMRI}" ] + then + exit ${SMF_EXIT_MON_OFFLINE} + fi + echo "[FAILED]" + exit 1 + + fi + if [ ! -f "${SPAMASS_PID}" ] + then + warning "PID File ${SPAMASS_PID} not existent after launch." + if [ -n "${SMF_FMRI}" ] + then + exit ${SMF_EXIT_MON_DEGRADE} + fi + exit 2 + fi + return 0 +} + +stop() { + if [ ! -f "${SPAMASS_PID}" ] + then + warning "${SPAMASS_PID} not found. Assuming daemon not running" + return 0 + fi + + kill -0 "`cat ${SPAMASS_PID}`" + if [ $? -ne 0 ] + then + warning "spamass-milter not running. Nothing to stop." + return 0 + fi + + if [ ! -n "${SMF_FMRI}" ] + then + printf "%-60s" "Shutting down spamass-milter: " + fi + kill "`cat ${SPAMASS_PID}`" + RETVAL=$? + if [ ${RETVAL} -eq 0 ] ; then + if [ ! -n "${SMF_FMRI}" ] + then + echo "[ OK ]" + fi + else + if [ ! -n "${SMF_FMRI}" ] + then + echo "[FAILED]" + exit 3 + fi + error "Error while terminating spamass-milter" + exit ${SMF_EXIT_ERR_FATAL} + fi + return 0 +} + +if [ ! -x "${PREFIX}/sbin/spamass-milter" ] +then + error "${PREFIX}/sbin/spamass-milter does not exist or not executable." + if [ -n "${SMF_FMRI}" ] + then + exit ${SMF_EXIT_ERR_FATAL} + fi + + exit 1 +fi + + +# Source config files +if [ -f /opt/csw/etc/spamass-milter ] +then + . /opt/csw/etc/spamass-milter +fi +if [ -f /etc/opt/csw/spamass-milter ] +then + . /etc/opt/csw/spamass-milter +fi + +BASE_ARGS="-f -p ${SPAMASS_SOCK} -P ${SPAMASS_PID}" +ARGS="" + +# Assemble arguments for spamass-milter. SPAMASS_SOCK and SPAMASS_PID +# are already taken care of in BASE_ARGS. +if [ -n "${BUCKET}" ] +then + ARGS="${ARGS} -b ${BUCKET}" +fi +if [ -n "${BUCKET_BCC}" ] +then + if [ -n "${BUCKET}" ] + then + warning "BUCKET already set. Ignoring BUCKET_BCC" + else + ARGS="${ARGS} -B ${BUCKET_BCC}" + fi +fi +if [ -n "${DEFAULTDOMAIN}" ] +then + ARGS="${ARGS} -e ${DEFAULTDOMAIN}" +fi +if [ -n "${IGNORE}" ] +then + ARGS="${ARGS} -i ${IGNORE}" +fi +if [ -n "${DONTMODIFY}" ] +then + case "${DONTMODIFY}" in + 'any') + ARGS="${ARGS} -M" + ;; + 'some') + ARGS="${ARGS} -m" + ;; + 'ignore') + : + ;; + *) + warning "${DONTMODIFY} is not a valid value for DONTMODIFY. Assuming 'ignore'." + ;; + esac +fi +if [ -n "${REJECT}" ] +then + ARGS="${ARGS} -r ${REJECT}" +fi +if [ -n "${DEFAULTUSER}" ] +then + ARGS="${ARGS} -u ${DEFAULTUSER}" +fi +if [ -n "${MAILADDR_EXPANSION}" ] +then + case "${MAILADDR_EXPANSION}" in + 'yes') + ARGS="${ARGS} -x" + ;; + 'no') + : + ;; + *) + warning "${MAILADDR_EXPANSION} is not a valid value for MAILADDR_EXPANSION. Assuming 'no'." + ;; + esac +fi +if [ -n "${SPAMC_FLAGS}" ] +then + ARGS="${ARGS} -- ${SPAMC_FLAGS}" +fi + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; +*) + echo "Usage: `basename $0` {start|stop|restart}" >&2 + ;; +esac + +exit 0 Property changes on: csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.CSW =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.CSW (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.CSW 2012-02-05 14:21:24 UTC (rev 17002) @@ -0,0 +1,97 @@ +# This is a shell script fragment. It will be sourced by +# /etc/opt/csw/init.d/cswspamass-milter. +# +# Use this file to pass flags to spamass-milter during startup. +# +# $Id$ + +# path to create socket. +# +# Equivalent to: -p +# +# Default: /var/run/spamass.sock +#SPAMASS_SOCK=/var/run/spamass.sock + +# Redirect spam to this mail address. The orignal recipient(s) will +# not receive anything. +# +# BUCKET and BUCKET_BCC are mutually exclusive. +# +# Equivalent to: -b +# +# Default: none +#BUCKET= + +# add this mail address as a BCC recipient of spam. +# +# Equivalent to: -B +# +# BUCKET and BUCKET_BCC are mutually exclusive. +# +# Default: none +#BUCKET_BCC= + +# Pass full email address to spamc instead of just username. Uses +# 'defaultdomain' if there was none. +# +# Equivalent to: -e +# +# Default: none +#DEFAULTDOMAIN= + +# skip (ignore) checks from these IPs or netblocks. Example: +# +# 192.168.12.5,10.0.0.0/8,172.16.0.0/255.255.0.0 +# +# Equivalent to: -i +# +# Default: none +#IGNORE= + +# Values: any,some,ignore +# +# any: don't modify the message at all (-M) +# +# some: don't modify body, Content-type: or Subject: (-m) +# +# ignore: ignore this flag, and use default behavior of spamass-milter +# +# Default: ignore +#DONTMODIFY=ignore + +# pidfile: Put processid in pidfile +# +# Equivalent to: -P +# +# Default: /var/opt/csw/run/spamass-milter.pid +#SPAMASS_PID=/var/opt/csw/run/spamass-milter.pid + +# reject messages with a score >= nn with an SMTP error. Use -1 to +# reject any messages tagged by SA. +# +# Equivalent to: -r +# +# Default: none +#REJECT=5 + +# pass the recipient's username to spamc. Uses 'defaultuser' if there +# are multiple recipients. +# +# Equivalent to: -u +# +# Default: none +#DEFAULTUSER= + +# pass email address through alias and virtusertable expansion. +# +# Values: yes,no (yes: -x) +# +# Default: no +#MAILADDR_EXPANSION=no + +# Pass flags to spamc. +# +# Equivalent to: -- +# +# Default: none +#SPAMC_FLAGS= \ No newline at end of file Property changes on: csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.CSW ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Feb 5 16:13:16 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 05 Feb 2012 15:13:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17003] csw/mgar/pkg/spamass-milter/trunk Message-ID: Revision: 17003 http://gar.svn.sourceforge.net/gar/?rev=17003&view=rev Author: guengel Date: 2012-02-05 15:13:16 +0000 (Sun, 05 Feb 2012) Log Message: ----------- spamass-milter/trunk: Minor change to startup script. Added license information. Added -norunpath. Modified Paths: -------------- csw/mgar/pkg/spamass-milter/trunk/Makefile csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter Modified: csw/mgar/pkg/spamass-milter/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/Makefile 2012-02-05 14:21:24 UTC (rev 17002) +++ csw/mgar/pkg/spamass-milter/trunk/Makefile 2012-02-05 15:13:16 UTC (rev 17003) @@ -14,6 +14,7 @@ DISTFILES += spamass-milter.CSW DISTFILES += README.CSW DISTFILES += changelog.CSW +DISTFILES += COPYING PATCHFILES = 0000-Workaround-for-missing-paths.h.patch @@ -21,19 +22,21 @@ PRESERVECONF = $(sysconfdir)/spamass-milter PACKAGES = CSWspamass-milter -CATALOGNAME = spamass_milter RUNTIME_DEP_PKGS = CSWspamassassin BUILD_DEP_PKGS = CSWspamassassin BUILD_DEP_PKGS += CSWsendmail BUILD_DEP_PKGS += CSWlibmilter +LICENSE = COPYING + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz SENDMAIL = $(libdir)/sendmail EXTRA_CONFIGURE_ENV = SENDMAIL=$(SENDMAIL) +EXTRA_CXX_FLAGS = -norunpath CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter 2012-02-05 14:21:24 UTC (rev 17002) +++ csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter 2012-02-05 15:13:16 UTC (rev 17003) @@ -11,8 +11,6 @@ # being useful, would otherwise leave service in # maintenance mode # -# /etc/init.d/ sample script for Solaris -# Modified for CSW # $Id$ # The defaults. They can be overwritten by /opt/csw/etc/spamass-milter @@ -106,6 +104,7 @@ if [ $? -ne 0 ] then warning "spamass-milter not running. Nothing to stop." + rm -f "${SPAMASS_PID}" return 0 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Feb 5 16:36:49 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 05 Feb 2012 15:36:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17004] csw/mgar/pkg/spamass-milter/trunk/Makefile Message-ID: Revision: 17004 http://gar.svn.sourceforge.net/gar/?rev=17004&view=rev Author: guengel Date: 2012-02-05 15:36:48 +0000 (Sun, 05 Feb 2012) Log Message: ----------- spamass-milter/trunk: Create $(localstatedir)/run. Modified Paths: -------------- csw/mgar/pkg/spamass-milter/trunk/Makefile Modified: csw/mgar/pkg/spamass-milter/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/Makefile 2012-02-05 15:13:16 UTC (rev 17003) +++ csw/mgar/pkg/spamass-milter/trunk/Makefile 2012-02-05 15:36:48 UTC (rev 17004) @@ -55,4 +55,5 @@ @ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/init.d @ginstall -m 755 $(FILEDIR)/cswspamass-milter $(PKGROOT)$(sysconfdir)/init.d/ @ginstall -m 755 $(FILEDIR)/spamass-milter.CSW $(PKGROOT)$(sysconfdir)/ + @ginstall -m 755 -d $(PKGROOT)$(localstatedir)/run @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Feb 5 20:00:27 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 05 Feb 2012 19:00:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[17005] csw/mgar/pkg/spamass-milter/trunk Message-ID: Revision: 17005 http://gar.svn.sourceforge.net/gar/?rev=17005&view=rev Author: guengel Date: 2012-02-05 19:00:27 +0000 (Sun, 05 Feb 2012) Log Message: ----------- spamass-milter/trunk: All documentation go now into $(docdir)/spamass_milter. Improved README.CSW. Modified Paths: -------------- csw/mgar/pkg/spamass-milter/trunk/Makefile csw/mgar/pkg/spamass-milter/trunk/files/README.CSW Modified: csw/mgar/pkg/spamass-milter/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/Makefile 2012-02-05 15:36:48 UTC (rev 17004) +++ csw/mgar/pkg/spamass-milter/trunk/Makefile 2012-02-05 19:00:27 UTC (rev 17005) @@ -46,8 +46,8 @@ post-merge-modulated: @echo " ==> Installing $(NAME) (custom)" - @ginstall -m 755 -d $(PKGROOT)$(docdir)/$(NAME) - @$(foreach DOC,$(DOCLIST),ginstall -m 444 $(WORKSRC)/$(DOC) $(PKGROOT)$(docdir)/$(NAME);) + @ginstall -m 755 -d $(PKGROOT)$(docdir)/$(subst -,_,$(NAME)) + @$(foreach DOC,$(DOCLIST),ginstall -m 444 $(WORKSRC)/$(DOC) $(PKGROOT)$(docdir)/$(subst -,_,$(NAME));) @$(MAKECOOKIE) post-merge: Modified: csw/mgar/pkg/spamass-milter/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/README.CSW 2012-02-05 15:36:48 UTC (rev 17004) +++ csw/mgar/pkg/spamass-milter/trunk/files/README.CSW 2012-02-05 19:00:27 UTC (rev 17005) @@ -1,6 +1,9 @@ spamass-milter README.CSW ========================= +As of version 0.3.2,REV=2012.02.05, spamass-milter comes with a startup script +for Solaris 9 and 10+ including SMF support on Solaris 10+. + You can customize spamass-milter startup options by editing /etc/opt/csw/spamass-milter. Please see /etc/opt/csw/spamass-milter.CSW for more information. @@ -8,3 +11,38 @@ Site wide configuration can be put into /opt/csw/etc/spamass-milter. Configuration in /etc/opt/csw/spamass-milter takes precedence over /opt/csw/etc/spamass-milter, though. + +You can start spamass-milter on Solaris 9 by issuing + + /etc/opt/csw/init.d/cswspamass-milter start + +Symlinks to /etc/rc?.d will be created by the package automatically. + +On Solaris 10, the preferred method is using SMF. You can start +spamass-milter by issuing + + svcadm enable cswspamass-milter. + +The startup script will log warnings and errors to the DAEMON syslog facility. + + +Sendmail Integration +-------------------- + +We recommend using OpenCSW Sendmail. Solaris Sendmail has not been tested with +spamass-milter and is not guaranteed to work. + +In order to make sendmail talk to spamass-milter, add the following lines to +your sendmail.mc file + +INPUT_MAIL_FILTER(`spamassassin', `S=local:/var/run/spamass.sock, F=, T=C:15m;S:4m;R:4m;E:10m')dnl +define(`confMILTER_MACROS_CONNECT',`t, b, j, _, {daemon_name}, {if_name}, {if_addr}')dnl +define(`confMILTER_MACROS_HELO',`s, {tls_version}, {cipher}, {cipher_bits}, {cert_subject}, {cert_issuer}')dnl +define(`confMILTER_MACROS_ENVRCPT',`r, v, Z')dnl + +and recreate sendmail.cf. For more details, please refer to the README file in +/opt/csw/share/doc/spamass_milter. + +Please keep in mind that spamass-milter uses Spamassassin's spamc which in turn +talks to spamd. So, besides configuring sendmail to talk to spamass-milter you +also need a running spamassassin installation. 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 Feb 6 17:12:24 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 06 Feb 2012 16:12:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17006] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 17006 http://gar.svn.sourceforge.net/gar/?rev=17006&view=rev Author: wahwah Date: 2012-02-06 16:12:24 +0000 (Mon, 06 Feb 2012) Log Message: ----------- mGAR v2: background some of the directory deleting Targets like 'spotless' can take time on large builds, let's background them and return the prompt. Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2012-02-05 19:00:27 UTC (rev 17005) +++ csw/mgar/gar/v2/gar.mk 2012-02-06 16:12:24 UTC (rev 17006) @@ -999,11 +999,15 @@ @echo " ==> Removing $(COOKIEDIR)" @-rm -rf $(COOKIEDIR) @echo " ==> Removing $(WORKDIR)" - @-rm -rf $(WORKDIR) + @-rm -rf tmp-deleteme-workdir + @-mv $(WORKDIR) tmp-deleteme-workdir + @-rm -rf tmp-deleteme-workdir & spotless: imageclean @echo " ==> Removing $(DESTDIR)" - @-rm -rf work + @-rm -rf work-old + @-mv work work-old + @-rm -rf work-old & # Print package dependencies PKGDEP_LIST = $(filter-out $(BUILDDEPS),$(DEPEND_LIST)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Feb 6 22:18:12 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 06 Feb 2012 21:18:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17007] csw/mgar/pkg/spamass-milter/trunk Message-ID: Revision: 17007 http://gar.svn.sourceforge.net/gar/?rev=17007&view=rev Author: guengel Date: 2012-02-06 21:18:12 +0000 (Mon, 06 Feb 2012) Log Message: ----------- spamass-milter/trunk: Added sendmail feature macro. Modified Paths: -------------- csw/mgar/pkg/spamass-milter/trunk/Makefile csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 Modified: csw/mgar/pkg/spamass-milter/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/Makefile 2012-02-06 16:12:24 UTC (rev 17006) +++ csw/mgar/pkg/spamass-milter/trunk/Makefile 2012-02-06 21:18:12 UTC (rev 17007) @@ -15,6 +15,7 @@ DISTFILES += README.CSW DISTFILES += changelog.CSW DISTFILES += COPYING +DISTFILES += spamass-milter.m4 PATCHFILES = 0000-Workaround-for-missing-paths.h.patch @@ -54,6 +55,9 @@ @echo " ==> Installing startup script" @ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/init.d @ginstall -m 755 $(FILEDIR)/cswspamass-milter $(PKGROOT)$(sysconfdir)/init.d/ - @ginstall -m 755 $(FILEDIR)/spamass-milter.CSW $(PKGROOT)$(sysconfdir)/ + @ginstall -m 644 $(FILEDIR)/spamass-milter.CSW $(PKGROOT)$(sysconfdir)/ @ginstall -m 755 -d $(PKGROOT)$(localstatedir)/run + @echo " ==> Installing spamass-milter sendmail macor" + @ginstall -m 755 -d $(PKGROOT)$(sharedstatedir)/sendmail/cf/feature + @ginstall -m 644 $(FILEDIR)/spamass-milter.m4 $(PKGROOT)$(sharedstatedir)/sendmail/cf/feature/ @$(MAKECOOKIE) Modified: csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW 2012-02-06 16:12:24 UTC (rev 17006) +++ csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW 2012-02-06 21:18:12 UTC (rev 17007) @@ -1,3 +1,10 @@ +spamass-milter (0.3.2,REV=2012.02.06) + + * spamass-milter.m4: Added Sendmail feature macro + + -- Rafael Ostertag Mon, 06 Feb 2012 22:04:52 +0100 + + spamass-milter (0.3.2,REV=2012.02.05) * New upstream release 0.3.2 @@ -5,3 +12,4 @@ * Added startup script and configuration file for startup script -- Rafael Ostertag Sun, 05 Feb 2012 15:10:36 +0100 + Added: csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 2012-02-06 21:18:12 UTC (rev 17007) @@ -0,0 +1,17 @@ +divert(-1) +# Sendmail feature for simple integration of spamass-milter +# +# Part of CSWspamass-milter. +# + +divert(0) +VERSIONID(`$Id')dnl +divert(-1) + +ifdef(`_ARG_',dnl + define(`__SPAMASS_SOCK__',defn(`_ARG_')),dnl + define(`__SPAMASS_SOCK__',`/var/run/spamass.sock'))dnl +INPUT_MAIL_FILTER(`spamass-milter', `S=local:'__SPAMASS_SOCK__`, F=, T=C:15m;S:4m;R:4m;E:10m') +define(`confMILTER_MACROS_CONNECT',`t, b, j, _, {daemon_name}, {if_name}, {if_addr}')dnl +define(`confMILTER_MACROS_HELO',`s, {tls_version}, {cipher}, {cipher_bits}, {cert_subject}, {cert_issuer}')dnl +define(`confMILTER_MACROS_ENVRCPT',`r, v, Z')dnl Property changes on: csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 ___________________________________________________________________ Added: svn:keywords + Id 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 Feb 7 01:50:06 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 07 Feb 2012 00:50:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17008] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 17008 http://gar.svn.sourceforge.net/gar/?rev=17008&view=rev Author: bdwalton Date: 2012-02-07 00:50:06 +0000 (Tue, 07 Feb 2012) Log Message: ----------- php5/trunk: the test suite blows up on sol9/i386. sol10 only now Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-02-06 21:18:12 UTC (rev 17007) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-02-07 00:50:06 UTC (rev 17008) @@ -5,6 +5,8 @@ SF_PROJ = $(shell echo $(NAME) | sed -e 's/[0-9]//g') DISTNAME = $(SF_PROJ)-$(VERSION) +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + DESCRIPTION = A high-level scripting language. define BLURB PHP is a widely-used Open Source general-purpose scripting language that is 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 Feb 7 01:57:53 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 07 Feb 2012 00:57:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17009] csw/mgar/pkg/ruby19/trunk Message-ID: Revision: 17009 http://gar.svn.sourceforge.net/gar/?rev=17009&view=rev Author: bdwalton Date: 2012-02-07 00:57:52 +0000 (Tue, 07 Feb 2012) Log Message: ----------- ruby19/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile csw/mgar/pkg/ruby19/trunk/checksums Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-07 00:50:06 UTC (rev 17008) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-07 00:57:52 UTC (rev 17009) @@ -1,6 +1,6 @@ NAME = ruby19 -VERSION = 1.9.2 -PATCHLEVEL = p290 +VERSION = 1.9.3 +PATCHLEVEL = p0 CATEGORIES = lang GARTYPE = v2 Modified: csw/mgar/pkg/ruby19/trunk/checksums =================================================================== --- csw/mgar/pkg/ruby19/trunk/checksums 2012-02-07 00:50:06 UTC (rev 17008) +++ csw/mgar/pkg/ruby19/trunk/checksums 2012-02-07 00:57:52 UTC (rev 17009) @@ -1 +1 @@ -604da71839a6ae02b5b5b5e1b792d5eb ruby-1.9.2-p290.tar.gz +8e2fef56185cfbaf29d0c8329fc77c05 ruby-1.9.3-p0.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 Feb 7 18:36:56 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Feb 2012 17:36:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[17010] csw/mgar/pkg/lsof/branches Message-ID: Revision: 17010 http://gar.svn.sourceforge.net/gar/?rev=17010&view=rev Author: dmichelsen Date: 2012-02-07 17:36:56 +0000 (Tue, 07 Feb 2012) Log Message: ----------- lsof: Add branch for experimental 4.86A.sun for Solaris 11 Modified Paths: -------------- csw/mgar/pkg/lsof/branches/lsof-4.86A.sun-Solaris-11/Makefile csw/mgar/pkg/lsof/branches/lsof-4.86A.sun-Solaris-11/checksums Added Paths: ----------- csw/mgar/pkg/lsof/branches/lsof-4.86A.sun-Solaris-11/ Modified: csw/mgar/pkg/lsof/branches/lsof-4.86A.sun-Solaris-11/Makefile =================================================================== --- csw/mgar/pkg/lsof/trunk/Makefile 2012-02-01 18:13:41 UTC (rev 16968) +++ csw/mgar/pkg/lsof/branches/lsof-4.86A.sun-Solaris-11/Makefile 2012-02-07 17:36:56 UTC (rev 17010) @@ -1,7 +1,7 @@ # TBD: NAME = lsof -VERSION = 4.85 +VERSION = 4.86A.sun CATEGORIES = utils GARTYPE = v2 @@ -13,20 +13,27 @@ open by each process. endef -MASTER_SITES = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ +MASTER_SITES += ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ +MASTER_SITES += ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/ DISTNAME = $(NAME)_$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += lsof-license # Do not automatically use VxFS -PATCHFILES += 0002-Disable-VxFS-autodetect.patch +# PATCHFILES += 0002-Disable-VxFS-autodetect.patch SRCDIST = $(DISTNAME)_src -WORKSRC = $(WORKDIR)/$(DISTNAME)/$(SRCDIST) +#WORKSRC = $(WORKDIR)/$(DISTNAME)/$(SRCDIST) PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 +GARCOMPILER-5.9 = SOS12 +GARCOMPILER-5.10 = SOS12 +GARCOMPILER-5.11 = SOS12U2 +GARCOMPILER = $(GARCOMPILER-$(GAROSREL)) + VENDOR_URL = http://people.freebsd.org/~abe/ LICENSE = lsof-license @@ -34,6 +41,8 @@ BUILD64-sparc-5.9 = 1 BUILD64-sparc-5.10 = 1 BUILD64-i386-5.10 = 1 +BUILD64-sparc-5.11 = 1 +BUILD64-i386-5.11 = 1 BUILD64 = $(BUILD64-$(GARCH)-$(GAROSREL)) EXTRA_BUILD_ISAS = sparcv8plus @@ -61,17 +70,22 @@ SOLARIS_INSTR = $(ISA) SOLARIS_KERNBITS = $(MEMORYMODEL) -BUILD_DEP_PKGS += VRTSfssdk +# No VxFS for Solaris 11 yet +BUILD_DEP_PKGS-5.9 += VRTSfssdk +BUILD_DEP_PKGS-5.10 += VRTSfssdk +BUILD_DEP_PKGS += $(BUILD_DEP_PKGS-$(GAROSREL)) # The Veritas Filesystem library libvxfsutil.a is sparcv8+, make sure to build that # specific ISA and not link when building sparcv8 SOLARIS_VXFSINCL-sparcv8plus = /opt/VRTS/include SOLARIS_VXFSINCL-sparcv9 = /opt/VRTS/include SOLARIS_VXFSINCL-i386 = /opt/VRTS/include +SOLARIS_VXFSINCL-pentium_pro = /opt/VRTS/include SOLARIS_VXFSINCL-amd64 = /opt/VRTS/include SOLARIS_VXFSLIB-sparcv8plus = /opt/VRTS/lib SOLARIS_VXFSLIB-sparcv9 = /opt/VRTS/lib SOLARIS_VXFSLIB-i386 = /opt/VRTS/lib +SOLARIS_VXFSLIB-pentium_pro = /opt/VRTS/lib SOLARIS_VXFSLIB-amd64 = /opt/VRTS/lib SOLARIS_VXFSINCL = $(SOLARIS_VXFSINCL-$(ISA)) SOLARIS_VXFSLIB = $(SOLARIS_VXFSLIB-$(ISA)) @@ -95,10 +109,10 @@ INSTALLISADIR ?= $(WORKROOTDIR)/install-$(MODULATION) -post-extract-modulated: - @echo " ==> Extracting source distribution" - @$(if $(filter-out global,$(MODULATION)),( cd $(WORKDIR)/$(DISTNAME) ; tar xf $(SRCDIST).tar )) - @$(MAKECOOKIE) +#post-extract-modulated: +# @echo " ==> Extracting source distribution" +# @$(if $(filter-out global,$(MODULATION)),( cd $(WORKDIR)/$(DISTNAME) ; tar xf $(SRCDIST).tar )) +# @$(MAKECOOKIE) configure-custom: @echo " ==> Configuring in $(WORKSRC)" Modified: csw/mgar/pkg/lsof/branches/lsof-4.86A.sun-Solaris-11/checksums =================================================================== --- csw/mgar/pkg/lsof/trunk/checksums 2012-02-01 18:13:41 UTC (rev 16968) +++ csw/mgar/pkg/lsof/branches/lsof-4.86A.sun-Solaris-11/checksums 2012-02-07 17:36:56 UTC (rev 17010) @@ -1 +1 @@ -102ee2081172bbe76dccaa6cceda8573 lsof_4.85.tar.bz2 +cd884d0a50d6d8329932bd01c9579515 lsof_4.86A.sun.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 Feb 7 18:49:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Feb 2012 17:49:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17011] csw/mgar/pkg/lsof/branches/lsof-4.86A. sun-Solaris-11/Makefile Message-ID: Revision: 17011 http://gar.svn.sourceforge.net/gar/?rev=17011&view=rev Author: dmichelsen Date: 2012-02-07 17:49:11 +0000 (Tue, 07 Feb 2012) Log Message: ----------- lsof/branches/lsof-4.86A.sun-Solaris-11: Remove compiler definitions better kept in GAR Modified Paths: -------------- csw/mgar/pkg/lsof/branches/lsof-4.86A.sun-Solaris-11/Makefile Modified: csw/mgar/pkg/lsof/branches/lsof-4.86A.sun-Solaris-11/Makefile =================================================================== --- csw/mgar/pkg/lsof/branches/lsof-4.86A.sun-Solaris-11/Makefile 2012-02-07 17:36:56 UTC (rev 17010) +++ csw/mgar/pkg/lsof/branches/lsof-4.86A.sun-Solaris-11/Makefile 2012-02-07 17:49:11 UTC (rev 17011) @@ -29,11 +29,6 @@ PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 -GARCOMPILER-5.9 = SOS12 -GARCOMPILER-5.10 = SOS12 -GARCOMPILER-5.11 = SOS12U2 -GARCOMPILER = $(GARCOMPILER-$(GAROSREL)) - VENDOR_URL = http://people.freebsd.org/~abe/ LICENSE = lsof-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 Wed Feb 8 12:19:10 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 08 Feb 2012 11:19:10 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[598] utilities/site_links.py Message-ID: Revision: 598 http://opencsw.svn.sourceforge.net/opencsw/?rev=598&view=rev Author: wahwah Date: 2012-02-08 11:19:10 +0000 (Wed, 08 Feb 2012) Log Message: ----------- site-links: Updating the site list Modified Paths: -------------- utilities/site_links.py Modified: utilities/site_links.py =================================================================== --- utilities/site_links.py 2012-01-24 16:28:06 UTC (rev 597) +++ utilities/site_links.py 2012-02-08 11:19:10 UTC (rev 598) @@ -28,18 +28,24 @@ SITE_DATA = [ # [name, main url, [other urls], nav_member] - ["Main website", "http://www.opencsw.org", ["http://opencsw.org"], True], - ["Mantis", "http://www.opencsw.org/bugtrack", ["http://opencsw.org/bugtrack"], True], + ["Main website", "http://www.opencsw.org", + ["http://opencsw.org"], True], + ["Mantis", "http://www.opencsw.org/bugtrack", + ["http://opencsw.org/bugtrack"], True], # ["pkgutil wiki", "http://pkgutil.wikidot.com", None, True], - ["Packages in experimental", "http://mirror.opencsw.org/experimental.html", None, False], + ["Packages in experimental", + "http://buildfarm.opencsw.org/experimental.html", None, False], ["mGAR on SourceForge / Trac", "http://gar.sourceforge.net", - ["http://sourceforge.net/projects/gar", "http://apps.sourceforge.net/trac/gar"], + ["http://sourceforge.net/projects/gar", + "http://apps.sourceforge.net/trac/gar"], True], ["Buildfarm", "http://buildfarm.opencsw.org", None, False], ["Project wiki", "http://wiki.opencsw.org", None, True], ["Mailing lists", "https://lists.opencsw.org", None, False], ["pkgutil", "http://pkgutil.wikidot.com", None, False], + ["community", "http://www.opencsw.org/community/", + None, 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 Wed Feb 8 13:28:22 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 08 Feb 2012 12:28:22 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[599] utilities/site_links.py Message-ID: Revision: 599 http://opencsw.svn.sourceforge.net/opencsw/?rev=599&view=rev Author: wahwah Date: 2012-02-08 12:28:21 +0000 (Wed, 08 Feb 2012) Log Message: ----------- site-links: usr /usr/bin/env Modified Paths: -------------- utilities/site_links.py Modified: utilities/site_links.py =================================================================== --- utilities/site_links.py 2012-02-08 11:19:10 UTC (rev 598) +++ utilities/site_links.py 2012-02-08 12:28:21 UTC (rev 599) @@ -1,4 +1,4 @@ -#!/opt/csw/bin/python2.6 +#!/usr/bin/env python2.6 # coding=utf-8 # $Id$ # 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 Feb 8 13:28:34 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 08 Feb 2012 12:28:34 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[600] utilities/site_links.py Message-ID: Revision: 600 http://opencsw.svn.sourceforge.net/opencsw/?rev=600&view=rev Author: wahwah Date: 2012-02-08 12:28:34 +0000 (Wed, 08 Feb 2012) Log Message: ----------- site-links: update the sites Modified Paths: -------------- utilities/site_links.py Modified: utilities/site_links.py =================================================================== --- utilities/site_links.py 2012-02-08 12:28:21 UTC (rev 599) +++ utilities/site_links.py 2012-02-08 12:28:34 UTC (rev 600) @@ -31,21 +31,27 @@ ["Main website", "http://www.opencsw.org", ["http://opencsw.org"], True], ["Mantis", "http://www.opencsw.org/bugtrack", - ["http://opencsw.org/bugtrack"], True], + ["http://opencsw.org/bugtrack", + "https://www.opencsw.org/mantis", + "http://www.opencsw.org/mantis", + "http://opencsw.org/mantis"], + True], # ["pkgutil wiki", "http://pkgutil.wikidot.com", None, True], ["Packages in experimental", "http://buildfarm.opencsw.org/experimental.html", None, False], - ["mGAR on SourceForge / Trac", "http://gar.sourceforge.net", + ["mGAR", "http://gar.opencsw.org", ["http://sourceforge.net/projects/gar", - "http://apps.sourceforge.net/trac/gar"], + "http://apps.sourceforge.net/trac/gar", + "http://gar.sourceforge.net"], True], - ["Buildfarm", "http://buildfarm.opencsw.org", + ["pkgdb", "http://buildfarm.opencsw.org/pkgdb/", None, False], ["Project wiki", "http://wiki.opencsw.org", None, True], ["Mailing lists", "https://lists.opencsw.org", None, False], ["pkgutil", "http://pkgutil.wikidot.com", None, False], - ["community", "http://www.opencsw.org/community/", - None, False], + # ["community", "http://www.opencsw.org/community", + # None, True], + ["pkgbrowser", "http://pkg.opencsw.org/pkgbrowser", None, 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 Wed Feb 8 13:28:46 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 08 Feb 2012 12:28:46 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[601] utilities/site_links.py Message-ID: Revision: 601 http://opencsw.svn.sourceforge.net/opencsw/?rev=601&view=rev Author: wahwah Date: 2012-02-08 12:28:46 +0000 (Wed, 08 Feb 2012) Log Message: ----------- site-links: Less verbose output Modified Paths: -------------- utilities/site_links.py Modified: utilities/site_links.py =================================================================== --- utilities/site_links.py 2012-02-08 12:28:34 UTC (rev 600) +++ utilities/site_links.py 2012-02-08 12:28:46 UTC (rev 601) @@ -135,7 +135,7 @@ self.AddLink(base_site, site_to, text) added_to += 1 if not added_to and url_to.startswith("http"): - logging.info( + logging.debug( "%s, linked off %s, doesn't belong to urls of known sites.", repr(url_to), base_site) if added_to > 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 Wed Feb 8 13:28:57 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 08 Feb 2012 12:28:57 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[602] utilities/site_links.py Message-ID: Revision: 602 http://opencsw.svn.sourceforge.net/opencsw/?rev=602&view=rev Author: wahwah Date: 2012-02-08 12:28:57 +0000 (Wed, 08 Feb 2012) Log Message: ----------- site-links: Print missing links Modified Paths: -------------- utilities/site_links.py Modified: utilities/site_links.py =================================================================== --- utilities/site_links.py 2012-02-08 12:28:46 UTC (rev 601) +++ utilities/site_links.py 2012-02-08 12:28:57 UTC (rev 602) @@ -107,7 +107,7 @@ self.sites_by_url[url] = site # Indexed by tuples of links. self.links = {} - self.print_missing = False + self.print_missing = True def SetPrintMissing(self, print_missing): self.print_missing = print_missing 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 Feb 8 13:29:08 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 08 Feb 2012 12:29:08 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[603] utilities/site_links_test.py Message-ID: Revision: 603 http://opencsw.svn.sourceforge.net/opencsw/?rev=603&view=rev Author: wahwah Date: 2012-02-08 12:29:08 +0000 (Wed, 08 Feb 2012) Log Message: ----------- site-links: Unit test updates Modified Paths: -------------- utilities/site_links_test.py Modified: utilities/site_links_test.py =================================================================== --- utilities/site_links_test.py 2012-02-08 12:28:57 UTC (rev 602) +++ utilities/site_links_test.py 2012-02-08 12:29:08 UTC (rev 603) @@ -36,21 +36,32 @@ def test4(self): self.assertEquals("a_b_c", sl.identificatorify("A+b C")) + class ShortenTest(unittest.TestCase): - + def test1(self): - self.assertEquals(u"abc...wxyz", sl.shorten("abcdefghijklmnopqrtsuvwxyz", 10)) - self.assertEquals(u"abcdefgh...rtsuvwxyz", sl.shorten("abcdefghijklmnopqrtsuvwxyz", 20)) + self.assertEquals( + u"abc...wxyz", + sl.shorten("abcdefghijklmnopqrtsuvwxyz", 10)) + self.assertEquals( + u"abcdefgh...rtsuvwxyz", + sl.shorten("abcdefghijklmnopqrtsuvwxyz", 20)) + class UrlRecognitionTest(unittest.TestCase): def setUp(self): self.ocl = sl.OpenCswLinks(sl.SITE_DATA) def test1(self): - g = self.ocl.sites_by_url["http://apps.sourceforge.net/mediawiki/gar"] + g = self.ocl.sites_by_url["http://sourceforge.net/projects/gar"] self.assertTrue(self.ocl.MatchesSite(u"http://gar.opencsw.org", g)) + def testBugtrack(self): + g = self.ocl.sites_by_url["http://www.opencsw.org/bugtrack"] + self.assertTrue( + self.ocl.MatchesSite(u"http://www.opencsw.org/mantis", g)) + 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 Wed Feb 8 13:29:19 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 08 Feb 2012 12:29:19 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[604] utilities Message-ID: Revision: 604 http://opencsw.svn.sourceforge.net/opencsw/?rev=604&view=rev Author: wahwah Date: 2012-02-08 12:29:19 +0000 (Wed, 08 Feb 2012) Log Message: ----------- site-links: Formatting, white space changes Modified Paths: -------------- utilities/site_links.py utilities/site_links_test.py Modified: utilities/site_links.py =================================================================== --- utilities/site_links.py 2012-02-08 12:29:08 UTC (rev 603) +++ utilities/site_links.py 2012-02-08 12:29:19 UTC (rev 604) @@ -4,7 +4,7 @@ # # Identifies OpenCSW mirror status. # (C) 2009 Maciej Blizinski -# +# # 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 @@ -98,6 +98,7 @@ class OpenCswLinks(object): + def __init__(self, site_data): self.sites = set([Site(*a) for a in site_data]) self.sites_by_url = dict([(x.url, x) for x in self.sites]) Modified: utilities/site_links_test.py =================================================================== --- utilities/site_links_test.py 2012-02-08 12:29:08 UTC (rev 603) +++ utilities/site_links_test.py 2012-02-08 12:29:19 UTC (rev 604) @@ -1,10 +1,10 @@ -#!/opt/csw/bin/python2.6 +#!/usr/bin/env python2.6 # coding=utf-8 # $Id$ # # Identifies OpenCSW mirror status. # (C) 2009 Maciej Blizinski -# +# # 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 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 Feb 8 15:39:25 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 08 Feb 2012 14:39:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17012] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 17012 http://gar.svn.sourceforge.net/gar/?rev=17012&view=rev Author: bonivart Date: 2012-02-08 14:39:25 +0000 (Wed, 08 Feb 2012) Log Message: ----------- perl/trunk: test 5.12.4 Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-02-07 17:49:11 UTC (rev 17011) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-02-08 14:39:25 UTC (rev 17012) @@ -24,7 +24,7 @@ PACKAGES += CSWperl SPKG_DESC_CSWperl = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm3 +RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags PACKAGES += CSWperldoc @@ -38,10 +38,6 @@ CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl -# We contain libperl.so and libperl.so.5.12.3 -CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink -CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch - # Core module updates # Not used at the moment, leave one as example #MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ @@ -54,16 +50,14 @@ CONFIGURE_SCRIPTS = perl # Compatable with all prior patch revs -INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 # Force use of db-4.8 # TBD: Reinsert libperl.so, see below. -#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -lperl PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -PERL_LIBS-64 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) -BUILD64 = 1 +#BUILD64 = 1 # Configuration flags CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) @@ -129,6 +123,9 @@ EXTRA_LDFLAGS-32 = -L$(libdir) EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) +# We want 64 bit binaries +#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) + EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* @@ -138,7 +135,7 @@ EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod # Tests take a long time, run once for every release -#TEST_SCRIPTS = +TEST_SCRIPTS = BUILD_SCRIPTS = perl @@ -158,8 +155,7 @@ # Splitting of a separate libperl.so requires more work and careful planning. # Override for now. CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so -CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.12.3|soname=libperl.so.5.12.3|pkgname=CSWperl|expected=CSWlibperl5-12-3 -CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so +CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.12.4|soname=libperl.so.5.12.4|pkgname=CSWperl|expected=CSWlibperl5-12-4 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at opencsw.org Wed Feb 8 16:23:04 2012 From: wilbury at opencsw.org (Juraj Lutter) Date: Wed, 08 Feb 2012 16:23:04 +0100 Subject: [csw-devel] SF.net SVN: gar:[17002] csw/mgar/pkg/spamass-milter/trunk In-Reply-To: References: Message-ID: <4F329358.7050109@opencsw.org> On 02/05/2012 03:21 PM, guengel at users.sourceforge.net wrote: > Revision: 17002 > http://gar.svn.sourceforge.net/gar/?rev=17002&view=rev > Author: guengel > Date: 2012-02-05 14:21:24 +0000 (Sun, 05 Feb 2012) > Log Message: > ----------- > spamass-milter/trunk: Added patch to make it compile on solaris. Startup script and startup script config added. Minimalistic README.CSW and changelog.CSW added. > +diff --git a/daemon.c b/daemon.c > +index dd54571..d1245f6 100644 > +--- a/daemon.c > ++++ b/daemon.c > +@@ -39,7 +39,11 @@ static char sccsid[] = "@(#)daemon.c 8.1 (Berkeley) 6/4/93"; > + /* $Id: daemon.c,v 1.1 2003/10/21 21:40:32 dnelson Exp $ */ > + > + #include > ++#ifndef __sun > + #include > ++#else > ++#define _PATH_DEVNULL "/dev/null" > ++#endif Wouldn't it be better to use: #ifndef _PATH_DEVULL #define _PATH_DEVNULL "/dev/null" #endif /* _PATH_DEVNULL */ rather than #ifndef __sun? In that case the patch can be accepted by upstream as it seems less platform-dependent. -- Juraj Lutter From bonivart at users.sourceforge.net Thu Feb 9 17:50:39 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 09 Feb 2012 16:50:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17013] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 17013 http://gar.svn.sourceforge.net/gar/?rev=17013&view=rev Author: bonivart Date: 2012-02-09 16:50:39 +0000 (Thu, 09 Feb 2012) Log Message: ----------- memconf/trunk: update to 2.22 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2012-02-08 14:39:25 UTC (rev 17012) +++ csw/mgar/pkg/memconf/trunk/Makefile 2012-02-09 16:50:39 UTC (rev 17013) @@ -1,5 +1,5 @@ NAME = memconf -VERSION = 2.21 +VERSION = 2.22 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2012-02-08 14:39:25 UTC (rev 17012) +++ csw/mgar/pkg/memconf/trunk/checksums 2012-02-09 16:50:39 UTC (rev 17013) @@ -1,2 +1,2 @@ -2bd6ec7ae2e1c9f078e9f77035c9167f memconf.gz -b9ae140edae89a761eb5177767de258b memconf.man +06f7d35ae2b247e27087781c4a5ddb31 memconf.gz +644e16c7ed6e4e4a095d0645b038ec19 memconf.man 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 Feb 10 01:33:32 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 10 Feb 2012 00:33:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17014] csw/mgar/pkg/lang-python/python/trunk Message-ID: Revision: 17014 http://gar.svn.sourceforge.net/gar/?rev=17014&view=rev Author: wahwah Date: 2012-02-10 00:33:31 +0000 (Fri, 10 Feb 2012) Log Message: ----------- lang-python/python/trunk: version upgrade, dependency update, separate Solaris 10 build to solve the multiprocessing module problem Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile csw/mgar/pkg/lang-python/python/trunk/checksums Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-02-09 16:50:39 UTC (rev 17013) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-02-10 00:33:31 UTC (rev 17014) @@ -1,7 +1,7 @@ # $Id$ NAME = Python -VERSION = 2.6.6 +VERSION = 2.6.7 CATEGORIES = lang GARTYPE = v2 VER = 2.6 @@ -36,6 +36,14 @@ DISTFILES = $(DISTNAME).tar.bz2 +PACKAGING_PLATFORMS = solaris9_sparc solaris9_i386 +# Some features are missing on Solaris 9, e.g. functionality required for the +# multiprocessing support. +# http://osdir.com/ml/opensolaris-discuss/2009-07/msg00865.html +# http://bugs.python.org/issue3770 +# It's a platform deficiency. +PACKAGING_PLATFORMS += solaris10_sparc solaris10_i386 + # Patches PATCHFILES += faqwiz.diff PATCHFILES += makesetup.diff @@ -128,17 +136,17 @@ RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER)-tk RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbdb47 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbzip2 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm3 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm4 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 -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) += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) Modified: csw/mgar/pkg/lang-python/python/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/checksums 2012-02-09 16:50:39 UTC (rev 17013) +++ csw/mgar/pkg/lang-python/python/trunk/checksums 2012-02-10 00:33:31 UTC (rev 17014) @@ -1 +1 @@ -cf4e6881bb84a7ce6089e4a307f71f14 Python-2.6.6.tar.bz2 +d40ef58ed88438a870bbeb0ac5d4217b Python-2.6.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 Fri Feb 10 01:35:32 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 10 Feb 2012 00:35:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17015] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 17015 http://gar.svn.sourceforge.net/gar/?rev=17015&view=rev Author: wahwah Date: 2012-02-10 00:35:32 +0000 (Fri, 10 Feb 2012) Log Message: ----------- lang-python/python/trunk: PACKAGING_PLATFORMS use dashes, not underscores Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-02-10 00:33:31 UTC (rev 17014) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-02-10 00:35:32 UTC (rev 17015) @@ -36,13 +36,13 @@ DISTFILES = $(DISTNAME).tar.bz2 -PACKAGING_PLATFORMS = solaris9_sparc solaris9_i386 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 # Some features are missing on Solaris 9, e.g. functionality required for the # multiprocessing support. # http://osdir.com/ml/opensolaris-discuss/2009-07/msg00865.html # http://bugs.python.org/issue3770 # It's a platform deficiency. -PACKAGING_PLATFORMS += solaris10_sparc solaris10_i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 # Patches PATCHFILES += faqwiz.diff 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 Feb 10 11:40:09 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 10 Feb 2012 10:40:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17016] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 17016 http://gar.svn.sourceforge.net/gar/?rev=17016&view=rev Author: wahwah Date: 2012-02-10 10:40:09 +0000 (Fri, 10 Feb 2012) Log Message: ----------- lang-python/python/trunk: Compiling on Solaris 10 doesn't help. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-02-10 00:35:32 UTC (rev 17015) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-02-10 10:40:09 UTC (rev 17016) @@ -41,8 +41,9 @@ # multiprocessing support. # http://osdir.com/ml/opensolaris-discuss/2009-07/msg00865.html # http://bugs.python.org/issue3770 -# It's a platform deficiency. -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +# However, this bug is about better detection of SEM_VALUE_MAX in Solaris +# http://bugs.python.org/issue3110 +# PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 # Patches PATCHFILES += faqwiz.diff 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 Feb 10 17:19:50 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 10 Feb 2012 16:19:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[17017] csw/mgar/pkg Message-ID: Revision: 17017 http://gar.svn.sourceforge.net/gar/?rev=17017&view=rev Author: wahwah Date: 2012-02-10 16:19:50 +0000 (Fri, 10 Feb 2012) Log Message: ----------- crosstools-ng/trunk: Initial commit. Added Paths: ----------- csw/mgar/pkg/crosstools-ng/ csw/mgar/pkg/crosstools-ng/Makefile csw/mgar/pkg/crosstools-ng/branches/ csw/mgar/pkg/crosstools-ng/tags/ csw/mgar/pkg/crosstools-ng/trunk/ csw/mgar/pkg/crosstools-ng/trunk/Makefile csw/mgar/pkg/crosstools-ng/trunk/checksums csw/mgar/pkg/crosstools-ng/trunk/files/ csw/mgar/pkg/crosstools-ng/trunk/files/0001-If-you-use-bash-declare-that.patch csw/mgar/pkg/crosstools-ng/trunk/files/sanitize_filenames.sh Added: csw/mgar/pkg/crosstools-ng/Makefile =================================================================== --- csw/mgar/pkg/crosstools-ng/Makefile (rev 0) +++ csw/mgar/pkg/crosstools-ng/Makefile 2012-02-10 16:19:50 UTC (rev 17017) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/crosstools-ng/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/crosstools-ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/crosstools-ng/trunk/Makefile (rev 0) +++ csw/mgar/pkg/crosstools-ng/trunk/Makefile 2012-02-10 16:19:50 UTC (rev 17017) @@ -0,0 +1,32 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = crosstool-ng +VERSION = 1.13.2 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Toolchain generator +define BLURB +endef + +MASTER_SITES = http://crosstool-ng.org/download/crosstool-ng/ +# http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.13.2.tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 + +CONFIGURE_ARGS = --prefix=$(prefix) +TEST_SCRIPTS = + +PATCHFILES += 0001-If-you-use-bash-declare-that.patch + +CHECKPKG_OVERRIDES_CSWcrosstool-ng += file-with-bad-content + +include gar/category.mk + +post-merge: + $(FILEDIR)/sanitize_filenames.sh $(PKGROOT) + if [ -f $(PKGROOT)/opt/csw/share/man/man1/ct-ng.1.gz ]; then \ + gunzip $(PKGROOT)/opt/csw/share/man/man1/ct-ng.1.gz; \ + fi + +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/crosstools-ng/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/crosstools-ng/trunk/checksums =================================================================== --- csw/mgar/pkg/crosstools-ng/trunk/checksums (rev 0) +++ csw/mgar/pkg/crosstools-ng/trunk/checksums 2012-02-10 16:19:50 UTC (rev 17017) @@ -0,0 +1 @@ +749cf70568ad07d1b13fdcd25b163553 crosstool-ng-1.13.2.tar.bz2 Added: csw/mgar/pkg/crosstools-ng/trunk/files/0001-If-you-use-bash-declare-that.patch =================================================================== --- csw/mgar/pkg/crosstools-ng/trunk/files/0001-If-you-use-bash-declare-that.patch (rev 0) +++ csw/mgar/pkg/crosstools-ng/trunk/files/0001-If-you-use-bash-declare-that.patch 2012-02-10 16:19:50 UTC (rev 17017) @@ -0,0 +1,22 @@ +From 53ffecb08029331678e8f54d4e33cad8d7e9c6be Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 10 Feb 2012 16:51:57 +0100 +Subject: [PATCH] If you use bash, declare that. + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 6a68b38..ecd4dc0 100755 +--- a/configure ++++ b/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + myname="${0##*/}" + +-- +1.7.8.3 + Added: csw/mgar/pkg/crosstools-ng/trunk/files/sanitize_filenames.sh =================================================================== --- csw/mgar/pkg/crosstools-ng/trunk/files/sanitize_filenames.sh (rev 0) +++ csw/mgar/pkg/crosstools-ng/trunk/files/sanitize_filenames.sh 2012-02-10 16:19:50 UTC (rev 17017) @@ -0,0 +1,11 @@ +#!/opt/csw/bin/bash + +set -x +set -u +set -e + +for f in $1/opt/csw/share/doc/ct-ng-1.13.2/*; do + no_spaces=$(basename $(echo "$f" | gtr ' ' '_')) + d=$1/opt/csw/share/doc/ct-ng-1.13.2 + gmv "${f}" "${d}/${no_spaces}" +done 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 Feb 10 17:24:31 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 10 Feb 2012 16:24:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17018] csw/mgar/pkg/crosstools-ng/trunk/files/ sanitize_filenames.sh Message-ID: Revision: 17018 http://gar.svn.sourceforge.net/gar/?rev=17018&view=rev Author: wahwah Date: 2012-02-10 16:24:31 +0000 (Fri, 10 Feb 2012) Log Message: ----------- crosstools-ng/trunk: make the script executable Property Changed: ---------------- csw/mgar/pkg/crosstools-ng/trunk/files/sanitize_filenames.sh Property changes on: csw/mgar/pkg/crosstools-ng/trunk/files/sanitize_filenames.sh ___________________________________________________________________ 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 Sat Feb 11 04:11:54 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 11 Feb 2012 03:11:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17019] csw/mgar/pkg/ruby19/trunk Message-ID: Revision: 17019 http://gar.svn.sourceforge.net/gar/?rev=17019&view=rev Author: bdwalton Date: 2012-02-11 03:11:54 +0000 (Sat, 11 Feb 2012) Log Message: ----------- ruby19/trunk: patch around a solaris chmod() platform difference in the test suite; build for sol10+ only for now Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby19/trunk/files/0001-Skip-a-chmod-fileutils-test-on-solaris.patch Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-10 16:24:31 UTC (rev 17018) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-11 03:11:54 UTC (rev 17019) @@ -4,6 +4,8 @@ CATEGORIES = lang GARTYPE = v2 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + # Working with Jens Deppe, we've determined that the two failing tests # in 1.9.1p376 are bad tests (as documented here[1] and here[2]). # They make assumptions about kernel behaviour that don't hold for @@ -78,6 +80,7 @@ MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Skip-a-chmod-fileutils-test-on-solaris.patch PATCHFILES += 0003-Use-echo-port-instead-of-http-for-gem-server-test.patch # We define upstream file regex so we can be notifed of new upstream Added: csw/mgar/pkg/ruby19/trunk/files/0001-Skip-a-chmod-fileutils-test-on-solaris.patch =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/0001-Skip-a-chmod-fileutils-test-on-solaris.patch (rev 0) +++ csw/mgar/pkg/ruby19/trunk/files/0001-Skip-a-chmod-fileutils-test-on-solaris.patch 2012-02-11 03:11:54 UTC (rev 17019) @@ -0,0 +1,29 @@ +From 884a805cc4484712dc72ded825d3a8e5f399d8a6 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 11 Feb 2012 02:20:57 +0100 +Subject: [PATCH] Skip a chmod fileutils test on solaris + +Setting sticky bits on regular files doesn't work, so add solaris to +the list of systems where this fileutils mode setting test is skipped. + +Signed-off-by: Ben Walton +--- + test/fileutils/test_fileutils.rb | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb +index 70a6fb8..271a5e8 100644 +--- a/test/fileutils/test_fileutils.rb ++++ b/test/fileutils/test_fileutils.rb +@@ -914,7 +914,7 @@ class TestFileUtils + # regular file. It's slightly strange. Anyway it's no effect bit. + # see /usr/src/sys/ufs/ufs/ufs_chmod() + # NetBSD and OpenBSD also denies it. +- if /freebsd|netbsd|openbsd/ !~ RUBY_PLATFORM ++ if /solaris|freebsd|netbsd|openbsd/ !~ RUBY_PLATFORM + chmod "u+t,o+t", 'tmp/a' + assert_equal 07500, File.stat('tmp/a').mode & 07777 + chmod "a-t,a-s", 'tmp/a' +-- +1.7.8.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 Sat Feb 11 16:58:25 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 11 Feb 2012 15:58:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17020] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 17020 http://gar.svn.sourceforge.net/gar/?rev=17020&view=rev Author: dmichelsen Date: 2012-02-11 15:58:24 +0000 (Sat, 11 Feb 2012) Log Message: ----------- openldap/trunk: Enable 64 bit SASL, add build dependencies Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2012-02-11 03:11:54 UTC (rev 17019) +++ csw/mgar/pkg/openldap/trunk/Makefile 2012-02-11 15:58:24 UTC (rev 17020) @@ -37,6 +37,15 @@ LICENSE = COPYRIGHT +BUILD_DEP_PKGS += CSWbdb48devel +BUILD_DEP_PKGS += CSWlibicu-dev +BUILD_DEP_PKGS += CSWlibtool +BUILD_DEP_PKGS += CSWunixodbc-dev +BUILD_DEP_PKGS += CSWsasl-dev +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibwrap-dev +BUILD_DEP_PKGS += CSWperl + PACKAGES += CSWopenldap SPKG_DESC_CSWopenldap = OpenLDAP server for Lightweight Directory Access Protocol # PKGFILES is catchall @@ -153,6 +162,8 @@ CONFIGURE_ARGS += --enable-wrappers CONFIGURE_ARGS += --enable-backends=mod CONFIGURE_ARGS += --enable-overlays=mod +CONFIGURE_ARGS += --enable-spasswd +CONFIGURE_ARGS += --with-cyrus-sasl # Is the absence of this arg causing https://www.opencsw.org/mantis/view.php?id=4468 ? CONFIGURE_ARGS += --enable-dynamic @@ -166,13 +177,6 @@ CONFIGURE_ARGS += ac_cv_lib_net_main=no CONFIGURE_ARGS += ac_cv_lib_net_socket=no -# spasswd requires Cyrus SASL -CONFIGURE_ARGS_32 += --enable-spasswd - -# Disable Cyrus SASL in 64 bit until the libraries are available -# -CONFIGURE_ARGS_64 += --without-cyrus-sasl - # We have Perl only for 32 bit: # CONFIGURE_ARGS_32 += --enable-perl=mod This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Feb 11 21:41:54 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 11 Feb 2012 20:41:54 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[605] web/wordpresscsw/wp-content/themes/opencsw/ package.php Message-ID: Revision: 605 http://opencsw.svn.sourceforge.net/opencsw/?rev=605&view=rev Author: dmichelsen Date: 2012-02-11 20:41:54 +0000 (Sat, 11 Feb 2012) Log Message: ----------- Rename link to GAR sources to Package Sources, add stub for community site Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/package.php Modified: web/wordpresscsw/wp-content/themes/opencsw/package.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/package.php 2012-02-08 12:29:19 UTC (rev 604) +++ web/wordpresscsw/wp-content/themes/opencsw/package.php 2012-02-11 20:41:54 UTC (rev 605) @@ -75,7 +75,7 @@ print "\n" ; print "\n" ; print "\n" ; - print "Package Build Repository\n" ; + print "Package Sources\n" ; if ( strlen($repositoryUrl) < 1) { print "Not available" ; } else { @@ -101,6 +101,16 @@ print "' target='_blank'>View bugs about " . $softwareName . "\n" ; print "\n"; print "\n"; + + print "\n" ; + print ""; 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 Sun Feb 12 04:20:12 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 12 Feb 2012 03:20:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17021] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17021 http://gar.svn.sourceforge.net/gar/?rev=17021&view=rev Author: bdwalton Date: 2012-02-12 03:20:12 +0000 (Sun, 12 Feb 2012) Log Message: ----------- ruby19/trunk: build with sun pro again, force memory alignment on sparc Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-11 15:58:24 UTC (rev 17020) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-12 03:20:12 UTC (rev 17021) @@ -100,7 +100,7 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib -GARCOMPILER = GCC4 +#GARCOMPILER = GCC4 # RUNTIME_DEP_PKGS_CSWruby19 += CSWgcc4corert # RUNTIME_DEP_PKGS_CSWruby19-dev += CSWgcc4core # # This is for rbconfig.rb: without this, modules built may not get a @@ -113,6 +113,14 @@ include gar/category.mk +# these are after the include so GARCH is set. +# attempting to get a usable build on sparc: +# i think we're fighting a byte alignment issue +ifeq ($(GARCH),sparc) +EXTRA_CFLAGS = -xmemalign=1i +endif + + SPKG_VERSION := $(SPKG_VERSION)$(PATCHLEVEL) MERGE_EXCLUDE_STATICLIBS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Feb 12 13:03:35 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 12 Feb 2012 12:03:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[17022] csw/mgar/pkg/spamass-milter/trunk/files Message-ID: Revision: 17022 http://gar.svn.sourceforge.net/gar/?rev=17022&view=rev Author: guengel Date: 2012-02-12 12:03:35 +0000 (Sun, 12 Feb 2012) Log Message: ----------- Documented spamass-milter.m4. Modified Paths: -------------- csw/mgar/pkg/spamass-milter/trunk/files/README.CSW csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 Modified: csw/mgar/pkg/spamass-milter/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/README.CSW 2012-02-12 03:20:12 UTC (rev 17021) +++ csw/mgar/pkg/spamass-milter/trunk/files/README.CSW 2012-02-12 12:03:35 UTC (rev 17022) @@ -1,16 +1,18 @@ spamass-milter README.CSW ========================= -As of version 0.3.2,REV=2012.02.05, spamass-milter comes with a startup script -for Solaris 9 and 10+ including SMF support on Solaris 10+. +As of version 0.3.2,REV=2012.02.05, spamass-milter comes with a +startup script for Solaris 9 and 10+ including SMF support on Solaris +10+. You can customize spamass-milter startup options by editing -/etc/opt/csw/spamass-milter. Please see /etc/opt/csw/spamass-milter.CSW for -more information. +/etc/opt/csw/spamass-milter. Please see +/etc/opt/csw/spamass-milter.CSW for more information. Site wide configuration can be put into -/opt/csw/etc/spamass-milter. Configuration in /etc/opt/csw/spamass-milter takes -precedence over /opt/csw/etc/spamass-milter, though. +/opt/csw/etc/spamass-milter. Configuration in +/etc/opt/csw/spamass-milter takes precedence over +/opt/csw/etc/spamass-milter, though. You can start spamass-milter on Solaris 9 by issuing @@ -23,26 +25,54 @@ svcadm enable cswspamass-milter. -The startup script will log warnings and errors to the DAEMON syslog facility. +The startup script will log warnings and errors to the DAEMON syslog +facility. Sendmail Integration -------------------- -We recommend using OpenCSW Sendmail. Solaris Sendmail has not been tested with -spamass-milter and is not guaranteed to work. +We recommend using OpenCSW Sendmail. Solaris Sendmail has not been +tested with spamass-milter and is not guaranteed to work. -In order to make sendmail talk to spamass-milter, add the following lines to -your sendmail.mc file +In order to make sendmail talk to spamass-milter, add the following +lines to your sendmail.mc file INPUT_MAIL_FILTER(`spamassassin', `S=local:/var/run/spamass.sock, F=, T=C:15m;S:4m;R:4m;E:10m')dnl define(`confMILTER_MACROS_CONNECT',`t, b, j, _, {daemon_name}, {if_name}, {if_addr}')dnl define(`confMILTER_MACROS_HELO',`s, {tls_version}, {cipher}, {cipher_bits}, {cert_subject}, {cert_issuer}')dnl define(`confMILTER_MACROS_ENVRCPT',`r, v, Z')dnl -and recreate sendmail.cf. For more details, please refer to the README file in -/opt/csw/share/doc/spamass_milter. +and recreate sendmail.cf. For more details, please refer to the README +file in /opt/csw/share/doc/spamass_milter. -Please keep in mind that spamass-milter uses Spamassassin's spamc which in turn -talks to spamd. So, besides configuring sendmail to talk to spamass-milter you -also need a running spamassassin installation. +Please keep in mind that spamass-milter uses Spamassassin's spamc +which in turn talks to spamd. So, besides configuring sendmail to talk +to spamass-milter you also need a running spamassassin installation. + + +Sendmail Feature Macro +---------------------- + +This package provides a Sendmail FEATURE macro, that can be used with +the CSW Sendmail package. Add the following to your sendmail.mc file: + + FEATURE(`spamass-milter')dnl + +and it will add the necessary configuration (see `Sendmail +Integration' above) in order to use spamass-milter. + +Calling the FEATURE macro without parameter, it will expect the +spamass-milter socket to be /var/run/spamass.sock. + +If your spamass-milter socket is not at the default location, add +something like + + FEATURE(`spamass-milter', `')dnl + +to your sendmail.mc file. is the absolute path to the +spamass-milter socket. + +In any case, the filter will be called `spamass-milter'. + +Direct comments and/or suggestions to raos at opencsw.org. Modified: csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW 2012-02-12 03:20:12 UTC (rev 17021) +++ csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW 2012-02-12 12:03:35 UTC (rev 17022) @@ -1,3 +1,10 @@ +spamass-milter (0.3.2,REV=2012.02.12) + + * Documented spamass-milter.m4 + + -- Rafael Ostertag Sun, 12 Feb 2012 12:56:56 +0100 + + spamass-milter (0.3.2,REV=2012.02.06) * spamass-milter.m4: Added Sendmail feature macro Modified: csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 2012-02-12 03:20:12 UTC (rev 17021) +++ csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 2012-02-12 12:03:35 UTC (rev 17022) @@ -3,6 +3,25 @@ # # Part of CSWspamass-milter. # +# +# Use it like this in your sendmail.mc file: +# +# FEATURE(`spamass-milter')dnl +# +# This will add the necessary configuration to use spamass-milter. It +# expects the spamass-milter socket to be /var/run/spamass.sock. +# +# If your spamass-milter socket is not at the default location, add +# something like +# +# FEATURE(`spamass-milter', `')dnl +# +# to your sendmail.mc file. is the absolute path to the +# spamass-milter socket. +# +# In any case, the filter will be called `spamass-milter'. +# +# Direct comments and/or suggestions to raos at opencsw.org. divert(0) VERSIONID(`$Id')dnl 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 Feb 12 14:46:42 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 12 Feb 2012 13:46:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17023] csw/mgar/pkg/ruby19/trunk Message-ID: Revision: 17023 http://gar.svn.sourceforge.net/gar/?rev=17023&view=rev Author: bdwalton Date: 2012-02-12 13:46:41 +0000 (Sun, 12 Feb 2012) Log Message: ----------- ruby19/trunk: backport a patch to the garbage collector specific to studio 12.2 Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby19/trunk/files/0002-vm.c-vm_define_method-improve-guard-of-iseq-from-GC..patch Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-12 12:03:35 UTC (rev 17022) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-12 13:46:41 UTC (rev 17023) @@ -4,6 +4,9 @@ CATEGORIES = lang GARTYPE = v2 +# patchfile 0002-vm.c... is a backport from upstream +VERSION_FLAG_PATCH = 1 + PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 # Working with Jens Deppe, we've determined that the two failing tests @@ -81,6 +84,7 @@ DISTFILES = $(DISTNAME).tar.gz PATCHFILES += 0001-Skip-a-chmod-fileutils-test-on-solaris.patch +PATCHFILES += 0002-vm.c-vm_define_method-improve-guard-of-iseq-from-GC..patch PATCHFILES += 0003-Use-echo-port-instead-of-http-for-gem-server-test.patch # We define upstream file regex so we can be notifed of new upstream Added: csw/mgar/pkg/ruby19/trunk/files/0002-vm.c-vm_define_method-improve-guard-of-iseq-from-GC..patch =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/0002-vm.c-vm_define_method-improve-guard-of-iseq-from-GC..patch (rev 0) +++ csw/mgar/pkg/ruby19/trunk/files/0002-vm.c-vm_define_method-improve-guard-of-iseq-from-GC..patch 2012-02-12 13:46:41 UTC (rev 17023) @@ -0,0 +1,47 @@ +From 8457bea9ab5394cb43f4d5019ccb8836675366ad Mon Sep 17 00:00:00 2001 +From: ngoto +Date: Sun, 18 Dec 2011 09:58:31 +0000 +Subject: [PATCH] * vm.c (vm_define_method): improve guard of iseq from GC. + Fix failure or segmentation fault in + test_singleton_method(TestGc) on sparc Solaris10 compiled + with Oracle Solaris Studio 12.2. [Bug #5762] + [ruby-dev:45000] [Bug #4178] + +git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk at 34071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e +--- + ChangeLog | 7 +++++++ + vm.c | 3 +-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 01be941..8dd6907 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,10 @@ ++Sun Dec 18 18:52:37 2011 Naohisa Goto ++ ++ * vm.c (vm_define_method): improve guard of iseq from GC. Fix ++ failure or segmentation fault in test_singleton_method(TestGc) ++ on sparc Solaris10 compiled with Oracle Solaris Studio 12.2. ++ [Bug #5762] [ruby-dev:45000] [Bug #4178] ++ + Sun Dec 18 14:34:31 2011 Nobuyoshi Nakada + + * ext/bigdecimal/bigdecimal.c (Init_bigdecimal): does not follow +diff --git a/vm.c b/vm.c +index e04a44b..67ca439 100644 +--- a/vm.c ++++ b/vm.c +@@ -1912,8 +1912,7 @@ vm_define_method(rb_thread_t *th, VALUE obj, ID id, VALUE iseqval, + GetISeqPtr(iseqval, miseq); + + if (miseq->klass) { +- iseqval = rb_iseq_clone(iseqval, 0); +- RB_GC_GUARD(iseqval); ++ RB_GC_GUARD(iseqval) = rb_iseq_clone(iseqval, 0); + GetISeqPtr(iseqval, miseq); + } + +-- +1.7.5.4 + 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 Feb 12 14:55:41 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 12 Feb 2012 13:55:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17024] csw/mgar/pkg/ruby19/trunk/files/0002-vm. c-vm_define_method-improve-guard-of-iseq-from-GC..patch Message-ID: Revision: 17024 http://gar.svn.sourceforge.net/gar/?rev=17024&view=rev Author: bdwalton Date: 2012-02-12 13:55:40 +0000 (Sun, 12 Feb 2012) Log Message: ----------- ruby19/trunk: update patch so it applies cleanly Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/files/0002-vm.c-vm_define_method-improve-guard-of-iseq-from-GC..patch Modified: csw/mgar/pkg/ruby19/trunk/files/0002-vm.c-vm_define_method-improve-guard-of-iseq-from-GC..patch =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/0002-vm.c-vm_define_method-improve-guard-of-iseq-from-GC..patch 2012-02-12 13:46:41 UTC (rev 17023) +++ csw/mgar/pkg/ruby19/trunk/files/0002-vm.c-vm_define_method-improve-guard-of-iseq-from-GC..patch 2012-02-12 13:55:40 UTC (rev 17024) @@ -1,20 +1,23 @@ -From 8457bea9ab5394cb43f4d5019ccb8836675366ad Mon Sep 17 00:00:00 2001 -From: ngoto -Date: Sun, 18 Dec 2011 09:58:31 +0000 -Subject: [PATCH] * vm.c (vm_define_method): improve guard of iseq from GC. - Fix failure or segmentation fault in - test_singleton_method(TestGc) on sparc Solaris10 compiled - with Oracle Solaris Studio 12.2. [Bug #5762] - [ruby-dev:45000] [Bug #4178] +From 1209f5bd59e6bf404e5a9954ef1a55db3ac68372 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 12 Feb 2012 14:52:23 +0100 +Subject: [PATCH] * vm.c (vm_define_method): improve guard of iseq from GC. -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk at 34071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e +Fix failure or segmentation fault in test_singleton_method(TestGc) on +sparc Solaris10 compiled with Oracle Solaris Studio 12.2. + +[Bug #5762] [ruby-dev:45000] [Bug #4178] + +git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk at 34071b2dd03c8-39d4-4d8f-98ff-823fe69b080e + +Signed-off-by: Ben Walton --- ChangeLog | 7 +++++++ vm.c | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog -index 01be941..8dd6907 100644 +index c4ea779..0dfbe0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ @@ -25,14 +28,14 @@ + on sparc Solaris10 compiled with Oracle Solaris Studio 12.2. + [Bug #5762] [ruby-dev:45000] [Bug #4178] + - Sun Dec 18 14:34:31 2011 Nobuyoshi Nakada + Mon Oct 10 22:33:12 2011 KOSAKI Motohiro - * ext/bigdecimal/bigdecimal.c (Init_bigdecimal): does not follow + * test/-ext-/old_thread_select/test_old_thread_select.rb: diff --git a/vm.c b/vm.c -index e04a44b..67ca439 100644 +index f2cdcf5..7340a15 100644 --- a/vm.c +++ b/vm.c -@@ -1912,8 +1912,7 @@ vm_define_method(rb_thread_t *th, VALUE obj, ID id, VALUE iseqval, +@@ -1917,8 +1917,7 @@ vm_define_method(rb_thread_t *th, VALUE obj, ID id, VALUE iseqval, GetISeqPtr(iseqval, miseq); if (miseq->klass) { @@ -43,5 +46,5 @@ } -- -1.7.5.4 +1.7.8.3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Feb 12 16:56:22 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 12 Feb 2012 15:56:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[17025] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 17025 http://gar.svn.sourceforge.net/gar/?rev=17025&view=rev Author: guengel Date: 2012-02-12 15:56:22 +0000 (Sun, 12 Feb 2012) Log Message: ----------- glib2/trunk: Disabled check /glib/642026-ec Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/0004-Disable-check-glib-642026-ec.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2012-02-12 13:55:40 UTC (rev 17024) +++ csw/mgar/pkg/glib2/trunk/Makefile 2012-02-12 15:56:22 UTC (rev 17025) @@ -30,6 +30,8 @@ PATCHFILES += 0002-Replace-sh-by-svcs-in-utils-find-program.patch # Patch from glib-2.28.8 PATCHFILES += 0002-Make-glib-work-with-zoneinfo-version-1.patch +# Disabled. Need to report, but wait on outcome on x86. +PATCHFILES += 0004-Disable-check-glib-642026-ec.patch # PATCHFILES = 0001-Use-proper-locale-for-collate-tests.patch @@ -153,7 +155,8 @@ CATALOGNAME_CSWglib2devel = glib2_devel_stub -BUILD_DEP_PKGS = CSWggettext CSWlibpcre-dev CSWlibiconv-dev CSWlibffi5 +BUILD_DEP_PKGS = CSWggettext CSWlibiconv-dev CSWlibffi-dev +BUILD_DEP_PKGS += CSWlibdbus-dev CSWlibgamin-dev # To make the tests working BUILD_DEP_PKGS += CSWpython CSWdbuspython CSWsharedmimeinfo # This is used to adjust paths in documentation @@ -163,7 +166,7 @@ LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -EXTRA_CFLAGS = -features=extensions -xc99 -D_XPG6 +EXTRA_CFLAGS = -features=extensions -xc99 -D_XPG6 -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 #EXTRA_CFLAGS-5.10 += -xc99 -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -D_XPG6 #EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(GAROSREL)) @@ -178,14 +181,15 @@ CONFIGURE_ARGS += --enable-included-printf CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --with-threads=posix +CONFIGURE_ARGS += --disable-silent-rules # CONFIGURE_ARGS += --enable-static # DTrace compilation fails, disable for now CONFIGURE_ARGS += --disable-dtrace # DEBUGGING -# CONFIGURE_ARGS += --enable-debug=yes -# EXTRA_CFLAGS += -xO0 -g +CONFIGURE_ARGS += --enable-debug=yes +EXTRA_CFLAGS += -xO0 -g # Those are to make the checks work EXTRA_COMMON_EXPORTS = TZ Added: csw/mgar/pkg/glib2/trunk/files/0004-Disable-check-glib-642026-ec.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0004-Disable-check-glib-642026-ec.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0004-Disable-check-glib-642026-ec.patch 2012-02-12 15:56:22 UTC (rev 17025) @@ -0,0 +1,27 @@ +From 6065700bcdaf41459c3bef56dac289600df5adb5 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 12 Feb 2012 16:52:10 +0100 +Subject: [PATCH] Disable check /glib/642026-ec + +--- + gthread/tests/642026.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/gthread/tests/642026.c b/gthread/tests/642026.c +index a95623d..64d2fb9 100644 +--- a/gthread/tests/642026.c ++++ b/gthread/tests/642026.c +@@ -86,7 +86,9 @@ main (int argc, + g_test_bug_base ("https://bugzilla.gnome.org/show_bug.cgi?id="); + + #ifdef G_ERRORCHECK_MUTEXES +- g_test_add_func ("/glib/642026-ec", testcase); ++ /* Disabled because it fails on Solaris 10 */ ++ /* g_test_add_func ("/glib/642026-ec", testcase); */ ++ printf("/glib/642026-ec has been disabled\n"); + #else + g_test_add_func ("/glib/642026", testcase); + #endif +-- +1.7.9 + 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 Feb 12 22:44:12 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 12 Feb 2012 21:44:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17026] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17026 http://gar.svn.sourceforge.net/gar/?rev=17026&view=rev Author: bdwalton Date: 2012-02-12 21:44:12 +0000 (Sun, 12 Feb 2012) Log Message: ----------- ruby19/trunk: disable tests until next version change Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-12 15:56:22 UTC (rev 17025) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-12 21:44:12 UTC (rev 17026) @@ -16,7 +16,7 @@ # # [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543805 # [2] http://redmine.ruby-lang.org/issues/show/2609 -ifneq ($(VERSION)$(PATCHLEVEL), 1.9.1p376) +ifneq ($(VERSION)$(PATCHLEVEL), 1.9.3p0) else TEST_SCRIPTS = endif 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 Feb 12 22:52:45 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 12 Feb 2012 21:52:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17027] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17027 http://gar.svn.sourceforge.net/gar/?rev=17027&view=rev Author: bdwalton Date: 2012-02-12 21:52:45 +0000 (Sun, 12 Feb 2012) Log Message: ----------- ruby19/trunk: update some postinstall targets, disable the multiconfig stuff Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-12 21:44:12 UTC (rev 17026) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-12 21:52:45 UTC (rev 17027) @@ -131,12 +131,12 @@ COMPILE_ELISP = 1 -PI_TARGETS = samples rbconfig rbscripts multiconfig +PI_TARGETS = samples rbconfig rbscripts post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) -multiconfig: RBCONFIG=/opt/csw/lib/ruby19/1.9.1/$(GARCH)-solaris2.9/rbconfig.rb +multiconfig: RBCONFIG=/opt/csw/lib/ruby19/$(VERSION)/$(GARCH)-solaris2.10/rbconfig.rb multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12 @@ -151,7 +151,7 @@ # Fix up rbconfig rbconfig: @gsed -i -e s,$(DESTDIR),, \ - $(DESTDIR)$(libdir)/$(NAME)/$(VERSION)/$(GARCH)-solaris2.9/rbconfig.rb + $(DESTDIR)$(libdir)/$(NAME)/$(VERSION)/$(GARCH)-solaris2.10/rbconfig.rb @$(MAKECOOKIE) # Copy samples 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 Feb 12 23:31:54 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 12 Feb 2012 22:31:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17028] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17028 http://gar.svn.sourceforge.net/gar/?rev=17028&view=rev Author: bdwalton Date: 2012-02-12 22:31:54 +0000 (Sun, 12 Feb 2012) Log Message: ----------- ruby19/trunk: more postinstall tweaks Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-12 21:52:45 UTC (rev 17027) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-12 22:31:54 UTC (rev 17028) @@ -136,7 +136,7 @@ post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) -multiconfig: RBCONFIG=/opt/csw/lib/ruby19/$(VERSION)/$(GARCH)-solaris2.10/rbconfig.rb +multiconfig: RBCONFIG=/opt/csw/lib/ruby/$(VERSION)/$(GARCH)-solaris2.10/rbconfig.rb multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12 @@ -151,7 +151,7 @@ # Fix up rbconfig rbconfig: @gsed -i -e s,$(DESTDIR),, \ - $(DESTDIR)$(libdir)/$(NAME)/$(VERSION)/$(GARCH)-solaris2.10/rbconfig.rb + $(DESTDIR)$(libdir)/ruby/$(VERSION)/$(GARCH)-solaris2.10/rbconfig.rb @$(MAKECOOKIE) # Copy samples 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 Feb 13 01:59:31 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 13 Feb 2012 00:59:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17029] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17029 http://gar.svn.sourceforge.net/gar/?rev=17029&view=rev Author: bdwalton Date: 2012-02-13 00:59:31 +0000 (Mon, 13 Feb 2012) Log Message: ----------- ruby19/trunk: add note about api (libdir) vs version number difference and correct a few paths to match this info Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-12 22:31:54 UTC (rev 17028) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-13 00:59:31 UTC (rev 17029) @@ -4,6 +4,9 @@ CATEGORIES = lang GARTYPE = v2 +#NOTE: Some things below use version 1.9.1. As of 1.9.3, the api of +#the libs is 1.9.1, so that is why we can't use $(VERSION). + # patchfile 0002-vm.c... is a backport from upstream VERSION_FLAG_PATCH = 1 @@ -136,7 +139,7 @@ post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) -multiconfig: RBCONFIG=/opt/csw/lib/ruby/$(VERSION)/$(GARCH)-solaris2.10/rbconfig.rb +multiconfig: RBCONFIG=/opt/csw/lib/ruby/1.9.1/$(GARCH)-solaris2.10/rbconfig.rb multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12 @@ -151,7 +154,7 @@ # Fix up rbconfig rbconfig: @gsed -i -e s,$(DESTDIR),, \ - $(DESTDIR)$(libdir)/ruby/$(VERSION)/$(GARCH)-solaris2.10/rbconfig.rb + $(DESTDIR)$(libdir)/ruby/1.9.1/$(GARCH)-solaris2.10/rbconfig.rb @$(MAKECOOKIE) # Copy samples 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 Feb 13 03:32:50 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 13 Feb 2012 02:32:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[17030] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17030 http://gar.svn.sourceforge.net/gar/?rev=17030&view=rev Author: bdwalton Date: 2012-02-13 02:32:50 +0000 (Mon, 13 Feb 2012) Log Message: ----------- ruby19/trunk: update a few deps and checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-13 00:59:31 UTC (rev 17029) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-13 02:32:50 UTC (rev 17030) @@ -44,22 +44,17 @@ ARCHALL_CSWruby19-ri = 1 # checkpkg overrides -CHECKPKG_OVERRIDES_CSWruby19-dev += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby19-dev += surplus-dependency|CSWruby19 CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWruby19-samples += surplus-dependency|CSWruby19 -CHECKPKG_OVERRIDES_CSWruby19-tk += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby19-tk += surplus-dependency|CSWruby19 CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWruby19-ri += surplus-dependency|CSWruby19 CHECKPKG_OVERRIDES_CSWruby19-tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 CHECKPKG_OVERRIDES_CSWruby19-tk += soname-not-found|libruby19.so CHECKPKG_OVERRIDES_CSWruby19 += soname-not-found|libruby19.so -RUNTIME_DEP_PKGS_CSWruby19 = CSWgdbm CSWiconv CSWncurses CSWosslrt -RUNTIME_DEP_PKGS_CSWruby19 += CSWreadline CSWzlib +RUNTIME_DEP_PKGS_CSWruby19 = CSWlibgdbm4 CSWlibiconv2 CSWncurses CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWruby19 += CSWlibreadline6 CSWlibz1 CSWlibffi4 RUNTIME_DEP_PKGS_CSWruby19-samples = CSWruby19 RUNTIME_DEP_PKGS_CSWruby19-tk = CSWruby19 CSWtk CSWtcl RUNTIME_DEP_PKGS_CSWruby19-dev = CSWruby19 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 Feb 13 04:35:11 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 13 Feb 2012 03:35:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17031] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17031 http://gar.svn.sourceforge.net/gar/?rev=17031&view=rev Author: bdwalton Date: 2012-02-13 03:35:11 +0000 (Mon, 13 Feb 2012) Log Message: ----------- ruby19/trunk: override usr/local and usr/share, etc refs in the samples package Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-13 02:32:50 UTC (rev 17030) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-13 03:35:11 UTC (rev 17031) @@ -47,12 +47,14 @@ CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWruby19-samples += surplus-dependency|CSWruby19 +CHECKPKG_OVERRIDES_CSWruby19-samples += file-with-bad-content CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWruby19-ri += surplus-dependency|CSWruby19 CHECKPKG_OVERRIDES_CSWruby19-tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 CHECKPKG_OVERRIDES_CSWruby19-tk += soname-not-found|libruby19.so CHECKPKG_OVERRIDES_CSWruby19 += soname-not-found|libruby19.so + RUNTIME_DEP_PKGS_CSWruby19 = CSWlibgdbm4 CSWlibiconv2 CSWncurses CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWruby19 += CSWlibreadline6 CSWlibz1 CSWlibffi4 RUNTIME_DEP_PKGS_CSWruby19-samples = CSWruby19 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Feb 13 09:49:18 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 13 Feb 2012 08:49:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17032] csw/mgar/pkg/mozldap/trunk/Makefile Message-ID: Revision: 17032 http://gar.svn.sourceforge.net/gar/?rev=17032&view=rev Author: cgrzemba Date: 2012-02-13 08:49:18 +0000 (Mon, 13 Feb 2012) Log Message: ----------- mozldap/trunk: fix pc-file package location Modified Paths: -------------- csw/mgar/pkg/mozldap/trunk/Makefile Modified: csw/mgar/pkg/mozldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/mozldap/trunk/Makefile 2012-02-13 03:35:11 UTC (rev 17031) +++ csw/mgar/pkg/mozldap/trunk/Makefile 2012-02-13 08:49:18 UTC (rev 17032) @@ -118,6 +118,7 @@ SPKG_DESC_CSWmozldap-dev += $(DESCRIPTION), development files PKGFILES_DEVEL_SHAREDLIBLINK = PKGFILES_CSWmozldap-dev = $(PKGFILES_DEVEL_INCLUDEDIR) +PKGFILES_CSWmozldap-dev = $(PKGFILES_DEVEL_PKGCONFIG) ARCHALL_CSWmozldap-dev = 1 RUNTIME_DEP_PKGS_CSWmozldap-dev += CSWlibssldap60 RUNTIME_DEP_PKGS_CSWmozldap-dev += CSWlibprldap60 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 Feb 13 10:22:20 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 13 Feb 2012 09:22:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17033] csw/mgar/pkg/yasm/trunk/Makefile Message-ID: Revision: 17033 http://gar.svn.sourceforge.net/gar/?rev=17033&view=rev Author: dmichelsen Date: 2012-02-13 09:22:20 +0000 (Mon, 13 Feb 2012) Log Message: ----------- yasm/trunk: Minor fixes Modified Paths: -------------- csw/mgar/pkg/yasm/trunk/Makefile Modified: csw/mgar/pkg/yasm/trunk/Makefile =================================================================== --- csw/mgar/pkg/yasm/trunk/Makefile 2012-02-13 08:49:18 UTC (rev 17032) +++ csw/mgar/pkg/yasm/trunk/Makefile 2012-02-13 09:22:20 UTC (rev 17033) @@ -15,8 +15,10 @@ endef MASTER_SITES = http://www.tortall.net/projects/yasm/releases/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = http://yasm.tortall.net/ + RUNTIME_DEP_PKGS_CSWyasm += CSWlibintl8 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 Mon Feb 13 14:15:01 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 13 Feb 2012 13:15:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[17034] csw/mgar/pkg/rbgems Message-ID: Revision: 17034 http://gar.svn.sourceforge.net/gar/?rev=17034&view=rev Author: dmichelsen Date: 2012-02-13 13:15:01 +0000 (Mon, 13 Feb 2012) Log Message: ----------- rbgems/i18n: Initial commit Modified Paths: -------------- csw/mgar/pkg/rbgems/i18n/trunk/Makefile csw/mgar/pkg/rbgems/i18n/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rbgems/i18n/ Modified: csw/mgar/pkg/rbgems/i18n/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/Makefile 2012-02-13 09:22:20 UTC (rev 17033) +++ csw/mgar/pkg/rbgems/i18n/trunk/Makefile 2012-02-13 13:15:01 UTC (rev 17034) @@ -1,5 +1,5 @@ NAME = i18n -VERSION = 0.5.0 +VERSION = 0.6.0 CATEGORIES = rbgems GARTYPE = v2 @@ -9,10 +9,10 @@ New wave Internationalization suport for Ruby. endef -# RUNTIME_DEP_PKGS += CSWgem-activesupport -# RUNTIME_DEP_PKGS += CSWgem-sqlite3-ruby -# RUNTIME_DEP_PKGS += CSWgem-mocha -# RUNTIME_DEP_PKGS += CSWgem-test_declarative +RUNTIME_DEP_PKGS += CSWgem-activesupport +RUNTIME_DEP_PKGS += CSWgem-sqlite3-ruby +RUNTIME_DEP_PKGS += CSWgem-mocha +RUNTIME_DEP_PKGS += CSWgem-test_declarative GEM_INSTALL_NO_TEST = Modified: csw/mgar/pkg/rbgems/i18n/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/checksums 2012-02-13 09:22:20 UTC (rev 17033) +++ csw/mgar/pkg/rbgems/i18n/trunk/checksums 2012-02-13 13:15:01 UTC (rev 17034) @@ -1 +1 @@ -761d743478dfbdc4f2c1743d5241c009 i18n-0.5.0.gem +fb94282dab8aadb7de15db134f8133ff i18n-0.6.0.gem 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 Feb 13 14:26:05 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 13 Feb 2012 13:26:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[17035] csw/mgar/pkg/rbgems Message-ID: Revision: 17035 http://gar.svn.sourceforge.net/gar/?rev=17035&view=rev Author: dmichelsen Date: 2012-02-13 13:26:04 +0000 (Mon, 13 Feb 2012) Log Message: ----------- rbgems/faker: Initial commit Modified Paths: -------------- csw/mgar/pkg/rbgems/faker/trunk/Makefile csw/mgar/pkg/rbgems/faker/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rbgems/faker/ Modified: csw/mgar/pkg/rbgems/faker/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/tzinfo/trunk/Makefile 2012-02-13 09:22:20 UTC (rev 17033) +++ csw/mgar/pkg/rbgems/faker/trunk/Makefile 2012-02-13 13:26:04 UTC (rev 17035) @@ -1,15 +1,15 @@ -NAME = tzinfo -VERSION = 0.3.27 +NAME = faker +VERSION = 1.0.1 CATEGORIES = rbgems GARTYPE = v2 -DESCRIPTION = Daylight-savings aware timezone library +DESCRIPTION = A port of Data::Faker from Perl define BLURB - TZInfo is a Ruby library that uses the standard tz (Olson) database toprovide daylight savings aware transformations betwen times indiferent time zones. +Faker, a port of Data::Faker from Perl, is used to easily generate fake data: names, addresses, phone numbers, etc. endef -LICENSE = LICENSE +LICENSE = License.txt ARCHALL = 1 Modified: csw/mgar/pkg/rbgems/faker/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/tzinfo/trunk/checksums 2012-02-13 09:22:20 UTC (rev 17033) +++ csw/mgar/pkg/rbgems/faker/trunk/checksums 2012-02-13 13:26:04 UTC (rev 17035) @@ -1 +1 @@ -66c3e84a2fd7af9e70f3b551bee7e2b7 tzinfo-0.3.27.gem +54adf555499dd56c4cd1ac8990b1069f faker-1.0.1.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Feb 13 15:03:54 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 13 Feb 2012 14:03:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17036] csw/mgar/pkg Message-ID: Revision: 17036 http://gar.svn.sourceforge.net/gar/?rev=17036&view=rev Author: janholzh Date: 2012-02-13 14:03:54 +0000 (Mon, 13 Feb 2012) Log Message: ----------- x264/trunk: Initial commit work for x86 done Added Paths: ----------- csw/mgar/pkg/x264/ csw/mgar/pkg/x264/Makefile csw/mgar/pkg/x264/branches/ csw/mgar/pkg/x264/tags/ csw/mgar/pkg/x264/trunk/ csw/mgar/pkg/x264/trunk/Makefile csw/mgar/pkg/x264/trunk/checksums csw/mgar/pkg/x264/trunk/files/ Added: csw/mgar/pkg/x264/Makefile =================================================================== --- csw/mgar/pkg/x264/Makefile (rev 0) +++ csw/mgar/pkg/x264/Makefile 2012-02-13 14:03:54 UTC (rev 17036) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/x264/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x264/trunk/Makefile 2012-02-13 14:03:54 UTC (rev 17036) @@ -0,0 +1,67 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = x264 +VERSION = snapshot-20120211-2245 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = x264 is encoding video streams into the H.264/MPEG-4 AVC format +define BLURB + x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC format, and is released under the terms of the GNU GPL. +endef + +VENDOR_URL = http://www.videolan.org/developers/x264.html +MASTER_SITES = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ +DISTFILES = $(DISTNAME).tar.bz2 + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\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 = + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +GARCOMPILER = GCC4 +SKIPTEST = 1 +BUILD64_LIBS_ONLY = 1 + + +CONFIGURE_ARGS-isa-pentium_pro = $(DIRPATHS) --enable-shared --enable-pic +CONFIGURE_ARGS-isa-amd64 = $(DIRPATHS) --enable-shared --enable-pic --host=amd64-pc-solaris2.10 +CONFIGURE_ARGS += $(CONFIGURE_ARGS-isa-$(ISA)) + +RUNTIME_DEP_PKGS_CSWlibx264-120 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWx264-dev += CSWlibx264-120 + +PACKAGES += CSWx264 +SPKG_DESC_CSWx264 = $(DESCRIPTION) +# PKGFILES is catchall + +PACKAGES += CSWlibx264-120 +CATALOGNAME_CSWlibx264-120 = libx264_120 +PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.120) +PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.120(\.\d+)*) +SPKG_DESC_CSWlibx264-120 += $(DESCRIPTION), libx264.so.120 + +PACKAGES += CSWx264-dev +CATALOGNAME_CSWx264-dev = x264_dev +SPKG_DESC_CSWx264-dev += $(DESCRIPTION), development files +PKGFILES_CSWx264-dev += /opt/csw/lib/libx264.so +PKGFILES_CSWx264-dev += $(PKGFILES_DEVEL) + +#Some overrides +CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase +# seems to be checkpkg bug: +CHECKPKG_OVERRIDES_CSWlibx264-120 += non-uniform-lib-versions-in-package|sonames=libx264.so.120 + + + + +include gar/category.mk + +# For 'grep -q' +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/x264/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/x264/trunk/checksums =================================================================== --- csw/mgar/pkg/x264/trunk/checksums (rev 0) +++ csw/mgar/pkg/x264/trunk/checksums 2012-02-13 14:03:54 UTC (rev 17036) @@ -0,0 +1 @@ +b6f499b863370542304b213b9edc01d6 x264-snapshot-20120211-2245.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Feb 13 16:08:32 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 13 Feb 2012 15:08:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17037] csw/mgar/pkg/x264/trunk/Makefile Message-ID: Revision: 17037 http://gar.svn.sourceforge.net/gar/?rev=17037&view=rev Author: janholzh Date: 2012-02-13 15:08:31 +0000 (Mon, 13 Feb 2012) Log Message: ----------- x264/trunk: add the sparc part Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile Modified: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile 2012-02-13 14:03:54 UTC (rev 17036) +++ csw/mgar/pkg/x264/trunk/Makefile 2012-02-13 15:08:31 UTC (rev 17037) @@ -32,6 +32,8 @@ CONFIGURE_ARGS-isa-pentium_pro = $(DIRPATHS) --enable-shared --enable-pic CONFIGURE_ARGS-isa-amd64 = $(DIRPATHS) --enable-shared --enable-pic --host=amd64-pc-solaris2.10 +CONFIGURE_ARGS-isa-sparcv8plus = $(DIRPATHS) --enable-shared --enable-pic --disable-asm +CONFIGURE_ARGS-isa-sparcv9 = $(DIRPATHS) --enable-shared --enable-pic --disable-asm CONFIGURE_ARGS += $(CONFIGURE_ARGS-isa-$(ISA)) RUNTIME_DEP_PKGS_CSWlibx264-120 += CSWlibgcc-s1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Feb 13 16:17:46 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 13 Feb 2012 15:17:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17038] csw/mgar/pkg/x264/trunk/Makefile Message-ID: Revision: 17038 http://gar.svn.sourceforge.net/gar/?rev=17038&view=rev Author: janholzh Date: 2012-02-13 15:17:46 +0000 (Mon, 13 Feb 2012) Log Message: ----------- x264/trunk: rename x264_dev to libx264_dev add another override Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile Modified: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile 2012-02-13 15:08:31 UTC (rev 17037) +++ csw/mgar/pkg/x264/trunk/Makefile 2012-02-13 15:17:46 UTC (rev 17038) @@ -37,7 +37,7 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS-isa-$(ISA)) RUNTIME_DEP_PKGS_CSWlibx264-120 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWx264-dev += CSWlibx264-120 +RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-120 PACKAGES += CSWx264 SPKG_DESC_CSWx264 = $(DESCRIPTION) @@ -49,14 +49,15 @@ PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.120(\.\d+)*) SPKG_DESC_CSWlibx264-120 += $(DESCRIPTION), libx264.so.120 -PACKAGES += CSWx264-dev -CATALOGNAME_CSWx264-dev = x264_dev -SPKG_DESC_CSWx264-dev += $(DESCRIPTION), development files -PKGFILES_CSWx264-dev += /opt/csw/lib/libx264.so -PKGFILES_CSWx264-dev += $(PKGFILES_DEVEL) +PACKAGES += CSWlibx264-dev +CATALOGNAME_CSWlibx264-dev = libx264_dev +SPKG_DESC_CSWlibx264-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibx264-dev += /opt/csw/lib/libx264.so +PKGFILES_CSWlibx264-dev += $(PKGFILES_DEVEL) #Some overrides CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase +CHECKPKG_OVERRIDES_CSWlibx264-120 += pkginfo-description-not-starting-with-uppercase # seems to be checkpkg bug: CHECKPKG_OVERRIDES_CSWlibx264-120 += non-uniform-lib-versions-in-package|sonames=libx264.so.120 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 Feb 13 17:29:19 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 13 Feb 2012 16:29:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[17039] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 17039 http://gar.svn.sourceforge.net/gar/?rev=17039&view=rev Author: wahwah Date: 2012-02-13 16:29:19 +0000 (Mon, 13 Feb 2012) Log Message: ----------- mysql5/branches/mysql-5.0.x: Version bump to 5.0.95 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-02-13 15:17:46 UTC (rev 17038) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-02-13 16:29:19 UTC (rev 17039) @@ -8,7 +8,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.0 -PATCHLEVEL = 92 +PATCHLEVEL = 95 ALTS_PRIO = 50 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2012-02-13 15:17:46 UTC (rev 17038) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2012-02-13 16:29:19 UTC (rev 17039) @@ -1 +1 @@ -a72ee3d1d54bff74836de9500858a311 mysql-5.0.92.tar.gz +3959d47a893b45b5ff70939d485d832c mysql-5.0.95.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 Feb 13 17:54:22 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 13 Feb 2012 16:54:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[17040] csw/mgar/pkg Message-ID: Revision: 17040 http://gar.svn.sourceforge.net/gar/?rev=17040&view=rev Author: dmichelsen Date: 2012-02-13 16:54:22 +0000 (Mon, 13 Feb 2012) Log Message: ----------- vbindiff: Initial commit Added Paths: ----------- csw/mgar/pkg/vbindiff/ csw/mgar/pkg/vbindiff/Makefile csw/mgar/pkg/vbindiff/branches/ csw/mgar/pkg/vbindiff/tags/ csw/mgar/pkg/vbindiff/trunk/ csw/mgar/pkg/vbindiff/trunk/Makefile csw/mgar/pkg/vbindiff/trunk/checksums csw/mgar/pkg/vbindiff/trunk/files/ Added: csw/mgar/pkg/vbindiff/Makefile =================================================================== --- csw/mgar/pkg/vbindiff/Makefile (rev 0) +++ csw/mgar/pkg/vbindiff/Makefile 2012-02-13 16:54:22 UTC (rev 17040) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/vbindiff/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/vbindiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/vbindiff/trunk/Makefile (rev 0) +++ csw/mgar/pkg/vbindiff/trunk/Makefile 2012-02-13 16:54:22 UTC (rev 17040) @@ -0,0 +1,33 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = vbindiff +VERSION = 3.0_beta4 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Visual Binary Diff +define BLURB +endef + +MASTER_SITES = http://www.cjmweb.net/vbindiff/ +DISTFILES = $(DISTNAME).tar.gz + +PACKAGES += CSWvbindiff +SPKG_DESC_CSWvbindiff = Visual binary diff +RUNTIME_DEP_PKGS_CSWvbindiff += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWvbindiff += CSWlibpanel5 + +REINPLACEMENTS = wall +REINPLACE_MATCH_wall = -Wall +REINPLACE_WITH_wall = +REINPLACE_FILES_wall += Makefile.in + +EXTRA_INC += $(includedir)/ncurses + +EXTRA_CXXFLAGS = -norunpath + +#CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/vbindiff/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/vbindiff/trunk/checksums =================================================================== --- csw/mgar/pkg/vbindiff/trunk/checksums (rev 0) +++ csw/mgar/pkg/vbindiff/trunk/checksums 2012-02-13 16:54:22 UTC (rev 17040) @@ -0,0 +1 @@ +dbda80ef580e1a0975ef50b9aaa5210e vbindiff-3.0_beta4.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 Tue Feb 14 00:23:27 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 13 Feb 2012 23:23:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[17041] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 17041 http://gar.svn.sourceforge.net/gar/?rev=17041&view=rev Author: wahwah Date: 2012-02-13 23:23:26 +0000 (Mon, 13 Feb 2012) Log Message: ----------- bugfix: quick_start installation Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-02-13 16:54:22 UTC (rev 17040) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-02-13 23:23:26 UTC (rev 17041) @@ -353,7 +353,8 @@ ginstall -m 755 -d $(PKGROOT)/opt/csw/share/$(NAME)/doc gln -sf ../../../$(NAME)/share/$(NAME)/doc/README-$(BASE_VERSION).CSW \ $(PKGROOT)/opt/csw/share/$(NAME)/doc/README-$(BASE_VERSION).CSW - ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql + [ -d $(PKGROOT)$(datadir)/mysql55 ] + ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql55 ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) 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 Feb 14 00:27:28 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 13 Feb 2012 23:27:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17042] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 17042 http://gar.svn.sourceforge.net/gar/?rev=17042&view=rev Author: wahwah Date: 2012-02-13 23:27:28 +0000 (Mon, 13 Feb 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: version bump to 5.5.20 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-02-13 23:23:26 UTC (rev 17041) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-02-13 23:27:28 UTC (rev 17042) @@ -13,7 +13,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)55 BASE_VERSION = 5.5 -PATCHLEVEL = 19 +PATCHLEVEL = 20 ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2012-02-13 23:23:26 UTC (rev 17041) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2012-02-13 23:27:28 UTC (rev 17042) @@ -1 +1 @@ -a78cf450974e9202bd43674860349b5a mysql-5.5.19.tar.gz +375794ebf84b4c7b63f1676bc7416cd0 mysql-5.5.20.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 Tue Feb 14 00:38:25 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 13 Feb 2012 23:38:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17043] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 17043 http://gar.svn.sourceforge.net/gar/?rev=17043&view=rev Author: wahwah Date: 2012-02-13 23:38:25 +0000 (Mon, 13 Feb 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: this patch doesn't apply any more, let's see if we can do without it. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-02-13 23:27:28 UTC (rev 17042) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-02-13 23:38:25 UTC (rev 17043) @@ -143,7 +143,7 @@ EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.* EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* -PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch +# PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch # Enable 64 bits build BUILD64 = 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 Tue Feb 14 01:36:33 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 14 Feb 2012 00:36:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[17044] csw/mgar/pkg/ruby18/trunk Message-ID: Revision: 17044 http://gar.svn.sourceforge.net/gar/?rev=17044&view=rev Author: bdwalton Date: 2012-02-14 00:36:33 +0000 (Tue, 14 Feb 2012) Log Message: ----------- ruby18/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile csw/mgar/pkg/ruby18/trunk/checksums Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2012-02-13 23:38:25 UTC (rev 17043) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2012-02-14 00:36:33 UTC (rev 17044) @@ -1,6 +1,6 @@ NAME = ruby18 DISTVERSION = 1.8.7 -PATCHLEVEL = p334 +PATCHLEVEL = p357 VERSION = $(DISTVERSION) CATEGORIES = lang GARTYPE = v2 Modified: csw/mgar/pkg/ruby18/trunk/checksums =================================================================== --- csw/mgar/pkg/ruby18/trunk/checksums 2012-02-13 23:38:25 UTC (rev 17043) +++ csw/mgar/pkg/ruby18/trunk/checksums 2012-02-14 00:36:33 UTC (rev 17044) @@ -1 +1 @@ -2f14f604bf981bb938ab5fc8b09eb1a6 ruby-1.8.7-p334.tar.bz2 +3abd9e2a29f756a0d30c7bfca578cdeb ruby-1.8.7-p357.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 Tue Feb 14 04:57:14 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 14 Feb 2012 03:57:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17045] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17045 http://gar.svn.sourceforge.net/gar/?rev=17045&view=rev Author: bdwalton Date: 2012-02-14 03:57:14 +0000 (Tue, 14 Feb 2012) Log Message: ----------- ruby19/trunk: checkpkg updates and a few more dep tweaks Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-14 00:36:33 UTC (rev 17044) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-14 03:57:14 UTC (rev 17045) @@ -47,18 +47,22 @@ CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWruby19-samples += surplus-dependency|CSWruby19 +CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWruby|or|CSWruby18 CHECKPKG_OVERRIDES_CSWruby19-samples += file-with-bad-content CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWruby19-ri += surplus-dependency|CSWruby19 CHECKPKG_OVERRIDES_CSWruby19-tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 CHECKPKG_OVERRIDES_CSWruby19-tk += soname-not-found|libruby19.so +CHECKPKG_OVERRIDES_CSWruby19-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby-static.a +CHECKPKG_OVERRIDES_CSWruby19-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb CHECKPKG_OVERRIDES_CSWruby19 += soname-not-found|libruby19.so +CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby|or|CSWruby18 - -RUNTIME_DEP_PKGS_CSWruby19 = CSWlibgdbm4 CSWlibiconv2 CSWncurses CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWruby19 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWruby19 += CSWlibssl0-9-8 CSWlibyaml RUNTIME_DEP_PKGS_CSWruby19 += CSWlibreadline6 CSWlibz1 CSWlibffi4 RUNTIME_DEP_PKGS_CSWruby19-samples = CSWruby19 -RUNTIME_DEP_PKGS_CSWruby19-tk = CSWruby19 CSWtk CSWtcl +RUNTIME_DEP_PKGS_CSWruby19-tk = CSWruby19 CSWtk CSWtcl CSWlibx11 RUNTIME_DEP_PKGS_CSWruby19-dev = CSWruby19 RUNTIME_DEP_PKGS_CSWruby19-ri = CSWruby19 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Feb 14 10:06:04 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 14 Feb 2012 09:06:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17046] csw/mgar/pkg/x264/trunk/Makefile Message-ID: Revision: 17046 http://gar.svn.sourceforge.net/gar/?rev=17046&view=rev Author: janholzh Date: 2012-02-14 09:06:03 +0000 (Tue, 14 Feb 2012) Log Message: ----------- x264/trunk: Disable PIC where possable Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile Modified: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile 2012-02-14 03:57:14 UTC (rev 17045) +++ csw/mgar/pkg/x264/trunk/Makefile 2012-02-14 09:06:03 UTC (rev 17046) @@ -30,9 +30,11 @@ BUILD64_LIBS_ONLY = 1 -CONFIGURE_ARGS-isa-pentium_pro = $(DIRPATHS) --enable-shared --enable-pic -CONFIGURE_ARGS-isa-amd64 = $(DIRPATHS) --enable-shared --enable-pic --host=amd64-pc-solaris2.10 -CONFIGURE_ARGS-isa-sparcv8plus = $(DIRPATHS) --enable-shared --enable-pic --disable-asm +#More info on mimpure-text: http://blogs.everycity.co.uk/alasdair/2009/05/text-relocation-remains-against-symbol-libx264/ + +CONFIGURE_ARGS-isa-pentium_pro = $(DIRPATHS) --enable-shared --extra-ldflags="-mimpure-text -lrt" +CONFIGURE_ARGS-isa-amd64 = $(DIRPATHS) --enable-shared --extra-ldflags="-mimpure-text -lrt" --host=amd64-pc-solaris2.10 +CONFIGURE_ARGS-isa-sparcv8plus = $(DIRPATHS) --enable-shared --extra-ldflags="-mimpure-text -lrt" --disable-asm CONFIGURE_ARGS-isa-sparcv9 = $(DIRPATHS) --enable-shared --enable-pic --disable-asm CONFIGURE_ARGS += $(CONFIGURE_ARGS-isa-$(ISA)) 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 Feb 14 10:23:40 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Feb 2012 09:23:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[17047] csw/mgar/pkg/libstatgrab/trunk Message-ID: Revision: 17047 http://gar.svn.sourceforge.net/gar/?rev=17047&view=rev Author: dmichelsen Date: 2012-02-14 09:23:40 +0000 (Tue, 14 Feb 2012) Log Message: ----------- libstatgrab/trunk: Update to 0.17 and split packages Modified Paths: -------------- csw/mgar/pkg/libstatgrab/trunk/Makefile csw/mgar/pkg/libstatgrab/trunk/checksums Modified: csw/mgar/pkg/libstatgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/libstatgrab/trunk/Makefile 2012-02-14 09:06:03 UTC (rev 17046) +++ csw/mgar/pkg/libstatgrab/trunk/Makefile 2012-02-14 09:23:40 UTC (rev 17047) @@ -1,5 +1,5 @@ NAME = libstatgrab -VERSION = 0.16 +VERSION = 0.17 CATEGORIES = lib GARTYPE = v2 @@ -14,17 +14,37 @@ MASTER_SITES = ftp://ftp.uk.i-scream.org/pub/i-scream/libstatsgrab/ MASTER_SITES += http://dl.ambiweb.de/mirrors/ftp.i-scream.org/libstatgrab/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://www.i-scream.org/libstatgrab/ -SPKG_SOURCEURL = http://www.i-scream.org/libstatgrab/ +PACKAGES += CSWlibstatgrab6 +SPKG_DESC_CSWlibstatgrab6 = A library that provides cross platform access to statistics, libstatgrab.so.6 +PKGFILES_CSWlibstatgrab6 += $(call pkgfiles_lib,libstatgrab.so.6) +OBSOLETED_BY_CSWlibstatgrab6 = CSWlibstatgrab +PACKAGES += CSWlibstatgrab-dev +SPKG_DESC_CSWlibstatgrab-dev = Development files for libstatgrab.so.6 +PKGFILES_CSWlibstatgrab-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibstatgrab-dev += CSWlibstatgrab6 + +# Put this in -utils: +# statgrab-make-mrtg-config +PKGFILES_DEVEL_CONFIG = +PKGFILES_DEVEL_CONFIG_MANPAGE = +DEVEL_EXECUTABLES = +ISAEXEC_EXCLUDE_FILES = + +PACKAGES += CSWlibstatgrab-utils +SPKG_DESC_CSWlibstatgrab-utils = Statistic gathering tools based on libstatgrab.so.6 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibstatgrab-utils += CSWlibstatgrab6 + # Don't pull in ncurses from CSW, but add needed libraries to be self-sufficient LINKER_FLAGS = -lkstat -ldevinfo -lsocket -lnsl -BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 +ISAEXEC = 1 NORUNPATH = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-curses-prefix=/usr Modified: csw/mgar/pkg/libstatgrab/trunk/checksums =================================================================== --- csw/mgar/pkg/libstatgrab/trunk/checksums 2012-02-14 09:06:03 UTC (rev 17046) +++ csw/mgar/pkg/libstatgrab/trunk/checksums 2012-02-14 09:23:40 UTC (rev 17047) @@ -1 +1 @@ -77582438274679a9641d043ddcccdd4e libstatgrab-0.16.tar.gz +58385c9392898be3b09ffc5e3ebe8717 libstatgrab-0.17.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 Feb 14 10:42:33 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Feb 2012 09:42:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[17048] csw/mgar/pkg/x11-ssh-askpass Message-ID: Revision: 17048 http://gar.svn.sourceforge.net/gar/?rev=17048&view=rev Author: dmichelsen Date: 2012-02-14 09:42:33 +0000 (Tue, 14 Feb 2012) Log Message: ----------- x11-ssh-askpass: Move old recipe to tags/legacy Added Paths: ----------- csw/mgar/pkg/x11-ssh-askpass/branches/ csw/mgar/pkg/x11-ssh-askpass/tags/ csw/mgar/pkg/x11-ssh-askpass/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/x11-ssh-askpass/trunk/legacy/ 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 Feb 14 11:43:20 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Feb 2012 10:43:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17049] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 17049 http://gar.svn.sourceforge.net/gar/?rev=17049&view=rev Author: dmichelsen Date: 2012-02-14 10:43:20 +0000 (Tue, 14 Feb 2012) Log Message: ----------- sudo/trunk: Add sample sudo.conf, rework sudo-ldap Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/sudo/trunk/files/ csw/mgar/pkg/sudo/trunk/files/sudo.conf.CSW Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-02-14 09:42:33 UTC (rev 17048) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-02-14 10:43:20 UTC (rev 17049) @@ -1,6 +1,5 @@ # $Id$ # -# Make sudo-ldap with AUXV-linkage of /opt/csw/libexec/sudoers.so, which is the file differing between minimal and ldap NAME = sudo VERSION = 1.8.3p2 @@ -20,30 +19,21 @@ MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ DISTFILES += $(DISTNAME).tar.gz +DISTFILES += sudo.conf.CSW LICENSE = doc/LICENSE VENDOR_URL = http://www.sudo.ws -LDAP_DOCFILES += $(docdir)/sudo/README.LDAP -LDAP_DOCFILES += $(docdir)/sudo/schema.ActiveDirectory -LDAP_DOCFILES += $(docdir)/sudo/schema.OpenLDAP -LDAP_DOCFILES += $(docdir)/sudo/schema.iPlanet -LDAP_DOCFILES += $(docdir)/sudo/sudoers2ldif - -LDAP_MANFILES += $(mandir)/man4/sudoers.ldap.4 - PACKAGES += CSWsudo SPKG_DESC_CSWsudo = Provides limited super user privileges # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWsudo += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsudo += CSWlibz1 -# Logical dependency, no tracking via checkpkg -RUNTIME_DEP_PKGS_CSWsudo += CSWsudo-common -CHECKPKG_OVERRIDES_CSWsudo += surplus-dependency|CSWsudo-common OBSOLETED_BY_CSWsudo = CSWsudo-common # These are just docs +CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudo.1m CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudoedit.1m CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man4/sudoers.4 CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/UPGRADE @@ -52,20 +42,36 @@ CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/ChangeLog CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/etc/opt/csw/sudoers.CSW CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/share|root/opt/csw/share/doc/sudo/ChangeLog -CHECKPKG_OVERRIDES_CSWsudo += pkginfo-opencsw-repository-uncommitted + +# This is a private library CHECKPKG_OVERRIDES_CSWsudo += soname-not-part-of-filename|soname=libsudo_noexec.so|filename=sudo_noexec.so +LDAP_DOCFILES += $(docdir)/sudo/README.LDAP +LDAP_DOCFILES += $(docdir)/sudo/schema.ActiveDirectory +LDAP_DOCFILES += $(docdir)/sudo/schema.OpenLDAP +LDAP_DOCFILES += $(docdir)/sudo/schema.iPlanet +LDAP_DOCFILES += $(docdir)/sudo/sudoers2ldif +LDAP_MANFILES += $(mandir)/man4/sudoers.ldap.4 + PACKAGES += CSWsudo-ldap SPKG_DESC_CSWsudo-ldap = LDAP bindings for SUDO -PKGFILES_CSWsudo-ldap = $(bindir)/sudo\.ldap -PKGFILES_CSWsudo-ldap += $(bindir)/sudoedit\.ldap -PKGFILES_CSWsudo-ldap += $(LDAP_MANFILES) +PKGFILES_CSWsudo-ldap += $(libexecdir)/sudoers-ldap.so PKGFILES_CSWsudo-ldap += $(LDAP_DOCFILES) +PKGFILES_CSWsudo-ldap += $(LDAP_MANFILES) RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWlibz1 +# This logical dependency can not be tracked via checkpkg RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWsudo +CHECKPKG_OVERRIDES_CSWsudo-ldap += surplus-dependency|CSWsudo OBSOLETED_BY_CSWsudo-ldap += CSWsudoldap CATALOGNAME_CSWsudoldap = sudo_ldap_stub +CHECKPKG_OVERRIDES_CSWsudo-ldap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/README.LDAP +# This is a private library +CHECKPKG_OVERRIDES_CSWsudo-ldap += soname-not-part-of-filename|soname=sudoers.so|filename=sudoers-ldap.so + LOGPATH = $(localstatedir)/log/sudo TIMEPATH = $(localstatedir)/sudo IOLOGPATH = $(LOGPATH)/io @@ -115,28 +121,20 @@ MERGE_SCRIPTS_isa-default-ldap-disabled = copy-all MERGE_SCRIPTS_isa-default-ldap-enabled = copy-all -EXTRA_PAX_ARGS_LDAP-disabled += -s ',($(bindir)/sudo.*),$$1.minimal,' -EXTRA_PAX_ARGS_LDAP-enabled += -s ',($(bindir)/sudo.*),$$1.ldap,' +EXTRA_PAX_ARGS_LDAP-enabled += -s ',($(libexecdir))/sudoers.so,$$1/sudoers-ldap.so,' EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_LDAP-$(LDAP)) MIGRATE_FILES_CSWsudo += sudoers PRESERVECONF += $(sysconfdir)/sudoers +PRESERVECONF += $(sysconfdir)/sudo.conf -ALTERNATIVES_CSWsudo += minimal -ALTERNATIVE_minimal += $(bindir)/sudo sudo $(bindir)/sudo.minimal 50 -ALTERNATIVE_minimal += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.minimal - -ALTERNATIVES_CSWsudo-ldap += ldap -ALTERNATIVE_ldap += $(bindir)/sudo sudo $(bindir)/sudo.ldap 60 -ALTERNATIVE_ldap += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.ldap - include gar/category.mk post-install-modulated: - #@( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.minimal ) - #@( cd $(DESTDIR)$(bindir) ; gmv sudoedit sudoedit.minimal ) - @ginstall -d $(DESTDIR)$(IOLOGPATH) - @ginstall -d $(DESTDIR)$(TIMEPATH) + ginstall -d $(DESTDIR)$(IOLOGPATH) + ginstall -d $(DESTDIR)$(TIMEPATH) + ginstall -d $(DESTDIR)$(sysconfdir) + ginstall $(WORKDIR)/sudo.conf.CSW $(DESTDIR)$(sysconfdir) @$(MAKECOOKIE) Added: csw/mgar/pkg/sudo/trunk/files/sudo.conf.CSW =================================================================== --- csw/mgar/pkg/sudo/trunk/files/sudo.conf.CSW (rev 0) +++ csw/mgar/pkg/sudo/trunk/files/sudo.conf.CSW 2012-02-14 10:43:20 UTC (rev 17049) @@ -0,0 +1,46 @@ +# +# Sample /etc/opt/csw/sudo.conf file +# +# Format: +# Plugin plugin_name plugin_path +# Path askpass /path/to/askpass +# Path noexec /path/to/noexec.so +# +# Sudo plugins: +# +# The plugin_path is relative to ${prefix}/libexec unless fully qualified. +# The plugin_name corresponds to a global symbol in the plugin +# that contains the plugin interface structure. +# +# The sudoers plugin is used by default if no Plugin lines are present. +#Plugin sudoers_policy sudoers.so +#Plugin sudoers_io sudoers.so + +# LDAP-enabled plugin: +#Plugin sudoers_policy sudoers-ldap.so +#Plugin sudoers_io sudoers-ldap.so + +# +# Sudo askpass: +# +# An askpass helper program may be specified to provide a graphical +# password prompt for "sudo -A" support. Sudo does not ship with its +# own passpass program but can use the OpenSSH askpass. +# +# Use the OpenSSH askpass +#Path askpass /usr/X11R6/bin/ssh-askpass +# +# Use the Gnome OpenSSH askpass (requires CSWgnome-ssh-askpass) +#Path askpass /opt/csw/bin/gnome-ssh-askpass + +# +# Sudo noexec: +# +# Path to a shared library containing dummy versions of the execv(), +# execve() and fexecve() library functions that just return an error. +# This is used to implement the "noexec" functionality on systems that +# support C or its equivalent. +# The compiled-in value is usually sufficient and should only be changed +# if you rename or move the sudo_noexec.so file. +# +#Path noexec /opt/csw/libexec/sudo_noexec.so 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 Feb 14 13:13:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Feb 2012 12:13:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17050] csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile Message-ID: Revision: 17050 http://gar.svn.sourceforge.net/gar/?rev=17050&view=rev Author: dmichelsen Date: 2012-02-14 12:13:11 +0000 (Tue, 14 Feb 2012) Log Message: ----------- cpan/Unix-Statgrab/trunk: Update to latest package naming and new libname Modified Paths: -------------- csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile Modified: csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile 2012-02-14 10:43:20 UTC (rev 17049) +++ csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile 2012-02-14 12:13:11 UTC (rev 17050) @@ -8,12 +8,17 @@ define BLURB endef -PACKAGES = CSWpmunixstatgrab -CATALOGNAME = pm_unixstatgrab +LICENSE = README -RUNTIME_DEP_PKGS = CSWlibstatgrab -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +BUILD_DEP_PKGS += CSWlibstatgrab-dev +PACKAGES += CSWpm-unix-statgrab +SPKG_DESC_CSWpm-unix-statgrab = Perl extension for collecting information about the machine +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpm-unix-statgrab = CSWlibstatgrab6 +OBSOLETED_BY_CSWpm-unix-statgrab = CSWpmunixstatgrab +CATALOGNAME_CSWpmunixstatgrab = pm_unixstatgrab_stub + EXTRA_PERL_CONFIGURE_ARGS = CC=$(CC) LIBS="-L$(libdir) -lstatgrab -lperl" INC="-I$(includedir)" 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 Feb 14 13:26:36 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Feb 2012 12:26:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[17051] csw/mgar/pkg Message-ID: Revision: 17051 http://gar.svn.sourceforge.net/gar/?rev=17051&view=rev Author: dmichelsen Date: 2012-02-14 12:26:35 +0000 (Tue, 14 Feb 2012) Log Message: ----------- bsdiff: Initial commit Added Paths: ----------- csw/mgar/pkg/bsdiff/ csw/mgar/pkg/bsdiff/Makefile csw/mgar/pkg/bsdiff/branches/ csw/mgar/pkg/bsdiff/tags/ csw/mgar/pkg/bsdiff/trunk/ csw/mgar/pkg/bsdiff/trunk/Makefile csw/mgar/pkg/bsdiff/trunk/checksums csw/mgar/pkg/bsdiff/trunk/files/ csw/mgar/pkg/bsdiff/trunk/files/0001-Add-substitutes-for-err-errx-warn-warnx.patch csw/mgar/pkg/bsdiff/trunk/files/COPYING Added: csw/mgar/pkg/bsdiff/Makefile =================================================================== --- csw/mgar/pkg/bsdiff/Makefile (rev 0) +++ csw/mgar/pkg/bsdiff/Makefile 2012-02-14 12:26:35 UTC (rev 17051) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/bsdiff/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/bsdiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/bsdiff/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bsdiff/trunk/Makefile 2012-02-14 12:26:35 UTC (rev 17051) @@ -0,0 +1,45 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = bsdiff +VERSION = 4.3 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Binary diff/patch utility +define BLURB +endef + +MASTER_SITES = http://www.daemonology.net/bsdiff/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += COPYING + +PATCHFILES += 0001-Add-substitutes-for-err-errx-warn-warnx.patch + +PACKAGES += CSWbsdiff +SPKG_DESC_CSWmypkg = Binary diff/patch utility +# PKGFILES is catchall + +EXTRA_CFLAGS += -I. + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +build-custom: + cd $(WORKSRC) && $(CC) $(CFLAGS) -lbz2 -o bsdiff bsdiff.c err.c + cd $(WORKSRC) && $(CC) $(CFLAGS) -lbz2 -o bspatch bspatch.c err.c + @$(MAKECOOKIE) + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKSRC)/bsdiff $(DESTDIR)$(bindir)/bsdiff + ginstall -m 755 $(WORKSRC)/bspatch $(DESTDIR)$(bindir)/bspatch + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall -m 755 $(WORKSRC)/bsdiff.1 $(DESTDIR)$(mandir)/man1/bsdiff.1 + ginstall -m 755 $(WORKSRC)/bspatch.1 $(DESTDIR)$(mandir)/man1/bspatch.1 + @$(MAKECOOKIE) + Property changes on: csw/mgar/pkg/bsdiff/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/bsdiff/trunk/checksums =================================================================== --- csw/mgar/pkg/bsdiff/trunk/checksums (rev 0) +++ csw/mgar/pkg/bsdiff/trunk/checksums 2012-02-14 12:26:35 UTC (rev 17051) @@ -0,0 +1 @@ +e6d812394f0e0ecc8d5df255aa1db22a bsdiff-4.3.tar.gz Added: csw/mgar/pkg/bsdiff/trunk/files/0001-Add-substitutes-for-err-errx-warn-warnx.patch =================================================================== --- csw/mgar/pkg/bsdiff/trunk/files/0001-Add-substitutes-for-err-errx-warn-warnx.patch (rev 0) +++ csw/mgar/pkg/bsdiff/trunk/files/0001-Add-substitutes-for-err-errx-warn-warnx.patch 2012-02-14 12:26:35 UTC (rev 17051) @@ -0,0 +1,89 @@ +From b30b1b21d6becceaf2fe18f646e14c4953c72d2a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 14 Feb 2012 11:41:10 +0100 +Subject: [PATCH] Add substitutes for err, errx, warn, warnx + +--- + err.c | 34 ++++++++++++++++++++++++++++++++++ + err.h | 28 ++++++++++++++++++++++++++++ + 2 files changed, 62 insertions(+), 0 deletions(-) + create mode 100644 err.c + create mode 100644 err.h + +diff --git a/err.c b/err.c +new file mode 100644 +index 0000000..52af1c6 +--- /dev/null ++++ b/err.c +@@ -0,0 +1,34 @@ ++/* ++ * emulations of common functions from err.h ++ * Fabian Groffen ++ */ ++ ++#include ++#include ++#include ++#include ++ ++#include "err.h" ++ ++extern char **__xargv; ++ ++void ++errmsg(char doexit, int excode, char adderr, const char *fmt, ...) ++{ ++ fprintf(stderr, "%s: ", *__xargv); ++ if (fmt != NULL) { ++ va_list argp; ++ va_start(argp, fmt); ++ vfprintf(stderr, fmt, argp); ++ va_end(argp); ++ if (adderr) ++ fprintf(stderr, ": "); ++ } ++ if (adderr) ++ fprintf(stderr, "%s", strerror(errno)); ++ fprintf(stderr, "\n"); ++ if (doexit) ++ exit(excode); ++} ++ ++ +diff --git a/err.h b/err.h +new file mode 100644 +index 0000000..7d03c75 +--- /dev/null ++++ b/err.h +@@ -0,0 +1,28 @@ ++/* ++ * emulations of common functions from err.h ++ * Fabian Groffen ++ */ ++ ++#ifndef REPLACEMENT_ERR_H ++#define REPLACEMENT_ERR_H 1 ++ ++void errmsg(char doexit, int excode, char adderr, const char *fmt, ...); ++ ++#ifndef HAVE_ERR ++# define err(E, FMT...) errmsg(1, E, 1, FMT) ++#endif ++ ++#ifndef HAVE_ERRX ++# define errx(E, FMT...) errmsg(1, E, 0, FMT) ++#endif ++ ++#ifndef HAVE_WARN ++# define warn(FMT...) errmsg(0, 0, 1, FMT) ++#endif ++ ++#ifndef HAVE_WARNX ++# define warnx(FMT...) errmsg(0, 0, 0, FMT) ++#endif ++ ++#endif ++ +-- +1.7.9 + Added: csw/mgar/pkg/bsdiff/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/bsdiff/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/bsdiff/trunk/files/COPYING 2012-02-14 12:26:35 UTC (rev 17051) @@ -0,0 +1,26 @@ +/*- + * Copyright 2003-2005 Colin Percival + * All rights reserved + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted providing 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. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 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. + */ + 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 Feb 14 13:30:16 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Feb 2012 12:30:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17052] csw/mgar/pkg/bsdiff/trunk/files/ 0001-Add-substitutes-for-err-errx-warn-warnx.patch Message-ID: Revision: 17052 http://gar.svn.sourceforge.net/gar/?rev=17052&view=rev Author: dmichelsen Date: 2012-02-14 12:30:16 +0000 (Tue, 14 Feb 2012) Log Message: ----------- bsdiff/trunk: Use private variable for global argv Modified Paths: -------------- csw/mgar/pkg/bsdiff/trunk/files/0001-Add-substitutes-for-err-errx-warn-warnx.patch Modified: csw/mgar/pkg/bsdiff/trunk/files/0001-Add-substitutes-for-err-errx-warn-warnx.patch =================================================================== --- csw/mgar/pkg/bsdiff/trunk/files/0001-Add-substitutes-for-err-errx-warn-warnx.patch 2012-02-14 12:26:35 UTC (rev 17051) +++ csw/mgar/pkg/bsdiff/trunk/files/0001-Add-substitutes-for-err-errx-warn-warnx.patch 2012-02-14 12:30:16 UTC (rev 17052) @@ -28,12 +28,12 @@ + +#include "err.h" + -+extern char **__xargv; ++extern char **___Argv; + +void +errmsg(char doexit, int excode, char adderr, const char *fmt, ...) +{ -+ fprintf(stderr, "%s: ", *__xargv); ++ fprintf(stderr, "%s: ", *___Argv); + if (fmt != NULL) { + va_list argp; + va_start(argp, fmt); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Feb 14 16:52:15 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 14 Feb 2012 15:52:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17053] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 17053 http://gar.svn.sourceforge.net/gar/?rev=17053&view=rev Author: janholzh Date: 2012-02-14 15:52:14 +0000 (Tue, 14 Feb 2012) Log Message: ----------- ffmpeg/trunk: Update to 0.9.1 and get asm on x86 to work. Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ffmpeg/trunk/files/0003-fix_a_few_shells.patch Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-02-14 12:30:16 UTC (rev 17052) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-02-14 15:52:14 UTC (rev 17053) @@ -8,7 +8,7 @@ # Another thing is to see if it can be build with suncc see http://ftp.jaist.ac.jp/pub/pkgsrc/current/pkgsrc/multimedia/ffmpeg/Makefile.common NAME = ffmpeg -VERSION = 0.8.6 +VERSION = 0.9.1 CATEGORIES = lib GARTYPE = v2 @@ -23,7 +23,7 @@ PATCHFILES += 0001-fix-version.sh.patch PATCHFILES += 0002-change-linker-flags.patch -PATCHFILES += 0003-fix-testsuite-shells.patch +PATCHFILES += 0003-fix_a_few_shells.patch LICENSE = COPYING.GPLv3 @@ -38,10 +38,11 @@ RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibsdl +RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibavfilter2 +RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibmp3lame0 RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibtheoradec1 @@ -55,7 +56,7 @@ RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibsdl +RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibavcodec53 @@ -63,7 +64,7 @@ RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibmp3lame0 RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibtheoraenc1 -RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibspeex1 PACKAGES += CSWlibavfilter2 @@ -74,12 +75,12 @@ RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibswscale2 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibsdl +RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavcodec53 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibmp3lame0 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibspeex1 @@ -92,10 +93,10 @@ RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibsdl +RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibavcodec53 RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibmp3lame0 RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibtheoradec1 @@ -107,11 +108,11 @@ PKGFILES_CSWlibavutil51 += $(call pkgfiles_lib,libavutil.so.51) RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibsdl +RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibmp3lame0 RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibspeex1 @@ -123,10 +124,10 @@ RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibsdl +RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibmp3lame0 RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibtheoradec1 @@ -139,16 +140,33 @@ RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibsdl +RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibmp3lame0 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibspeex1 +PACKAGES += CSWlibswresample0 +SPKG_DESC_CSWlibswresample0 = FFMPEG library libswresample.so.0 +PKGFILES_CSWlibswresample0 += $(call pkgfiles_lib,libswresample.so.0) +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibtheoraenc1 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibspeex1 + + PACKAGES += CSWffmpeg-dev SPKG_DESC_CSWffmpeg-dev = Development files for several FFMPEG shared libraries PKGFILES_CSWffmpeg-dev += $(PKGFILES_DEVEL) @@ -159,7 +177,9 @@ RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavutil51 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibpostproc51 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswscale2 +RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswresample0 + PACKAGES += CSWffmpeg SPKG_DESC_CSWffmpeg = Very fast video and audio converter # PKGFILES is catchall @@ -168,12 +188,13 @@ RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswscale2 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibsdl +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibz1 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibogg0 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavcodec53 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWftype2 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavdevice53 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswresample0 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibmp3lame0 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibtheoradec1 @@ -202,11 +223,11 @@ NODIRPATHS += --sharedstatedir #EXTRA_CFLAGS-64 += -xcode=pic32 -EXTRA_CFLAGS-64 += -fPIC -EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(MEMORYMODEL)) +#EXTRA_CFLAGS-64 += -fPIC +#EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(MEMORYMODEL)) -EXTRA_CXXFLAGS-64 += -fPIC -EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS-$(MEMORYMODEL)) +#EXTRA_CXXFLAGS-64 += -fPIC +#EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS-$(MEMORYMODEL)) CONFIGURE_ARGS += --prefix=$(prefix) CONFIGURE_ARGS += --bindir=$(bindir) @@ -220,10 +241,15 @@ CONFIGURE_ARGS += --enable-version3 CONFIGURE_ARGS += --enable-runtime-cpudetect -# All ASM code is broke no clue if it yasm that breaks it or solaris in gerneral. As it is disabled in pkgsrc too probably a global problem. -CONFIGURE_ARGS += --disable-asm +#Needs sse to get asm stuff to work on x86 +CONFIGURE_ARGS_i386 += --extra-cflags="-mfpmath=sse -msse" +CONFIGURE_ARGS_i386 += --extra-cxxflags="-mfpmath=sse -msse" +#no asm on sparc +CONFIGURE_ARGS_sparc = --disable-asm -# Needs two builds one shared one static +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) + +# Needs two builds one shared one static maybe in the future #CONFIGURE_ARGS-SHARED-yes += --enable-shared #CONFIGURE_ARGS += $(CONFIGURE_ARGS-SHARED-$(SHARED)) @@ -238,6 +264,7 @@ # No libtheora CONFIGURE_ARGS += --enable-libtheora CONFIGURE_ARGS += --enable-libvorbis +#CONFIGURE_ARGS += --enable-libx264 # Tests only work with static build #SKIPTEST-SHARED-yes = 1 Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2012-02-14 12:30:16 UTC (rev 17052) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2012-02-14 15:52:14 UTC (rev 17053) @@ -1 +1 @@ -b4ef1fa6506750569fdb64a0f0a646a8 ffmpeg-0.8.6.tar.bz2 +41ae6cfdef81a54835b914f523e575cf ffmpeg-0.9.1.tar.bz2 Added: csw/mgar/pkg/ffmpeg/trunk/files/0003-fix_a_few_shells.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/0003-fix_a_few_shells.patch (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/files/0003-fix_a_few_shells.patch 2012-02-14 15:52:14 UTC (rev 17053) @@ -0,0 +1,121 @@ +From 1ce453bb7c5c0814c90a8dbc5addf2b1d2aa8f60 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Tue, 14 Feb 2012 11:09:15 +0100 +Subject: [PATCH] fix_a_few_shells + +--- + libavcodec/codec_names.sh | 2 +- + tests/codec-regression.sh | 2 +- + tests/copycooker.sh | 2 +- + tests/fate-run.sh | 2 +- + tests/fate-update.sh | 2 +- + tests/fate.sh | 2 +- + tests/ffserver-regression.sh | 2 +- + tests/lavf-regression.sh | 2 +- + tests/lavfi-regression.sh | 2 +- + tests/regression-funcs.sh | 2 +- + 10 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/libavcodec/codec_names.sh b/libavcodec/codec_names.sh +index 0e499c9..89ccd45 100755 +--- a/libavcodec/codec_names.sh ++++ b/libavcodec/codec_names.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + # Copyright (c) 2011 Nicolas George + # +diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh +index 7676074..8362677 100755 +--- a/tests/codec-regression.sh ++++ b/tests/codec-regression.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # automatic regression test for avconv + # +diff --git a/tests/copycooker.sh b/tests/copycooker.sh +index 4b5811d..9b0f125 100755 +--- a/tests/copycooker.sh ++++ b/tests/copycooker.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + LC_ALL=C + export LC_ALL +diff --git a/tests/fate-run.sh b/tests/fate-run.sh +index 350ff57..ae5be45 100755 +--- a/tests/fate-run.sh ++++ b/tests/fate-run.sh +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + + export LC_ALL=C + +diff --git a/tests/fate-update.sh b/tests/fate-update.sh +index 6b4668f..bc356fe 100755 +--- a/tests/fate-update.sh ++++ b/tests/fate-update.sh +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + + set -e + +diff --git a/tests/fate.sh b/tests/fate.sh +index e04c871..2a75ef5 100755 +--- a/tests/fate.sh ++++ b/tests/fate.sh +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + + config=$1 + +diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh +index 11e4a54..2e1c474 100755 +--- a/tests/ffserver-regression.sh ++++ b/tests/ffserver-regression.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "\nFile $wd/tests/data/$_\n\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf + #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "\nFile $wd/tests/data/$_\n\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf +diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh +index f2b2624..d2b6168 100755 +--- a/tests/lavf-regression.sh ++++ b/tests/lavf-regression.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # automatic regression test for libavformat + # +diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh +index 74e5373..8d3a660 100755 +--- a/tests/lavfi-regression.sh ++++ b/tests/lavfi-regression.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # automatic regression test for libavfilter + # +diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh +index b0a9b85..c7d59e3 100755 +--- a/tests/regression-funcs.sh ++++ b/tests/regression-funcs.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # common regression functions for avconv + # +-- +1.7.9 + 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 Feb 14 17:17:28 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 Feb 2012 16:17:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17054] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 17054 http://gar.svn.sourceforge.net/gar/?rev=17054&view=rev Author: wahwah Date: 2012-02-14 16:17:27 +0000 (Tue, 14 Feb 2012) Log Message: ----------- mysql5/branches/mysql-5.0.x: do not try to support multiple version installations, drop alternatives and coreutils dependencies Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-02-14 15:52:14 UTC (rev 17053) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-02-14 16:17:27 UTC (rev 17054) @@ -13,8 +13,6 @@ VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server -# PACKAGING_PLATFORMS = solaris9-sparc solaris10-sparc - # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG @@ -32,7 +30,7 @@ # Existing databases are in this location localstatedir = /var$(BUILD_PREFIX)/$(NAME) # To avoid file conflicts -datadir = $(prefix)/share/mysql/$(BASE_VERSION) +# datadir = $(prefix)/share/mysql/$(BASE_VERSION) MYSQL_LIB_VER = 15 @@ -44,24 +42,15 @@ RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient$(MYSQL_LIB_VER) CSWmysql-dev_programs += mysql_config -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION))) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1-$(BASE_VERSION)) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)) PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel -CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config-$(BASE_VERSION).1 -ALTERNATIVES_CSWmysql-dev = mysql_dev -ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs))-$(BASE_VERSION) $(ALTS_PRIO) -ALTERNATIVE_mysql_dev += $(bindir)/$(ISA_DEFAULT64)/$(firstword $(CSWmysql-dev_programs)) mysql_dev64 $(bindir)/$(ISA_DEFAULT64)/$(firstword $(CSWmysql-dev_programs))-$(BASE_VERSION) $(ALTS_PRIO) -ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ - $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION) \ - $(bindir)/$(ISA_DEFAULT64)/$(C)64 $C $(bindir)/$(ISA_DEFAULT64)/$C-$(BASE_VERSION)) -ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ - $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) - +CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) @@ -96,10 +85,10 @@ PACKAGES += CSW$(NAME)client SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries PKGFILES_CSW$(NAME)client = $(bindir) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION))) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)-$(BASE_VERSION)\.1) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 @@ -112,25 +101,19 @@ RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWcoreutils +# RUNTIME_DEP_PKGS_CSW$(NAME) += CSWcoreutils CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSW$(NAME)client -CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSWcoreutils +# CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSWcoreutils EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.* EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch -# PATCHFILES += 0003-OpenCSW-perl-for-tests.patch PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch PATCHFILES += 0004-looking-for-ps-use-basename-0.patch -# Perhaps using sed would be better, but we have a patch for now. -PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch -# PATCHFILES += 0007-versioned-mysqld-during-db-init-$(BASE_VERSION).patch -PATCHFILES += 0008-versioned-mysqld-in-mysql_install_db.patch -PATCHFILES += 0009-versioned-datadir-in-mysql_install_db-$(BASE_VERSION).patch # Enable 64 bits build BUILD64 = 1 @@ -138,7 +121,7 @@ EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ +MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL/ DISTFILES = mysql-$(VERSION).tar.gz DISTFILES += csw$(NAME).tpl DISTFILES += quick_start-csw @@ -151,7 +134,6 @@ # TODO: Do the proper prerequsite pkgs. BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) - # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler @@ -175,7 +157,7 @@ CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) -CONFIGURE_ARGS += --program-suffix=-$(BASE_VERSION) +# CONFIGURE_ARGS += --program-suffix= CONFIGURE_ARGS += --with-federated-storage-engine # TODO: Make the tests pass. They don't at the moment. @@ -197,7 +179,7 @@ CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME) -CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess-$(BASE_VERSION).1 +CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess.1 # This could be reviewed. CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content @@ -246,22 +228,6 @@ EXECUTABLES += resolve_stack_dump EXECUTABLES += resolveip -ALTERNATIVES_CSW$(NAME) = mysql$(BASE_VERSION)_main -ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) $(ALTS_PRIO) -ALTERNATIVE_mysql$(BASE_VERSION)_main += $(bindir)/$(ISA_DEFAULT64)/$(firstword $(EXECUTABLES)) mysql_main64 $(bindir)/$(ISA_DEFAULT64)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) $(ALTS_PRIO) -ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\ - $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION) \ - $(bindir)/$(ISA_DEFAULT64)/$C $(C)64 $(bindir)/$(ISA_DEFAULT64)/$C-$(BASE_VERSION)) - -ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)_client -ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(client_programs)) mysql_client $(bindir)/$(firstword $(client_programs)) $(ALTS_PRIO) -ALTERNATIVE_mysql$(BASE_VERSION)_client += $(bindir)/$(ISA_DEFAULT64)/$(firstword $(client_programs)) mysql_client64 $(bindir)/$(ISA_DEFAULT64)/$(firstword $(client_programs)) $(ALTS_PRIO) -ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ - $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION) \ - $(bindir)/$(ISA_DEFAULT64)/$C $(C)64 $(bindir)/$(ISA_DEFAULT64)/$C-$(BASE_VERSION)) -ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ - $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) - # These are harmless, although it would be nice to clean them up eventually. # Help appreciated? CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/doc/mysql5devel_stub/README.CSW|CSWmysql5|CSWmysql51 @@ -317,17 +283,6 @@ ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) - # Create symlinks to binaries - # ginstall -m 755 -d $(PKGROOT)$(bindir) - #for f in $(PKGROOT)$(bindir)/*; do \ - # if echo $$f | grep amd64$$; then continue; fi; \ - # if echo $$f | grep sparcv9$$; then continue; fi; \ - # ln -s ../$(NAME)/bin/`basename $$f` \ - # $(PKGROOT)$(bindir)/`basename $$f`; \ - #done # http://www.opencsw.org/bugtrack/view.php?id=4149 ginstall -m 755 -d $(PKGROOT)$(sysconfdir) @$(MAKECOOKIE) - -# We need the GNU userland (nobody knows why) -PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2012-02-14 15:52:14 UTC (rev 17053) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2012-02-14 16:17:27 UTC (rev 17054) @@ -15,7 +15,7 @@ MYSQL_HOME="/var${prefix}/mysql5" sysconfdir="/etc${prefix}" # https://www.opencsw.org/mantis/view.php?id=4646 -DEFAULTS_FILE="${prefix}/share/mysql/5.0/mysql/my-small.cnf" +DEFAULTS_FILE="${prefix}/share/mysql/my-small.cnf" MYSQLD_USER="mysql" # Provide the default data directory MYSQLD_DATADIR="${MYSQL_HOME}" @@ -64,7 +64,7 @@ echo "Creating MySQL core database in $MYSQLD_DATADIR" echo echo "### The following messages are from mysql_install_db." -"$BASEDIR/bin/mysql_install_db-5.0" \ +"$BASEDIR/bin/mysql_install_db" \ --defaults-extra-file="$DEFAULTS_FILE" \ --user="$MYSQLD_USER" \ --basedir="$BASEDIR" \ Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2012-02-14 15:52:14 UTC (rev 17053) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2012-02-14 16:17:27 UTC (rev 17054) @@ -26,7 +26,6 @@ MYSQLD_DATADIR=$MYSQL_VAR MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid CONFFILE=${sysconfdir}/my.cnf -MYSQLD_PROG=${MYSQLD_PROG:-mysqld-${BASE_VERSION}} # Source the configuration [ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc @@ -98,8 +97,7 @@ # fi # 2006-04-16 --defaults-file is changed to --defaults-extra-file - ${BINDIR}/mysqld_safe-${BASE_VERSION} \ - --mysqld-version=${BASE_VERSION} \ + ${BINDIR}/mysqld_safe \ `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ --pid-file=$MYSQLD_PID_FILE \ `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ 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 Feb 14 17:26:03 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 Feb 2012 16:26:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[17055] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 17055 http://gar.svn.sourceforge.net/gar/?rev=17055&view=rev Author: wahwah Date: 2012-02-14 16:26:02 +0000 (Tue, 14 Feb 2012) Log Message: ----------- migrateconf: preserve file attributes when copying Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2012-02-14 16:17:27 UTC (rev 17054) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2012-02-14 16:26:02 UTC (rev 17055) @@ -1,7 +1,7 @@ # $HeadURL$ NAME = cswclassutils -VERSION = 1.45 +VERSION = 1.47 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2012-02-14 16:17:27 UTC (rev 17054) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2012-02-14 16:26:02 UTC (rev 17055) @@ -262,7 +262,7 @@ elif [ -f "${archpath}" ]; then debug cp "${archpath}" "${dstpath}" mkdir -p "${PKG_INSTALL_ROOT}${dstdir}" - cp "${archpath}" "${dstpath}" + cp -p "${archpath}" "${dstpath}" else echo "WARNING: ${archpath} is neither a file or directory." fi 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 Feb 14 19:55:09 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 Feb 2012 18:55:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17056] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ quick_start-csw Message-ID: Revision: 17056 http://gar.svn.sourceforge.net/gar/?rev=17056&view=rev Author: wahwah Date: 2012-02-14 18:55:09 +0000 (Tue, 14 Feb 2012) Log Message: ----------- mysql5/branches/mysql-5.0.x: update the my-small.cnf location Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2012-02-14 16:26:02 UTC (rev 17055) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2012-02-14 18:55:09 UTC (rev 17056) @@ -2,8 +2,8 @@ # # $Id$ # -# initial version for blastwave.org by Alex Moore 2006.02.25 Revised 2006.03.25 -# - see bug report 0001542 +# initial version for blastwave.org by Alex Moore 2006.02.25 +# Revised 2006.03.25 - see bug report 0001542 # # This script creates a default database with the small-memory footprint. # Input may be provided for DATADIR and DEFAULTS_FILE @@ -14,7 +14,7 @@ MYSQL_HOME=${prefix} MYSQL_VAR=/var${prefix} sysconfdir=/etc${prefix} -DEFAULTS_FILE=${prefix}/share/mysql/5.0/mysql/my-small.cnf +DEFAULTS_FILE=${prefix}/share/mysql/my-small.cnf MYSQLD_USER=mysql # # Provide a default data directory @@ -54,7 +54,7 @@ ` || exit $? if [ $usrin = "[default]" ]; then if [ ! -f "$DEFAULTS_FILE" ]; then - IN_DEFAULTS_FILE=$MYSQL_HOME/share/mysql/5.0/mysql/my-small.cnf + IN_DEFAULTS_FILE=$MYSQL_HOME/share/mysql/my-small.cnf echo "Using $IN_DEFAULTS_FILE to create the options file." else IN_DEFAULTS_FILE=$DEFAULTS_FILE 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 Feb 15 11:41:29 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 15 Feb 2012 10:41:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[17057] csw/mgar/pkg/sudo_ldap/ Message-ID: Revision: 17057 http://gar.svn.sourceforge.net/gar/?rev=17057&view=rev Author: dmichelsen Date: 2012-02-15 10:41:28 +0000 (Wed, 15 Feb 2012) Log Message: ----------- sudo_ldap: Remove recipe as it is now a modulation inside sudo/ Removed Paths: ------------- csw/mgar/pkg/sudo_ldap/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Feb 15 13:07:54 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 15 Feb 2012 12:07:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17058] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 17058 http://gar.svn.sourceforge.net/gar/?rev=17058&view=rev Author: janholzh Date: 2012-02-15 12:07:54 +0000 (Wed, 15 Feb 2012) Log Message: ----------- ffmpeg/trunk: enable libx264 support Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-02-15 10:41:28 UTC (rev 17057) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-02-15 12:07:54 UTC (rev 17058) @@ -264,7 +264,7 @@ # No libtheora CONFIGURE_ARGS += --enable-libtheora CONFIGURE_ARGS += --enable-libvorbis -#CONFIGURE_ARGS += --enable-libx264 +CONFIGURE_ARGS += --enable-libx264 # Tests only work with static build #SKIPTEST-SHARED-yes = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Feb 15 13:34:07 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 15 Feb 2012 12:34:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17059] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 17059 http://gar.svn.sourceforge.net/gar/?rev=17059&view=rev Author: janholzh Date: 2012-02-15 12:34:07 +0000 (Wed, 15 Feb 2012) Log Message: ----------- ffmpeg/trunk: add libx264 depends Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-02-15 12:07:54 UTC (rev 17058) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-02-15 12:34:07 UTC (rev 17059) @@ -48,6 +48,7 @@ RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibx264-120 PACKAGES += CSWlibavdevice53 SPKG_DESC_CSWlibavdevice53 = FFMPEG library libavdevice.so.53 @@ -66,6 +67,7 @@ RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibx264-120 PACKAGES += CSWlibavfilter2 SPKG_DESC_CSWlibavfilter2 = FFMPEG library libavfilter.so.2 @@ -85,6 +87,7 @@ RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibtheoraenc1 +RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibx264-120 PACKAGES += CSWlibavformat53 SPKG_DESC_CSWlibavformat53 = FFMPEG library libavformat.so.53 @@ -102,6 +105,7 @@ RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibx264-120 PACKAGES += CSWlibavutil51 SPKG_DESC_CSWlibavutil51 = FFMPEG library libavutil.so.51 @@ -117,6 +121,7 @@ RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibtheoraenc1 +RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibx264-120 PACKAGES += CSWlibpostproc51 SPKG_DESC_CSWlibpostproc51 = FFMPEG library libpostproc.so.51 @@ -133,6 +138,7 @@ RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibx264-120 PACKAGES += CSWlibswscale2 SPKG_DESC_CSWlibswscale2 = FFMPEG library libswscale.so.2 @@ -149,6 +155,7 @@ RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibx264-120 PACKAGES += CSWlibswresample0 SPKG_DESC_CSWlibswresample0 = FFMPEG library libswresample.so.0 @@ -165,6 +172,7 @@ RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibx264-120 PACKAGES += CSWffmpeg-dev @@ -202,6 +210,7 @@ RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavfilter2 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibpostproc51 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibx264-120 # These are all examples CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ffmpeg.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Feb 15 13:42:15 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 15 Feb 2012 12:42:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17060] csw/mgar/pkg/ffmpeg/trunk/files/ 0003-fix-testsuite-shells.patch Message-ID: Revision: 17060 http://gar.svn.sourceforge.net/gar/?rev=17060&view=rev Author: janholzh Date: 2012-02-15 12:42:15 +0000 (Wed, 15 Feb 2012) Log Message: ----------- ffmpeg/trunk: remove old patch Removed Paths: ------------- csw/mgar/pkg/ffmpeg/trunk/files/0003-fix-testsuite-shells.patch Deleted: csw/mgar/pkg/ffmpeg/trunk/files/0003-fix-testsuite-shells.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/0003-fix-testsuite-shells.patch 2012-02-15 12:34:07 UTC (rev 17059) +++ csw/mgar/pkg/ffmpeg/trunk/files/0003-fix-testsuite-shells.patch 2012-02-15 12:42:15 UTC (rev 17060) @@ -1,110 +0,0 @@ -From 2b29e3734ad0db1d9cde466f7d424bd886ce5084 Mon Sep 17 00:00:00 2001 -From: Jan Holzhueter -Date: Mon, 18 Jul 2011 13:02:57 +0200 -Subject: [PATCH] fix-testsuite-shells - ---- - tests/codec-regression.sh | 2 +- - tests/copycooker.sh | 2 +- - tests/fate-run.sh | 2 +- - tests/fate-update.sh | 2 +- - tests/fate.sh | 2 +- - tests/ffserver-regression.sh | 2 +- - tests/lavf-regression.sh | 2 +- - tests/lavfi-regression.sh | 2 +- - tests/regression-funcs.sh | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh -index b210231..3453d96 100755 ---- a/tests/codec-regression.sh -+++ b/tests/codec-regression.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - # - # automatic regression test for ffmpeg - # -diff --git a/tests/copycooker.sh b/tests/copycooker.sh -index 4b5811d..f1e1fcc 100755 ---- a/tests/copycooker.sh -+++ b/tests/copycooker.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - - LC_ALL=C - export LC_ALL -diff --git a/tests/fate-run.sh b/tests/fate-run.sh -index 366145d..a6beab0 100755 ---- a/tests/fate-run.sh -+++ b/tests/fate-run.sh -@@ -1,4 +1,4 @@ --#! /bin/sh -+#!/opt/csw/bin/bash - - export LC_ALL=C - -diff --git a/tests/fate-update.sh b/tests/fate-update.sh -index 6b4668f..cf3ee98 100755 ---- a/tests/fate-update.sh -+++ b/tests/fate-update.sh -@@ -1,4 +1,4 @@ --#! /bin/sh -+#!/opt/csw/bin/bash - - set -e - -diff --git a/tests/fate.sh b/tests/fate.sh -index 9fd117c..5f91b3b 100755 ---- a/tests/fate.sh -+++ b/tests/fate.sh -@@ -1,4 +1,4 @@ --#! /bin/sh -+#!/opt/csw/bin/bash - - config=$1 - -diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh -index 11e4a54..2690699 100755 ---- a/tests/ffserver-regression.sh -+++ b/tests/ffserver-regression.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - - #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "\nFile $wd/tests/data/$_\n\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf - #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "\nFile $wd/tests/data/$_\n\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf -diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh -index 39e752b..373fe84 100755 ---- a/tests/lavf-regression.sh -+++ b/tests/lavf-regression.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - # - # automatic regression test for libavformat - # -diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh -index 0322134..bd83fab 100755 ---- a/tests/lavfi-regression.sh -+++ b/tests/lavfi-regression.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - # - # automatic regression test for libavfilter - # -diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh -index e57cdf1..a6fd652 100755 ---- a/tests/regression-funcs.sh -+++ b/tests/regression-funcs.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - # - # common regression functions for ffmpeg - # --- -1.7.6 - 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 Feb 15 14:47:30 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 15 Feb 2012 13:47:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17061] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 17061 http://gar.svn.sourceforge.net/gar/?rev=17061&view=rev Author: wahwah Date: 2012-02-15 13:47:30 +0000 (Wed, 15 Feb 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: updated to use CSWmysql5 package family. Work in progress. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswusergroup csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/quick_start-csw Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-02-15 12:42:15 UTC (rev 17060) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-02-15 13:47:30 UTC (rev 17061) @@ -11,7 +11,7 @@ PROJ_NAME = mysql -NAME = $(PROJ_NAME)55 +NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 PATCHLEVEL = 20 ALTS_PRIO = 55 @@ -35,6 +35,9 @@ endef # There are problems with the build using Sun Studio. +# GARCOMPILER = SOS12 +# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ GARCOMPILER = GNU INITSMF = $(sysconfdir)/init\.d/csw$(NAME) @@ -42,35 +45,27 @@ # Existing databases are in this location localstatedir = /var$(BUILD_PREFIX)/$(NAME) # To avoid file conflicts -datadir = $(prefix)/share/mysql/$(BASE_VERSION) +# datadir = $(prefix)/share/mysql/$(BASE_VERSION) MYSQL_LIB_VER = 18 +MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(sbindir) $(libexecdir) + PACKAGES += CSWmysql-dev SPKG_DESC_CSWmysql-dev = MySQL development files PKGFILES_CSWmysql-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient$(MYSQL_LIB_VER) CSWmysql-dev_programs += mysql_config -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name)$(PROGRAM_SUFFIX))) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1$(PROGRAM_SUFFIX)) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)$(PROGRAM_SUFFIX)) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)$(PROGRAM_SUFFIX)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)) PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql -CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config$(PROGRAM_SUFFIX).1 CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 -# Not sure why this is necessary. All README.CSW should have a version number -# appended. -CHECKPKG_OVERRIDES_CSWmysql55 += file-collision|/opt/csw/share/doc/mysql_dev/README.CSW|CSWmysql5|CSWmysql55 -ALTERNATIVES_CSWmysql-dev = mysql_dev -ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) $(ALTS_PRIO) -ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ - $(bindir)/$C $C $(bindir)/$C$(PROGRAM_SUFFIX)) -ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ - $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)$(PROGRAM_SUFFIX).1) - +CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 PATCHFILES += 0003-I-HATE-CMAKE.patch PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch @@ -108,10 +103,10 @@ PACKAGES += CSW$(NAME)client SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries PKGFILES_CSW$(NAME)client = $(bindir) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name)$(PROGRAM_SUFFIX))) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)$(PROGRAM_SUFFIX)\.1) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)$(PROGRAM_SUFFIX)) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)$(PROGRAM_SUFFIX)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1 # RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) # RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) @@ -142,8 +137,8 @@ EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.* EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* +EXTRA_MERGE_EXCLUDE_FILES += $(datadir)/mysql-test.* -# PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch # Enable 64 bits build BUILD64 = 1 @@ -163,7 +158,6 @@ BUILD_DEP_PKGS += CSWcmake BUILD_DEP_PKGS += CSWbison -PROGRAM_SUFFIX = -$(BASE_VERSION) # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler @@ -187,16 +181,16 @@ CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) -CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX) # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix) +CMAKE_ARGS += -DINSTALL_LAYOUT=RPM CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir) CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir) -CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir)) -CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir)) -CMAKE_ARGS += -DINSTALL_MANDIR=$(subst $(prefix)/,,$(mandir)) -CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir)) +# CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir)) +# CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir)) +# CMAKE_ARGS += -DINSTALL_MANDIR=$(subst $(prefix)/,,$(mandir)) +# CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir)) CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/$(MM_LIBDIR)/plugin CMAKE_ARGS += -DWITH_READLINE=1 CMAKE_ARGS += -DWITH_SSL=system @@ -235,7 +229,7 @@ CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME) -CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess$(PROGRAM_SUFFIX).1 +CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess.1 # This could be reviewed. CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content @@ -280,22 +274,6 @@ EXECUTABLES += resolve_stack_dump EXECUTABLES += resolveip -ALTERNATIVES_CSW$(NAME) = mysql$(BASE_VERSION)_main -ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))$(PROGRAM_SUFFIX) $(ALTS_PRIO) -ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\ - $(bindir)/$C $C $(bindir)/$C$(PROGRAM_SUFFIX)) - -ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)_client -ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(client_programs)) mysql_client $(bindir)/$(firstword $(client_programs)) $(ALTS_PRIO) -ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ - $(bindir)/$C $C $(bindir)/$C$(PROGRAM_SUFFIX)) -ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ - $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)$(PROGRAM_SUFFIX).1) - -# These are harmless, although it would be nice to clean them up eventually. -# Help appreciated? -CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/info/mysql.info|CSWmysql5|CSWmysql51 - CONFIGURE_SCRIPTS = custom include gar/category.mk @@ -329,15 +307,13 @@ @$(MAKECOOKIE) post-install-modulated: - # (cd $(DESTDIR)$(libdir); gmv -v mysql/* .) - # (cd $(DESTDIR)$(libdir); grmdir -v mysql) ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(WORKDIR)/csw$(NAME) $(DESTDIR)$(sysconfdir)/init.d - # Add versions to binary names - for f in $(EXECUTABLES); do \ - gmv -v "$(DESTDIR)$(bindir)/$${f}" \ - "$(DESTDIR)$(bindir)/$${f}$(PROGRAM_SUFFIX)"; \ - done + # # Add versions to binary names + # for f in $(EXECUTABLES); do \ + # gmv -v "$(DESTDIR)$(bindir)/$${f}" \ + # "$(DESTDIR)$(bindir)/$${f}"; \ + # done (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18; \ ln -s libmysqlclient.so.18 libmysqlclient_r.so.18) (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18.0.0; \ @@ -353,14 +329,12 @@ ginstall -m 755 -d $(PKGROOT)/opt/csw/share/$(NAME)/doc gln -sf ../../../$(NAME)/share/$(NAME)/doc/README-$(BASE_VERSION).CSW \ $(PKGROOT)/opt/csw/share/$(NAME)/doc/README-$(BASE_VERSION).CSW - [ -d $(PKGROOT)$(datadir)/mysql55 ] - ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql55 + # The quick_start-csw file is almost the same as postinstall. + # [ -d $(PKGROOT)$(datadir)/mysql ] + # ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) # http://www.opencsw.org/bugtrack/view.php?id=4149 ginstall -m 755 -d $(PKGROOT)$(sysconfdir) @$(MAKECOOKIE) - -# We need the GNU userland (nobody knows why) -PATH := /opt/csw/gnu:$(PATH) Copied: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall (from rev 16958, csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.postinstall) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall 2012-02-15 13:47:30 UTC (rev 17061) @@ -0,0 +1,106 @@ +#!/bin/ksh -p +# +# $Id$ +# +# initial version for blastwave.org by Alex Moore 2006.02.25 +# Revised 2006.03.25 - see bug report 0001542 +# +# This script creates a default database with the small-memory footprint. +# Input may be provided for DATADIR and DEFAULTS_FILE +# +# http://dev.mysql.com/doc/refman/5.0/en/option-files.html +# +prefix="/opt/csw" +BASEDIR="${prefix}" +MYSQL_HOME="/var${prefix}/mysql5" +sysconfdir="/etc${prefix}" +# https://www.opencsw.org/mantis/view.php?id=4646 +DEFAULTS_FILE="${prefix}/share/mysql/my-small.cnf" +MYSQLD_USER="mysql" +# Provide the default data directory +MYSQLD_DATADIR="${MYSQL_HOME}" +DEPRECATED_DEFAULTS_FILE="${BASEDIR}/my.cnf" + +# http://bugs.mysql.com/bug.php?id=31164 +# ERROR: 1004 Can't create file '/var/tmp//installRJaiQ3/#sql6fee_1_0.frm' (errno: 13) +unset TMPDIR + +if [ -r "${DEPRECATED_DEFAULTS_FILE}" ]; then + echo "*** WARNING ***" + echo "File '${DEPRECATED_DEFAULTS_FILE}' found. This location is deprecated." + echo "This file takes no effect." +fi + +if [ ! -f "$DEFAULTS_FILE" ]; then + IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf + echo "Using $IN_DEFAULTS_FILE to create the options file." +else + IN_DEFAULTS_FILE=$DEFAULTS_FILE + echo "Using $DEFAULTS_FILE as the options file." +fi + +if [ -d "$MYSQLD_DATADIR/mysql" ]; then + echo "mysql database already exists." + echo "Leaving script without initializing a database." + exit 0 +fi + +echo "Setting up the database" +# Create the database directory and set the permissions if needed +if [ ! -d "$MYSQLD_DATADIR" ] ; then + mkdir -p $MYSQLD_DATADIR + chown -R mysql:mysql $MYSQLD_DATADIR + chmod 0700 $MYSQLD_DATADIR +fi +# +# copy the configuration file if not exists. +CNFCOPIED=no +if [ ! -f "$DEFAULTS_FILE" ] ; then + cp -p $IN_DEFAULTS_FILE $DEFAULTS_FILE + CNFCOPIED=yes +fi +# +# Run the mysql script to create the database +echo "Creating MySQL core database in $MYSQLD_DATADIR" +echo +echo "### The following messages are from mysql_install_db." +"$BASEDIR/bin/mysql_install_db" \ + --defaults-extra-file="$DEFAULTS_FILE" \ + --user="$MYSQLD_USER" \ + --basedir="$BASEDIR" \ + --datadir="$MYSQLD_DATADIR" + +# Fix permissions on the data directory, since mysql_install_db was run as +# root. +chown -R ${MYSQLD_USER}:mysql $MYSQLD_DATADIR + +# Update --datadir in the cnf file with the correct value if file was copied +if [ x"$CNFCOPIED" = xyes ]; then + sed -e "s|/var/opt/csw/mysql5|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new + mv $DEFAULTS_FILE.new $DEFAULTS_FILE +fi + +# Ending message +echo +echo "### The following messages are from $0." +echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes." +echo "Please ignore references to starting mysqld_safe in the messages above." +echo " These messages are from mysql_install_db. See the following" +echo " for starting CSWmysql5." +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi +if [ $smf = yes ] +then + echo "Running \`svcadm enable cswmysql5\` start to start the database." + # First, we clear the status, since it's likely to be 'maintenance'. + svcadm disable cswmysql5 + svcadm clear cswmysql5 + svcadm enable cswmysql5 +else + echo "Running \`/etc/opt/csw/init.d/cswmysql\` start to start the database." + /etc/opt/csw/init.d/cswmysql start +fi + +exit 0 + +# vim:set ts=2 sw=2 sts=2 expandtab: Copied: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.preinstall (from rev 16958, csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.preinstall) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.preinstall 2012-02-15 13:47:30 UTC (rev 17061) @@ -0,0 +1,40 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.postinstall 2012-02-15 12:42:15 UTC (rev 17060) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.postinstall 2012-02-15 13:47:30 UTC (rev 17061) @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -MYSQLDATADIR=/var/opt/csw/mysql51 -if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then - echo "No database directory found in the default location:" - echo "${MYSQLDATADIR}/mysql" - echo "If you need to build the initial database directory," - echo " see /opt/csw/mysql5/share/mysql/quick_start-csw" - echo "If you are using a non-default database directory location," - echo " please start mysql manually." - exit 0 -fi Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.preinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.preinstall 2012-02-15 12:42:15 UTC (rev 17060) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.preinstall 2012-02-15 13:47:30 UTC (rev 17061) @@ -1,40 +0,0 @@ -#!/bin/sh -# vim:set sw=2 ts=2 sts=2 expandtab: -# -# $Id$ -# - -obsolete_directories="/opt/csw/mysql51/var:/var/opt/csw/mysql51" - -obsolete_dir_information=" -This directory is obsolete. Files in this directory are going to be ignored. -Please move your data to the new location. - -Feel free to remove this file afterwards. -" -obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" - -for dirpair in ${obsolete_directories}; do - obsolete_dir=`echo ${dirpair} | cut -d: -f1` - new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory ${obsolete_dir} still exists. " - echo "* Please move your configuration to ${new_dir}. " - echo "* " - echo "* Installation will continue in 10 seconds. " - echo "* Press CTRL+C if you want to stop now. " - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" - fi - fi -done - -exit 0 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW 2012-02-15 12:42:15 UTC (rev 17060) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW 2012-02-15 13:47:30 UTC (rev 17061) @@ -1,60 +1,12 @@ [[needs review]] -MySQL 5.1 OpenCSW package +MySQL 5.5 OpenCSW package ======================= -* http://www.opencsw.org/packages/mysql51 - -The package has been reworked from the ground up, using GAR. Up until this -moment, the mysql5 package was in the version from before the fork. The new -packages are created so that they are as close to the original ones as -possible, but some changes are inevitable, and some other changes were -considered necessary. - * Read only /opt/csw support - data in /var/opt/csw - configuration in /etc/opt/csw -* The prefix is still /opt/csw/mysql51, but all the binaries are now linked from +* The prefix is /opt/csw, and all the binaries are now in /opt/csw, so that the standard PATH setting allows to use them * The startup script is now in /etc/opt/csw/init.d * SMF support is handled by cswclassutils - - -Here are the old notes from the previous maintainer, Alex Moore: - ---------------8<----------------8<--------------------8<------------------------ - -If you are not using the default location for --datadir, package installation - will NOT start CSWmysql5. More code is needed for that. I welcome patches. - -If you are not using the default location for --datadir, you will find - that CSWmysql5 works much better when you create /etc/my.cnf with at - least the entries that follow. You may also want some entries in this - global options file for client programs that you use. - For example: --datadir is /db/mysql5/var - Create /etc/my.cnf with the following entries: - # Global MySQL options file. - [mysqld] - datadir = /db/mysql5/var - basedir = /opt/csw/mysql5 - -I also changed the option for --defaults-file to --defaults-extra-file - in the startup script. - This allows your options file to be read after the global options file - /etc/my.cnf. - -Note that if you are using the default location for --datadir, you do not - really need /etc/opt/csw/mysql5rc. In this case, you should put any options - in the appropriate group in my.cnf. See the MySQL documentation for - details. - -If you are not using the default location for --datadir, you only need - /etc/opt/csw/mysql5rc for the startup script options for - --defaults-extra-file and possibly --pid-file. All other options may be - put in the appropriate group in my.cnf - -Click 'Views and info' on the package page at - http://www.opencsw.org/packages.php/mysql5 -for the latest information. - -Alex Moore Copied: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl (from rev 16958, csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl 2012-02-15 13:47:30 UTC (rev 17061) @@ -0,0 +1,206 @@ +#!/bin/sh +# vim:ft=sh: +# +# $Id$ +# Start script for MySQL database. +# +# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod +# 700. +# +# First time installation can use quick_start-csw in +# /opt/csw/mysql5/share/mysql to build the mysql database for the +# grant tables. Or create the initial database yourself. +# +# Use my.cnf for startup options. See MySQL documention +# for 'Using Option Files'. +# Support for mysql5rc still remains in this startup script. +# + +RETVAL=0 +prefix="@prefix@" +BASEDIR="${prefix}" +BINDIR="@bindir@" +MYSQL_VAR="@localstatedir@" +sysconfdir="@sysconfdir@" +BASE_VERSION="@BASE_VERSION@" +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +CONFFILE=${sysconfdir}/my.cnf + +# Source the configuration +[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc +[ -r @prefix@/etc/mysql5rc ] && . @prefix@/etc/mysql5rc +[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc + +if [ -r "${sysconfdir}/my.cnf" ]; then + MYSQL_HOME="${MYSQL_VAR}" +elif [ -r "${BASEDIR}/my.cnf" ]; then + MYSQL_HOME="${BASEDIR}" +fi +export MYSQL_HOME + +# To get started quickly, copy a sample configuration file from +# $BASEDIR/share/mysql +# For example, +# cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf +# +# Or, manually follow the database creation steps below, and have +# mysql just use defaults for everything. + +# 2006-03-11 Changed to only look for the grant tables database +# 2006-04-16 Changed again. Look for either the grant tables database +# or the options file. +# 2006-12-28 Fix problem. Look for either the grant tables database in +# the default location or the default options file. +if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then + exit 0 +fi + +# If CONFFILE is the server default file, unset CONFFILE +if [ "${CONFFILE}" = "${MYSQL_HOME}/my.cnf" \ + -o \ + "${CONFFILE}" = "${sysconfdir}/my.cnf" ]; then + CONFFILE= +fi + +# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR +# Also, check that MYSQLD_DATADIR contains a mysql directory +if [ ! -d "$MYSQL_HOME/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then + MYSQLD_DATADIR= +fi + +# Make sure required vars are set +MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_HOME/mysql.pid} + +# If a database already exists, start whether or not there is a conf file. +# If no conf file, the database will just use internal defaults for everything. + +start_it() { + if test -r $MYSQLD_PID_FILE ; then + if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then + echo "${MYSQLD_PROG} (`cat $MYSQLD_PID_FILE`) seems to be running." + return 1 + fi + fi + + printf "%-60s" "Starting ${MYSQLD_PROG}: " + + # 2006-03-11 + # This script no longer creates the default database. You may create the + # default database manually or use + # /opt/csw/mysql5/share/mysql/quick_start-csw + # if [ ! -d "$BASEDIR/var/mysql" ] ; then + # echo MySQL core database has not been created. + # echo Creating it now... + # $BASEDIR/bin/mysql_install_db + # chown -R mysql:mysql $BASEDIR/var + # fi + + # 2006-04-16 --defaults-file is changed to --defaults-extra-file + ${BINDIR}/mysqld_safe \ + `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ + --pid-file=$MYSQLD_PID_FILE \ + `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ + `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ + `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ + `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ + `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ + `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ + `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ + `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ + `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ + `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ + `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ + `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ + `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ + `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ + `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ + `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ + `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ + `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ + `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ + `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ + `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ + `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ + `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ + `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ + `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ + `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ + `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ + `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ + `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ + `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ + `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ + `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ + `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ + `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ + `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ + `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ + `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ + `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ + `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ + `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ + `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ + `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ + `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ + & >/dev/null 2>&1 + RETVAL=$? + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + return 1 + fi + return 0 +} + +stop_it() { + + printf "%-60s" "Shutting down mysqld: " + if test -f "$MYSQLD_PID_FILE" ; then + pkill `pgrep_opts` mysqld_safe >/dev/null 2>&1 + kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 + RETVAL=$? + else + RETVAL=1 + fi + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + fi + echo "" + return 0 +} + +pgrep_opts() { + if [ -x /bin/zonename ] + then + echo "-z `/bin/zonename`" + fi +} + +case $1 in + start) + start_it + ;; + + stop) + stop_it + ;; + + restart) + stop_it + while pgrep `pgrep_opts` ${MYSQLD_PROG} > /dev/null + do + sleep 1 + done + start_it + ;; + + *) + echo "Usage: $0 { start | stop | restart } " + ;; +esac + +exit $RETVAL Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl 2012-02-15 12:42:15 UTC (rev 17060) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl 2012-02-15 13:47:30 UTC (rev 17061) @@ -1,208 +0,0 @@ -#!/bin/sh -# vim:ft=sh: -# -# $Id$ -# Start script for MySQL database. -# -# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod -# 700. -# -# First time installation can use quick_start-csw in -# /opt/csw/mysql55/share/mysql to build the mysql database for the -# grant tables. Or create the initial database yourself. -# -# Use my.cnf for startup options. See MySQL documention -# for 'Using Option Files'. -# Support for mysql55rc still remains in this startup script. -# - -RETVAL=0 -prefix="@prefix@" -BASEDIR="${prefix}" -BINDIR="@bindir@" -MYSQL_VAR="@localstatedir@" -sysconfdir="@sysconfdir@" -BASE_VERSION="@BASE_VERSION@" -MYSQLD_DATADIR=$MYSQL_VAR -MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid -CONFFILE=${sysconfdir}/my.cnf -MYSQLD_PROG=${MYSQLD_PROG:-mysqld-${BASE_VERSION}} - -# Source the configuration -[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc -[ -r @prefix@/etc/mysql5rc ] && . @prefix@/etc/mysql5rc -[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc - -if [ -r "${sysconfdir}/my.cnf" ]; then - MYSQL_HOME="${MYSQL_VAR}" -elif [ -r "${BASEDIR}/my.cnf" ]; then - MYSQL_HOME="${BASEDIR}" -fi -export MYSQL_HOME - -# To get started quickly, copy a sample configuration file from -# $BASEDIR/share/mysql -# For example, -# cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf -# -# Or, manually follow the database creation steps below, and have -# mysql just use defaults for everything. - -# 2006-03-11 Changed to only look for the grant tables database -# 2006-04-16 Changed again. Look for either the grant tables database -# or the options file. -# 2006-12-28 Fix problem. Look for either the grant tables database in -# the default location or the default options file. -if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then - exit 0 -fi - -# If CONFFILE is the server default file, unset CONFFILE -if [ "${CONFFILE}" = "${MYSQL_HOME}/my.cnf" \ - -o \ - "${CONFFILE}" = "${sysconfdir}/my.cnf" ]; then - CONFFILE= -fi - -# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR -# Also, check that MYSQLD_DATADIR contains a mysql directory -if [ ! -d "$MYSQL_HOME/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then - MYSQLD_DATADIR= -fi - -# Make sure required vars are set -MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_HOME/mysql.pid} - -# If a database already exists, start whether or not there is a conf file. -# If no conf file, the database will just use internal defaults for everything. - -start_it() { - if test -r $MYSQLD_PID_FILE ; then - if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then - echo "${MYSQLD_PROG} (`cat $MYSQLD_PID_FILE`) seems to be running." - return 1 - fi - fi - - printf "%-60s" "Starting ${MYSQLD_PROG}: " - - # 2006-03-11 - # This script no longer creates the default database. You may create the - # default database manually or use - # /opt/csw/mysql5/share/mysql/quick_start-csw - # if [ ! -d "$BASEDIR/var/mysql" ] ; then - # echo MySQL core database has not been created. - # echo Creating it now... - # $BASEDIR/bin/mysql_install_db - # chown -R mysql:mysql $BASEDIR/var - # fi - - # 2006-04-16 --defaults-file is changed to --defaults-extra-file - ${BINDIR}/mysqld_safe-${BASE_VERSION} \ - --mysqld-version=${BASE_VERSION} \ - `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ - --pid-file=$MYSQLD_PID_FILE \ - `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ - `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ - `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ - `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ - `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ - `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ - `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ - `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ - `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ - `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ - `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ - `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ - `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ - `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ - `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ - `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ - `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ - `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ - `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ - `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ - `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ - `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ - `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ - `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ - `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ - `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ - `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ - `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ - `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ - `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ - `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ - `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ - `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ - `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ - `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ - `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ - `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ - `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ - `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ - `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ - `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ - `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ - `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ - & >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - return 1 - fi - return 0 -} - -stop_it() { - - printf "%-60s" "Shutting down mysqld: " - if test -f "$MYSQLD_PID_FILE" ; then - pkill `pgrep_opts` mysqld_safe >/dev/null 2>&1 - kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 - RETVAL=$? - else - RETVAL=1 - fi - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - fi - echo "" - return 0 -} - -pgrep_opts() { - if [ -x /bin/zonename ] - then - echo "-z `/bin/zonename`" - fi -} - -case $1 in - start) - start_it - ;; - - stop) - stop_it - ;; - - restart) - stop_it - while pgrep `pgrep_opts` ${MYSQLD_PROG} > /dev/null - do - sleep 1 - done - start_it - ;; - - *) - echo "Usage: $0 { start | stop | restart } " - ;; -esac - -exit $RETVAL Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswusergroup =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswusergroup 2012-02-15 12:42:15 UTC (rev 17060) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswusergroup 2012-02-15 13:47:30 UTC (rev 17061) @@ -1 +1 @@ -mysql:mysql:MySQL database user:/var/opt/csw/mysql51:/bin/false:: +mysql:mysql:MySQL database user:/var/opt/csw/mysql5:/bin/false:: Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/quick_start-csw 2012-02-15 12:42:15 UTC (rev 17060) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/quick_start-csw 2012-02-15 13:47:30 UTC (rev 17061) @@ -129,14 +129,14 @@ echo "See /opt/csw/share/mysql/doc/README.CSW for packaging changes." echo "Please ignore references to starting mysqld_safe in the messages above." echo " These messages are from mysql_install_db. See the following" -echo " for starting CSWmysql55." +echo " for starting CSWmysql5." smf=no if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi if [ $smf = yes ] then - echo "To start mysqld; run \`svcadm enable cswmysql55\` on Solaris 10 or later" + echo "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later" else - echo "To start mysqld; run \`/etc/opt/csw/init.d/cswmysql55 start\` on Solaris 9 or earlier" + echo "To start mysqld; run \`/etc/opt/csw/init.d/cswmysql start\` on Solaris 9 or earlier" fi exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Feb 15 15:33:46 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 15 Feb 2012 14:33:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17062] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 17062 http://gar.svn.sourceforge.net/gar/?rev=17062&view=rev Author: janholzh Date: 2012-02-15 14:33:46 +0000 (Wed, 15 Feb 2012) Log Message: ----------- ffmpeg/trunk: sparcv9 needs PIC Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-02-15 13:47:30 UTC (rev 17061) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-02-15 14:33:46 UTC (rev 17062) @@ -256,7 +256,11 @@ #no asm on sparc CONFIGURE_ARGS_sparc = --disable-asm +#sparcv9 needs --enable-pic +CONFIGURE_ARGS_sparcv9 += --enable-pic + CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(ISA)) # Needs two builds one shared one static maybe in the future #CONFIGURE_ARGS-SHARED-yes += --enable-shared 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 Feb 15 18:16:29 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 15 Feb 2012 17:16:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[17063] csw/mgar/pkg/mysql5/branches/mysql-5.1.x Message-ID: Revision: 17063 http://gar.svn.sourceforge.net/gar/?rev=17063&view=rev Author: wahwah Date: 2012-02-15 17:16:29 +0000 (Wed, 15 Feb 2012) Log Message: ----------- mysql5/branches/mysql-5.1.x: port some changes from 5.0 to 5.1 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql5 Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2012-02-15 14:33:46 UTC (rev 17062) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2012-02-15 17:16:29 UTC (rev 17063) @@ -3,7 +3,7 @@ # $Id$ PROJ_NAME = mysql -NAME = $(PROJ_NAME)51 +NAME = $(PROJ_NAME)5 BASE_VERSION = 5.1 PATCHLEVEL = 59 VERSION = $(BASE_VERSION).$(PATCHLEVEL) @@ -21,22 +21,17 @@ (Structured Query Language) database server. endef -# Change prefix to /opt/csw/$(NAME) -prefix = $(BUILD_PREFIX)/$(NAME) -localstatedir = /var$(prefix) -sysconfdir = /etc$(prefix) -libdir = $(BUILD_PREFIX)/lib -includedir = $(BUILD_PREFIX)/include - -# Where to put the init script -global_sysconfdir = /etc$(BUILD_PREFIX) -# Where to link the binaries -global_bindir = $(BUILD_PREFIX)/bin - INITSMF = $(sysconfdir)/init\.d/csw$(NAME) +# Existing databases are in this location +localstatedir = /var$(BUILD_PREFIX)/$(NAME) +# To avoid file conflicts +# datadir = $(prefix)/share/mysql/$(BASE_VERSION) + MYSQL_LIB_VER = 16 +MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(sbindir) $(libexecdir) + PACKAGES += CSWmysql-dev SPKG_DESC_CSWmysql-dev = MySQL development files PKGFILES_CSWmysql-dev = $(PKGFILES_DEVEL) @@ -56,29 +51,14 @@ PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWosslrt OBSOLETED_BY_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSW$(NAME)rt PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWosslrt OBSOLETED_BY_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSW$(NAME)rt -PACKAGES += CSW$(NAME)client -SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries -RPKGFILES_CSW$(NAME)client = $(bindir) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/sbin/$(bin_name)) -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt -CHECKPKG_OVERRIDES_CSWmysql5client += bad-rpath-entry # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSW$(NAME)client_programs += myisamlog @@ -97,6 +77,19 @@ CSW$(NAME)client_programs += mysql_zap CSW$(NAME)client_programs += perror CSW$(NAME)client_programs += replace +PACKAGES += CSW$(NAME)client +SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries +RPKGFILES_CSW$(NAME)client = $(bindir) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/sbin/$(bin_name)) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt +CHECKPKG_OVERRIDES_CSWmysql5client += bad-rpath-entry PACKAGES += CSW$(NAME) RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) Copied: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.postinstall (from rev 16832, csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.postinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.postinstall 2012-02-15 17:16:29 UTC (rev 17063) @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $Id$ +# + +MYSQLDATADIR=/var/opt/csw/mysql51 +if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then + echo "No database directory found in the default location:" + echo "${MYSQLDATADIR}/mysql" + echo "If you need to build the initial database directory," + echo " see /opt/csw/mysql5/share/mysql/quick_start-csw" + echo "If you are using a non-default database directory location," + echo " please start mysql manually." + exit 0 +fi Copied: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.preinstall (from rev 16832, csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.preinstall 2012-02-15 17:16:29 UTC (rev 17063) @@ -0,0 +1,40 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_directories="/opt/csw/mysql51/var:/var/opt/csw/mysql51" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall 2012-02-15 14:33:46 UTC (rev 17062) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall 2012-02-15 17:16:29 UTC (rev 17063) @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -MYSQLDATADIR=/var/opt/csw/mysql51 -if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then - echo "No database directory found in the default location:" - echo "${MYSQLDATADIR}/mysql" - echo "If you need to build the initial database directory," - echo " see /opt/csw/mysql5/share/mysql/quick_start-csw" - echo "If you are using a non-default database directory location," - echo " please start mysql manually." - exit 0 -fi Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall 2012-02-15 14:33:46 UTC (rev 17062) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall 2012-02-15 17:16:29 UTC (rev 17063) @@ -1,40 +0,0 @@ -#!/bin/sh -# vim:set sw=2 ts=2 sts=2 expandtab: -# -# $Id$ -# - -obsolete_directories="/opt/csw/mysql51/var:/var/opt/csw/mysql51" - -obsolete_dir_information=" -This directory is obsolete. Files in this directory are going to be ignored. -Please move your data to the new location. - -Feel free to remove this file afterwards. -" -obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" - -for dirpair in ${obsolete_directories}; do - obsolete_dir=`echo ${dirpair} | cut -d: -f1` - new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory ${obsolete_dir} still exists. " - echo "* Please move your configuration to ${new_dir}. " - echo "* " - echo "* Installation will continue in 10 seconds. " - echo "* Press CTRL+C if you want to stop now. " - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" - fi - fi -done - -exit 0 Copied: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql5 (from rev 16832, csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql5 (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql5 2012-02-15 17:16:29 UTC (rev 17063) @@ -0,0 +1,183 @@ +#!/bin/sh +# +# $Id$ +# Start script for MySQL database. +# +# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod +# 700. +# +# First time installation can use quick_start-csw in +# /opt/csw/mysql51/share/mysql to build the mysql database for the +# grant tables. Or create the initial database yourself. +# +# Use my.cnf for startup options. See MySQL documention +# for 'Using Option Files'. +# Support for mysql51rc still remains in this startup script. +# + +RETVAL=0 +MYSQLHOME=/opt/csw/mysql51 +MYSQL_VAR=/var/opt/csw/mysql51 +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +CONFFILE=$MYSQL_VAR/my.cnf + +# +# Source configuration +[ -r /opt/csw/mysql51/etc/mysql51rc ] && . /opt/csw/mysql51/etc/mysql51rc +[ -r /etc/opt/csw/mysql51rc ] && . /etc/opt/csw/mysql51rc + +# To get started quickly, copy a sample configuration file from +# $MYSQLHOME/share/mysql +# For example, +# cp /opt/csw/mysql51/share/mysql/my-medium.cnf /opt/csw/mysql51/var/my.cnf +# +# Or, manually follow the database creation steps below, and have +# mysql just use defaults for everything. + +# 2006-03-11 Changed to only look for the grant tables database +# 2006-04-16 Changed again. Look for either the grant tables database +# or the options file. +# 2006-12-28 Fix problem. Look for either the grant tables database in +# the default location or the default options file. +if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then + exit 0 +fi + +# If CONFFILE is the server default file, unset CONFFILE +if [ x"$CONFFILE" = x"$MYSQL_VAR/my.cnf" ]; then + CONFFILE= +fi + +# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR +# Also, check that MYSQLD_DATADIR contains a mysql directory +if [ ! -d "$MYSQL_VAR/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then + MYSQLD_DATADIR= +fi + +# Make sure required vars are set +MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_VAR/mysql.pid} + +# If a database already exists, start whether or not there is a conf file. +# If no conf file, the database will just use internal defaults for everything. + +start_it() { + if test -r $MYSQLD_PID_FILE ; then + if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then + echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." + return 1 + fi + fi + + printf "%-60s" "Starting mysqld: " +# 2006-03-11 +# This script no longer creates the default database. You may create the +# default database manually or use /opt/csw/mysql51/share/mysql/quick_start-csw +# if [ ! -d "$MYSQLHOME/var/mysql" ] ; then +# echo MySQL core database has not been created. +# echo Creating it now... +# $MYSQLHOME/bin/mysql_install_db +# chown -R mysql:mysql $MYSQLHOME/var +# fi + +# 2006-04-16 --defaults-file is changed to --defaults-extra-file + $MYSQLHOME/bin/mysqld_safe \ + `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ + --pid-file=$MYSQLD_PID_FILE \ + `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ + `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ + `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ + `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ + `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ + `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ + `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ + `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ + `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ + `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ + `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ + `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ + `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ + `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ + `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ + `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ + `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ + `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ + `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ + `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ + `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ + `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ + `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ + `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ + `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ + `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ + `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ + `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ + `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ + `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ + `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ + `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ + `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ + `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ + `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ + `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ + `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ + `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ + `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ + `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ + `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ + `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ + `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ + & >/dev/null 2>&1 + RETVAL=$? + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + return 1 + fi + return 0 +} + +stop_it() { + + printf "%-60s" "Shutting down mysqld: " + if test -f "$MYSQLD_PID_FILE" ; then + pkill mysqld_safe >/dev/null 2>&1 + kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 + RETVAL=$? + else + RETVAL=1 + fi + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + fi + echo "" + return 0 +} + +case $1 in + start) + start_it + ;; + + stop) + stop_it + ;; + + restart) + stop_it + while pgrep mysqld > /dev/null + do + sleep 1 + done + start_it + ;; + + *) + echo "Usage: $0 { start | stop | restart } " + ;; +esac + +exit $RETVAL Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51 2012-02-15 14:33:46 UTC (rev 17062) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51 2012-02-15 17:16:29 UTC (rev 17063) @@ -1,183 +0,0 @@ -#!/bin/sh -# -# $Id$ -# Start script for MySQL database. -# -# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod -# 700. -# -# First time installation can use quick_start-csw in -# /opt/csw/mysql51/share/mysql to build the mysql database for the -# grant tables. Or create the initial database yourself. -# -# Use my.cnf for startup options. See MySQL documention -# for 'Using Option Files'. -# Support for mysql51rc still remains in this startup script. -# - -RETVAL=0 -MYSQLHOME=/opt/csw/mysql51 -MYSQL_VAR=/var/opt/csw/mysql51 -MYSQLD_DATADIR=$MYSQL_VAR -MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid -CONFFILE=$MYSQL_VAR/my.cnf - -# -# Source configuration -[ -r /opt/csw/mysql51/etc/mysql51rc ] && . /opt/csw/mysql51/etc/mysql51rc -[ -r /etc/opt/csw/mysql51rc ] && . /etc/opt/csw/mysql51rc - -# To get started quickly, copy a sample configuration file from -# $MYSQLHOME/share/mysql -# For example, -# cp /opt/csw/mysql51/share/mysql/my-medium.cnf /opt/csw/mysql51/var/my.cnf -# -# Or, manually follow the database creation steps below, and have -# mysql just use defaults for everything. - -# 2006-03-11 Changed to only look for the grant tables database -# 2006-04-16 Changed again. Look for either the grant tables database -# or the options file. -# 2006-12-28 Fix problem. Look for either the grant tables database in -# the default location or the default options file. -if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then - exit 0 -fi - -# If CONFFILE is the server default file, unset CONFFILE -if [ x"$CONFFILE" = x"$MYSQL_VAR/my.cnf" ]; then - CONFFILE= -fi - -# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR -# Also, check that MYSQLD_DATADIR contains a mysql directory -if [ ! -d "$MYSQL_VAR/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then - MYSQLD_DATADIR= -fi - -# Make sure required vars are set -MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_VAR/mysql.pid} - -# If a database already exists, start whether or not there is a conf file. -# If no conf file, the database will just use internal defaults for everything. - -start_it() { - if test -r $MYSQLD_PID_FILE ; then - if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then - echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." - return 1 - fi - fi - - printf "%-60s" "Starting mysqld: " -# 2006-03-11 -# This script no longer creates the default database. You may create the -# default database manually or use /opt/csw/mysql51/share/mysql/quick_start-csw -# if [ ! -d "$MYSQLHOME/var/mysql" ] ; then -# echo MySQL core database has not been created. -# echo Creating it now... -# $MYSQLHOME/bin/mysql_install_db -# chown -R mysql:mysql $MYSQLHOME/var -# fi - -# 2006-04-16 --defaults-file is changed to --defaults-extra-file - $MYSQLHOME/bin/mysqld_safe \ - `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ - --pid-file=$MYSQLD_PID_FILE \ - `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ - `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ - `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ - `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ - `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ - `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ - `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ - `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ - `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ - `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ - `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ - `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ - `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ - `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ - `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ - `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ - `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ - `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ - `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ - `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ - `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ - `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ - `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ - `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ - `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ - `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ - `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ - `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ - `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ - `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ - `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ - `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ - `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ - `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ - `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ - `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ - `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ - `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ - `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ - `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ - `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ - `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ - `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ - & >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - return 1 - fi - return 0 -} - -stop_it() { - - printf "%-60s" "Shutting down mysqld: " - if test -f "$MYSQLD_PID_FILE" ; then - pkill mysqld_safe >/dev/null 2>&1 - kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 - RETVAL=$? - else - RETVAL=1 - fi - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - fi - echo "" - return 0 -} - -case $1 in - start) - start_it - ;; - - stop) - stop_it - ;; - - restart) - stop_it - while pgrep mysqld > /dev/null - do - sleep 1 - done - start_it - ;; - - *) - echo "Usage: $0 { start | stop | restart } " - ;; -esac - -exit $RETVAL 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 Feb 15 22:30:32 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 15 Feb 2012 21:30:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17064] csw/mgar/pkg/mysql5/branches/mysql-6.0/ Message-ID: Revision: 17064 http://gar.svn.sourceforge.net/gar/?rev=17064&view=rev Author: wahwah Date: 2012-02-15 21:30:31 +0000 (Wed, 15 Feb 2012) Log Message: ----------- A branch to try out MySQL 6.0 Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-6.0/ 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 Feb 15 23:13:24 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 Feb 2012 22:13:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17065] csw/mgar/pkg/sendmail/trunk/files/sendmail.mc Message-ID: Revision: 17065 http://gar.svn.sourceforge.net/gar/?rev=17065&view=rev Author: bonivart Date: 2012-02-15 22:13:24 +0000 (Wed, 15 Feb 2012) Log Message: ----------- sendmail/trunk: support milter-greylist and spamassassin-milter Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/files/sendmail.mc Modified: csw/mgar/pkg/sendmail/trunk/files/sendmail.mc =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/sendmail.mc 2012-02-15 21:30:31 UTC (rev 17064) +++ csw/mgar/pkg/sendmail/trunk/files/sendmail.mc 2012-02-15 22:13:24 UTC (rev 17065) @@ -1,4 +1,4 @@ -VERSIONID(`$Id: sendmail.mc,v 1.0 2012/02/01 15:19:30 bonivart Exp $') +VERSIONID(`$Id: sendmail.mc,v 1.1 2012/02/15 15:19:30 bonivart Exp $') OSTYPE(`solaris9csw') DOMAIN(`generic') define(`SMART_HOST',`smarthost.mydomain.com') @@ -8,6 +8,12 @@ FEATURE(`genericstable', `hash -o /etc/opt/csw/mail/genericstable') FEATURE(`access_db', `hash -T /etc/opt/csw/mail/access') FEATURE(`virtusertable', `hash /etc/opt/csw/mail/virtusertable') +dnl Enable if you have installed CSWspamass-milter +dnl FEATURE(`spamass-milter')dnl +dnl Enable if you have installed CSWmiltergreylist +dnl Copy /opt/csw/share/doc/miltergreylist/milter-greylist.m4 +dnl to /opt/csw/share/sendmail/cf/feature/milter-greylist.m4 +dnl FEATURE(`milter-greylist') MASQUERADE_AS(`mydomain.com') MASQUERADE_DOMAIN(`mydomain.com') FEATURE(`masquerade_entire_domain') 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 Feb 16 01:21:47 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 16 Feb 2012 00:21:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17066] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 17066 http://gar.svn.sourceforge.net/gar/?rev=17066&view=rev Author: bdwalton Date: 2012-02-16 00:21:47 +0000 (Thu, 16 Feb 2012) Log Message: ----------- ruby18/trunk: disable pthread use to hopefully speed things up Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2012-02-15 22:13:24 UTC (rev 17065) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2012-02-16 00:21:47 UTC (rev 17066) @@ -116,7 +116,6 @@ PATCHFILES += 0005-Correct-a-usr-local-reference-in-mkmf.rb.patch CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-pthread CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --with-tcl-dir=$(prefix) CONFIGURE_ARGS += --with-tk-dir=$(prefix) 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 Feb 16 02:43:08 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 16 Feb 2012 01:43:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17067] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 17067 http://gar.svn.sourceforge.net/gar/?rev=17067&view=rev Author: bdwalton Date: 2012-02-16 01:43:08 +0000 (Thu, 16 Feb 2012) Log Message: ----------- ruby18/trunk: update build deps Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2012-02-16 00:21:47 UTC (rev 17066) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2012-02-16 01:43:08 UTC (rev 17067) @@ -8,8 +8,9 @@ TEST_SCRIPTS = TEST_ARGS = test-all -BUILD_DEP_PKGS = CSWbdb48devel CSWlibgdbm3 CSWcoreutils CSWiconv CSWncurses -BUILD_DEP_PKGS += CSWreadline CSWzlib CSWossldevel +BUILD_DEP_PKGS = CSWbdb48devel CSWlibgdbm-dev CSWcoreutils CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibreadline-dev CSWlibz-dev CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibncurses-dev PACKAGES = CSWruby18 CSWruby18-doc CSWruby18-tk CSWruby18-dev CSWruby18-mode PACKAGES += CSWruby18-mode-el CSWlibruby18-1 CSWruby18-gcc4 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 Feb 16 02:45:19 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 16 Feb 2012 01:45:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[17068] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 17068 http://gar.svn.sourceforge.net/gar/?rev=17068&view=rev Author: bdwalton Date: 2012-02-16 01:45:19 +0000 (Thu, 16 Feb 2012) Log Message: ----------- ruby18/trunk: update library deps Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2012-02-16 01:43:08 UTC (rev 17067) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2012-02-16 01:45:19 UTC (rev 17068) @@ -40,8 +40,9 @@ LICENSE = COPYING -RUNTIME_DEP_PKGS_CSWruby18 = CSWbdb48 CSWlibgdbm3 CSWiconv CSWlibruby18-1 -RUNTIME_DEP_PKGS_CSWruby18 += CSWncurses CSWosslrt CSWreadline CSWzlib +RUNTIME_DEP_PKGS_CSWruby18 = CSWbdb48 CSWlibgdbm4 CSWlibiconv2 CSWlibruby18-1 +RUNTIME_DEP_PKGS_CSWruby18 += CSWlibncurses5 CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWruby18 += CSWlibreadline6 CSWlibz1 RUNTIME_DEP_PKGS_CSWruby18-gcc4 = CSWruby18 CSWgcc4core 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 Feb 16 03:39:45 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 16 Feb 2012 02:39:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17069] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 17069 http://gar.svn.sourceforge.net/gar/?rev=17069&view=rev Author: bdwalton Date: 2012-02-16 02:39:44 +0000 (Thu, 16 Feb 2012) Log Message: ----------- ruby18/trunk: update checkpkg overrides as many are no longer required Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2012-02-16 01:45:19 UTC (rev 17068) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2012-02-16 02:39:44 UTC (rev 17069) @@ -149,37 +149,19 @@ SOS12_LD_FLAGS = endif -# Transitional overrides. Once the packages with 18 in the names are -# released, these can be removed...oh and checkpkg will need a tweak too -CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby18-doc += surplus-dependency|CSWruby18 -CHECKPKG_OVERRIDES_CSWruby18-dev += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby18 += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWruby18-dev += surplus-dependency|CSWcoreutils -CHECKPKG_OVERRIDES_CSWruby18-dev += surplus-dependency|CSWruby18 -CHECKPKG_OVERRIDES_CSWruby18-tk += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby18-tk += surplus-dependency|CSWruby18 -CHECKPKG_OVERRIDES_CSWruby18 += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWrubydev += archall-devel-package -# End of transitional overrides. - CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWpython - -CHECKPKG_OVERRIDES_CSWruby18-gcc4 += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWruby18-gcc4 += surplus-dependency|CSWgcc4core +CHECKPKG_OVERRIDES_CSWrubydev += archall-devel-package -CHECKPKG_OVERRIDES_CSWruby18 += surplus-dependency|CSWalternatives - # usr/local overrides CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/fileutils.rb CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ruby18.1 CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/bin/ri18 CHECKPKG_OVERRIDES_CSWruby18-doc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/1.8/tk/dialog.rb -CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/tkextlib/itcl/setup.rb -CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/tkextlib/itk/setup.rb - include gar/category.mk SPKG_VERSION := $(SPKG_VERSION)$(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Thu Feb 16 09:20:22 2012 From: pfelecan at opencsw.org (Peter FELECAN) Date: Thu, 16 Feb 2012 09:20:22 +0100 Subject: [csw-devel] SF.net SVN: gar:[17064] csw/mgar/pkg/mysql5/branches/mysql-6.0/ In-Reply-To: (wahwah@users.sourceforge.net's message of "Wed, 15 Feb 2012 21:30:32 +0000") References: Message-ID: wahwah at users.sourceforge.net writes: > csw/mgar/pkg/mysql5/branches/mysql-6.0/ in the end csw/mgar/pkg/mysql6 isn't it? -- Peter From maciej at opencsw.org Thu Feb 16 10:28:52 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 16 Feb 2012 09:28:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17064] csw/mgar/pkg/mysql5/branches/mysql-6.0/ In-Reply-To: References: Message-ID: 2012/2/16 Peter FELECAN : >> ? ? csw/mgar/pkg/mysql5/branches/mysql-6.0/ > > in the end csw/mgar/pkg/mysql6 isn't it? Yes, but it's still at alpha, and we're nowhere near releasing it, so it's more like a free fire area for me to experiment. If/when it builds and works, we'll move to to pkg/mysql6. From wahwah at users.sourceforge.net Thu Feb 16 10:30:58 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 16 Feb 2012 09:30:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17070] csw/mgar/pkg/mysql5/branches/mysql-6.0 Message-ID: Revision: 17070 http://gar.svn.sourceforge.net/gar/?rev=17070&view=rev Author: wahwah Date: 2012-02-16 09:30:58 +0000 (Thu, 16 Feb 2012) Log Message: ----------- mysql5/branches/mysql-6.0: these two patches don't apply, and the whole thing doesn't pass the configuration step. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-6.0/Makefile csw/mgar/pkg/mysql5/branches/mysql-6.0/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-6.0/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-6.0/Makefile 2012-02-16 02:39:44 UTC (rev 17069) +++ csw/mgar/pkg/mysql5/branches/mysql-6.0/Makefile 2012-02-16 09:30:58 UTC (rev 17070) @@ -12,9 +12,8 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 -BASE_VERSION = 5.5 -PATCHLEVEL = 20 -ALTS_PRIO = 55 +BASE_VERSION = 6.0 +PATCHLEVEL = 11-alpha VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server @@ -66,8 +65,8 @@ PKGFILES_CSWmysql-dev += /opt/csw/include/mysql CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 -PATCHFILES += 0003-I-HATE-CMAKE.patch -PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch +# PATCHFILES += 0003-I-HATE-CMAKE.patch +# PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) Modified: csw/mgar/pkg/mysql5/branches/mysql-6.0/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-6.0/checksums 2012-02-16 02:39:44 UTC (rev 17069) +++ csw/mgar/pkg/mysql5/branches/mysql-6.0/checksums 2012-02-16 09:30:58 UTC (rev 17070) @@ -1 +1 @@ -375794ebf84b4c7b63f1676bc7416cd0 mysql-5.5.20.tar.gz +516b0695b97102508811f2c4d6e8e683 mysql-6.0.11-alpha.tar.gz 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 Feb 16 10:42:10 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 16 Feb 2012 09:42:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17071] csw/mgar/pkg/x264/trunk/Makefile Message-ID: Revision: 17071 http://gar.svn.sourceforge.net/gar/?rev=17071&view=rev Author: janholzh Date: 2012-02-16 09:42:10 +0000 (Thu, 16 Feb 2012) Log Message: ----------- x264/trunk: rebuild with libav* support Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile Modified: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile 2012-02-16 09:30:58 UTC (rev 17070) +++ csw/mgar/pkg/x264/trunk/Makefile 2012-02-16 09:42:10 UTC (rev 17071) @@ -29,7 +29,9 @@ SKIPTEST = 1 BUILD64_LIBS_ONLY = 1 +BUILD_DEP_PKGS += CSWffmpeg-dev + #More info on mimpure-text: http://blogs.everycity.co.uk/alasdair/2009/05/text-relocation-remains-against-symbol-libx264/ CONFIGURE_ARGS-isa-pentium_pro = $(DIRPATHS) --enable-shared --extra-ldflags="-mimpure-text -lrt" @@ -38,24 +40,28 @@ CONFIGURE_ARGS-isa-sparcv9 = $(DIRPATHS) --enable-shared --enable-pic --disable-asm CONFIGURE_ARGS += $(CONFIGURE_ARGS-isa-$(ISA)) -RUNTIME_DEP_PKGS_CSWlibx264-120 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-120 PACKAGES += CSWx264 SPKG_DESC_CSWx264 = $(DESCRIPTION) # PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWx264 += CSWlibavformat53 +RUNTIME_DEP_PKGS_CSWx264 += CSWlibavcodec53 +RUNTIME_DEP_PKGS_CSWx264 += CSWlibswscale2 +RUNTIME_DEP_PKGS_CSWx264 += CSWlibavutil51 PACKAGES += CSWlibx264-120 CATALOGNAME_CSWlibx264-120 = libx264_120 PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.120) PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.120(\.\d+)*) SPKG_DESC_CSWlibx264-120 += $(DESCRIPTION), libx264.so.120 +RUNTIME_DEP_PKGS_CSWlibx264-120 += CSWlibgcc-s1 PACKAGES += CSWlibx264-dev CATALOGNAME_CSWlibx264-dev = libx264_dev SPKG_DESC_CSWlibx264-dev += $(DESCRIPTION), development files PKGFILES_CSWlibx264-dev += /opt/csw/lib/libx264.so PKGFILES_CSWlibx264-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-120 #Some overrides CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase 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 Feb 17 03:49:07 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 17 Feb 2012 02:49:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17072] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 17072 http://gar.svn.sourceforge.net/gar/?rev=17072&view=rev Author: bdwalton Date: 2012-02-17 02:49:07 +0000 (Fri, 17 Feb 2012) Log Message: ----------- ruby18/trunk: drop some configure options that are no longer recognized Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2012-02-16 09:42:10 UTC (rev 17071) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2012-02-17 02:49:07 UTC (rev 17072) @@ -119,14 +119,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared -CONFIGURE_ARGS += --with-tcl-dir=$(prefix) -CONFIGURE_ARGS += --with-tk-dir=$(prefix) -CONFIGURE_ARGS += --with-dbm-dir=$(prefix)/bdb48 -CONFIGURE_ARGS += --with-gdbm-dir=$(prefix) -CONFIGURE_ARGS += --with-iconv-dir=$(prefix) -CONFIGURE_ARGS += --with-openssl-dir=$(prefix) -CONFIGURE_ARGS += --with-readline-dir=$(prefix) -CONFIGURE_ARGS += --with-zlib-dir=$(prefix) CONFIGURE_ARGS += --program-suffix=18 EXTRA_CONFIGURE_ARGS_isa-default-compiler-sun = --enable-install-doc 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 Feb 17 16:51:28 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Feb 2012 15:51:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17073] csw/mgar/pkg/cpan Message-ID: Revision: 17073 http://gar.svn.sourceforge.net/gar/?rev=17073&view=rev Author: dmichelsen Date: 2012-02-17 15:51:28 +0000 (Fri, 17 Feb 2012) Log Message: ----------- cpan/IRC-Utils: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/IRC-Utils/ csw/mgar/pkg/cpan/IRC-Utils/branches/ csw/mgar/pkg/cpan/IRC-Utils/tags/ csw/mgar/pkg/cpan/IRC-Utils/trunk/ csw/mgar/pkg/cpan/IRC-Utils/trunk/Makefile csw/mgar/pkg/cpan/IRC-Utils/trunk/checksums csw/mgar/pkg/cpan/IRC-Utils/trunk/files/ Property changes on: csw/mgar/pkg/cpan/IRC-Utils/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/IRC-Utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IRC-Utils/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/IRC-Utils/trunk/Makefile 2012-02-17 15:51:28 UTC (rev 17073) @@ -0,0 +1,19 @@ +NAME = IRC-Utils +VERSION = 0.12 +CATEGORIES = cpan +AUTHOR = HINRIK + +DESCRIPTION = Common utilities for IRC-related tasks +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +PACKAGES += CSWpm-irc-utils +CATALOGNAME_CSWpm-irc-utils = pm_irc_utils + +ARCHALL_CSWpm-irc-utils = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/IRC-Utils/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IRC-Utils/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/IRC-Utils/trunk/checksums 2012-02-17 15:51:28 UTC (rev 17073) @@ -0,0 +1 @@ +05e99007ca07dbb9b77e534c71d2a5c1 IRC-Utils-0.12.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 Feb 17 16:55:05 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Feb 2012 15:55:05 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[606] buildfarm/bin/list-experimental Message-ID: Revision: 606 http://opencsw.svn.sourceforge.net/opencsw/?rev=606&view=rev Author: dmichelsen Date: 2012-02-17 15:55:05 +0000 (Fri, 17 Feb 2012) Log Message: ----------- Skip projects starting with a dot from experimental Modified Paths: -------------- buildfarm/bin/list-experimental Modified: buildfarm/bin/list-experimental =================================================================== --- buildfarm/bin/list-experimental 2012-02-11 20:41:54 UTC (rev 605) +++ buildfarm/bin/list-experimental 2012-02-17 15:55:05 UTC (rev 606) @@ -157,7 +157,7 @@ } opendir E, "/home/experimental" || die "Cannot open /home/experimental"; -my @dirs = sort grep { -d "/home/experimental/$_" && !/^\.\.*$/ } readdir E; +my @dirs = sort grep { -d "/home/experimental/$_" && !/^\..*$/ } readdir E; closedir E; my $fd = *STDOUT; 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 Feb 17 17:01:53 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Feb 2012 16:01:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17074] csw/mgar/pkg/cpan/makemake Message-ID: Revision: 17074 http://gar.svn.sourceforge.net/gar/?rev=17074&view=rev Author: dmichelsen Date: 2012-02-17 16:01:52 +0000 (Fri, 17 Feb 2012) Log Message: ----------- cpan/makemake: Adjust to mgar Modified Paths: -------------- csw/mgar/pkg/cpan/makemake Modified: csw/mgar/pkg/cpan/makemake =================================================================== --- csw/mgar/pkg/cpan/makemake 2012-02-17 15:51:28 UTC (rev 17073) +++ csw/mgar/pkg/cpan/makemake 2012-02-17 16:01:52 UTC (rev 17074) @@ -296,4 +296,4 @@ close( MF ); -system( "cd $name/trunk; gmake makesum; gmake package "); +system( "cd $name/trunk; mgar makesum; mgar package "); 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 Feb 17 17:02:28 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Feb 2012 16:02:28 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[607] buildfarm/bin/generate-catalog Message-ID: Revision: 607 http://opencsw.svn.sourceforge.net/opencsw/?rev=607&view=rev Author: dmichelsen Date: 2012-02-17 16:02:28 +0000 (Fri, 17 Feb 2012) Log Message: ----------- Add timestamp to catalog and check for cycles now that chkcat is fast enough Modified Paths: -------------- buildfarm/bin/generate-catalog Modified: buildfarm/bin/generate-catalog =================================================================== --- buildfarm/bin/generate-catalog 2012-02-17 15:55:05 UTC (rev 606) +++ buildfarm/bin/generate-catalog 2012-02-17 16:02:28 UTC (rev 607) @@ -17,12 +17,12 @@ readonly _URL # bldcat prints a lot of output -if ! bldcat --fast --timestamp . >/dev/null +if ! bldcat --fast --param=timestamp . >/dev/null then echo "bldcat failed in $(pwd)." false fi -if chkcat -e --nocyclic catalog +if chkcat -e catalog then echo chkcat returned no errors else @@ -39,7 +39,7 @@ if curl -s -f ${_URL} > catalog.new then mv catalog.new catalog - /opt/csw/bin/gzip --to-stdout catalog > catalog.gz + /opt/csw/bin/gzip -9 --to-stdout catalog > catalog.gz else echo "Signing $(pwd) failed." 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 Feb 17 17:03:32 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Feb 2012 16:03:32 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[608] buildfarm/bin Message-ID: Revision: 608 http://opencsw.svn.sourceforge.net/opencsw/?rev=608&view=rev Author: dmichelsen Date: 2012-02-17 16:03:32 +0000 (Fri, 17 Feb 2012) Log Message: ----------- Make sure pkgutil.pkg on primary is always up-to-date Modified Paths: -------------- buildfarm/bin/opencsw-future-update Added Paths: ----------- buildfarm/bin/link-toplevel-pkgutil Added: buildfarm/bin/link-toplevel-pkgutil =================================================================== --- buildfarm/bin/link-toplevel-pkgutil (rev 0) +++ buildfarm/bin/link-toplevel-pkgutil 2012-02-17 16:03:32 UTC (rev 608) @@ -0,0 +1,13 @@ +#!/bin/sh +# +# Link the toplevel pkgutil.pkg from the most current one in the catalogs + +PATH=/opt/csw/bin:/opt/csw/sbin:/usr/bin:/usr/sbin + +set -x + +ROOT=/home/mirror/opencsw-official + +gzip -c -d ${ROOT}/unstable/sparc/5.10/pkgutil-*.gz > ${ROOT}/pkgutil.pkg + +# vim:set ci si ts=2 sts=2 sw=2 expandtab: Property changes on: buildfarm/bin/link-toplevel-pkgutil ___________________________________________________________________ Added: svn:executable + * Modified: buildfarm/bin/opencsw-future-update =================================================================== --- buildfarm/bin/opencsw-future-update 2012-02-17 16:02:28 UTC (rev 607) +++ buildfarm/bin/opencsw-future-update 2012-02-17 16:03:32 UTC (rev 608) @@ -19,6 +19,7 @@ # Generating unstable. ${BASE_DIR}/generate-unstable +${BASE_DIR}/link-toplevel-pkgutil ${BASE_DIR}/push-opencsw-to-mirror ${BASE_DIR}/send-catalog-update-notifications 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 Feb 17 17:13:21 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Feb 2012 16:13:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17075] csw/mgar/pkg/a2ps/trunk Message-ID: Revision: 17075 http://gar.svn.sourceforge.net/gar/?rev=17075&view=rev Author: dmichelsen Date: 2012-02-17 16:13:21 +0000 (Fri, 17 Feb 2012) Log Message: ----------- a2ps/trunk: Updte to 4.14 Modified Paths: -------------- csw/mgar/pkg/a2ps/trunk/Makefile csw/mgar/pkg/a2ps/trunk/checksums Modified: csw/mgar/pkg/a2ps/trunk/Makefile =================================================================== --- csw/mgar/pkg/a2ps/trunk/Makefile 2012-02-17 16:01:52 UTC (rev 17074) +++ csw/mgar/pkg/a2ps/trunk/Makefile 2012-02-17 16:13:21 UTC (rev 17075) @@ -1,7 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ NAME = a2ps -VERSION = 4.13 -SPKG_VERSION = 4.13b +VERSION = 4.14 CATEGORIES = apps GARTYPE = v2 @@ -10,27 +9,32 @@ Any to PostScript filter endef -MASTER_SITES = http://ftp.gnu.org/pub/gnu/a2ps/ -DISTFILES = $(NAME)-$(VERSION)b.tar.gz +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWa2ps +SPKG_DESC_CSWa2ps = Any to PostScript filter +RUNTIME_DEP_PKGS_CSWa2ps += CSWlibintl8 -# 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 = +# These are just docs +CHECKPKG_OVERRIDES_CSWa2ps += file-with-bad-content|/usr/local|root/opt/csw/share/info/a2ps.info +CHECKPKG_OVERRIDES_CSWa2ps += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/site-lisp/a2ps.el +CHECKPKG_OVERRIDES_CSWa2ps += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/site-lisp/a2ps.elc +CHECKPKG_OVERRIDES_CSWa2ps += file-with-bad-content|/usr/share|root/opt/csw/share/info/a2ps.info -CONFIGURE_ARGS = $(DIRPATHS) +# Just for one .el file? No. +CHECKPKG_OVERRIDES_CSWa2ps += missing-dependency|CSWemacscommon -TEST_SCRIPTS = +PRESERVECONF += $(sysconfdir)/a2ps.cfg +PRESERVECONF += $(sysconfdir)/a2ps-site.cfg +MIGATE_FILES += a2ps.cfg +MIGATE_FILES += a2ps-site.cfg + +# There is one test failing: +SKIPTEST ?= 1 + include gar/category.mk -# -PRESERVECONF = /opt/csw/etc/a2ps-site.cfg -PRESERVECONF = /opt/csw/etc/a2ps.cfg -#RUNTIME_DEP_PKGS += -RUNTIME_DEP_PKGS_CSWa2ps += CSWggettextrt -RUNTIME_DEP_PKGS_CSWa2ps += CSWemacscommon Modified: csw/mgar/pkg/a2ps/trunk/checksums =================================================================== --- csw/mgar/pkg/a2ps/trunk/checksums 2012-02-17 16:01:52 UTC (rev 17074) +++ csw/mgar/pkg/a2ps/trunk/checksums 2012-02-17 16:13:21 UTC (rev 17075) @@ -1 +1 @@ -0c8e0c31b08c14f7a7198ce967eb3281 a2ps-4.13b.tar.gz +781ac3d9b213fa3e1ed0d79f986dc8c7 a2ps-4.14.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 Feb 17 17:15:25 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Feb 2012 16:15:25 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[609] buildfarm/bin/experimental-footer.inc Message-ID: Revision: 609 http://opencsw.svn.sourceforge.net/opencsw/?rev=609&view=rev Author: dmichelsen Date: 2012-02-17 16:15:24 +0000 (Fri, 17 Feb 2012) Log Message: ----------- Fix experimental HTML code Modified Paths: -------------- buildfarm/bin/experimental-footer.inc Modified: buildfarm/bin/experimental-footer.inc =================================================================== --- buildfarm/bin/experimental-footer.inc 2012-02-17 16:03:32 UTC (rev 608) +++ buildfarm/bin/experimental-footer.inc 2012-02-17 16:15:24 UTC (rev 609) @@ -1,4 +1,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 Fri Feb 17 17:17:04 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Feb 2012 16:17:04 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[610] buildfarm/bin/cswcatalog Message-ID: Revision: 610 http://opencsw.svn.sourceforge.net/opencsw/?rev=610&view=rev Author: dmichelsen Date: 2012-02-17 16:17:04 +0000 (Fri, 17 Feb 2012) Log Message: ----------- Allow UNCOMMITTED packages in experimental catalogs Modified Paths: -------------- buildfarm/bin/cswcatalog Modified: buildfarm/bin/cswcatalog =================================================================== --- buildfarm/bin/cswcatalog 2012-02-17 16:15:24 UTC (rev 609) +++ buildfarm/bin/cswcatalog 2012-02-17 16:17:04 UTC (rev 610) @@ -105,7 +105,7 @@ print "Processing packages from $opt_pkgdir\n"; my @pkgs = grep { is_pkgfile $_ } get_filelist("$opt_pkgdir"); foreach my $pkg (@pkgs) { - my ($cname,$vers,$os,$arch) = ($pkg =~ /^([^-]+)-([^-]+)-SunOS([^-]+)-([^-]+)-CSW\./); + my ($cname,$vers,$os,$arch) = ($pkg =~ /^([^-]+)-([^-]+)-SunOS([^-]+)-([^-]+)-(?:CSW|UNCOMMITTED)\./); if( !defined $cname || !defined $vers ) { print "- Ignoring $pkg\n"; 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 Feb 17 18:57:10 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 17 Feb 2012 17:57:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17076] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 17076 http://gar.svn.sourceforge.net/gar/?rev=17076&view=rev Author: bonivart Date: 2012-02-17 17:57:09 +0000 (Fri, 17 Feb 2012) Log Message: ----------- pkgutil/trunk: 2.6.3 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 2012-02-17 16:13:21 UTC (rev 17075) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2012-02-17 17:57:09 UTC (rev 17076) @@ -1,5 +1,5 @@ NAME = pkgutil -VERSION = 2.6.2 +VERSION = 2.6.3 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2012-02-17 16:13:21 UTC (rev 17075) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2012-02-17 17:57:09 UTC (rev 17076) @@ -1 +1 @@ -88a8ea5a5c00610fc7a350fe6548d34d pkgutil-2.6.2.zip +7908d0f3fe1690e2709e00bc2869613a pkgutil-2.6.3.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 Fri Feb 17 23:19:44 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Feb 2012 22:19:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17077] csw/mgar/pkg/cpan/makemake Message-ID: Revision: 17077 http://gar.svn.sourceforge.net/gar/?rev=17077&view=rev Author: dmichelsen Date: 2012-02-17 22:19:44 +0000 (Fri, 17 Feb 2012) Log Message: ----------- cpan/makemake: Add license detection and automatic stub catalog names Modified Paths: -------------- csw/mgar/pkg/cpan/makemake Modified: csw/mgar/pkg/cpan/makemake =================================================================== --- csw/mgar/pkg/cpan/makemake 2012-02-17 17:57:09 UTC (rev 17076) +++ csw/mgar/pkg/cpan/makemake 2012-02-17 22:19:44 UTC (rev 17077) @@ -12,6 +12,10 @@ use version 0.77; # get latest bug-fixes and API use Data::Dumper; +# For online retreival of catalogname for package +use LWP::UserAgent; +use JSON; + # TBD: # [10:14] El_Che: no fix for require, but it gives you filenames of the source # [10:16] Dagobert: Ahhhh.... sorry, I missed that @@ -275,8 +279,16 @@ print MF "CATALOG_RELEASE = unstable\n"; print MF "\n"; +foreach (qw(LICENSE LICENSE.LGPL COPYING Copying COPYRIGHT Artistic ARTISTIC GPL)) { + if( -f "$distdir/$_" ) { + print MF "LICENSE = $_\n\n"; + last; + } +} + print MF "PACKAGES += $cswpkg\n"; print MF "CATALOGNAME_$cswpkg = $cswcatalog\n"; +print MF "SPKG_DESC_$cswpkg = $description\n"; # Do we have the package in the catalog and has it the same name? # dam at login [login]:/home/dam > curl -s http://buildfarm.opencsw.org/pkgdb/rest/catalogs/current/sparc/SunOS5.9/pkgnames/CSWvim/ @@ -290,6 +302,42 @@ print MF "RUNTIME_DEP_PKGS_$cswpkg += $p\n"; } +# Is this an obsoletion for an old package? +my @oldpkgs = mod2pkg( $modname ); +if( @oldpkgs > 1 ) { + print STDERR "ERROR: More than one package for module '$modname' found: @oldpkgs\n"; +} +my $oldpkg = shift @oldpkgs; +if( $oldpkg ne $cswpkg ) { + print MF "OBSOLETED_BY_$cswpkg += $oldpkg\n"; + + my $ua = LWP::UserAgent->new; + $ua->timeout(300); + $ua->proxy(['http', 'ftp'], 'http://proxy:3128' ); + + my $catalog = "unstable"; + my $arch = "sparc"; + my $rel = "SunOS5.10"; + + my $url = "http://buildfarm.opencsw.org/pkgdb/rest/catalogs/$catalog/$arch/$rel/pkgnames/$oldpkg/"; + + my $response = $ua->get( $url ); + + if ($response->is_success) { + my $json_string = $response->decoded_content; # or whatever + if( $json_string eq "null" ) { + print "Couldn't find package $oldpkg in $catalog:$arch:$rel\n"; + } else { + my $data = decode_json $json_string; + my $cname = $data->{catalogname}; + print MF "CATALOGNAME_$oldpkg = ${cname}_stub\n"; + } + } else { + print "Error getting $url\n" . $response->status_line; + } + +} + print MF "\n"; print MF "include gar/category.mk\n"; 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 Feb 17 23:41:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Feb 2012 22:41:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17078] csw/mgar/pkg/cpan/Algorithm-Diff/trunk Message-ID: Revision: 17078 http://gar.svn.sourceforge.net/gar/?rev=17078&view=rev Author: dmichelsen Date: 2012-02-17 22:41:12 +0000 (Fri, 17 Feb 2012) Log Message: ----------- cpan/Algorithm-Diff/trunk: Adjust package name Modified Paths: -------------- csw/mgar/pkg/cpan/Algorithm-Diff/trunk/Makefile csw/mgar/pkg/cpan/Algorithm-Diff/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Algorithm-Diff/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Algorithm-Diff/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Algorithm-Diff/trunk/Makefile 2012-02-17 22:19:44 UTC (rev 17077) +++ csw/mgar/pkg/cpan/Algorithm-Diff/trunk/Makefile 2012-02-17 22:41:12 UTC (rev 17078) @@ -4,14 +4,19 @@ GARTYPE = v2 AUTHOR = TYEMQ -DESCRIPTION = Compute intelligent differences between two files/lists +DESCRIPTION = Diff (also Longest Common Subsequence) define BLURB - Compute 'intelligent' differences between two files / lists endef -PACKAGES = CSWpmalgdiff -CATALOGNAME = pm_algorithmdiff +DISTFILES += COPYING -ARCHALL = 1 +CATALOG_RELEASE = unstable +PACKAGES += CSWpm-algorithm-diff +CATALOGNAME_CSWpm-algorithm-diff = pm_algorithm_diff +SPKG_DESC_CSWpm-algorithm-diff = Diff (also Longest Common Subsequence) +ARCHALL_CSWpm-algorithm-diff = 1 +OBSOLETED_BY_CSWpm-algorithm-diff += CSWpmalgdiff +CATALOGNAME_CSWpmalgdiff = pm_algorithmdiff_stub + include gar/category.mk Modified: csw/mgar/pkg/cpan/Algorithm-Diff/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Algorithm-Diff/trunk/checksums 2012-02-17 22:19:44 UTC (rev 17077) +++ csw/mgar/pkg/cpan/Algorithm-Diff/trunk/checksums 2012-02-17 22:41:12 UTC (rev 17078) @@ -1 +1 @@ -ff3e17ae485f8adfb8857b183991fbce download/Algorithm-Diff-1.1902.tar.gz +ff3e17ae485f8adfb8857b183991fbce Algorithm-Diff-1.1902.tar.gz Added: csw/mgar/pkg/cpan/Algorithm-Diff/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Algorithm-Diff/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Algorithm-Diff/trunk/files/COPYING 2012-02-17 22:41:12 UTC (rev 17078) @@ -0,0 +1,6 @@ +Parts Copyright (c) 2000-2004 Ned Konz. All rights reserved. +Parts by Tye McQueen. + +This program is free software; you can redistribute it and/or modify it +under the same terms as Perl. + 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 Feb 18 05:29:25 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 18 Feb 2012 04:29:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17079] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17079 http://gar.svn.sourceforge.net/gar/?rev=17079&view=rev Author: bdwalton Date: 2012-02-18 04:29:24 +0000 (Sat, 18 Feb 2012) Log Message: ----------- ruby19/trunk: configure options: drop pthread and specifcy the soname Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-17 22:41:12 UTC (rev 17078) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-18 04:29:24 UTC (rev 17079) @@ -1,4 +1,4 @@ -NAME = ruby19 +83;40003;0cNAME = ruby19 VERSION = 1.9.3 PATCHLEVEL = p0 CATEGORIES = lang @@ -102,8 +102,8 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-suffix=19 -CONFIGURE_ARGS += --enable-pthread CONFIGURE_ARGS += --enable-shared +CONFIGURE_ARGS += --with-soname=ruby19 EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sat Feb 18 17:38:06 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 18 Feb 2012 16:38:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17080] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 17080 http://gar.svn.sourceforge.net/gar/?rev=17080&view=rev Author: j_arndt Date: 2012-02-18 16:38:05 +0000 (Sat, 18 Feb 2012) Log Message: ----------- nagios: update to 3.3.1 Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile csw/mgar/pkg/nagios/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nagios/trunk/files/0001-Removed-gcc-macro.patch csw/mgar/pkg/nagios/trunk/files/0001-changed-install-and-command-options-in-configure.patch csw/mgar/pkg/nagios/trunk/files/0003-changed-syntax-of-define-statement.patch csw/mgar/pkg/nagios/trunk/files/0005-Adjusted-CFLAGS-to-solaris-compiler.patch csw/mgar/pkg/nagios/trunk/files/0005-changed-object-files-to-executables.patch csw/mgar/pkg/nagios/trunk/files/0006-path-to-csw-perl.patch csw/mgar/pkg/nagios/trunk/files/0007-nagios-bug-244.patch csw/mgar/pkg/nagios/trunk/files/0008-changed-paths-to-match-csw-standards.patch Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2012-02-18 04:29:24 UTC (rev 17079) +++ csw/mgar/pkg/nagios/trunk/Makefile 2012-02-18 16:38:05 UTC (rev 17080) @@ -1,5 +1,5 @@ NAME = nagios -VERSION = 3.2.3 +VERSION = 3.3.1 CATEGORIES = apps GARTYPE = v2 @@ -9,6 +9,7 @@ endef MASTER_SITES = $(SF_MIRRORS) +DISTNAME = nagios DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWnagios.preinstall DISTFILES += CSWnagios.postinstall @@ -16,24 +17,23 @@ DISTFILES += cswusergroup DISTFILES += README.CSW -PATCHFILES = patch.diff # cgi/cmd.c - GNU macro __attribute__ unknown to compiler - # http://article.gmane.org/gmane.network.nagios.devel/4726 - # (Error 2) -PATCHFILES += 0002-changed-options-for-ginstall.patch +PATCHFILES += 0001-Removed-gcc-macro.patch +PATCHFILES += 0001-changed-install-and-command-options-in-configure.patch +PATCHFILES += 0003-changed-syntax-of-define-statement.patch +PATCHFILES += 0005-changed-object-files-to-executables.patch +PATCHFILES += 0005-Adjusted-CFLAGS-to-solaris-compiler.patch +PATCHFILES += 0006-path-to-csw-perl.patch +PATCHFILES += 0007-nagios-bug-244.patch +PATCHFILES += 0008-changed-paths-to-match-csw-standards.patch -PACKAGES = CSWnagios -CATALOGNAME = nagios - -PACKAGING_PLATFORMS = solaris9-sparc -PACKAGING_PLATFORMS += solaris9-i386 - RUNTIME_DEP_PKGS_CSWnagios = CSWapache2 CSWgd CSWglib2 CSWjpeg CSWlibtoolrt CSWggettextrt -RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWnagiosp CSWap2modphp5 CSWbdb -RUNTIME_DEP_PKGS_CSWnagios += CSWcswclassutils +RUNTIME_DEP_PKGS_CSWnagios += CSWperl CSWnagiosp CSWap2-modphp5 RUNTIME_DEP_PKGS_CSWnagios += CSWlibgd2 RUNTIME_DEP_PKGS_CSWnagios += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWnagios += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWnagios += CSWlibz1 +RUNTIME_DEP_PKGS_CSWnagios += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWnagios += CSWfreetype LICENSE = LICENSE @@ -48,12 +48,7 @@ $$$$3 ~ /\/var\/opt\/csw\/nagios\/rw/ { $$$$2 = "cswcptemplates" ; $$$$4 = "2755" ; $$$$5 = "nagios" ; $$$$6 = "nagioscm" } \ { print }' -# -# CSW class action utilities -# -SPKG_CLASSES = none cswusergroup ugfiles cswmigrateconf cswcptemplates cswinitsmf cswpostmsg - INITSMF = /etc/opt/csw/init.d/cswnagios USERGROUP = /etc/opt/csw/pkg/CSWnagios/cswusergroup POSTMSG = /opt/csw/share/doc/nagios/README.CSW @@ -78,12 +73,17 @@ CONFIGURE_ARGS += --with-checkresult-dir=/var/opt/csw/nagios/spool/checkresults CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/nagios/nagios.lock CONFIGURE_ARGS += --localstatedir=/var$(prefix) -CONFIGURE_ENV += install_user=$(USER) install_group=csw # see PATCHFILES +CONFIGURE_ENV += install_user=$(USER) install_grp=csw # see PATCHFILES +CONFIGURE_ENV += PATH=/usr/bin:/usr/ccs/bin:/opt/csw/bin:/opt/csw/bin/ +CONFIGURE_ENV += CC=/opt/SUNWspro/bin/cc +CONFIGURE_ENV += PERL=/opt/csw/bin/perl # # build # +BUILD_ENV_PATH = $(bindir):$(PATH) + EXTRA_LIB = $(BUILD_PREFIX)/lib LD_OPTIONS += -R/opt/csw/lib @@ -93,56 +93,21 @@ # ENABLE_CHECK = 0 -TEST_TARGET = none +#TEST_TARGET = none +TEST_SCRIPTS = # # install +# Nagios Makefile calls install-basic by default # -#INSTALL_ARGS += install-init -#INSTALL_ARGS += install-config INSTALL_ARGS += install-commandmode # # override chkpkg -# (in all html and cfg files the string /usr/local appears, which is uncritical. -# the string appears in /opt/csw/nagios/bin/nagios and opt/csw/nagios/bin/p1.pl too, where it is a comment) +# (in all html and cfg files the string /usr/local appears, which is uncritical.) # -CHECKPKG_OVERRIDES_CSWnagios += action-class-only-in-pkginfo|ugfiles -CHECKPKG_OVERRIDES_CSWnagios += action-class-only-in-pkginfo|cswmigrateconf -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/bin/nagios -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/bin/p1.pl -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/cgisecurity.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/monitoring-windows.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/volatileservices.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/faststartup.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/freshness.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/macros.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/config.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/upgrading.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/quickstart-opensuse.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/notifications.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/verifyconfig.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/redundancy.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/perfdata.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configmain.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/monitoring-printers.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/quickstart-ubuntu.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/security.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/eventhandlers.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/startstop.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/cgiincludes.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configcgi.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/distributed.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/int-tcpwrappers.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/cgiauth.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/objectdefinitions.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/monitoring-routers.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/clusters.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/nagiostats.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/quickstart-fedora.html -CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configobject.html CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios/nagios.cfg CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios/cgi.cfg @@ -150,16 +115,16 @@ # yes, we need this dependencies # -CHECKPKG_OVERRIDES_CSWnagios += obsolete-dependency|CSWcswclassutils CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWgd CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWglib2 CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWnagiosp CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWlibtoolrt -CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWap2modphp5 +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWap2-modphp5 CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWggettextrt -CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWbdb -CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWosslrt +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWjpeg + include gar/category.mk DOCS = Changelog INSTALLING README UPGRADING @@ -205,21 +170,6 @@ @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/printer.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/printer.cfg @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/switch.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/switch.cfg @# - @#ginstall -m 775 -d $(DESTDIR)$(TEMPLATEDIR) - @#ginstall -m 775 -d $(DESTDIR)$(TEMPLATEDIR)/objects - @#ginstall -b -m 664 $(WORKSRC)/sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg.CSW - @#ginstall -b -m 664 $(WORKSRC)/sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.CSW - @#ginstall -b -m 660 $(WORKSRC)/sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.CSW - @#ginstall -b -m 644 $(WORKSRC)/sample-config/httpd.conf $(DESTDIR)$(CFGDIR)/httpd-nagios.conf.CSW - @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg.CSW - @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg.CSW - @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg.CSW - @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.CSW - @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg.CSW - @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg.CSW - @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg.CSW - @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg.CSW - @# @# create user and group -> cswusergroup @# @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWnagios Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2012-02-18 04:29:24 UTC (rev 17079) +++ csw/mgar/pkg/nagios/trunk/checksums 2012-02-18 16:38:05 UTC (rev 17080) @@ -1 +1 @@ -fe1be46e6976a52acdb021a782b5d04b nagios-3.2.3.tar.gz +d03a52e1f24ee582cf05fde4d15ff30b nagios-3.3.1.tar.gz Added: csw/mgar/pkg/nagios/trunk/files/0001-Removed-gcc-macro.patch =================================================================== --- csw/mgar/pkg/nagios/trunk/files/0001-Removed-gcc-macro.patch (rev 0) +++ csw/mgar/pkg/nagios/trunk/files/0001-Removed-gcc-macro.patch 2012-02-18 16:38:05 UTC (rev 17080) @@ -0,0 +1,25 @@ +From 3546f5148c875d715698f904f50f65b348afb15e Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sat, 11 Feb 2012 18:45:15 +0100 +Subject: [PATCH] Removed gcc macro + +--- + cgi/cmd.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/cgi/cmd.c b/cgi/cmd.c +index 2adc06d..6671af5 100755 +--- a/cgi/cmd.c ++++ b/cgi/cmd.c +@@ -1891,7 +1891,7 @@ void commit_command_data(int cmd) { + return; + } + +-__attribute__((format(printf, 2, 3))) ++/* __attribute__((format(printf, 2, 3))) */ + static int cmd_submitf(int id, const char *fmt, ...) { + char cmd[MAX_EXTERNAL_COMMAND_LENGTH]; + const char *command; +-- +1.7.8.3 + Added: csw/mgar/pkg/nagios/trunk/files/0001-changed-install-and-command-options-in-configure.patch =================================================================== --- csw/mgar/pkg/nagios/trunk/files/0001-changed-install-and-command-options-in-configure.patch (rev 0) +++ csw/mgar/pkg/nagios/trunk/files/0001-changed-install-and-command-options-in-configure.patch 2012-02-18 16:38:05 UTC (rev 17080) @@ -0,0 +1,34 @@ +From cb2ee195ba14e16060115e90d41d8744cff31b29 Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sat, 11 Feb 2012 19:11:07 +0100 +Subject: [PATCH] changed install and command options in configure + +--- + configure | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index bb7b3bf..bf774a8 100755 +--- a/configure ++++ b/configure +@@ -5664,7 +5664,7 @@ cat >>confdefs.h <<_ACEOF + #define DEFAULT_NAGIOS_GROUP "$nagios_grp" + _ACEOF + +-INSTALL_OPTS="-o $nagios_user -g $nagios_grp" ++INSTALL_OPTS="-o $install_user -g $install_grp" + + + +@@ -5685,7 +5685,7 @@ else + fi; + + +-COMMAND_OPTS="-o $command_user -g $command_grp" ++COMMAND_OPTS="-o $install_user -g $install_grp" + + + MAIL_PROG=no +-- +1.7.8.3 + Added: csw/mgar/pkg/nagios/trunk/files/0003-changed-syntax-of-define-statement.patch =================================================================== --- csw/mgar/pkg/nagios/trunk/files/0003-changed-syntax-of-define-statement.patch (rev 0) +++ csw/mgar/pkg/nagios/trunk/files/0003-changed-syntax-of-define-statement.patch 2012-02-18 16:38:05 UTC (rev 17080) @@ -0,0 +1,25 @@ +From 3eac415f8cf5068c253b909e2bce23daf8df7af4 Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sat, 11 Feb 2012 18:48:33 +0100 +Subject: [PATCH 3/3] changed syntax of define statement + +--- + include/nebmodules.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/nebmodules.h b/include/nebmodules.h +index a3992f4..17c456b 100755 +--- a/include/nebmodules.h ++++ b/include/nebmodules.h +@@ -31,7 +31,7 @@ extern "C" { + + /***** MODULE VERSION INFORMATION *****/ + +-#define NEB_API_VERSION(x) int __neb_api_version = x; ++#define NEB_API_VERSION(x) int __neb_api_version = x + #define CURRENT_NEB_API_VERSION 3 + + +-- +1.7.8.3 + Added: csw/mgar/pkg/nagios/trunk/files/0005-Adjusted-CFLAGS-to-solaris-compiler.patch =================================================================== --- csw/mgar/pkg/nagios/trunk/files/0005-Adjusted-CFLAGS-to-solaris-compiler.patch (rev 0) +++ csw/mgar/pkg/nagios/trunk/files/0005-Adjusted-CFLAGS-to-solaris-compiler.patch 2012-02-18 16:38:05 UTC (rev 17080) @@ -0,0 +1,39 @@ +From 928321930443886384a517e4ed976cc38bac1f6e Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sat, 11 Feb 2012 22:13:43 +0100 +Subject: [PATCH] Adjusted CFLAGS to solaris compiler + +--- + base/Makefile.in | 2 +- + cgi/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/base/Makefile.in b/base/Makefile.in +index 868e1d1..e82524a 100755 +--- a/base/Makefile.in ++++ b/base/Makefile.in +@@ -11,7 +11,7 @@ SRC_INCLUDE=../include + SRC_XDATA=../xdata + + CC=@CC@ +-CFLAGS=-Wall @CFLAGS@ @DEFS@ -DNSCORE ++CFLAGS=@CFLAGS@ @DEFS@ -DNSCORE + + # Compiler flags for use with gprof + #CFLAGS=-pg -DHAVE_CONFIG_H -DNSCORE +diff --git a/cgi/Makefile.in b/cgi/Makefile.in +index e45b126..59ac0a8 100755 +--- a/cgi/Makefile.in ++++ b/cgi/Makefile.in +@@ -26,7 +26,7 @@ CGIEXTRAS=@CGIEXTRAS@ + + CP=@CP@ + CC=@CC@ +-CFLAGS=-Wall @CFLAGS@ @DEFS@ -DNSCGI ++CFLAGS=@CFLAGS@ @DEFS@ -DNSCGI + + # Compiler flags for optimization (overrides default) + #CFLAGS=-O3 -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -DHAVE_CONFIG_H -DNSCGI +-- +1.7.8.3 + Added: csw/mgar/pkg/nagios/trunk/files/0005-changed-object-files-to-executables.patch =================================================================== --- csw/mgar/pkg/nagios/trunk/files/0005-changed-object-files-to-executables.patch (rev 0) +++ csw/mgar/pkg/nagios/trunk/files/0005-changed-object-files-to-executables.patch 2012-02-18 16:38:05 UTC (rev 17080) @@ -0,0 +1,34 @@ +From ff6ff7c6d8ad5a08cbf13c722f5d058e99663ebb Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sat, 11 Feb 2012 18:53:35 +0100 +Subject: [PATCH 5/5] changed object files to executables + +--- + module/Makefile.in | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/module/Makefile.in b/module/Makefile.in +index a0eb7c5..2184405 100755 +--- a/module/Makefile.in ++++ b/module/Makefile.in +@@ -25,13 +25,13 @@ STRIP=@STRIP@ + + CP=@CP@ + +-all: helloworld.o ++all: helloworld + +-helloworld.o: helloworld.c +- $(CC) $(MOD_CFLAGS) $(CFLAGS) -o helloworld.o helloworld.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) ++helloworld: helloworld.c ++ $(CC) $(MOD_CFLAGS) $(CFLAGS) -o helloworld helloworld.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) + + clean: +- rm -f helloworld.o ++ rm -f helloworld + rm -f core *.o + rm -f *~ *.*~ + +-- +1.7.8.3 + Added: csw/mgar/pkg/nagios/trunk/files/0006-path-to-csw-perl.patch =================================================================== --- csw/mgar/pkg/nagios/trunk/files/0006-path-to-csw-perl.patch (rev 0) +++ csw/mgar/pkg/nagios/trunk/files/0006-path-to-csw-perl.patch 2012-02-18 16:38:05 UTC (rev 17080) @@ -0,0 +1,91 @@ +From 6702010ea490949aeeeec4ce83cf775319092adc Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Tue, 14 Feb 2012 20:46:54 +0100 +Subject: [PATCH] path to csw perl + +--- + configure | 44 ++++++++++++++++++++++---------------------- + 1 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/configure b/configure +index bf774a8..20c39a4 100755 +--- a/configure ++++ b/configure +@@ -7184,15 +7184,15 @@ cat >>confdefs.h <<_ACEOF + #define EMBEDDEDPERL + _ACEOF + +- PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" +- PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`" +- CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`" ++ PERLLIBS="`/opt/csw/bin/perl -MExtUtils::Embed -e ldopts`" ++ PERLDIR="`/opt/csw/bin/perl -MConfig -e 'print $Config{installsitearch}'`" ++ CFLAGS="${CFLAGS} `/opt/csw/bin/perl -MExtUtils::Embed -e ccopts`" + USEPERL=yes + INSTALLPERLSTUFF=yes; + PERLXSI_O=perlxsi.o + OBJS="${OBJS} ${PERLXSI_O}" + echo "creating base/perlxsi.c" +- perl -MExtUtils::Embed -e xsinit -- -o base/perlxsi.c ++ /opt/csw/bin/perl -MExtUtils::Embed -e xsinit -- -o base/perlxsi.c + + echo "Embedded Perl interpreter will be compiled in..." + +@@ -7215,7 +7215,7 @@ _ACEOF + fi + + if test x$USEPERL = xyes; then +- if (perl -e 'use Config;exit -1 unless ($Config{'usethreads'});'); then ++ if (/opt/csw/bin/perl -e 'use Config;exit -1 unless ($Config{'usethreads'});'); then + echo "Using threaded perl" + + cat >>confdefs.h <<_ACEOF +@@ -8761,28 +8761,28 @@ fi + + + +-perl subst include/locations.h +-perl subst html/config.inc.php ++/opt/csw/bin/perl subst include/locations.h ++/opt/csw/bin/perl subst html/config.inc.php + + + echo "" + echo "Creating sample config files in sample-config/ ..." + +-perl subst sample-config/nagios.cfg +-perl subst sample-config/cgi.cfg +-perl subst sample-config/resource.cfg +-perl subst sample-config/httpd.conf +-perl subst sample-config/mrtg.cfg +- +-perl subst sample-config/template-object/templates.cfg +-perl subst sample-config/template-object/commands.cfg +-perl subst sample-config/template-object/timeperiods.cfg +-perl subst sample-config/template-object/contacts.cfg +- +-perl subst sample-config/template-object/localhost.cfg +-perl subst sample-config/template-object/windows.cfg +-perl subst sample-config/template-object/printer.cfg +-perl subst sample-config/template-object/switch.cfg ++/opt/csw/bin/perl subst sample-config/nagios.cfg ++/opt/csw/bin/perl subst sample-config/cgi.cfg ++/opt/csw/bin/perl subst sample-config/resource.cfg ++/opt/csw/bin/perl subst sample-config/httpd.conf ++/opt/csw/bin/perl subst sample-config/mrtg.cfg ++ ++/opt/csw/bin/perl subst sample-config/template-object/templates.cfg ++/opt/csw/bin/perl subst sample-config/template-object/commands.cfg ++/opt/csw/bin/perl subst sample-config/template-object/timeperiods.cfg ++/opt/csw/bin/perl subst sample-config/template-object/contacts.cfg ++ ++/opt/csw/bin/perl subst sample-config/template-object/localhost.cfg ++/opt/csw/bin/perl subst sample-config/template-object/windows.cfg ++/opt/csw/bin/perl subst sample-config/template-object/printer.cfg ++/opt/csw/bin/perl subst sample-config/template-object/switch.cfg + + + +-- +1.7.9 + Added: csw/mgar/pkg/nagios/trunk/files/0007-nagios-bug-244.patch =================================================================== --- csw/mgar/pkg/nagios/trunk/files/0007-nagios-bug-244.patch (rev 0) +++ csw/mgar/pkg/nagios/trunk/files/0007-nagios-bug-244.patch 2012-02-18 16:38:05 UTC (rev 17080) @@ -0,0 +1,28 @@ +From 8099eab91753c9a721edc68da1f72c42f89ca83e Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Fri, 17 Feb 2012 20:52:05 +0100 +Subject: [PATCH] nagios bug 244 + +--- + html/Makefile.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/html/Makefile.in b/html/Makefile.in +index c89d72f..4c9c019 100755 +--- a/html/Makefile.in ++++ b/html/Makefile.in +@@ -75,9 +75,9 @@ install: + do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done + for file in includes/*.*; \ + do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done +- for file in includes/rss/*; \ ++ for file in includes/rss/*.*; \ + do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done +- for file in includes/rss/extlib/*; \ ++ for file in includes/rss/extlib/*.*; \ + do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done + + install-unstripped: +-- +1.7.9 + Added: csw/mgar/pkg/nagios/trunk/files/0008-changed-paths-to-match-csw-standards.patch =================================================================== --- csw/mgar/pkg/nagios/trunk/files/0008-changed-paths-to-match-csw-standards.patch (rev 0) +++ csw/mgar/pkg/nagios/trunk/files/0008-changed-paths-to-match-csw-standards.patch 2012-02-18 16:38:05 UTC (rev 17080) @@ -0,0 +1,132 @@ +From 7ec21d10956ef667f76c3d1008c4215082ebe094 Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sat, 18 Feb 2012 13:56:45 +0100 +Subject: [PATCH] changed paths to match csw standards + +--- + base/nagios.c | 2 +- + p1.pl | 56 ++++++++++++++++++++++++++++---------------------------- + 2 files changed, 29 insertions(+), 29 deletions(-) + +diff --git a/base/nagios.c b/base/nagios.c +index 1f0b17a..db0a164 100755 +--- a/base/nagios.c ++++ b/base/nagios.c +@@ -510,7 +510,7 @@ int main(int argc, char **argv, char **env) { + printf("\n"); + printf(" Make sure you are specifying the name of the MAIN configuration file on\n"); + printf(" the command line and not the name of another configuration file. The\n"); +- printf(" main configuration file is typically '/usr/local/nagios/etc/nagios.cfg'\n"); ++ printf(" main configuration file is typically '/etc/opt/csw/nagios/nagios.cfg'\n"); + } + + printf("\n***> One or more problems was encountered while processing the config files...\n"); +diff --git a/p1.pl b/p1.pl +index 0e95291..4e48cb1 100755 +--- a/p1.pl ++++ b/p1.pl +@@ -16,7 +16,7 @@ use constant DEBUG_LEVEL => 0 ; + # use constant DEBUG_LEVEL => LEAVE_MSG | CACHE_DUMP ; + # use constant DEBUG_LEVEL => LEAVE_MSG | CACHE_DUMP | PLUGIN_DUMP ; + +-use constant DEBUG_LOG_PATH => '/usr/local/nagios/var/' ; ++use constant DEBUG_LOG_PATH => '/var/opt/csw/nagios' ; + # use constant DEBUG_LOG_PATH => './' ; + use constant LEAVE_MSG_STREAM => DEBUG_LOG_PATH . 'epn_leave-msgs.log' ; + use constant CACHE_DUMP_STREAM => DEBUG_LOG_PATH . 'epn_cache-dump.log' ; +@@ -425,49 +425,49 @@ B<2> logs messages describing the success or otherwise of the plugin compilation + + An example of such messages are + +- Fri Apr 22 11:54:21 2005 eval_file: successfully compiled "/usr/local/nagios/libexec/check_bass ". +- Fri Apr 22 11:54:21 2005 run_package: "/usr/local/nagios/libexec/check_bass " returning ("0", "BASS Transaction completed Ok. ++ Fri Apr 22 11:54:21 2005 eval_file: successfully compiled "/opt/csw/nagios/libexec/check_bass ". ++ Fri Apr 22 11:54:21 2005 run_package: "/opt/csw/nagios/libexec/check_bass " returning ("0", "BASS Transaction completed Ok. + "). +- Fri Apr 22 11:55:02 2005 eval_file: successfully compiled "/usr/local/nagios/libexec/check_ad -D production.prod -S". +- Fri Apr 22 11:55:02 2005 run_package: "/usr/local/nagios/libexec/check_ad -D foo.dom -S" returning ("0", "Ok. Expected 2 domain controllers [foo1 foo2] for "foo.dom.prod" domain from "1.1.2.3" DNS, found 8 [foo1 foo2 ..] ++ Fri Apr 22 11:55:02 2005 eval_file: successfully compiled "/opt/csw/nagios/libexec/check_ad -D production.prod -S". ++ Fri Apr 22 11:55:02 2005 run_package: "/opt/csw/nagios/libexec/check_ad -D foo.dom -S" returning ("0", "Ok. Expected 2 domain controllers [foo1 foo2] for "foo.dom.prod" domain from "1.1.2.3" DNS, found 8 [foo1 foo2 ..] + "). +- Fri Apr 22 11:55:19 2005 eval_file: successfully compiled "/usr/local/nagios/libexec/check_ldap adonis". +- Fri Apr 22 11:55:19 2005 run_package: "/usr/local/nagios/libexec/check_ldap adonis" returning ("0", "Ok. Schema query response DN: dc=ipaustralia,dc=gov,dc=au aci: (target="ldap:///dc=ipaustralia,dc=gov,dc=au")(targetattr!="userPassword")(targetfi ++ Fri Apr 22 11:55:19 2005 eval_file: successfully compiled "/opt/csw/nagios/libexec/check_ldap adonis". ++ Fri Apr 22 11:55:19 2005 run_package: "/opt/csw/nagios/libexec/check_ldap adonis" returning ("0", "Ok. Schema query response DN: dc=ipaustralia,dc=gov,dc=au aci: (target="ldap:///dc=ipaustralia,dc=gov,dc=au")(targetattr!="userPassword")(targetfi + "). +- Fri Apr 22 11:55:29 2005 eval_file: successfully compiled "/usr/local/nagios/libexec/check_scheduler -H aphrodite -p 7003". +- Fri Apr 22 11:55:30 2005 eval_file: successfully compiled "/usr/local/nagios/libexec/check_pams -H aphrodite -p 7003 -R". +- Fri Apr 22 11:55:29 2005 run_package: "/usr/local/nagios/libexec/check_scheduler -H aphrodite -p 7003" returning ("0", "Ok. COMSQ last ran 31 seconds ago. System: 0.02s Number of jobs waiting 0 "Detail" system sch_V2_6 14/01/2005 12:22:53 aimali Jobs: COMSQ/PollerManager Fri Apr 22 11:55:00, adhoc pause Fri Apr 22 09:00:00, PAMS/SchedExamDocCheck Thu Apr 21 23:00:00, CFX Cl" ++ Fri Apr 22 11:55:29 2005 eval_file: successfully compiled "/opt/csw/nagios/libexec/check_scheduler -H aphrodite -p 7003". ++ Fri Apr 22 11:55:30 2005 eval_file: successfully compiled "/opt/csw/nagios/libexec/check_pams -H aphrodite -p 7003 -R". ++ Fri Apr 22 11:55:29 2005 run_package: "/opt/csw/nagios/libexec/check_scheduler -H aphrodite -p 7003" returning ("0", "Ok. COMSQ last ran 31 seconds ago. System: 0.02s Number of jobs waiting 0 "Detail" system sch_V2_6 14/01/2005 12:22:53 aimali Jobs: COMSQ/PollerManager Fri Apr 22 11:55:00, adhoc pause Fri Apr 22 09:00:00, PAMS/SchedExamDocCheck Thu Apr 21 23:00:00, CFX Cl" + ). +- Fri Apr 22 11:55:30 2005 run_package: "/usr/local/nagios/libexec/check_pams -H aphrodite -p 7003 -R" returning ("0", "OK PAMS Worst: Test Time 2.61 Failure Ratio 0 [0:5] Statii: BASE OK Oracle (direct) OK COMS Processor OK CCS Name Search (direct) OK Correspondence Manager OK PAMS Tier OK CASEWORK OK Objective (direct) OK Customer Manager OK ++ Fri Apr 22 11:55:30 2005 run_package: "/opt/csw/nagios/libexec/check_pams -H aphrodite -p 7003 -R" returning ("0", "OK PAMS Worst: Test Time 2.61 Failure Ratio 0 [0:5] Statii: BASE OK Oracle (direct) OK COMS Processor OK CCS Name Search (direct) OK Correspondence Manager OK PAMS Tier OK CASEWORK OK Objective (direct) OK Customer Manager OK + "). +- Fri Apr 22 11:55:45 2005 eval_file: successfully compiled "/usr/local/nagios/libexec/check_coms ". +- Fri Apr 22 11:55:45 2005 run_package: "/usr/local/nagios/libexec/check_coms " returning ("0", "COMS Ok. 11 successes 20 minutes ago. 55 minute deltas: (0 0 0 11 0 1 3 4 0 6) or graph ++ Fri Apr 22 11:55:45 2005 eval_file: successfully compiled "/opt/csw/nagios/libexec/check_coms ". ++ Fri Apr 22 11:55:45 2005 run_package: "/opt/csw/nagios/libexec/check_coms " returning ("0", "COMS Ok. 11 successes 20 minutes ago. 55 minute deltas: (0 0 0 11 0 1 3 4 0 6) or graph + ) + + .. after all the plugins are compiled, the 'successfully compiled mesages' are replaced by 'skipping compilation' + +- Fri Apr 22 12:05:10 2005 eval_file: /usr/local/nagios/libexec/check_adds already successfully compiled and file has not changed; skipping compilation. +- Fri Apr 22 12:05:11 2005 eval_file: /usr/local/nagios/libexec/check_aub already successfully compiled and file has not changed; skipping compilation ++ Fri Apr 22 12:05:10 2005 eval_file: /opt/csw/nagios/libexec/check_adds already successfully compiled and file has not changed; skipping compilation. ++ Fri Apr 22 12:05:11 2005 eval_file: /opt/csw/nagios/libexec/check_aub already successfully compiled and file has not changed; skipping compilation + . +- Fri Apr 22 12:05:10 2005 run_package: "/usr/local/nagios/libexec/check_adds " returning ("0", "ADDS Transaction completed Ok. ++ Fri Apr 22 12:05:10 2005 run_package: "/opt/csw/nagios/libexec/check_adds " returning ("0", "ADDS Transaction completed Ok. + "). +- Fri Apr 22 12:05:13 2005 eval_file: /usr/local/nagios/libexec/check_eForm already successfully compiled and file has not changed; skipping compilation. +- Fri Apr 22 12:05:13 2005 run_package: "/usr/local/nagios/libexec/check_eForm " returning ("0", "eForm Transaction completed Ok. ++ Fri Apr 22 12:05:13 2005 eval_file: /opt/csw/nagios/libexec/check_eForm already successfully compiled and file has not changed; skipping compilation. ++ Fri Apr 22 12:05:13 2005 run_package: "/opt/csw/nagios/libexec/check_eForm " returning ("0", "eForm Transaction completed Ok. + "). +- Fri Apr 22 12:05:15 2005 eval_file: /usr/local/nagios/libexec/check_cfx_log already successfully compiled and file has not changed; skipping compilation. +- Fri Apr 22 12:05:15 2005 run_package: "/usr/local/nagios/libexec/check_cfx_log -H faxgw1" returning ("0", "Ok. Last write of "//faxgw1/Faxloader$/cfxFaxLoaderClient.log" 0.0 minutes ago. File info (create, access, modify, write times): "Wed Mar 26 17:19:42 2003 Fri Apr 22 12:05:13 2005 Fri Apr 22 12:05:13 2005 Fri Apr 22 12:05:13 2005". ++ Fri Apr 22 12:05:15 2005 eval_file: /opt/csw/nagios/libexec/check_cfx_log already successfully compiled and file has not changed; skipping compilation. ++ Fri Apr 22 12:05:15 2005 run_package: "/opt/csw/nagios/libexec/check_cfx_log -H faxgw1" returning ("0", "Ok. Last write of "//faxgw1/Faxloader$/cfxFaxLoaderClient.log" 0.0 minutes ago. File info (create, access, modify, write times): "Wed Mar 26 17:19:42 2003 Fri Apr 22 12:05:13 2005 Fri Apr 22 12:05:13 2005 Fri Apr 22 12:05:13 2005". + "). +- Fri Apr 22 12:05:16 2005 eval_file: /usr/local/nagios/libexec/check_cfx_log already successfully compiled and file has not changed; skipping compilation. +- Fri Apr 22 12:05:16 2005 run_package: "/usr/local/nagios/libexec/check_cfx_log -H faxgw2" returning ("0", "Ok. Last write of "//faxgw2/Faxloader$/cfxFaxLoaderClient.log" 0.3 minutes ago. File info (create, access, modify, write times): "Wed Mar 26 17:27:24 2003 Fri Apr 22 12:04:55 2005 Fri Apr 22 12:04:55 2005 Fri Apr 22 12:04:55 2005". ++ Fri Apr 22 12:05:16 2005 eval_file: /opt/csw/nagios/libexec/check_cfx_log already successfully compiled and file has not changed; skipping compilation. ++ Fri Apr 22 12:05:16 2005 run_package: "/opt/csw/nagios/libexec/check_cfx_log -H faxgw2" returning ("0", "Ok. Last write of "//faxgw2/Faxloader$/cfxFaxLoaderClient.log" 0.3 minutes ago. File info (create, access, modify, write times): "Wed Mar 26 17:27:24 2003 Fri Apr 22 12:04:55 2005 Fri Apr 22 12:04:55 2005 Fri Apr 22 12:04:55 2005". + "). +- Fri Apr 22 12:05:17 2005 eval_file: /usr/local/nagios/libexec/check_apps_asearch already successfully compiled and file has not changed; skipping compilation. +- Fri Apr 22 12:05:18 2005 eval_file: /usr/local/nagios/libexec/check_aurioness already successfully compiled and file has not changed; skipping compi lation. +- Fri Apr 22 12:05:11 2005 run_package: "/usr/local/nagios/libexec/check_aub " returning ("0", "AU-B Transaction completed Ok. ++ Fri Apr 22 12:05:17 2005 eval_file: /opt/csw/nagios/libexec/check_apps_asearch already successfully compiled and file has not changed; skipping compilation. ++ Fri Apr 22 12:05:18 2005 eval_file: /opt/csw/nagios/libexec/check_aurioness already successfully compiled and file has not changed; skipping compi lation. ++ Fri Apr 22 12:05:11 2005 run_package: "/opt/csw/nagios/libexec/check_aub " returning ("0", "AU-B Transaction completed Ok. + "). + + If you are lucky enough to have plugins with errors in them, + +- Fri Apr 22 12:16:01 2005 run_package: "//usr/local/nagios/libexec/eventhandlers/restart_coldfusion OK SOFT" returning ("3", "**ePN "//usr/local/nagios/libexec/eventhandlers/restart_coldfusion": "Can't use string ("") as a subroutine ref while "strict refs" in use at /usr/local/nagios/bin/p1.pl line 291, line 218". ++ Fri Apr 22 12:16:01 2005 run_package: "//opt/csw/nagios/libexec/eventhandlers/restart_coldfusion OK SOFT" returning ("3", "**ePN "//opt/csw/nagios/libexec/eventhandlers/restart_coldfusion": "Can't use string ("") as a subroutine ref while "strict refs" in use at /opt/csw/nagios/bin/p1.pl line 291, line 218". + + + B +@@ -522,7 +522,7 @@ arguments (if non null), the last compilation error, and a code ref to the Perl + + Sat Apr 23 19:24:59 2005 eval_file: after 5 compilations %Cache => + %Cache = ( +- '/usr/local/nagios/libexec/check_adds' => [ ++ '/opt/csw/nagios/libexec/check_adds' => [ + '100.230810185185', + undef, + '', +@@ -540,7 +540,7 @@ arguments (if non null), the last compilation error, and a code ref to the Perl + '', + sub { "DUMMY" } + ], +- '/usr/local/nagios/libexec/check_pams' => [ ++ '/opt/csw/nagios/libexec/check_pams' => [ + '1.90859953703704', + { + '-R -I -H asterix -p 7003' => [ +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Feb 18 21:12:52 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 18 Feb 2012 20:12:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17081] csw/mgar/pkg/nicstat/trunk/Makefile Message-ID: Revision: 17081 http://gar.svn.sourceforge.net/gar/?rev=17081&view=rev Author: bonivart Date: 2012-02-18 20:12:51 +0000 (Sat, 18 Feb 2012) Log Message: ----------- nicstat/trunk: update vendor link Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2012-02-18 16:38:05 UTC (rev 17080) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2012-02-18 20:12:51 UTC (rev 17081) @@ -13,7 +13,7 @@ SF_PROJ = $(NAME) DISTFILES = $(NAME)-src-$(VERSION).tar.gz -VENDOR_URL = http://blogs.sun.com/timc/entry/nicstat_the_solaris_and_linux +VENDOR_URL = http://blogs.oracle.com/timc/entry/nicstat_the_solaris_and_linux # Harmless build example not relevant to usage CHECKPKG_OVERRIDES_CSWnicstat += file-with-bad-content|/usr/local|root/opt/csw/share/doc/nicstat/README.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Feb 18 22:01:02 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 18 Feb 2012 21:01:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[17082] csw/mgar/pkg/cpan/Test-Simple/trunk Message-ID: Revision: 17082 http://gar.svn.sourceforge.net/gar/?rev=17082&view=rev Author: dmichelsen Date: 2012-02-18 21:01:02 +0000 (Sat, 18 Feb 2012) Log Message: ----------- cpan/Test-Simple/trunk: Update to 0.98 and new package name Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile csw/mgar/pkg/cpan/Test-Simple/trunk/checksums Modified: csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile 2012-02-18 20:12:51 UTC (rev 17081) +++ csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile 2012-02-18 21:01:02 UTC (rev 17082) @@ -1,26 +1,26 @@ NAME = Test-Simple -VERSION = 0.96 +VERSION = 0.98 CATEGORIES = cpan GARTYPE = v2 AUTHOR = MSCHWERN -DESCRIPTION = Basic utilities for writing tests +DESCRIPTION = Basic utilities for writing tests. define BLURB - This is an extremely simple, extremely basic module for writing - tests suitable for CPAN modules and other pursuits. If you wish - to do more complicated testing, use the Test::More module - (a drop-in replacement for this one). endef -DISTFILES = COPYING +DISTFILES += COPYING -PACKAGES = CSWpmtestsimple -CATALOGNAME = pm_testsimple +CATALOG_RELEASE = unstable -ARCHALL = 1 +PACKAGES += CSWpm-test-simple +CATALOGNAME_CSWpm-test-simple = pm_test_simple +SPKG_DESC_CSWpm-test-simple = Basic utilities for writing tests. +ARCHALL_CSWpm-test-simple = 1 +OBSOLETED_BY_CSWpm-test-simple += CSWpmtestsimple +CATALOGNAME_CSWpmtestsimple = pm_testsimple_stub # 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\/.* +EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/man3/.* include gar/category.mk Modified: csw/mgar/pkg/cpan/Test-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Simple/trunk/checksums 2012-02-18 20:12:51 UTC (rev 17081) +++ csw/mgar/pkg/cpan/Test-Simple/trunk/checksums 2012-02-18 21:01:02 UTC (rev 17082) @@ -1 +1 @@ -fbc734a7bb5b3fc3e2bc706e19d08b26 Test-Simple-0.96.tar.gz +a8b26c97440269b33dd79fd847c521d8 Test-Simple-0.98.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 Feb 19 00:54:54 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 18 Feb 2012 23:54:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17083] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17083 http://gar.svn.sourceforge.net/gar/?rev=17083&view=rev Author: bdwalton Date: 2012-02-18 23:54:54 +0000 (Sat, 18 Feb 2012) Log Message: ----------- drop some checkpkg overrides; split out the library files to a separate package Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-18 21:01:02 UTC (rev 17082) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-18 23:54:54 UTC (rev 17083) @@ -38,7 +38,7 @@ endef PACKAGES = CSWruby19 CSWruby19-samples CSWruby19-ri CSWruby19-tk -PACKAGES += CSWruby19-dev +PACKAGES += CSWruby19-dev CSWlibruby19-1 ARCHALL_CSWruby19-samples = 1 ARCHALL_CSWruby19-ri = 1 @@ -52,15 +52,14 @@ CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWruby19-ri += surplus-dependency|CSWruby19 CHECKPKG_OVERRIDES_CSWruby19-tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWruby19-tk += soname-not-found|libruby19.so CHECKPKG_OVERRIDES_CSWruby19-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby-static.a CHECKPKG_OVERRIDES_CSWruby19-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb -CHECKPKG_OVERRIDES_CSWruby19 += soname-not-found|libruby19.so CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby|or|CSWruby18 RUNTIME_DEP_PKGS_CSWruby19 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 RUNTIME_DEP_PKGS_CSWruby19 += CSWlibssl0-9-8 CSWlibyaml RUNTIME_DEP_PKGS_CSWruby19 += CSWlibreadline6 CSWlibz1 CSWlibffi4 +RUNTIME_DEP_PKGS_CSWruby19 += CSWlibruby19-1 RUNTIME_DEP_PKGS_CSWruby19-samples = CSWruby19 RUNTIME_DEP_PKGS_CSWruby19-tk = CSWruby19 CSWtk CSWtcl CSWlibx11 RUNTIME_DEP_PKGS_CSWruby19-dev = CSWruby19 @@ -68,6 +67,8 @@ SPKG_DESC_CSWruby19 = $(DESCRIPTION) +SPKG_DESC_CSWlibruby19-1 = The libruby shared object files (Ruby 1.9) + SPKG_DESC_CSWruby19-samples = Example programs for Ruby 1.9 SPKG_DESC_CSWruby19-ri = Ruby 1.9 Interactive Reference @@ -76,6 +77,8 @@ SPKG_DESC_CSWruby19-dev = Ruby 1.9 Extension Development Files +PKGFILES_CSWlibruby19-1 = /opt/csw/lib/libruby* + PKGFILES_CSWruby19-samples = $(docdir)/ruby19/sample.* PKGFILES_CSWruby19-ri = $(datadir)/ri19.* $(bindir)/ri19 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 Feb 19 04:08:26 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 19 Feb 2012 03:08:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17084] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17084 http://gar.svn.sourceforge.net/gar/?rev=17084&view=rev Author: bdwalton Date: 2012-02-19 03:08:25 +0000 (Sun, 19 Feb 2012) Log Message: ----------- ruby19/trunk: package split cleanups and a dep tweak Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-18 23:54:54 UTC (rev 17083) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-19 03:08:25 UTC (rev 17084) @@ -61,7 +61,7 @@ RUNTIME_DEP_PKGS_CSWruby19 += CSWlibreadline6 CSWlibz1 CSWlibffi4 RUNTIME_DEP_PKGS_CSWruby19 += CSWlibruby19-1 RUNTIME_DEP_PKGS_CSWruby19-samples = CSWruby19 -RUNTIME_DEP_PKGS_CSWruby19-tk = CSWruby19 CSWtk CSWtcl CSWlibx11 +RUNTIME_DEP_PKGS_CSWruby19-tk = CSWruby19 CSWlibruby19-1 CSWtk CSWtcl CSWlibx11 RUNTIME_DEP_PKGS_CSWruby19-dev = CSWruby19 RUNTIME_DEP_PKGS_CSWruby19-ri = CSWruby19 @@ -77,11 +77,11 @@ SPKG_DESC_CSWruby19-dev = Ruby 1.9 Extension Development Files -PKGFILES_CSWlibruby19-1 = /opt/csw/lib/libruby* +PKGFILES_CSWlibruby19-1 += $(call baseisadirs,$(libdir),libruby19\.so\.1.*) -PKGFILES_CSWruby19-samples = $(docdir)/ruby19/sample.* +PKGFILES_CSWruby19-samples = $(docdir)/ruby/sample.* -PKGFILES_CSWruby19-ri = $(datadir)/ri19.* $(bindir)/ri19 +PKGFILES_CSWruby19-ri = $(datadir)/ri/.* $(bindir)/ri19 PKGFILES_CSWruby19-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb 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 Feb 19 04:09:15 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 19 Feb 2012 03:09:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17085] csw/mgar/gar/v2/lib/python/dependency_checks.py Message-ID: Revision: 17085 http://gar.svn.sourceforge.net/gar/?rev=17085&view=rev Author: bdwalton Date: 2012-02-19 03:09:15 +0000 (Sun, 19 Feb 2012) Log Message: ----------- gar/v2: allow packages with .rb files to depend on ruby 1.9 or 1.8 Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2012-02-19 03:08:25 UTC (rev 17084) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2012-02-19 03:09:15 UTC (rev 17085) @@ -32,7 +32,7 @@ (r".*\.pl$", (u"CSWperl",)), (r".*\.pm$", (u"CSWperl",)), (r".*\.py$", (u"CSWpython",)), - (r".*\.rb$", (u"CSWruby", u"CSWruby18")), + (r".*\.rb$", (u"CSWruby", u"CSWruby18", u"CSWruby19")), (r".*\.elc?$", (u"CSWemacscommon",)), (r"/opt/csw/apache2/", (u"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 Sun Feb 19 04:33:25 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 19 Feb 2012 03:33:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17086] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17086 http://gar.svn.sourceforge.net/gar/?rev=17086&view=rev Author: bdwalton Date: 2012-02-19 03:33:25 +0000 (Sun, 19 Feb 2012) Log Message: ----------- ruby19/trunk: remove some more checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-19 03:09:15 UTC (rev 17085) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-19 03:33:25 UTC (rev 17086) @@ -46,15 +46,10 @@ # checkpkg overrides CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWruby19-samples += surplus-dependency|CSWruby19 -CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWruby|or|CSWruby18 CHECKPKG_OVERRIDES_CSWruby19-samples += file-with-bad-content CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby19-ri += surplus-dependency|CSWruby19 CHECKPKG_OVERRIDES_CSWruby19-tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWruby19-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby-static.a CHECKPKG_OVERRIDES_CSWruby19-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb -CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby|or|CSWruby18 RUNTIME_DEP_PKGS_CSWruby19 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 RUNTIME_DEP_PKGS_CSWruby19 += CSWlibssl0-9-8 CSWlibyaml 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 Feb 20 01:23:01 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 20 Feb 2012 00:23:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[17087] csw/mgar/pkg/vlc/trunk Message-ID: Revision: 17087 http://gar.svn.sourceforge.net/gar/?rev=17087&view=rev Author: wahwah Date: 2012-02-20 00:23:00 +0000 (Mon, 20 Feb 2012) Log Message: ----------- vlc/trunk: building vlc from a dedicated Solaris git repository Modified Paths: -------------- csw/mgar/pkg/vlc/trunk/Makefile csw/mgar/pkg/vlc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch csw/mgar/pkg/vlc/trunk/files/0005-Work-around-the-lack-of-dirfd.patch Modified: csw/mgar/pkg/vlc/trunk/Makefile =================================================================== --- csw/mgar/pkg/vlc/trunk/Makefile 2012-02-19 03:33:25 UTC (rev 17086) +++ csw/mgar/pkg/vlc/trunk/Makefile 2012-02-20 00:23:00 UTC (rev 17087) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = vlc -VERSION = 1.1.12 +VERSION = 1.2-git GARTYPE = v2 CATEGORIES = apps @@ -10,12 +10,22 @@ define BLURB endef -MASTER_SITES = $(SF_MIRROR) -DISTFILES = $(DISTNAME).tar.xz +# MASTER_SITES = http://download.videolan.org/pub/videolan/vlc/$(VERSION)/ +# DISTFILES = $(DISTNAME).tar.bz2 -PATCHFILES += 0001-Disable-strange-check-this-may-be-dangerous.patch -PATCHFILES += 0002-Hack-around-missing-packed-pragma.patch +# Solaris port +MASTER_SITES = http://repo.or.cz/w/vlc/solaris.git/snapshot/ +DISTFILES = 36ddbe70462f36a16c30c75e424cdc768f429fcd.tar.gz + +DISTNAME = solaris + +# WORKSRC = $(WORKDIR)/solaris + +# PATCHFILES += 0001-Disable-strange-check-this-may-be-dangerous.patch +# PATCHFILES += 0002-Hack-around-missing-packed-pragma.patch # PATCHFILES += 0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch +PATCHFILES += 0004-Bootstrap-on-Solaris.patch +PATCHFILES += 0005-Work-around-the-lack-of-dirfd.patch # We need e.g. stdbool.h PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -35,13 +45,16 @@ # Sun Studio implements packed attributes differently and compilations bails out: # "include/vlc_codecs.h", line 36: #error: FIXME -GARCOMPILER = SOS12U2 +# GARCOMPILER = SOS12U2 +GARCOMPILER = GNU # Taken from http://wiki.videolan.org/Solaris -EXTRA_CFLAGS = -D _XPG4_2 -D __SunOS -D __STDC_ISO_10646__ -D __EXTENSIONS__ -features=extensions -fast +# EXTRA_CFLAGS = -D _XPG4_2 -D __SunOS -D __STDC_ISO_10646__ -D __EXTENSIONS__ -features=extensions -fast # Solaris has MAXNAMELEN instead of NAME_MAX EXTRA_CFLAGS += -DNAME_MAX=MAXNAMLEN +# Necessary to include _Xglobal_lock +EXTRA_CFLAGS += -DXTHREADS # For inet_pton EXTRA_LINKER_FLAGS = -lsocket -lnsl @@ -54,6 +67,10 @@ # Not there yet, part of ffmpeg CONFIGURE_ARGS += --disable-avcodec +# x264.c:431:9: error: 'x264_open_gop_names' undeclared (first use in this +# function) +CONFIGURE_ARGS += --disable-x264 + # No libpostproc yet #CONFIGURE_ARGS += --disable-postproc @@ -61,8 +78,86 @@ CONFIGURE_ARGS += --disable-qt4 --disable-skins2 # Taken from http://wiki.videolan.org/Solaris -CONFIGURE_ARGS += --disable-libgcrypt --disable-remoteosd --disable-glx --disable-lua --disable-mad --disable-swscale --disable-postproc --disable-a52 --disable-fribidi --with-gnu-ld=no --disable-xcb +# CONFIGURE_ARGS += --disable-libgcrypt +# CONFIGURE_ARGS += --disable-remoteosd +# CONFIGURE_ARGS += --disable-glx +# CONFIGURE_ARGS += --disable-lua +# CONFIGURE_ARGS += --disable-mad +# CONFIGURE_ARGS += --disable-swscale +# CONFIGURE_ARGS += --disable-postproc +# CONFIGURE_ARGS += --disable-a52 +# CONFIGURE_ARGS += --disable-fribidi +# CONFIGURE_ARGS += --with-gnu-ld=no +# CONFIGURE_ARGS += --disable-xcb +SKIPTEST = 1 +PACKAGES = CSWvlc +# The catch-all package +SPKG_DESC_CSWvlc = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWvlc += CSWfconfig +RUNTIME_DEP_PKGS_CSWvlc += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibdvdread +RUNTIME_DEP_PKGS_CSWvlc += CSWlibflac8 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibkate1 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibproxy +RUNTIME_DEP_PKGS_CSWvlc += CSWlibrsvg2-2 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibsmbclient0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheora0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibvlc5 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibvlccore5 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWvlc += CSWsdlimage +CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/vlc/utils/audio-vlc-default.sh +CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/vlc/utils/video-vlc-default.sh +CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vlc/intf-vcd.txt + +PACKAGES += CSWvlc-dev +CATALOGNAME_CSWvlc-dev = vlc_dev +SPKG_DESC_CSWvlc-dev += $(DESCRIPTION), development files +PKGFILES_CSWvlc-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWvlc-dev += CSWlibvlc5 +RUNTIME_DEP_PKGS_CSWvlc-dev += CSWlibvlccore5 + +PACKAGES += CSWlibvlc5 +CATALOGNAME_CSWlibvlc5 = libvlc5 +PKGFILES_CSWlibvlc5 += $(call baseisadirs,$(libdir),libvlc\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibvlc5 += $(DESCRIPTION), libvlc.so.5 +RUNTIME_DEP_PKGS_CSWlibvlc5 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibvlc5 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibvlc5 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibvlc5 += CSWlibvlccore5 + +PACKAGES += CSWlibvlccore5 +CATALOGNAME_CSWlibvlccore5 = libvlccore5 +PKGFILES_CSWlibvlccore5 += $(call baseisadirs,$(libdir),libvlccore\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibvlccore5 += $(DESCRIPTION), libvlccore.so.5 +RUNTIME_DEP_PKGS_CSWlibvlccore5 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibvlccore5 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibvlccore5 += CSWlibiconv2 + include gar/category.mk +pre-configure-modulated: + # bootstrap defines #!/bin/sh and $(dirname ...) + (cd $(WORKSRC) && $(CONFIGURE_ENV) bash ./bootstrap) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/vlc/trunk/checksums =================================================================== --- csw/mgar/pkg/vlc/trunk/checksums 2012-02-19 03:33:25 UTC (rev 17086) +++ csw/mgar/pkg/vlc/trunk/checksums 2012-02-20 00:23:00 UTC (rev 17087) @@ -1 +1 @@ -56cb9975725a12da8c84882bc00fdce0 vlc-1.1.12.tar.xz +5dfeae611f841bf29549f0f2619b1c35 36ddbe70462f36a16c30c75e424cdc768f429fcd.tar.gz Added: csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch =================================================================== --- csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch 2012-02-20 00:23:00 UTC (rev 17087) @@ -0,0 +1,71 @@ +From 5d5c633d80070ec43f7780e89fe15602dbc0b078 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 19 Feb 2012 09:47:31 +0100 +Subject: [PATCH 1/2] Bootstrap on Solaris + +Solaris /bin/sh does not support "$( ... )" nor "if ! test ..." + +Tested on Solaris 10. +--- + bootstrap | 14 +++++++++++--- + modules/genmf | 6 ++++-- + 2 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/bootstrap b/bootstrap +index d315be2..1f478e2 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -22,7 +22,7 @@ export CYGWIN + set -e + set -x + +-cd "$(dirname "$0")" ++cd "`dirname "$0"`" + + ## + ## Check for various tools +@@ -66,8 +66,16 @@ fi + + # Check for autopoint (GNU gettext) + export AUTOPOINT +-test "$AUTOPOINT" || AUTOPOINT=autopoint +-if ! "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then ++if test "$AUTOPOINT"; then ++ : ++else ++ AUTOPOINT=autopoint ++fi ++if "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then ++ # Solaris /bin/sh does not support "if ! test ...", we have to invert the ++ # expression and use the "else" statement. ++ : ++else + AUTOPOINT=true + echo > ABOUT-NLS + fi +diff --git a/modules/genmf b/modules/genmf +index d7b2887..11cd702 100755 +--- a/modules/genmf ++++ b/modules/genmf +@@ -7,14 +7,16 @@ + ## Authors: Sam Hocevar + ## R?mi Denis-Courmont + +-cd $(dirname "$0")/.. || exit 1 ++cd `dirname "$0"`/.. || exit 1 + + while test "$1" + do + printf "." + dir="$1" + modf="modules/${dir}/Modules.am" +- if ! test -f "$modf"; then ++ if test -f "$modf"; then ++ : ++ else + echo "$modf does not exist!" >&2 + exit 1 + fi +-- +1.7.5.4 + Added: csw/mgar/pkg/vlc/trunk/files/0005-Work-around-the-lack-of-dirfd.patch =================================================================== --- csw/mgar/pkg/vlc/trunk/files/0005-Work-around-the-lack-of-dirfd.patch (rev 0) +++ csw/mgar/pkg/vlc/trunk/files/0005-Work-around-the-lack-of-dirfd.patch 2012-02-20 00:23:00 UTC (rev 17087) @@ -0,0 +1,126 @@ +From 7501269c2b9df09861a82662d175ade4cfce3941 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 19 Feb 2012 17:52:00 +0100 +Subject: [PATCH 2/2] Work around the lack of dirfd() + +Detect whether the system supports dirfd(). There was a Solaris-specific +workaround in one of the files, but it's a better idea to test for the +function and not rely on the OS detection. +--- + configure.ac | 2 ++ + include/vlc_common.h | 6 ++++++ + include/vlc_fixups.h | 7 +++++++ + modules/access/directory.c | 11 ++--------- + modules/misc/gnutls.c | 2 +- + src/misc/filesystem.c | 2 +- + 6 files changed, 19 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fa99eb7..6904bdd1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2334,6 +2334,8 @@ AS_IF([test "${have_ipv6}" = "yes"], [ + AC_CHECK_FUNCS(inet_ntop,[ + AC_DEFINE(HAVE_INET_NTOP, 1, [Define to 1 if you have inet_ntop().])]) + ++AC_CHECK_FUNCS(dirfd,[ ++ AC_DEFINE(HAVE_DIRFD, 1, [Define to 1 if you have the dirfd() function.])]) + + dnl + dnl GME demux plugin +diff --git a/include/vlc_common.h b/include/vlc_common.h +index 7f488a5..efd3b79 100644 +--- a/include/vlc_common.h ++++ b/include/vlc_common.h +@@ -887,4 +887,10 @@ VLC_EXPORT( const char *, VLC_Compiler, ( void ) LIBVLC_USED ); + "Public License;\nsee the file named COPYING for details.\n" \ + "Written by the VideoLAN team; see the AUTHORS file.\n") + ++#ifndef HAVE_DIRFD ++#define DIRFD(a) ((a)->dd_fd) ++#else ++#define DIRFD(a) (dirfd(a)) ++#endif ++ + #endif /* !VLC_COMMON_H */ +diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h +index ef37367..8808b0e 100644 +--- a/include/vlc_fixups.h ++++ b/include/vlc_fixups.h +@@ -275,4 +275,11 @@ long jrand48 (unsigned short subi[3]); + long nrand48 (unsigned short subi[3]); + #endif + ++/* dirfd() not available on some systems, e.g. Solaris 9 and 10 */ ++#ifndef HAVE_DIRFD ++#define DIRFD(a) ((a)->dd_fd) ++#else ++#define DIRFD(a) (dirfd(a)) ++#endif ++ + #endif /* !LIBVLC_FIXUPS_H */ +diff --git a/modules/access/directory.c b/modules/access/directory.c +index 7f29547..35fe91b 100644 +--- a/modules/access/directory.c ++++ b/modules/access/directory.c +@@ -46,13 +46,6 @@ + # include + #endif + +-#ifdef __sun__ +-static inline int dirfd (DIR *dir) +-{ +- return dir->dd_fd; +-} +-#endif +- + #include + #include + #include +@@ -155,7 +148,7 @@ int DirInit (access_t *p_access, DIR *handle) + root->i = 0; + #ifdef HAVE_OPENAT + struct stat st; +- if (fstat (dirfd (handle), &st)) ++ if (fstat (DIRFD (handle), &st)) + { + free (root); + free (uri); +@@ -315,7 +308,7 @@ block_t *DirBlock (access_t *p_access) + { + DIR *handle; + #ifdef HAVE_OPENAT +- int fd = vlc_openat (dirfd (current->handle), entry, O_RDONLY); ++ int fd = vlc_openat (DIRFD (current->handle), entry, O_RDONLY); + if (fd == -1) + goto skip; /* File cannot be opened... forget it */ + +diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c +index 1aba7da..5df560e 100644 +--- a/modules/misc/gnutls.c ++++ b/modules/misc/gnutls.c +@@ -538,7 +538,7 @@ gnutls_Addx509Directory( vlc_object_t *p_this, + else + { + struct stat st1, st2; +- int fd = dirfd( dir ); ++ int fd = DIRFD( dir ); + + /* + * Gets stats for the directory path, checks that it is not a +diff --git a/src/misc/filesystem.c b/src/misc/filesystem.c +index 9138ae9..bb3186f 100644 +--- a/src/misc/filesystem.c ++++ b/src/misc/filesystem.c +@@ -190,7 +190,7 @@ char *vlc_readdir( DIR *dir ) + struct dirent *ent; + char *path = NULL; + +- long len = fpathconf (dirfd (dir), _PC_NAME_MAX); ++ long len = fpathconf (DIRFD (dir), _PC_NAME_MAX); + if (len == -1) + { + #ifdef NAME_MAX +-- +1.7.5.4 + 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 Feb 20 09:01:38 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 20 Feb 2012 08:01:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17088] csw/mgar/pkg/vlc/trunk/Makefile Message-ID: Revision: 17088 http://gar.svn.sourceforge.net/gar/?rev=17088&view=rev Author: wahwah Date: 2012-02-20 08:01:37 +0000 (Mon, 20 Feb 2012) Log Message: ----------- vlc/trunk: Enable XCB Modified Paths: -------------- csw/mgar/pkg/vlc/trunk/Makefile Modified: csw/mgar/pkg/vlc/trunk/Makefile =================================================================== --- csw/mgar/pkg/vlc/trunk/Makefile 2012-02-20 00:23:00 UTC (rev 17087) +++ csw/mgar/pkg/vlc/trunk/Makefile 2012-02-20 08:01:37 UTC (rev 17088) @@ -39,9 +39,9 @@ BUILD_DEP_PKGS += CSWlibx11devel # This is for libxcb -#EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include -#EXTRA_LIB = /opt/csw/X11/lib -#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include +EXTRA_LIB = /opt/csw/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib # Sun Studio implements packed attributes differently and compilations bails out: # "include/vlc_codecs.h", line 36: #error: FIXME This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Feb 20 09:06:43 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Mon, 20 Feb 2012 08:06:43 +0000 Subject: [csw-devel] [PATCH 0/2] Solaris 10 related patches Message-ID: <1329725205-4425-1-git-send-email-maciej@opencsw.org> Hello, These are two patches that I wrote in order to compile VLC on Solaris 10 (sparc). They should be acceptable for other systems too. One is making shell scripts compatible with /bin/sh, and the other is working around missing dirfd, in a portable way. It tests for the function, and if it is not found, it defines a macro. A similar solution was already in the code, so I removed it and standardized on the macro. The packaging work has been done for OpenCSW, I aim to produce an updated VLC package. The last build[1] is from 2004, so it really needs an update. Maciej [1] http://www.opencsw.org/packages/CSWvlc/ Maciej Blizinski (2): Bootstrap on Solaris Work around the lack of dirfd() bootstrap | 14 +++++++++++--- configure.ac | 2 ++ include/vlc_common.h | 6 ++++++ include/vlc_fixups.h | 7 +++++++ modules/access/directory.c | 11 ++--------- modules/genmf | 6 ++++-- modules/misc/gnutls.c | 2 +- src/misc/filesystem.c | 2 +- 8 files changed, 34 insertions(+), 16 deletions(-) -- 1.7.5.4 From maciej at opencsw.org Mon Feb 20 09:06:44 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Mon, 20 Feb 2012 08:06:44 +0000 Subject: [csw-devel] =?utf-8?q?=5BPATCH_1/2=5D_Bootstrap_on_Solaris?= In-Reply-To: <1329725205-4425-1-git-send-email-maciej@opencsw.org> References: <1329725205-4425-1-git-send-email-maciej@opencsw.org> Message-ID: <1329725205-4425-2-git-send-email-maciej@opencsw.org> Solaris /bin/sh does not support "$( ... )" nor "if ! test ..." Tested on Solaris 10. --- bootstrap | 14 +++++++++++--- modules/genmf | 6 ++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/bootstrap b/bootstrap index d315be2..1f478e2 100755 --- a/bootstrap +++ b/bootstrap @@ -22,7 +22,7 @@ export CYGWIN set -e set -x -cd "$(dirname "$0")" +cd "`dirname "$0"`" ## ## Check for various tools @@ -66,8 +66,16 @@ fi # Check for autopoint (GNU gettext) export AUTOPOINT -test "$AUTOPOINT" || AUTOPOINT=autopoint -if ! "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then +if test "$AUTOPOINT"; then + : +else + AUTOPOINT=autopoint +fi +if "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then + # Solaris /bin/sh does not support "if ! test ...", we have to invert the + # expression and use the "else" statement. + : +else AUTOPOINT=true echo > ABOUT-NLS fi diff --git a/modules/genmf b/modules/genmf index d7b2887..11cd702 100755 --- a/modules/genmf +++ b/modules/genmf @@ -7,14 +7,16 @@ ## Authors: Sam Hocevar ## R?mi Denis-Courmont -cd $(dirname "$0")/.. || exit 1 +cd `dirname "$0"`/.. || exit 1 while test "$1" do printf "." dir="$1" modf="modules/${dir}/Modules.am" - if ! test -f "$modf"; then + if test -f "$modf"; then + : + else echo "$modf does not exist!" >&2 exit 1 fi -- 1.7.5.4 From maciej at opencsw.org Mon Feb 20 09:06:45 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Mon, 20 Feb 2012 08:06:45 +0000 Subject: [csw-devel] [PATCH 2/2] Work around the lack of dirfd() In-Reply-To: <1329725205-4425-1-git-send-email-maciej@opencsw.org> References: <1329725205-4425-1-git-send-email-maciej@opencsw.org> Message-ID: <1329725205-4425-3-git-send-email-maciej@opencsw.org> Detect whether the system supports dirfd(). There was a Solaris-specific workaround in one of the files, but it's a better idea to test for the function and not rely on the OS detection. --- configure.ac | 2 ++ include/vlc_common.h | 6 ++++++ include/vlc_fixups.h | 7 +++++++ modules/access/directory.c | 11 ++--------- modules/misc/gnutls.c | 2 +- src/misc/filesystem.c | 2 +- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index fa99eb7..6904bdd1 100644 --- a/configure.ac +++ b/configure.ac @@ -2334,6 +2334,8 @@ AS_IF([test "${have_ipv6}" = "yes"], [ AC_CHECK_FUNCS(inet_ntop,[ AC_DEFINE(HAVE_INET_NTOP, 1, [Define to 1 if you have inet_ntop().])]) +AC_CHECK_FUNCS(dirfd,[ + AC_DEFINE(HAVE_DIRFD, 1, [Define to 1 if you have the dirfd() function.])]) dnl dnl GME demux plugin diff --git a/include/vlc_common.h b/include/vlc_common.h index 7f488a5..efd3b79 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -887,4 +887,10 @@ VLC_EXPORT( const char *, VLC_Compiler, ( void ) LIBVLC_USED ); "Public License;\nsee the file named COPYING for details.\n" \ "Written by the VideoLAN team; see the AUTHORS file.\n") +#ifndef HAVE_DIRFD +#define DIRFD(a) ((a)->dd_fd) +#else +#define DIRFD(a) (dirfd(a)) +#endif + #endif /* !VLC_COMMON_H */ diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index ef37367..8808b0e 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -275,4 +275,11 @@ long jrand48 (unsigned short subi[3]); long nrand48 (unsigned short subi[3]); #endif +/* dirfd() not available on some systems, e.g. Solaris 9 and 10 */ +#ifndef HAVE_DIRFD +#define DIRFD(a) ((a)->dd_fd) +#else +#define DIRFD(a) (dirfd(a)) +#endif + #endif /* !LIBVLC_FIXUPS_H */ diff --git a/modules/access/directory.c b/modules/access/directory.c index 7f29547..35fe91b 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -46,13 +46,6 @@ # include #endif -#ifdef __sun__ -static inline int dirfd (DIR *dir) -{ - return dir->dd_fd; -} -#endif - #include #include #include @@ -155,7 +148,7 @@ int DirInit (access_t *p_access, DIR *handle) root->i = 0; #ifdef HAVE_OPENAT struct stat st; - if (fstat (dirfd (handle), &st)) + if (fstat (DIRFD (handle), &st)) { free (root); free (uri); @@ -315,7 +308,7 @@ block_t *DirBlock (access_t *p_access) { DIR *handle; #ifdef HAVE_OPENAT - int fd = vlc_openat (dirfd (current->handle), entry, O_RDONLY); + int fd = vlc_openat (DIRFD (current->handle), entry, O_RDONLY); if (fd == -1) goto skip; /* File cannot be opened... forget it */ diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index 1aba7da..5df560e 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -538,7 +538,7 @@ gnutls_Addx509Directory( vlc_object_t *p_this, else { struct stat st1, st2; - int fd = dirfd( dir ); + int fd = DIRFD( dir ); /* * Gets stats for the directory path, checks that it is not a diff --git a/src/misc/filesystem.c b/src/misc/filesystem.c index 9138ae9..bb3186f 100644 --- a/src/misc/filesystem.c +++ b/src/misc/filesystem.c @@ -190,7 +190,7 @@ char *vlc_readdir( DIR *dir ) struct dirent *ent; char *path = NULL; - long len = fpathconf (dirfd (dir), _PC_NAME_MAX); + long len = fpathconf (DIRFD (dir), _PC_NAME_MAX); if (len == -1) { #ifdef NAME_MAX -- 1.7.5.4 From maciej at opencsw.org Mon Feb 20 09:17:04 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Mon, 20 Feb 2012 08:17:04 +0000 Subject: [csw-devel] [PATCH 2/2] Work around the lack of dirfd() (corrected) In-Reply-To: <1329725205-4425-3-git-send-email-maciej@opencsw.org> References: <1329725205-4425-3-git-send-email-maciej@opencsw.org> Message-ID: <1329725824-4906-1-git-send-email-maciej@opencsw.org> Detect whether the system supports dirfd(). There was a Solaris-specific workaround in one of the files, but it's a better idea to test for the function and not rely on the OS detection. --- configure.ac | 2 ++ include/vlc_fixups.h | 7 +++++++ modules/access/directory.c | 11 ++--------- modules/misc/gnutls.c | 2 +- src/misc/filesystem.c | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index fa99eb7..6904bdd1 100644 --- a/configure.ac +++ b/configure.ac @@ -2334,6 +2334,8 @@ AS_IF([test "${have_ipv6}" = "yes"], [ AC_CHECK_FUNCS(inet_ntop,[ AC_DEFINE(HAVE_INET_NTOP, 1, [Define to 1 if you have inet_ntop().])]) +AC_CHECK_FUNCS(dirfd,[ + AC_DEFINE(HAVE_DIRFD, 1, [Define to 1 if you have the dirfd() function.])]) dnl dnl GME demux plugin diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index ef37367..8808b0e 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -275,4 +275,11 @@ long jrand48 (unsigned short subi[3]); long nrand48 (unsigned short subi[3]); #endif +/* dirfd() not available on some systems, e.g. Solaris 9 and 10 */ +#ifndef HAVE_DIRFD +#define DIRFD(a) ((a)->dd_fd) +#else +#define DIRFD(a) (dirfd(a)) +#endif + #endif /* !LIBVLC_FIXUPS_H */ diff --git a/modules/access/directory.c b/modules/access/directory.c index 7f29547..35fe91b 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -46,13 +46,6 @@ # include #endif -#ifdef __sun__ -static inline int dirfd (DIR *dir) -{ - return dir->dd_fd; -} -#endif - #include #include #include @@ -155,7 +148,7 @@ int DirInit (access_t *p_access, DIR *handle) root->i = 0; #ifdef HAVE_OPENAT struct stat st; - if (fstat (dirfd (handle), &st)) + if (fstat (DIRFD (handle), &st)) { free (root); free (uri); @@ -315,7 +308,7 @@ block_t *DirBlock (access_t *p_access) { DIR *handle; #ifdef HAVE_OPENAT - int fd = vlc_openat (dirfd (current->handle), entry, O_RDONLY); + int fd = vlc_openat (DIRFD (current->handle), entry, O_RDONLY); if (fd == -1) goto skip; /* File cannot be opened... forget it */ diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index 1aba7da..5df560e 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -538,7 +538,7 @@ gnutls_Addx509Directory( vlc_object_t *p_this, else { struct stat st1, st2; - int fd = dirfd( dir ); + int fd = DIRFD( dir ); /* * Gets stats for the directory path, checks that it is not a diff --git a/src/misc/filesystem.c b/src/misc/filesystem.c index 9138ae9..bb3186f 100644 --- a/src/misc/filesystem.c +++ b/src/misc/filesystem.c @@ -190,7 +190,7 @@ char *vlc_readdir( DIR *dir ) struct dirent *ent; char *path = NULL; - long len = fpathconf (dirfd (dir), _PC_NAME_MAX); + long len = fpathconf (DIRFD (dir), _PC_NAME_MAX); if (len == -1) { #ifdef NAME_MAX -- 1.7.5.4 From maciej at opencsw.org Mon Feb 20 09:45:42 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 20 Feb 2012 08:45:42 +0000 Subject: [csw-devel] [vlc-devel] [PATCH 2/2] Work around the lack of dirfd() (corrected) In-Reply-To: <1329726890.10331.2.camel@Nokia-N900> References: <1329725205-4425-3-git-send-email-maciej@opencsw.org> <1329725824-4906-1-git-send-email-maciej@opencsw.org> <1329726890.10331.2.camel@Nokia-N900> Message-ID: 2012/2/20 Brad : > ----- Original message ----- >> Detect whether the system supports dirfd(). There was a Solaris-specific >> workaround in one of the files, but it's a better idea to test for the >> function and not rely on the OS detection. > > VLC alreay does this. From the looks of it just remove the redundant Solaris ifdef'd function. I don't see the compat/dirfd.c file in the tree at all. I was building from the source referenced from http://wiki.videolan.org/Solaris - http://repo.or.cz/w/vlc/solaris.git - my goal is to build VLC on Solaris 10. It seems like the two trees have diverged significantly. I'm not sure which tree should I base my changes on. Any suggestions? Maciej From dmichelsen at users.sourceforge.net Mon Feb 20 11:44:55 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 20 Feb 2012 10:44:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[17089] csw/mgar/pkg/cpan/IO-Tty/trunk Message-ID: Revision: 17089 http://gar.svn.sourceforge.net/gar/?rev=17089&view=rev Author: dmichelsen Date: 2012-02-20 10:44:55 +0000 (Mon, 20 Feb 2012) Log Message: ----------- cpan/IO-Tty/trunk: Update to 1.10 and new deps Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Tty/trunk/Makefile csw/mgar/pkg/cpan/IO-Tty/trunk/checksums Modified: csw/mgar/pkg/cpan/IO-Tty/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Tty/trunk/Makefile 2012-02-20 08:01:37 UTC (rev 17088) +++ csw/mgar/pkg/cpan/IO-Tty/trunk/Makefile 2012-02-20 10:44:55 UTC (rev 17089) @@ -1,15 +1,21 @@ NAME = IO-Tty -VERSION = 1.08 +VERSION = 1.10 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = RGIERSIG +AUTHOR = TODDR -DESCRIPTION = Low-level allocate a pseudo-Tty, import constants +DESCRIPTION = Pseudo ttys and constants define BLURB - IO::Pty provides an interface to allow the creation of a pseudo tty. endef -PACKAGES = CSWpmiotty -CATALOGNAME = pm_iotty +BUILD_DEP_PKGS += CSWpm-test-simple +CATALOG_RELEASE = unstable + +PACKAGES += CSWpm-io-tty +CATALOGNAME_CSWpm-io-tty = pm_io_tty +SPKG_DESC_CSWpm-io-tty = Pseudo ttys and constants +OBSOLETED_BY_CSWpm-io-tty += CSWpmiotty +CATALOGNAME_CSWpmiotty = pm_iotty_stub + include gar/category.mk Modified: csw/mgar/pkg/cpan/IO-Tty/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-Tty/trunk/checksums 2012-02-20 08:01:37 UTC (rev 17088) +++ csw/mgar/pkg/cpan/IO-Tty/trunk/checksums 2012-02-20 10:44:55 UTC (rev 17089) @@ -1 +1 @@ -e99d819a6f8c11ae105b770cc508a4fc download/IO-Tty-1.08.tar.gz +46baec86a145e57f0ec661fa412b097c IO-Tty-1.10.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 Feb 20 14:06:39 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 20 Feb 2012 13:06:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17090] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17090 http://gar.svn.sourceforge.net/gar/?rev=17090&view=rev Author: bdwalton Date: 2012-02-20 13:06:39 +0000 (Mon, 20 Feb 2012) Log Message: ----------- ruby19/trunk: drop some line noise the snuck in (weird emacs startup issue) Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-20 10:44:55 UTC (rev 17089) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-20 13:06:39 UTC (rev 17090) @@ -1,4 +1,4 @@ -83;40003;0cNAME = ruby19 +NAME = ruby19 VERSION = 1.9.3 PATCHLEVEL = p0 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 Mon Feb 20 14:54:39 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 20 Feb 2012 13:54:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17091] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17091 http://gar.svn.sourceforge.net/gar/?rev=17091&view=rev Author: bdwalton Date: 2012-02-20 13:54:38 +0000 (Mon, 20 Feb 2012) Log Message: ----------- ruby19/trunk: accomodate better handling of the ruby api versioning in our recipe Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-20 13:06:39 UTC (rev 17090) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-20 13:54:38 UTC (rev 17091) @@ -6,6 +6,7 @@ #NOTE: Some things below use version 1.9.1. As of 1.9.3, the api of #the libs is 1.9.1, so that is why we can't use $(VERSION). +RUBY_API = 1.9.1 # patchfile 0002-vm.c... is a backport from upstream VERSION_FLAG_PATCH = 1 @@ -38,7 +39,7 @@ endef PACKAGES = CSWruby19 CSWruby19-samples CSWruby19-ri CSWruby19-tk -PACKAGES += CSWruby19-dev CSWlibruby19-1 +PACKAGES += CSWruby19-dev CSWlibruby191-1 ARCHALL_CSWruby19-samples = 1 ARCHALL_CSWruby19-ri = 1 @@ -99,9 +100,9 @@ # UPSTREAM_MASTER_SITES = CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --program-suffix=19 +CONFIGURE_ARGS += --program-suffix=$(RUBY_API) CONFIGURE_ARGS += --enable-shared -CONFIGURE_ARGS += --with-soname=ruby19 +CONFIGURE_ARGS += --with-soname=ruby$(RUBY_API) EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib @@ -138,7 +139,7 @@ post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) -multiconfig: RBCONFIG=/opt/csw/lib/ruby/1.9.1/$(GARCH)-solaris2.10/rbconfig.rb +multiconfig: RBCONFIG=/opt/csw/lib/ruby/$(RUBY_API)/$(GARCH)-solaris2.10/rbconfig.rb multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12 @@ -153,7 +154,7 @@ # Fix up rbconfig rbconfig: @gsed -i -e s,$(DESTDIR),, \ - $(DESTDIR)$(libdir)/ruby/1.9.1/$(GARCH)-solaris2.10/rbconfig.rb + $(DESTDIR)$(libdir)/ruby/$(RUBY_API)/$(GARCH)-solaris2.10/rbconfig.rb @$(MAKECOOKIE) # Copy samples 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 Feb 20 17:22:59 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 20 Feb 2012 16:22:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17092] csw/mgar/pkg/cpan/common-sense/trunk Message-ID: Revision: 17092 http://gar.svn.sourceforge.net/gar/?rev=17092&view=rev Author: dmichelsen Date: 2012-02-20 16:22:58 +0000 (Mon, 20 Feb 2012) Log Message: ----------- cpan/common-sense/trunk: Update to 3.4 and latest package naming Modified Paths: -------------- csw/mgar/pkg/cpan/common-sense/trunk/Makefile csw/mgar/pkg/cpan/common-sense/trunk/checksums Modified: csw/mgar/pkg/cpan/common-sense/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/common-sense/trunk/Makefile 2012-02-20 13:54:38 UTC (rev 17091) +++ csw/mgar/pkg/cpan/common-sense/trunk/Makefile 2012-02-20 16:22:58 UTC (rev 17092) @@ -1,5 +1,5 @@ NAME = common-sense -VERSION = 3.0 +VERSION = 3.4 CATEGORIES = cpan GARTYPE = v2 AUTHOR = MLEHMANN @@ -8,13 +8,15 @@ define BLURB endef -PACKAGES = CSWpmcommonsense -CATALOGNAME = pm_commonsense +CATALOG_RELEASE = unstable LICENSE = LICENSE -ARCHALL = 1 +PACKAGES += CSWpm-common-sense +CATALOGNAME_CSWpm-common-sense = pm_common_sense +SPKG_DESC_CSWpm-common-sense = Some sane defaults for Perl programs +ARCHALL_CSWpm-common-sense = 1 +OBSOLETED_BY_CSWpm-common-sense += CSWpmcommonsense +CATALOGNAME_CSWpmcommonsense = pm_commonsense_stub -CHECKPKG_OVERRIDES = pkginfo-description-not-starting-with-uppercase - include gar/category.mk Modified: csw/mgar/pkg/cpan/common-sense/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/common-sense/trunk/checksums 2012-02-20 13:54:38 UTC (rev 17091) +++ csw/mgar/pkg/cpan/common-sense/trunk/checksums 2012-02-20 16:22:58 UTC (rev 17092) @@ -1 +1 @@ -43e50e48f465f616b82837a09101a566 common-sense-3.0.tar.gz +b87ef7ea6f068afdf7a05b67e7600885 common-sense-3.4.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 Feb 20 17:31:52 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 20 Feb 2012 16:31:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17093] csw/mgar/pkg/cpan Message-ID: Revision: 17093 http://gar.svn.sourceforge.net/gar/?rev=17093&view=rev Author: dmichelsen Date: 2012-02-20 16:31:51 +0000 (Mon, 20 Feb 2012) Log Message: ----------- cpan/JSON-XS/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/JSON-XS/ csw/mgar/pkg/cpan/JSON-XS/branches/ csw/mgar/pkg/cpan/JSON-XS/tags/ csw/mgar/pkg/cpan/JSON-XS/trunk/ csw/mgar/pkg/cpan/JSON-XS/trunk/Makefile csw/mgar/pkg/cpan/JSON-XS/trunk/checksums csw/mgar/pkg/cpan/JSON-XS/trunk/files/ Property changes on: csw/mgar/pkg/cpan/JSON-XS/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/cpan/JSON-XS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/JSON-XS/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/JSON-XS/trunk/Makefile 2012-02-20 16:31:51 UTC (rev 17093) @@ -0,0 +1,20 @@ +NAME = JSON-XS +VERSION = 2.32 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = MLEHMANN + +DESCRIPTION = JSON serialising/deserialising, done correctly and fast +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = COPYING + +PACKAGES += CSWpm-json-xs +CATALOGNAME_CSWpm-json-xs = pm_json_xs +SPKG_DESC_CSWpm-json-xs = JSON serialising/deserialising, done correctly and fast +RUNTIME_DEP_PKGS_CSWpm-json-xs += CSWpm-common-sense + +include gar/category.mk Added: csw/mgar/pkg/cpan/JSON-XS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/JSON-XS/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/JSON-XS/trunk/checksums 2012-02-20 16:31:51 UTC (rev 17093) @@ -0,0 +1 @@ +87f71c78010083ad4d158b5765c4a609 JSON-XS-2.32.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 Feb 20 17:53:39 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 20 Feb 2012 16:53:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17094] csw/mgar/pkg/cpan/makemake Message-ID: Revision: 17094 http://gar.svn.sourceforge.net/gar/?rev=17094&view=rev Author: dmichelsen Date: 2012-02-20 16:53:39 +0000 (Mon, 20 Feb 2012) Log Message: ----------- cpan/makemake: Add patch from Claudio Modified Paths: -------------- csw/mgar/pkg/cpan/makemake Modified: csw/mgar/pkg/cpan/makemake =================================================================== --- csw/mgar/pkg/cpan/makemake 2012-02-20 16:31:51 UTC (rev 17093) +++ csw/mgar/pkg/cpan/makemake 2012-02-20 16:53:39 UTC (rev 17094) @@ -2,18 +2,16 @@ use strict; use warnings; - -use File::chdir; +use feature ':5.10'; +use Cwd; # was use File::chdir; use CPAN; use YAML qw(LoadFile); use File::Path; use File::Temp qw(:POSIX); use Module::Version 'get_version'; -use version 0.77; # get latest bug-fixes and API +use version 0.77; # get latest bug-fixes and API use Data::Dumper; - -# For online retreival of catalogname for package -use LWP::UserAgent; +use LWP::UserAgent; # For online retreival of catalogname for package use JSON; # TBD: @@ -30,146 +28,26 @@ # completes successfuly, the log file is thrown away. If the command fails, # the log file is printed along with an error message by calling fail. -our ($verbose, $logfile, $pgm); -sub logoutput { - if( ! $verbose ) { - $logfile = tmpnam(); - open( OLDOUT, '>&STDOUT' ); - open( OLDERR, '>&STDERR' ); - open( STDOUT, "> $logfile" ); - open( STDERR, "> $logfile" ); - } -} -sub endlog { - if( ! $verbose ) { - # Reference fh to silence warning - select( OLDERR ); select( OLDOUT ); +### Variables ### +my ( $verbose, $logfile, $pgm ); +my $cpandir = getcwd; - # Restore output. - select( STDOUT); - close( STDOUT ); - open( STDOUT, ">&OLDOUT" ); - close( STDERR ); - open( STDERR, ">&OLDERR" ); - rmtree( $logfile ); - } +### User input ### +my $modname = shift(@ARGV); +if ( !defined $modname ) { + say STDERR "Please supply the module name as a parameter.\nBaling out..."; + exit(1); } -sub fail { - close( STDOUT ); - open( STDOUT, ">&OLDOUT" ); - close( STDERR ); - open( STDERR, ">&OLDERR" ); - open( LOG, "< $logfile" ) or - die "$pgm: Error, @_ - can't open log\n"; - print STDERR foreach ; - close( LOG ); - rmtree( $logfile ); - die "\n$pgm: Error, @_\n"; -} +### Main ### -sub guess_name_from_module { - my $modname = shift @_; - my $mod = (CPAN::Shell->expand("Module", $modname))[0]; - if( !$mod ) { - print STDERR "ERROR: Can not find module $modname/n"; - return; - } - my $filename = $mod->distribution->base_id; - my ($name, $fileversion) = ($filename =~ /^(\D+)-(\d+(?:\.\d+)*)/); - my $dirname = $name; - my $pkgname = lc( $name ); - $pkgname = "CSWpm-" . $pkgname; - return ($pkgname, $dirname); -} +logoutput(); # Start logging +my $mod = ( CPAN::Shell->expand( "Module", $modname ) )[0] + or die "can not locate CPAN module $modname"; +endlog(); # End logging -sub path2pkg { - my @pathes = @_; - - return () if( @pathes == 0 ); - - my %pkgs; - open P, "/home/dam/mgar/gar/v2/bin/pkgdb show filename " . join( " ", @pathes ) . " |" or die "Cannot open gar/bin/pkgdb"; - while(

) { - my $path = shift @pathes; - $pkgs{$path} = [ split( /\s+/, $_ ) ]; - } - close P; - - return %pkgs; -} - -sub mod2pkg { - my $modname = shift @_; - my @result; - my $path = `/opt/csw/bin/perl -S /opt/csw/bin/pmpath $modname 2>&1`; - chomp $path; - if( $path =~ /Can't locate/ ) { - print STDERR "$modname is missing\n"; - return; - } - - my %pkgs = path2pkg( $path ); - return (map { @{$pkgs{$_} or ["undef $_"]} } keys %pkgs); -} - -sub dep_pkgs { - my $req = shift @_; - my @result; - foreach my $modname (keys %$req) { - my $version = version->parse( $req->{$modname} ); - if( $modname eq "perl" ) { - if( version->parse($^V) < $version ) { - die "requires perl version $version"; - } - next; - } - if( $version > version->parse( get_version($modname) ) ) { - print STDERR "Version of $modname is too old. Required is $version, installed is ", - (get_version($modname) or "nothing"), "\n"; - } - - my @pkgs = mod2pkg( $modname ); - if( @pkgs > 1 ) { - print STDERR "ERROR: More than one package for module '$modname' found: @pkgs\n"; - } - my $pkg = shift @pkgs; - if( $pkg ) { - print STDERR "Packages for module '$modname': $pkg\n"; - next if( $pkg eq 'CSWperl' ); - } else { - print STDERR "MISSING package for '$modname'\n"; - # Guess name of missing module - my $dirname; - ($pkg, $dirname) = guess_name_from_module( $modname ); - if( $pkg ) { - if( ! -d $dirname ) { - print STDERR "MISSING $pkg directory '$dirname', to build please invoke makemake $modname\n"; - } else { - print STDERR "MISSING $pkg Please build and install module in $dirname\n"; - } - } - } - push @result, $pkg if( $pkg ); - } - - return @result; -} - - - -my $modname = shift @ARGV; - -my $cpandir = $CWD; - -logoutput(); -my $mod = (CPAN::Shell->expand("Module", $modname))[0]; -endlog(); - -die "can not locate CPAN module $modname" unless( $mod ); - # We need this so dependencies can be retreived #logoutput(); #close( STDIN ); @@ -177,18 +55,18 @@ #endlog(); # print "Make done\n"; - my $filename = $mod->cpan_file; -my $author = (split(/\//, $filename))[2]; -my $author1 = substr($author,0,1); -my $author2 = substr($author,0,2); -print STDERR "WARNING: Strange username, CPAN lists " . $mod->userid . " but module is stored for $author\n" if( $author ne $mod->userid ); +my $author = ( split( /\//, $filename ) )[2]; +my $author1 = substr( $author, 0, 1 ); +my $author2 = substr( $author, 0, 2 ); +print STDERR "WARNING: Strange username, CPAN lists " . $mod->userid . " but module is stored for $author\n" + if ( $author ne $mod->userid ); -my ($notstandard, $fileonly) = ($filename =~ m,^${author1}/${author2}/${author}/(.*/)?([^/]+)$,); +my ( $notstandard, $fileonly ) = ( $filename =~ m,^${author1}/${author2}/${author}/(.*/)?([^/]+)$, ); # That is the version of the module which may be different than the one from the file # my $version = $mod->cpan_version; -my ($name, $fileversion) = ($fileonly =~ /^(\D+)-(\d+(?:\.\d+)*)/); +my ( $name, $fileversion ) = ( $fileonly =~ /^(\D+)-(\d+(?:\.\d+)*)/ ); #print "filename: $filename\n"; #print "notstandard: $notstandard\n"; @@ -197,151 +75,289 @@ #print "fileversion: $fileversion\n"; #print "author: $author\n"; -my $cswpkg = lc( $modname ); +my $cswpkg = lc($modname); $cswpkg =~ s/::/-/g; $cswpkg = "CSWpm-" . $cswpkg; -my $cswcatalog = lc( $modname ); +my $cswcatalog = lc($modname); $cswcatalog =~ s/::/_/g; $cswcatalog = "pm_" . $cswcatalog; # print "DSLIP: ", Dumper( $mod->dslip_status() ); -my $dslip = $mod->dslip_status; -my $archall = (!defined $dslip->{L} ? 2 : - $dslip->{L} eq 'p' ? 1 : - 0); +my $dslip = $mod->dslip_status; +my $archall = ( + !defined $dslip->{L} ? 2 + : $dslip->{L} eq 'p' ? 1 + : 0 +); logoutput(); $mod->distribution->get; endlog(); + #$mod->distribution->make; my $distdir = $mod->distribution->dir; -my (@build_dep_pkgs, @runtime_dep_pkgs); +my ( @build_dep_pkgs, @runtime_dep_pkgs ); my $description; -if( -f "$distdir/META.yml" ) { - my $meta = LoadFile( "$distdir/META.yml" ); - $description = $meta->{abstract} if( exists $meta->{abstract} ); - my $req = $meta->{requires}; - my $recommends = $meta->{recommends}; - my $build_requires = $meta->{build_requires}; +if ( -f "$distdir/META.yml" ) { + my $meta = LoadFile("$distdir/META.yml"); + $description = $meta->{abstract} if ( exists $meta->{abstract} ); + my $req = $meta->{requires}; + my $recommends = $meta->{recommends}; + my $build_requires = $meta->{build_requires}; - @build_dep_pkgs = dep_pkgs( $build_requires ); - @runtime_dep_pkgs = dep_pkgs( $req ); + @build_dep_pkgs = dep_pkgs($build_requires); + @runtime_dep_pkgs = dep_pkgs($req); } -$description ||= $mod->description; -$description ||= $mod->manpage_headline; -$description ||= $mod->distribution->as_glimpse; -$description ||= ""; -$description = ucfirst( $description ); -chomp( $description ); +$description //= $mod->description; # Changed to defined from false or +$description //= $mod->manpage_headline; +$description //= $mod->distribution->as_glimpse; +$description //= ""; +$description = ucfirst($description); +chomp($description); # Come back from cpan module build directory to GAR cpan/ -$CWD = $cpandir; +chdir($cpandir) or die($!); -if( ! -d $name ) { - system( "pwd; gmake newpkg-$name" ); +if ( !-d $name ) { + system("pwd; gmake newpkg-$name"); } -open( MF, ">$name/trunk/Makefile" ) or die "Couldn't write to $name/trunk/Makefile"; +open( my $mf_fh, '>', "$name/trunk/Makefile" ) or die "Couldn't write to $name/trunk/Makefile"; -print MF "NAME = $name\n"; -print MF "VERSION = $fileversion\n"; -print MF "CATEGORIES = cpan\n"; -print MF "AUTHOR = $author\n"; -print MF "\n"; -print MF "DESCRIPTION = $description\n"; -print MF "define BLURB\n"; -print MF "endef\n"; -print MF "\n"; +say {$mf_fh} "NAME = $name"; +say {$mf_fh} "VERSION = $fileversion"; +say {$mf_fh} 'CATEGORIES = cpan'; +say {$mf_fh} "AUTHOR = $author"; +say {$mf_fh} ""; +say {$mf_fh} "DESCRIPTION = $description"; +say {$mf_fh} "define BLURB"; +say {$mf_fh} "endef"; +say {$mf_fh} ""; my $upstreaminfo = 0; -if( $notstandard ) { - print MF "MASTER_SITES = \$(addsuffix ${notstandard},\$(CPAN_MIRRORS))\n"; - $upstreaminfo = 1; +if ($notstandard) { + say {$mf_fh} "MASTER_SITES = \$(addsuffix ${notstandard},\$(CPAN_MIRRORS))"; + $upstreaminfo = 1; } -if( $fileonly ne "${name}-${fileversion}.tar.gz" ) { - print MF "MODDIST = $fileonly\n"; - $upstreaminfo = 1; +if ( $fileonly ne "${name}-${fileversion}.tar.gz" ) { + say {$mf_fh} "MODDIST = $fileonly"; + $upstreaminfo = 1; } -print MF "\n" if( $upstreaminfo ); +say {$mf_fh} "" if ($upstreaminfo); -if( @build_dep_pkgs ) { - foreach my $p (@build_dep_pkgs) { - print MF "BUILD_DEP_PKGS += $p\n"; - } - print MF "\n"; +if (@build_dep_pkgs) { + foreach my $p (@build_dep_pkgs) { + say {$mf_fh} "BUILD_DEP_PKGS += $p"; + } + say {$mf_fh} ""; } -print MF "CATALOG_RELEASE = unstable\n"; -print MF "\n"; +say {$mf_fh} "CATALOG_RELEASE = unstable"; +say {$mf_fh} ""; -foreach (qw(LICENSE LICENSE.LGPL COPYING Copying COPYRIGHT Artistic ARTISTIC GPL)) { - if( -f "$distdir/$_" ) { - print MF "LICENSE = $_\n\n"; - last; - } +foreach my $file (qw(LICENSE LICENSE.LGPL COPYING Copying COPYRIGHT Artistic ARTISTIC GPL)) { + if ( -f "$distdir/$file" ) { + say {$mf_fh} "LICENSE = $file\n"; + last; + } } -print MF "PACKAGES += $cswpkg\n"; -print MF "CATALOGNAME_$cswpkg = $cswcatalog\n"; -print MF "SPKG_DESC_$cswpkg = $description\n"; +say {$mf_fh} "PACKAGES += $cswpkg"; +say {$mf_fh} "CATALOGNAME_$cswpkg = $cswcatalog"; +say {$mf_fh} "SPKG_DESC_$cswpkg = $description"; # Do we have the package in the catalog and has it the same name? # dam at login [login]:/home/dam > curl -s http://buildfarm.opencsw.org/pkgdb/rest/catalogs/current/sparc/SunOS5.9/pkgnames/CSWvim/ -# {"maintainer_full_name": "Dagobert Michelsen", "version_string": "7.3.055,REV=2010.11.25", "basename": "vim-7.3.055,REV=2010.11.25-SunOS5.9-sparc-CSW.pkg.gz", "maintainer_email": "dam at opencsw.org", "mtime": "2010-11-27 05:31:11", "file_basename": "vim-7.3.055,REV=2010.11.25-SunOS5.9-sparc-CSW.pkg.gz", "arch": "sparc", "osrel": "SunOS5.9", "size": 1026296, "md5_sum": "96bda1535071daa08372ceee7787b17b", "pkgname": "CSWvim", "rev": "2010.11.25", "filename_arch": "sparc", "version": "7.3.055,REV=2010.11.25", "cadam at login [login]:/home/dam > +# {"maintainer_full_name": "Dagobert Michelsen", "version_string": "7.3.055,REV=2010.11.25", "basename": "vim-7.3.055,REV=2010.11.25-SunOS5.9-sparc-CSW.pkg.gz", "maintainer_email": "dam at opencsw.org", "mtime": "2010-11-27 05:31:11", "file_basename": "vim-7.3.055,REV=2010.11.25-SunOS5.9-sparc-CSW.pkg.gz", "arch": "sparc", "osrel": "SunOS5.9", "size": 1026296, "md5_sum": "96bda1535071daa08372ceee7787b17b", "pkgname": "CSWvim", "rev": "2010.11.25", "filename_arch": "sparc", "version": "7.3.055,REV=2010.11.25", "cadam at login [login]:/home/dam > # Or does it need to be obsoleted? -print MF "# There was no information if this is pure Perl or not. Please remove if necessary.\n" if( $archall == 2 ); -print MF "ARCHALL_$cswpkg = 1\n" if( $archall ); +say {$mf_fh} "# There was no information if this is pure Perl or not. Please remove if necessary." if ( $archall == 2 ); +say {$mf_fh} "ARCHALL_$cswpkg = 1" if ($archall); foreach my $p (@runtime_dep_pkgs) { - print MF "RUNTIME_DEP_PKGS_$cswpkg += $p\n"; + say {$mf_fh} "RUNTIME_DEP_PKGS_$cswpkg += $p"; } # Is this an obsoletion for an old package? -my @oldpkgs = mod2pkg( $modname ); -if( @oldpkgs > 1 ) { - print STDERR "ERROR: More than one package for module '$modname' found: @oldpkgs\n"; +my @oldpkgs = mod2pkg($modname); +if ( @oldpkgs > 1 ) { + say STDERR "ERROR: More than one package for module '$modname' found: @oldpkgs"; } my $oldpkg = shift @oldpkgs; -if( $oldpkg ne $cswpkg ) { - print MF "OBSOLETED_BY_$cswpkg += $oldpkg\n"; +if ( $oldpkg ne $cswpkg ) { + say {$mf_fh} "OBSOLETED_BY_$cswpkg += $oldpkg"; - my $ua = LWP::UserAgent->new; - $ua->timeout(300); - $ua->proxy(['http', 'ftp'], 'http://proxy:3128' ); + my $ua = LWP::UserAgent->new; + $ua->timeout(300); + $ua->proxy( [ 'http', 'ftp' ], 'http://proxy:3128' ); - my $catalog = "unstable"; - my $arch = "sparc"; - my $rel = "SunOS5.10"; - - my $url = "http://buildfarm.opencsw.org/pkgdb/rest/catalogs/$catalog/$arch/$rel/pkgnames/$oldpkg/"; + my $catalog = "unstable"; + my $arch = "sparc"; + my $rel = "SunOS5.10"; - my $response = $ua->get( $url ); + my $url = "http://buildfarm.opencsw.org/pkgdb/rest/catalogs/$catalog/$arch/$rel/pkgnames/$oldpkg/"; - if ($response->is_success) { - my $json_string = $response->decoded_content; # or whatever - if( $json_string eq "null" ) { - print "Couldn't find package $oldpkg in $catalog:$arch:$rel\n"; - } else { - my $data = decode_json $json_string; - my $cname = $data->{catalogname}; - print MF "CATALOGNAME_$oldpkg = ${cname}_stub\n"; - } - } else { - print "Error getting $url\n" . $response->status_line; - } + my $response = $ua->get($url); + if ( $response->is_success ) { + my $json_string = $response->decoded_content; # or whatever + if ( $json_string eq "null" ) { + say "Couldn't find package $oldpkg in $catalog:$arch:$rel"; + } else { + my $data = decode_json $json_string; + my $cname = $data->{catalogname}; + say {$mf_fh} "CATALOGNAME_$oldpkg = ${cname}_stub"; + } + } else { + print "Error getting $url\n" . $response->status_line; + } + } -print MF "\n"; +say {$mf_fh} ""; +say {$mf_fh} "include gar/category.mk"; -print MF "include gar/category.mk\n"; +close($mf_fh) or warn($!); +chdir("$name/trunk") or die($!); +system('mgar', 'makesum') == 0 or die($!); +system('mgar', 'package') == 0 or die($!); -close( MF ); +say 'Done.'; -system( "cd $name/trunk; mgar makesum; mgar package "); +### Subroutines ### + +sub dep_pkgs { + my $req = shift @_; + my @result; + foreach my $modname ( keys %$req ) { + my $version = version->parse( $req->{$modname} ); + if ( $modname eq "perl" ) { + if ( version->parse($^V) < $version ) { + die "requires perl version $version"; + } + next; + } + if ( $version > version->parse( get_version($modname) ) ) { + print STDERR "Version of $modname is too old. Required is $version, installed is ", + ( get_version($modname) or "nothing" ), "\n"; + } + + my @pkgs = mod2pkg($modname); + if ( @pkgs > 1 ) { + print STDERR "ERROR: More than one package for module '$modname' found: @pkgs\n"; + } + my $pkg = shift @pkgs; + if ($pkg) { + print STDERR "Packages for module '$modname': $pkg\n"; + next if ( $pkg eq 'CSWperl' ); + } else { + print STDERR "MISSING package for '$modname'\n"; + + # Guess name of missing module + my $dirname; + ( $pkg, $dirname ) = guess_name_from_module($modname); + if ($pkg) { + if ( !-d $dirname ) { + print STDERR "MISSING $pkg directory '$dirname', to build please invoke makemake $modname\n"; + } else { + print STDERR "MISSING $pkg Please build and install module in $dirname\n"; + } + } + } + push @result, $pkg if ($pkg); + } + + return @result; +} + +sub endlog { + if ( !$verbose ) { + + # Reference fh to silence warning + select(OLDERR); select(OLDOUT); + + # Restore output. + select(STDOUT); + close(STDOUT); + open( STDOUT, ">&OLDOUT" ); + close(STDERR); + open( STDERR, ">&OLDERR" ); + + rmtree($logfile); + } +} + +sub fail { + close(STDOUT); + open( STDOUT, ">&OLDOUT" ); + close(STDERR); + open( STDERR, ">&OLDERR" ); + open( LOG, "< $logfile" ) + or die "$pgm: Error, @_ - can't open log\n"; + print STDERR foreach ; + close(LOG); + rmtree($logfile); + die "\n$pgm: Error, @_\n"; +} + +sub guess_name_from_module { + my $modname = shift @_; + my $mod = ( CPAN::Shell->expand( "Module", $modname ) )[0]; + if ( !$mod ) { + print STDERR "ERROR: Can not find module $modname/n"; + return; + } + my $filename = $mod->distribution->base_id; + my ( $name, $fileversion ) = ( $filename =~ /^(\D+)-(\d+(?:\.\d+)*)/ ); + my $dirname = $name; + my $pkgname = lc($name); + $pkgname = "CSWpm-" . $pkgname; + return ( $pkgname, $dirname ); +} + +sub logoutput { + if ( !$verbose ) { + $logfile = tmpnam(); + open( OLDOUT, '>&STDOUT' ); + open( OLDERR, '>&STDERR' ); + open( STDOUT, "> $logfile" ); + open( STDERR, "> $logfile" ); + } +} + +sub mod2pkg { + my $modname = shift @_; + my @result; + my $path = `/opt/csw/bin/perl -S /opt/csw/bin/pmpath $modname 2>&1`; + chomp $path; + if ( $path =~ /Can't locate/ ) { + print STDERR "$modname is missing\n"; + return; + } + + my %pkgs = path2pkg($path); + return ( map { @{ $pkgs{$_} or ["undef $_"] } } keys %pkgs ); +} + + +sub path2pkg { + my @pathes = @_; + + return () if ( @pathes == 0 ); + + my %pkgs; + open P, "/home/dam/mgar/gar/v2/bin/pkgdb show filename " . join( " ", @pathes ) . " |" + or die "Cannot open gar/bin/pkgdb"; + while (

) { + my $path = shift @pathes; + $pkgs{$path} = [ split( /\s+/, $_ ) ]; + } + close P; + + return %pkgs; +} 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 Feb 20 18:02:41 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 20 Feb 2012 17:02:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17095] csw/mgar/pkg/cpan/makemake Message-ID: Revision: 17095 http://gar.svn.sourceforge.net/gar/?rev=17095&view=rev Author: dmichelsen Date: 2012-02-20 17:02:41 +0000 (Mon, 20 Feb 2012) Log Message: ----------- cpan/makemake: Fixate GARTYPE to v2, use package database and do not rely on installed modules Modified Paths: -------------- csw/mgar/pkg/cpan/makemake Modified: csw/mgar/pkg/cpan/makemake =================================================================== --- csw/mgar/pkg/cpan/makemake 2012-02-20 16:53:39 UTC (rev 17094) +++ csw/mgar/pkg/cpan/makemake 2012-02-20 17:02:41 UTC (rev 17095) @@ -9,9 +9,11 @@ use File::Path; use File::Temp qw(:POSIX); use Module::Version 'get_version'; +use Parallel::ForkManager; use version 0.77; # get latest bug-fixes and API use Data::Dumper; use LWP::UserAgent; # For online retreival of catalogname for package +use Parallel::ForkManager; use JSON; # TBD: @@ -132,6 +134,7 @@ say {$mf_fh} "NAME = $name"; say {$mf_fh} "VERSION = $fileversion"; say {$mf_fh} 'CATEGORIES = cpan'; +say {$mf_fh} 'GARTYPE = v2'; say {$mf_fh} "AUTHOR = $author"; say {$mf_fh} ""; say {$mf_fh} "DESCRIPTION = $description"; @@ -332,16 +335,51 @@ sub mod2pkg { my $modname = shift @_; - my @result; - my $path = `/opt/csw/bin/perl -S /opt/csw/bin/pmpath $modname 2>&1`; - chomp $path; - if ( $path =~ /Can't locate/ ) { - print STDERR "$modname is missing\n"; - return; + + my %pkgs; + my $ua = LWP::UserAgent->new; + $ua->timeout(600); + + my $modpath = $modname; + $modpath =~ s,::,/,g; + $modpath .= '.pm'; + + my $pm = new Parallel::ForkManager( 15, "/tmp/makemake" ); + + $pm -> run_on_finish ( # called BEFORE the first call to start() + sub { + my ($pid, $exit_code, $ident, $exit_signal, $core_dump, $data_structure_reference) = @_; + + if (defined($data_structure_reference)) { + my ($pkg) = @{$data_structure_reference}; + $pkgs{$pkg} = 1 if( defined $pkg ); + } else { + print qq|No message received from child process $pid!\n|; + } + } + ); + + foreach my $prefix (@INC) { + $pm->start() and next; + my $response = $ua->get( "http://buildfarm.opencsw.org/pkgdb/rest/catalogs/unstable/sparc/SunOS5.10/pkgname-by-filename?filename=$prefix/$modpath" ); + my $json; + if ($response->is_success) { + $json = $response->decoded_content; # or whatever + } else { + print Dumper( $response ); + die $response->status_line; + } + + my $p = defined $json ? decode_json( $json ) : []; + + $pm->finish( 0, $p ); } - my %pkgs = path2pkg($path); - return ( map { @{ $pkgs{$_} or ["undef $_"] } } keys %pkgs ); + $pm->wait_all_children; + + print "Matched packages: ", join( ", ", keys %pkgs ), "\n"; + + return keys %pkgs; } 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 Feb 21 01:14:22 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 21 Feb 2012 00:14:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[17096] csw/mgar/pkg Message-ID: Revision: 17096 http://gar.svn.sourceforge.net/gar/?rev=17096&view=rev Author: wahwah Date: 2012-02-21 00:14:22 +0000 (Tue, 21 Feb 2012) Log Message: ----------- antiword/trunk: Just for the fun of it. Added Paths: ----------- csw/mgar/pkg/antiword/ csw/mgar/pkg/antiword/Makefile csw/mgar/pkg/antiword/branches/ csw/mgar/pkg/antiword/tags/ csw/mgar/pkg/antiword/trunk/ csw/mgar/pkg/antiword/trunk/Makefile csw/mgar/pkg/antiword/trunk/checksums csw/mgar/pkg/antiword/trunk/files/ csw/mgar/pkg/antiword/trunk/files/0001-Adjust-variables-in-Makefile.Solaris.patch Added: csw/mgar/pkg/antiword/Makefile =================================================================== --- csw/mgar/pkg/antiword/Makefile (rev 0) +++ csw/mgar/pkg/antiword/Makefile 2012-02-21 00:14:22 UTC (rev 17096) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/antiword/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/antiword/trunk/Makefile =================================================================== --- csw/mgar/pkg/antiword/trunk/Makefile (rev 0) +++ csw/mgar/pkg/antiword/trunk/Makefile 2012-02-21 00:14:22 UTC (rev 17096) @@ -0,0 +1,39 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = antiword +VERSION = 0.37 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://www.winfield.demon.nl/linux/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES = 0001-Adjust-variables-in-Makefile.Solaris.patch + +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = + +LICENSE = Docs/COPYING + +CHECKPKG_OVERRIDES_CSWantiword += file-with-bad-content|/usr/share|root/opt/csw/bin/antiword +CHECKPKG_OVERRIDES_CSWantiword += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/antiword.1 + +include gar/category.mk + +build-custom: + (cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) gmake -f Makefile.Solaris $(PARALLELMFLAGS)) + @$(MAKECOOKIE) + +install-custom: + (cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) gmake -f Makefile.Solaris DESTDIR=$(DESTDIR) $(PARALLELMFLAGS) install) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/antiword/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/antiword/trunk/checksums =================================================================== --- csw/mgar/pkg/antiword/trunk/checksums (rev 0) +++ csw/mgar/pkg/antiword/trunk/checksums 2012-02-21 00:14:22 UTC (rev 17096) @@ -0,0 +1 @@ +f868e2a269edcbc06bf77e89a55898d1 antiword-0.37.tar.gz Added: csw/mgar/pkg/antiword/trunk/files/0001-Adjust-variables-in-Makefile.Solaris.patch =================================================================== --- csw/mgar/pkg/antiword/trunk/files/0001-Adjust-variables-in-Makefile.Solaris.patch (rev 0) +++ csw/mgar/pkg/antiword/trunk/files/0001-Adjust-variables-in-Makefile.Solaris.patch 2012-02-21 00:14:22 UTC (rev 17096) @@ -0,0 +1,62 @@ +From 1d62f1c52525338a4724a62b233f9b1a45cc9e8b Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 21 Feb 2012 01:11:20 +0100 +Subject: [PATCH] Adjust variables in Makefile.Solaris + +--- + Makefile.Solaris | 24 +++++++++++++----------- + 1 files changed, 13 insertions(+), 11 deletions(-) + +diff --git a/Makefile.Solaris b/Makefile.Solaris +index 429db06..4830c22 100644 +--- a/Makefile.Solaris ++++ b/Makefile.Solaris +@@ -13,10 +13,10 @@ DB = NDEBUG + # Optimization: -O or debugging: -g + OPT = -xO2 + +-LDLIBS = ++LDLIBS += + +-CFLAGS = $(OPT) -D$(DB) +-LDFLAGS = ++CFLAGS += $(OPT) -D$(DB) ++LDFLAGS += + + OBJS =\ + main_u.o asc85enc.o blocklist.o chartrans.o datalist.o depot.o\ +@@ -34,9 +34,9 @@ PROGS =\ + LOCAL_INSTALL_DIR = $(HOME)/bin + LOCAL_RESOURCES_DIR = $(HOME)/.antiword + +-GLOBAL_INSTALL_DIR = /usr/local/bin +-GLOBAL_RESOURCES_DIR = /usr/local/share/antiword +-MAN_DIR = /usr/local/man/man1 ++GLOBAL_INSTALL_DIR = /opt/csw/bin ++GLOBAL_RESOURCES_DIR = /opt/csw/share/antiword ++MAN_DIR = /opt/csw/share/man/man1 + + all: $(PROGS) + +@@ -48,11 +48,13 @@ local_install: all + + # NOTE: you must be root to do this + install: all +- $(INSTALL) -c -o bin -g bin -m 755 $(PROGS) $(GLOBAL_INSTALL_DIR) +- $(INSTALL) -c -o bin -g bin -m 644 Docs/antiword.1 $(MAN_DIR) +- $(INSTALL) -d -o bin -g bin -m 755 $(GLOBAL_RESOURCES_DIR) +- $(INSTALL) -c -o bin -g bin -m 644 Resources/*.txt $(GLOBAL_RESOURCES_DIR) +- $(INSTALL) -c -o bin -g bin -m 644 Resources/fontnames $(GLOBAL_RESOURCES_DIR) ++ $(INSTALL) -c -o bin -g bin -m 755 -d $(DESTDIR)$(GLOBAL_INSTALL_DIR) ++ $(INSTALL) -c -o bin -g bin -m 755 -d $(DESTDIR)$(MAN_DIR) ++ $(INSTALL) -c -o bin -g bin -m 755 $(PROGS) $(DESTDIR)$(GLOBAL_INSTALL_DIR) ++ $(INSTALL) -c -o bin -g bin -m 644 Docs/antiword.1 $(DESTDIR)$(MAN_DIR) ++ $(INSTALL) -d -o bin -g bin -m 755 -d $(DESTDIR)$(GLOBAL_RESOURCES_DIR) ++ $(INSTALL) -c -o bin -g bin -m 644 Resources/*.txt $(DESTDIR)$(GLOBAL_RESOURCES_DIR) ++ $(INSTALL) -c -o bin -g bin -m 644 Resources/fontnames $(DESTDIR)$(GLOBAL_RESOURCES_DIR) + + clean: + rm -f $(OBJS) +-- +1.7.9 + 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 Feb 21 01:34:47 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 21 Feb 2012 00:34:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17097] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17097 http://gar.svn.sourceforge.net/gar/?rev=17097&view=rev Author: bdwalton Date: 2012-02-21 00:34:46 +0000 (Tue, 21 Feb 2012) Log Message: ----------- ruby19/trunk: force api version override to allow (some) sanity in packaging 1.9 Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-21 00:14:22 UTC (rev 17096) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-21 00:34:46 UTC (rev 17097) @@ -1,13 +1,9 @@ -NAME = ruby19 +NAME = ruby193 VERSION = 1.9.3 PATCHLEVEL = p0 CATEGORIES = lang GARTYPE = v2 -#NOTE: Some things below use version 1.9.1. As of 1.9.3, the api of -#the libs is 1.9.1, so that is why we can't use $(VERSION). -RUBY_API = 1.9.1 - # patchfile 0002-vm.c... is a backport from upstream VERSION_FLAG_PATCH = 1 @@ -38,50 +34,50 @@ closures. endef -PACKAGES = CSWruby19 CSWruby19-samples CSWruby19-ri CSWruby19-tk -PACKAGES += CSWruby19-dev CSWlibruby191-1 +PACKAGES = CSWruby193 CSWruby193-samples CSWruby193-ri CSWruby193-tk +PACKAGES += CSWruby193-dev CSWlibruby193-1 -ARCHALL_CSWruby19-samples = 1 -ARCHALL_CSWruby19-ri = 1 +ARCHALL_CSWruby193-samples = 1 +ARCHALL_CSWruby193-ri = 1 # checkpkg overrides -CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWruby19-samples += file-with-bad-content -CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby19-tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWruby19-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb +CHECKPKG_OVERRIDES_CSWruby193-samples += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWruby193-samples += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWruby193-samples += file-with-bad-content +CHECKPKG_OVERRIDES_CSWruby193 += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby193-tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWruby193-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb -RUNTIME_DEP_PKGS_CSWruby19 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWruby19 += CSWlibssl0-9-8 CSWlibyaml -RUNTIME_DEP_PKGS_CSWruby19 += CSWlibreadline6 CSWlibz1 CSWlibffi4 -RUNTIME_DEP_PKGS_CSWruby19 += CSWlibruby19-1 -RUNTIME_DEP_PKGS_CSWruby19-samples = CSWruby19 -RUNTIME_DEP_PKGS_CSWruby19-tk = CSWruby19 CSWlibruby19-1 CSWtk CSWtcl CSWlibx11 -RUNTIME_DEP_PKGS_CSWruby19-dev = CSWruby19 -RUNTIME_DEP_PKGS_CSWruby19-ri = CSWruby19 +RUNTIME_DEP_PKGS_CSWruby193 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWruby193 += CSWlibssl0-9-8 CSWlibyaml +RUNTIME_DEP_PKGS_CSWruby193 += CSWlibreadline6 CSWlibz1 CSWlibffi4 +RUNTIME_DEP_PKGS_CSWruby193 += CSWlibruby193-1 +RUNTIME_DEP_PKGS_CSWruby193-samples = CSWruby193 +RUNTIME_DEP_PKGS_CSWruby193-tk = CSWruby193 CSWlibruby193-1 CSWtk CSWtcl CSWlibx11 +RUNTIME_DEP_PKGS_CSWruby193-dev = CSWruby193 +RUNTIME_DEP_PKGS_CSWruby193-ri = CSWruby193 -SPKG_DESC_CSWruby19 = $(DESCRIPTION) +SPKG_DESC_CSWruby193 = $(DESCRIPTION) -SPKG_DESC_CSWlibruby19-1 = The libruby shared object files (Ruby 1.9) +SPKG_DESC_CSWlibruby193-1 = The libruby shared object files (Ruby $(VERSION)) -SPKG_DESC_CSWruby19-samples = Example programs for Ruby 1.9 +SPKG_DESC_CSWruby193-samples = Example programs for Ruby $(VERSION) -SPKG_DESC_CSWruby19-ri = Ruby 1.9 Interactive Reference +SPKG_DESC_CSWruby193-ri = Ruby $(VERSION) Interactive Reference -SPKG_DESC_CSWruby19-tk = Ruby 1.9 Tcl/TK Extension +SPKG_DESC_CSWruby193-tk = Ruby $(VERSION) Tcl/TK Extension -SPKG_DESC_CSWruby19-dev = Ruby 1.9 Extension Development Files +SPKG_DESC_CSWruby193-dev = Ruby $(VERSION) Extension Development Files -PKGFILES_CSWlibruby19-1 += $(call baseisadirs,$(libdir),libruby19\.so\.1.*) +PKGFILES_CSWlibruby193-1 += $(call baseisadirs,$(libdir),lib$(NAME)\.so\.1.*) -PKGFILES_CSWruby19-samples = $(docdir)/ruby/sample.* +PKGFILES_CSWruby193-samples = $(docdir)/$(NAME)/sample.* -PKGFILES_CSWruby19-ri = $(datadir)/ri/.* $(bindir)/ri19 +PKGFILES_CSWruby193-ri = $(datadir)/ri/.* $(bindir)/ri19 -PKGFILES_CSWruby19-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb +PKGFILES_CSWruby193-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb -PKGFILES_CSWruby19-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a +PKGFILES_CSWruby193-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ DISTFILES = $(DISTNAME).tar.gz @@ -100,16 +96,26 @@ # UPSTREAM_MASTER_SITES = CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --program-suffix=$(RUBY_API) +CONFIGURE_ARGS += --program-suffix=$(subst .,,$(VERSION)) CONFIGURE_ARGS += --enable-shared -CONFIGURE_ARGS += --with-soname=ruby$(RUBY_API) +CONFIGURE_ARGS += --with-soname=$(NAME) +#NOTE: We force this so that we can sanely provide multiple versions +#of ruby 1.9.x if required. The API (as of 1.9.3) was still 1.9.1. +#This makes it challenging to deliver multiple CSWlibruby19 packages, +#leave binary gem paths unaltered, etc. Instead, we override the API +#version which affects .so naming and a few directory paths. It's +#ugly but it should make progressing through potential API changes +#later much easier as we can deliver multiple versions of 1.9.x side +#by side. +CONFIGURE_ARGS += --with-ruby-version=$(VERSION) + EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib #GARCOMPILER = GCC4 -# RUNTIME_DEP_PKGS_CSWruby19 += CSWgcc4corert -# RUNTIME_DEP_PKGS_CSWruby19-dev += CSWgcc4core +# RUNTIME_DEP_PKGS_CSWruby193 += CSWgcc4corert +# RUNTIME_DEP_PKGS_CSWruby193-dev += CSWgcc4core # # This is for rbconfig.rb: without this, modules built may not get a # # proper setting. # EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) @@ -139,7 +145,7 @@ post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) -multiconfig: RBCONFIG=/opt/csw/lib/ruby/$(RUBY_API)/$(GARCH)-solaris2.10/rbconfig.rb +multiconfig: RBCONFIG=/opt/csw/lib/ruby/$(VERSION)/$(GARCH)-solaris2.10/rbconfig.rb multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12 @@ -154,7 +160,7 @@ # Fix up rbconfig rbconfig: @gsed -i -e s,$(DESTDIR),, \ - $(DESTDIR)$(libdir)/ruby/$(RUBY_API)/$(GARCH)-solaris2.10/rbconfig.rb + $(DESTDIR)$(libdir)/ruby/$(VERSION)/$(GARCH)-solaris2.10/rbconfig.rb @$(MAKECOOKIE) # Copy samples 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 Feb 21 01:36:19 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 21 Feb 2012 00:36:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[17098] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17098 http://gar.svn.sourceforge.net/gar/?rev=17098&view=rev Author: bdwalton Date: 2012-02-21 00:36:19 +0000 (Tue, 21 Feb 2012) Log Message: ----------- ruby19/trunk: allow bad strings in the ri documentation Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-21 00:34:46 UTC (rev 17097) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-21 00:36:19 UTC (rev 17098) @@ -47,6 +47,8 @@ CHECKPKG_OVERRIDES_CSWruby193 += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWruby193-tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 CHECKPKG_OVERRIDES_CSWruby193-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb +CHECKPKG_OVERRIDES_CSWruby193-ri += file-with-bad-content|/usr/share +CHECKPKG_OVERRIDES_CSWruby193-ri += file-with-bad-content|/usr/local RUNTIME_DEP_PKGS_CSWruby193 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 RUNTIME_DEP_PKGS_CSWruby193 += CSWlibssl0-9-8 CSWlibyaml 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 Feb 21 01:58:18 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 21 Feb 2012 00:58:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17099] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17099 http://gar.svn.sourceforge.net/gar/?rev=17099&view=rev Author: bdwalton Date: 2012-02-21 00:58:18 +0000 (Tue, 21 Feb 2012) Log Message: ----------- ruby19/trunk: simplify -ri package overrides for bad content Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-21 00:36:19 UTC (rev 17098) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-21 00:58:18 UTC (rev 17099) @@ -47,8 +47,7 @@ CHECKPKG_OVERRIDES_CSWruby193 += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWruby193-tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 CHECKPKG_OVERRIDES_CSWruby193-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb -CHECKPKG_OVERRIDES_CSWruby193-ri += file-with-bad-content|/usr/share -CHECKPKG_OVERRIDES_CSWruby193-ri += file-with-bad-content|/usr/local +CHECKPKG_OVERRIDES_CSWruby193-ri += file-with-bad-content RUNTIME_DEP_PKGS_CSWruby193 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 RUNTIME_DEP_PKGS_CSWruby193 += CSWlibssl0-9-8 CSWlibyaml 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 Feb 21 02:15:23 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 21 Feb 2012 01:15:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17100] csw/mgar/gar/v2/lib/python/dependency_checks.py Message-ID: Revision: 17100 http://gar.svn.sourceforge.net/gar/?rev=17100&view=rev Author: bdwalton Date: 2012-02-21 01:15:23 +0000 (Tue, 21 Feb 2012) Log Message: ----------- s/ruby19/ruby193/ to accommodate api vs version number in ruby 1.9 packaging Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2012-02-21 00:58:18 UTC (rev 17099) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2012-02-21 01:15:23 UTC (rev 17100) @@ -32,7 +32,7 @@ (r".*\.pl$", (u"CSWperl",)), (r".*\.pm$", (u"CSWperl",)), (r".*\.py$", (u"CSWpython",)), - (r".*\.rb$", (u"CSWruby", u"CSWruby18", u"CSWruby19")), + (r".*\.rb$", (u"CSWruby", u"CSWruby18", u"CSWruby193")), (r".*\.elc?$", (u"CSWemacscommon",)), (r"/opt/csw/apache2/", (u"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 Feb 21 03:11:02 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 21 Feb 2012 02:11:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[17101] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17101 http://gar.svn.sourceforge.net/gar/?rev=17101&view=rev Author: bdwalton Date: 2012-02-21 02:11:02 +0000 (Tue, 21 Feb 2012) Log Message: ----------- ruby19/trunk: drop an override that is no longer required Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-21 01:15:23 UTC (rev 17100) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-21 02:11:02 UTC (rev 17101) @@ -45,7 +45,6 @@ CHECKPKG_OVERRIDES_CSWruby193-samples += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWruby193-samples += file-with-bad-content CHECKPKG_OVERRIDES_CSWruby193 += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby193-tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 CHECKPKG_OVERRIDES_CSWruby193-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb CHECKPKG_OVERRIDES_CSWruby193-ri += file-with-bad-content 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 Feb 21 04:20:37 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 21 Feb 2012 03:20:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17102] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17102 http://gar.svn.sourceforge.net/gar/?rev=17102&view=rev Author: bdwalton Date: 2012-02-21 03:20:37 +0000 (Tue, 21 Feb 2012) Log Message: ----------- ruby19/trunk: override a few usr/local references Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-21 02:11:02 UTC (rev 17101) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-21 03:20:37 UTC (rev 17102) @@ -45,6 +45,11 @@ CHECKPKG_OVERRIDES_CSWruby193-samples += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWruby193-samples += file-with-bad-content CHECKPKG_OVERRIDES_CSWruby193 += missing-dependency|CSWruby +# the next two have /usr/local/bin from dln_find.c. it should be innocuous and +# not worth patching +CHECKPKG_OVERRIDES_CSWlibruby193-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby193.so.1 +CHECKPKG_OVERRIDES_CSWruby193-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby193-static.a +# CHECKPKG_OVERRIDES_CSWruby193-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb CHECKPKG_OVERRIDES_CSWruby193-ri += file-with-bad-content This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Feb 21 10:02:34 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 21 Feb 2012 09:02:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17103] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 17103 http://gar.svn.sourceforge.net/gar/?rev=17103&view=rev Author: janholzh Date: 2012-02-21 09:02:34 +0000 (Tue, 21 Feb 2012) Log Message: ----------- ffmpeg/trunk: update to 0.10 Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-02-21 03:20:37 UTC (rev 17102) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-02-21 09:02:34 UTC (rev 17103) @@ -8,7 +8,7 @@ # Another thing is to see if it can be build with suncc see http://ftp.jaist.ac.jp/pub/pkgsrc/current/pkgsrc/multimedia/ffmpeg/Makefile.common NAME = ffmpeg -VERSION = 0.9.1 +VERSION = 0.10 CATEGORIES = lib GARTYPE = v2 @@ -31,6 +31,7 @@ BUILD_DEP_PKGS += CSWlibtheora-dev BUILD_DEP_PKGS += CSWlibvorbis-dev +BUILD_DEP_PKGS += CSWx264-dev PACKAGES += CSWlibavcodec53 SPKG_DESC_CSWlibavcodec53 = FFMPEG library libavcodec.so.53 @@ -81,6 +82,7 @@ RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavcodec53 +RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibswresample0 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibmp3lame0 @@ -123,22 +125,22 @@ RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibx264-120 -PACKAGES += CSWlibpostproc51 -SPKG_DESC_CSWlibpostproc51 = FFMPEG library libpostproc.so.51 -PKGFILES_CSWlibpostproc51 += $(call pkgfiles_lib,libpostproc.so.51) -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibtheoraenc1 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibpostproc51 += CSWlibx264-120 +PACKAGES += CSWlibpostproc52 +SPKG_DESC_CSWlibpostproc52 = FFMPEG library libpostproc.so.52 +PKGFILES_CSWlibpostproc52 += $(call pkgfiles_lib,libpostproc.so.52) +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibtheoraenc1 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibx264-120 PACKAGES += CSWlibswscale2 SPKG_DESC_CSWlibswscale2 = FFMPEG library libswscale.so.2 @@ -183,7 +185,7 @@ RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavfilter2 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavformat53 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibpostproc51 +RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibpostproc52 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswscale2 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswresample0 @@ -209,7 +211,7 @@ RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavfilter2 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibpostproc51 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibpostproc52 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibx264-120 # These are all examples Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2012-02-21 03:20:37 UTC (rev 17102) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2012-02-21 09:02:34 UTC (rev 17103) @@ -1 +1 @@ -41ae6cfdef81a54835b914f523e575cf ffmpeg-0.9.1.tar.bz2 +dc665cc599a739e3c5262ccdac13d129 ffmpeg-0.10.tar.bz2 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 Feb 21 12:55:43 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 21 Feb 2012 11:55:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[17104] csw/mgar/pkg Message-ID: Revision: 17104 http://gar.svn.sourceforge.net/gar/?rev=17104&view=rev Author: idogan23 Date: 2012-02-21 11:55:43 +0000 (Tue, 21 Feb 2012) Log Message: ----------- mule: initial commit Added Paths: ----------- csw/mgar/pkg/mule/ csw/mgar/pkg/mule/Makefile csw/mgar/pkg/mule/branches/ csw/mgar/pkg/mule/tags/ csw/mgar/pkg/mule/trunk/ csw/mgar/pkg/mule/trunk/Makefile csw/mgar/pkg/mule/trunk/checksums csw/mgar/pkg/mule/trunk/files/ csw/mgar/pkg/mule/trunk/files/0001-javapath.patch csw/mgar/pkg/mule/trunk/files/cswmule csw/mgar/pkg/mule/trunk/files/cswmule.xml csw/mgar/pkg/mule/trunk/files/cswusergroup Copied: csw/mgar/pkg/mule/Makefile (from rev 17088, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mule/Makefile (rev 0) +++ csw/mgar/pkg/mule/Makefile 2012-02-21 11:55:43 UTC (rev 17104) @@ -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/mule/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/mule/trunk/Makefile =================================================================== --- csw/mgar/pkg/mule/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mule/trunk/Makefile 2012-02-21 11:55:43 UTC (rev 17104) @@ -0,0 +1,64 @@ +NAME = mule +VERSION = 3.2.1 +GARTYPE = v2 +CATEGORIES = server + +DESCRIPTION = Java based lightweight enterprise service bus +define BLURB + Lightweight enterprise service bus (ESB) and integration framework +endef + +MASTER_SITES = http://www.mulesoft.org/ +DISTNAME = $(NAME)-standalone-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += cswusergroup +DISTFILES += cswmule.xml + +PATCHFILES += 0001-javapath.patch + +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + +ARCHALL = 1 + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\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_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +SPKG_CLASSES = none cswinitsmf cswsampleconf cswusergroup ugfiles +INITSMF = /etc/opt/csw/init.d/cswmule +PRESERVECONF = /opt/csw/mule/conf/.* +USERGROUP = /etc/opt/csw/pkg/CSWmule/cswusergroup + +PROTOTYPE_MODIFIERS = mule_ugfiles +MULE_UGFILES = /opt/csw/mule/conf /var/opt/csw/mule/logs +PROTOTYPE_FILES_mule_ugfiles = $(MULE_UGFILES) +PROTOTYPE_USER_mule_ugfiles = mule +PROTOTYPE_GROUP_mule_ugfiles = mule +PROTOTYPE_CLASS_mule_ugfiles = ugfiles + +install-custom: + @ginstall -d $(DESTDIR)/opt/csw/$(NAME) + @cp -rp $(WORKDIR)/$(DISTNAME)/* $(DESTDIR)/opt/csw/$(NAME) + @ginstall -d $(DESTDIR)/var/opt/csw/mule + @mv $(DESTDIR)/opt/csw/mule/logs $(DESTDIR)/var/opt/csw/mule + @ln -s $(DESTDIR)/var/opt/csw/mule/logs $(DESTDIR)/opt/csw/mule/logs + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/cswmule $(DESTDIR)/etc/opt/csw/init.d/cswmule + @ginstall -d $(DESTDIR)/var/opt/csw/svc/manifest/application + @ginstall -m 644 $(FILEDIR)/cswmule.xml $(DESTDIR)/var/opt/csw/svc/manifest/application/cswmule.xml + @ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWmule + @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWmule/cswusergroup + @$(MAKECOOKIE) + +include gar/category.mk + Property changes on: csw/mgar/pkg/mule/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mule/trunk/checksums =================================================================== --- csw/mgar/pkg/mule/trunk/checksums (rev 0) +++ csw/mgar/pkg/mule/trunk/checksums 2012-02-21 11:55:43 UTC (rev 17104) @@ -0,0 +1 @@ +10907926513d4b444f353c1115fd7dd2 mule-standalone-3.2.1.tar.gz Added: csw/mgar/pkg/mule/trunk/files/0001-javapath.patch =================================================================== --- csw/mgar/pkg/mule/trunk/files/0001-javapath.patch (rev 0) +++ csw/mgar/pkg/mule/trunk/files/0001-javapath.patch 2012-02-21 11:55:43 UTC (rev 17104) @@ -0,0 +1,42 @@ +From a4c99c1614cc51cf4d8b8972386a1f24051a243a Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Tue, 21 Feb 2012 10:58:51 +0100 +Subject: [PATCH] javapath + +--- + bin/launcher | 13 +++++++++++-- + 1 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/bin/launcher b/bin/launcher +index 4c2c359..33ea58d 100755 +--- a/bin/launcher ++++ b/bin/launcher +@@ -1,8 +1,17 @@ + #! /bin/sh + ++# Use CSWjre6 if installed ++if [ -x /opt/csw/java/jre/jre6/bin/java ] ++then ++ echo "==> using CSWjre6" ++ JAVA=/opt/csw/java/jre/jre6/bin/java ++else ++ echo "==> CSWjre6 not installed" ++ JAVA= ++fi ++ + # Check for java in path + +-JAVA= + if [ -n "`which java 2>/dev/null`" ] + then + JAVA=java +@@ -32,4 +41,4 @@ cp=${cp}:${commonsCliJar} + + # The string passed to eval must handle spaces in paths correctly. + COMMAND_LINE="\"${JAVA}\" -Dmule.home=\"${MULE_HOME}\" -cp \"${cp}\" org.codehaus.groovy.tools.GroovyStarter --main groovy.ui.GroovyMain --conf \"${MULE_HOME}/bin/launcher.conf\" $@" +-eval $COMMAND_LINE +\ No newline at end of file ++eval $COMMAND_LINE +-- +1.7.9 + Added: csw/mgar/pkg/mule/trunk/files/cswmule =================================================================== --- csw/mgar/pkg/mule/trunk/files/cswmule (rev 0) +++ csw/mgar/pkg/mule/trunk/files/cswmule 2012-02-21 11:55:43 UTC (rev 17104) @@ -0,0 +1,27 @@ +#!/sbin/sh + +#FMRI application +#MANIFEST /var/opt/csw/svc/manifest/application/cswmule.xml + +DAEMON=/opt/csw/mule/bin/mule + +echo +echo "**********************************************************************" +echo "* You are running Solaris 9. This package might run on Solaris 9, *" +echo "* but it is only supported on Solaris 10 and later releases. *" +echo "**********************************************************************" +echo + +case $1 in +'start') + $DAEMON start + ;; +'stop') + $DAEMON stop + ;; +*) + + echo "Usage: $0 { start | stop }" + exit 1 + ;; +esac Added: csw/mgar/pkg/mule/trunk/files/cswmule.xml =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/mule/trunk/files/cswmule.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: csw/mgar/pkg/mule/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/mule/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/mule/trunk/files/cswusergroup 2012-02-21 11:55:43 UTC (rev 17104) @@ -0,0 +1 @@ +mule:mule:Mule ESP:::: 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 Feb 21 13:40:41 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 21 Feb 2012 12:40:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17105] csw/mgar/pkg/cpan Message-ID: Revision: 17105 http://gar.svn.sourceforge.net/gar/?rev=17105&view=rev Author: idogan23 Date: 2012-02-21 12:40:40 +0000 (Tue, 21 Feb 2012) Log Message: ----------- Email-MIME-Attachment-Stripper: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/ csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/branches/ csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/tags/ csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/ csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/checksums csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile 2012-02-21 12:40:40 UTC (rev 17105) @@ -0,0 +1,16 @@ +NAME = Email-MIME-Attachment-Stripper +VERSION = 1.316 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = RJBS + +DESCRIPTION = strip the attachments from an email +define BLURB + strip the attachments from an email +endef + +PACKAGES = CSWpm-email-mime-attachment-stripper +CATALOGNAME = pm_email-mime-attachment-stripper + +include gar/category.mk + Added: csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/checksums 2012-02-21 12:40:40 UTC (rev 17105) @@ -0,0 +1 @@ +b86eb6a18144b24279517349da96b582 Email-MIME-Attachment-Stripper-1.316.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 Feb 21 13:46:39 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 21 Feb 2012 12:46:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17106] csw/mgar/pkg/mule/trunk/files/cswusergroup Message-ID: Revision: 17106 http://gar.svn.sourceforge.net/gar/?rev=17106&view=rev Author: idogan23 Date: 2012-02-21 12:46:39 +0000 (Tue, 21 Feb 2012) Log Message: ----------- mule: set home directory Modified Paths: -------------- csw/mgar/pkg/mule/trunk/files/cswusergroup Modified: csw/mgar/pkg/mule/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/mule/trunk/files/cswusergroup 2012-02-21 12:40:40 UTC (rev 17105) +++ csw/mgar/pkg/mule/trunk/files/cswusergroup 2012-02-21 12:46:39 UTC (rev 17106) @@ -1 +1 @@ -mule:mule:Mule ESP:::: +mule:mule:Mule ESP:/opt/home/mule::: 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 Feb 21 14:12:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 21 Feb 2012 13:12:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17107] csw/mgar/pkg/cpan/Sub-Uplevel/trunk Message-ID: Revision: 17107 http://gar.svn.sourceforge.net/gar/?rev=17107&view=rev Author: dmichelsen Date: 2012-02-21 13:12:12 +0000 (Tue, 21 Feb 2012) Log Message: ----------- cpan/Sub-Uplevel/trunk: Update to 0.22 Modified Paths: -------------- csw/mgar/pkg/cpan/Sub-Uplevel/trunk/Makefile csw/mgar/pkg/cpan/Sub-Uplevel/trunk/checksums Modified: csw/mgar/pkg/cpan/Sub-Uplevel/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Sub-Uplevel/trunk/Makefile 2012-02-21 12:46:39 UTC (rev 17106) +++ csw/mgar/pkg/cpan/Sub-Uplevel/trunk/Makefile 2012-02-21 13:12:12 UTC (rev 17107) @@ -1,23 +1,23 @@ NAME = Sub-Uplevel -VERSION = 0.2002 +VERSION = 0.22 CATEGORIES = cpan GARTYPE = v2 AUTHOR = DAGOLDEN DESCRIPTION = Apparently run a function in a higher stack frame define BLURB - Like Tcl's uplevel() function, but not quite so dangerous. The idea is just - to fool caller(). All the really naughty bits of Tcl's uplevel() are - avoided. THIS IS NOT THE SORT OF THING YOU WANT TO DO EVERYDAY endef +CATALOG_RELEASE = unstable + LICENSE = LICENSE -PACKAGES = CSWpmsubuplevel -CATALOGNAME = pm_subuplevel +PACKAGES += CSWpm-sub-uplevel +CATALOGNAME_CSWpm-sub-uplevel = pm_sub_uplevel +SPKG_DESC_CSWpm-sub-uplevel = Apparently run a function in a higher stack frame +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-sub-uplevel = 1 +OBSOLETED_BY_CSWpm-sub-uplevel += CSWpmsubuplevel +CATALOGNAME_CSWpmsubuplevel = pm_subuplevel_stub -ARCHALL = 1 - -SPKG_VERSION = 0.20.02 - include gar/category.mk Modified: csw/mgar/pkg/cpan/Sub-Uplevel/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Sub-Uplevel/trunk/checksums 2012-02-21 12:46:39 UTC (rev 17106) +++ csw/mgar/pkg/cpan/Sub-Uplevel/trunk/checksums 2012-02-21 13:12:12 UTC (rev 17107) @@ -1 +1 @@ -509aedd3b680aea2c7a2fc67b9d5b007 download/Sub-Uplevel-0.2002.tar.gz +c166738a97c0424a0075ebe205d285db Sub-Uplevel-0.22.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 Feb 21 14:26:23 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 21 Feb 2012 13:26:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17108] csw/mgar/pkg/cpan/Test-Exception/trunk Message-ID: Revision: 17108 http://gar.svn.sourceforge.net/gar/?rev=17108&view=rev Author: dmichelsen Date: 2012-02-21 13:26:22 +0000 (Tue, 21 Feb 2012) Log Message: ----------- cpan/Test-Exception/trunk: Update to 0.31 Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile csw/mgar/pkg/cpan/Test-Exception/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Test-Exception/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE Modified: csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile 2012-02-21 13:12:12 UTC (rev 17107) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile 2012-02-21 13:26:22 UTC (rev 17108) @@ -1,21 +1,23 @@ NAME = Test-Exception -VERSION = 0.29 +VERSION = 0.31 CATEGORIES = cpan GARTYPE = v2 AUTHOR = ADIE DESCRIPTION = Test exception based code define BLURB - This module provides a few convenience methods for testing exception - based code. It is built with Test::Builder and plays happily with - Test::More and friends. endef -PACKAGES = CSWpmtstexception -CATALOGNAME = pm_tstexception +DISTFILES += COPYING -ARCHALL = 1 +CATALOG_RELEASE = unstable -LICENSE = $(FILEDIR)/LICENSE +PACKAGES += CSWpm-test-exception +CATALOGNAME_CSWpm-test-exception = pm_test_exception +SPKG_DESC_CSWpm-test-exception = Test exception based code +ARCHALL_CSWpm-test-exception = 1 +RUNTIME_DEP_PKGS_CSWpm-test-exception += CSWpm-sub-uplevel +OBSOLETED_BY_CSWpm-test-exception += CSWpmtstexcept +CATALOGNAME_CSWpmtstexcept = pm_tstexcept_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/Test-Exception/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/checksums 2012-02-21 13:12:12 UTC (rev 17107) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/checksums 2012-02-21 13:26:22 UTC (rev 17108) @@ -1 +1 @@ -9aea475db531d4fd4ce40cf25a0acd14 Test-Exception-0.29.tar.gz +adb57ca7614d15e5b307bf5e024b35a8 Test-Exception-0.31.tar.gz Copied: csw/mgar/pkg/cpan/Test-Exception/trunk/files/COPYING (from rev 16968, csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE) =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/files/COPYING 2012-02-21 13:26:22 UTC (rev 17108) @@ -0,0 +1,5 @@ +LICENCE + Copyright 2002-2007 Adrian Howard, All Rights Reserved. + + This program is free software; you can redistribute it and/or modify it + under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE 2012-02-21 13:12:12 UTC (rev 17107) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE 2012-02-21 13:26:22 UTC (rev 17108) @@ -1,5 +0,0 @@ -LICENCE - Copyright 2002-2007 Adrian Howard, 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 dmichelsen at users.sourceforge.net Tue Feb 21 14:26:39 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 21 Feb 2012 13:26:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17109] csw/mgar/pkg/lang-python Message-ID: Revision: 17109 http://gar.svn.sourceforge.net/gar/?rev=17109&view=rev Author: dmichelsen Date: 2012-02-21 13:26:38 +0000 (Tue, 21 Feb 2012) Log Message: ----------- lang-python/Paste: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/Paste/ csw/mgar/pkg/lang-python/Paste/Makefile csw/mgar/pkg/lang-python/Paste/branches/ csw/mgar/pkg/lang-python/Paste/tags/ csw/mgar/pkg/lang-python/Paste/trunk/Makefile csw/mgar/pkg/lang-python/Paste/trunk/checksums csw/mgar/pkg/lang-python/Paste/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/lang-python/Paste/Makefile csw/mgar/pkg/lang-python/Paste/branches/ csw/mgar/pkg/lang-python/Paste/tags/ csw/mgar/pkg/lang-python/Paste/trunk/Makefile csw/mgar/pkg/lang-python/Paste/trunk/checksums csw/mgar/pkg/lang-python/Paste/trunk/files/ Deleted: csw/mgar/pkg/lang-python/Paste/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-markdown/Makefile 2012-02-13 03:35:11 UTC (rev 17031) +++ csw/mgar/pkg/lang-python/Paste/Makefile 2012-02-21 13:26:38 UTC (rev 17109) @@ -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) Copied: csw/mgar/pkg/lang-python/Paste/Makefile (from rev 16997, csw/mgar/pkg/lang-python/python-markdown/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/Paste/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/Paste/Makefile 2012-02-21 13:26:38 UTC (rev 17109) @@ -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) Deleted: csw/mgar/pkg/lang-python/Paste/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile 2012-02-13 03:35:11 UTC (rev 17031) +++ csw/mgar/pkg/lang-python/Paste/trunk/Makefile 2012-02-21 13:26:38 UTC (rev 17109) @@ -1,25 +0,0 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -NAME = Markdown -VERSION = 2.1.1 -CATEGORIES = python -GARTYPE = v2 - -DESCRIPTION = Python implementation of Markdown -define BLURB -endef - -MASTER_SITES = $(PYPI_MIRROR) -DISTFILES = $(DISTNAME).tar.gz - -VENDOR_URL = http://www.freewisdom.org/projects/python-markdown/ - -PACKAGES = CSWpy-markdown -ARCHALL_CSWpy-markdown = 1 - -# There is no testsuite -TEST_SCRIPTS = - -include gar/category.mk Copied: csw/mgar/pkg/lang-python/Paste/trunk/Makefile (from rev 17000, csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/Paste/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/Paste/trunk/Makefile 2012-02-21 13:26:38 UTC (rev 17109) @@ -0,0 +1,25 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = Paste +VERSION = 1.7.5.1 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = Tools for using a Web Server Gateway Interface stack +define BLURB +endef + +MASTER_SITES = $(PYPI_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://pythonpaste.org/ + +PACKAGES = CSWpy-paste +ARCHALL_CSWpy-paste = 1 + +# Some tests fail which are probably harmless +SKIPTEST ?= 1 + +include gar/category.mk Deleted: csw/mgar/pkg/lang-python/Paste/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-markdown/trunk/checksums 2012-02-13 03:35:11 UTC (rev 17031) +++ csw/mgar/pkg/lang-python/Paste/trunk/checksums 2012-02-21 13:26:38 UTC (rev 17109) @@ -1 +0,0 @@ -3f82d30c488e4b88b8f86eb1c9ad0da7 Markdown-2.1.1.tar.gz Copied: csw/mgar/pkg/lang-python/Paste/trunk/checksums (from rev 16997, csw/mgar/pkg/lang-python/python-markdown/trunk/checksums) =================================================================== --- csw/mgar/pkg/lang-python/Paste/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/Paste/trunk/checksums 2012-02-21 13:26:38 UTC (rev 17109) @@ -0,0 +1 @@ +7ea5fabed7dca48eb46dc613c4b6c4ed Paste-1.7.5.1.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 Feb 21 14:35:28 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 21 Feb 2012 13:35:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17110] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 17110 http://gar.svn.sourceforge.net/gar/?rev=17110&view=rev Author: bonivart Date: 2012-02-21 13:35:28 +0000 (Tue, 21 Feb 2012) Log Message: ----------- pkgutil/trunk: 2.6.4 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 2012-02-21 13:26:38 UTC (rev 17109) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2012-02-21 13:35:28 UTC (rev 17110) @@ -1,5 +1,5 @@ NAME = pkgutil -VERSION = 2.6.3 +VERSION = 2.6.4 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2012-02-21 13:26:38 UTC (rev 17109) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2012-02-21 13:35:28 UTC (rev 17110) @@ -1 +1 @@ -7908d0f3fe1690e2709e00bc2869613a pkgutil-2.6.3.zip +8e6fb8a8fddc47d4a945ca46c462cfdc pkgutil-2.6.4.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 Tue Feb 21 14:36:03 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 21 Feb 2012 13:36:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[17111] csw/mgar/pkg/cpan Message-ID: Revision: 17111 http://gar.svn.sourceforge.net/gar/?rev=17111&view=rev Author: dmichelsen Date: 2012-02-21 13:36:03 +0000 (Tue, 21 Feb 2012) Log Message: ----------- cpan/Capture-Tiny/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Capture-Tiny/ csw/mgar/pkg/cpan/Capture-Tiny/branches/ csw/mgar/pkg/cpan/Capture-Tiny/tags/ csw/mgar/pkg/cpan/Capture-Tiny/trunk/ csw/mgar/pkg/cpan/Capture-Tiny/trunk/Makefile csw/mgar/pkg/cpan/Capture-Tiny/trunk/checksums csw/mgar/pkg/cpan/Capture-Tiny/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Capture-Tiny/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Capture-Tiny/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Capture-Tiny/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Capture-Tiny/trunk/Makefile 2012-02-21 13:36:03 UTC (rev 17111) @@ -0,0 +1,22 @@ +NAME = Capture-Tiny +VERSION = 0.16 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DAGOLDEN + +DESCRIPTION = Capture STDOUT and STDERR from Perl, XS or external programs +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +PACKAGES += CSWpm-capture-tiny +CATALOGNAME_CSWpm-capture-tiny = pm_capture_tiny +SPKG_DESC_CSWpm-capture-tiny = Capture STDOUT and STDERR from Perl, XS or external programs +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-capture-tiny = 1 +OBSOLETED_BY_CSWpm-capture-tiny += + +include gar/category.mk Added: csw/mgar/pkg/cpan/Capture-Tiny/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Capture-Tiny/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Capture-Tiny/trunk/checksums 2012-02-21 13:36:03 UTC (rev 17111) @@ -0,0 +1 @@ +3404b614cfe5bbbedb805cc3d4dace4c Capture-Tiny-0.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Feb 21 14:38:46 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 21 Feb 2012 13:38:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17112] csw/mgar/pkg Message-ID: Revision: 17112 http://gar.svn.sourceforge.net/gar/?rev=17112&view=rev Author: cgrzemba Date: 2012-02-21 13:38:45 +0000 (Tue, 21 Feb 2012) Log Message: ----------- splix/trunk: Inital commit Added Paths: ----------- csw/mgar/pkg/splix/ csw/mgar/pkg/splix/branches/ csw/mgar/pkg/splix/tags/ csw/mgar/pkg/splix/trunk/ csw/mgar/pkg/splix/trunk/Makefile csw/mgar/pkg/splix/trunk/files/ csw/mgar/pkg/splix/trunk/files/0001-make-patch.patch csw/mgar/pkg/splix/trunk/files/0002-use-gsed-in-compile.sh.patch csw/mgar/pkg/splix/trunk/files/0003-use-ginstall-in-ppd-makefile.patch csw/mgar/pkg/splix/trunk/files/postinstall Property changes on: csw/mgar/pkg/splix/trunk ___________________________________________________________________ Added: svn:ignore + checksums work Added: csw/mgar/pkg/splix/trunk/Makefile =================================================================== --- csw/mgar/pkg/splix/trunk/Makefile (rev 0) +++ csw/mgar/pkg/splix/trunk/Makefile 2012-02-21 13:38:45 UTC (rev 17112) @@ -0,0 +1,41 @@ +# $Id: Makefile 16944 2012-01-31 09:09:20Z cgrzemba $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = splix +SVN_REV = 300 +VERSION = rev$(SVN_REV) +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = CUPS printer drivers for SPL +define BLURB +SpliX is a set of CUPS printer drivers for SPL (Samsung Printer Language) printers. If you have a such printer, you need to download and use SpliX. Moreover you will find documentation about this proprietary language. +endef + +MASTER_SITES =$(SF_MIRRORS) +DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES += postinstall +# MASTER_SITES = svn-http://$(NAME).svn.sourceforge.net/svnroot/$(NAME) +# DISTFILES = $(VERSION) +# NOCHECKSUM = $(VERSION) +# SVNHTTP_CO_ARGS = --no-auth-cache --username guest --password guest + +VENDOR_URL = http://splix.ap2c.org + +PACKAGING_PLATFORMS = solaris10-i386 +GARCOMPILER = GNU +PATCHFILES += 0001-make-patch.patch +PATCHFILES += 0002-use-gsed-in-compile.sh.patch +PATCHFILES += 0003-use-ginstall-in-ppd-makefile.patch + +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = + +RUNTIME_DEP_PKGS_CSWsplix += CSWlibcupsimage2 +RUNTIME_DEP_PKGS_CSWsplix += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWsplix += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsplix += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWsplix += CSWlibjbig85-2 + +include gar/category.mk + Added: csw/mgar/pkg/splix/trunk/files/0001-make-patch.patch =================================================================== --- csw/mgar/pkg/splix/trunk/files/0001-make-patch.patch (rev 0) +++ csw/mgar/pkg/splix/trunk/files/0001-make-patch.patch 2012-02-21 13:38:45 UTC (rev 17112) @@ -0,0 +1,119 @@ +From 4eb30bd5822a48708d85cbbc27939d81842a8f22 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Mon, 20 Feb 2012 14:09:37 +0100 +Subject: [PATCH] make patch + +--- + Makefile | 6 +++--- + module.mk | 23 +++++++++++++---------- + rules.mk | 10 +++++----- + 3 files changed, 21 insertions(+), 18 deletions(-) + +diff --git a/Makefile b/Makefile +index c52f29c..17aec4e 100644 +--- a/Makefile ++++ b/Makefile +@@ -147,7 +147,7 @@ endif # MODE == debug + # | VERBOSE MODE AND INITIALIZATION | + # +--------------------------------------------------------------------------+ + +-V := ++V := 1 + ifeq ($(V),1) + Q := + else +@@ -377,13 +377,13 @@ distclean: clean + $(DEFFILE): Makefile $(patsubst %, %/module.mk, $(SUBDIRS)) module.mk + @echo -n " GEN $(DEFFILE)" + @echo "" > $@ +- @make -s -C ./ _depsreload ++ @gmake -C ./ _depsreload + + .PHONY: _depsreload + _depsreload: + @echo -n "." + @echo "DEFLOADED := 1" > $(DEFFILE) + @echo "_SUBDIRS := $(SUBDIRS)" >> $(DEFFILE) +- @if [ "$(SUBDIRS)" != "$(_SUBDIRS)" ]; then make -j 1 -s -C ./ _depsreload; \ ++ @if [ "$(SUBDIRS)" != "$(_SUBDIRS)" ]; then gmake -j 1 -C ./ _depsreload; \ + else echo "DEFDONE := 1" >> $(DEFFILE); echo ""; fi + +diff --git a/module.mk b/module.mk +index 966d927..f30b51f 100644 +--- a/module.mk ++++ b/module.mk +@@ -26,13 +26,16 @@ DISABLE_BLACKOPTIM ?= 0 + + + # Flags +-CXXFLAGS += `cups-config --cflags` -Iinclude -Wall -I/opt/local/include ++CXXFLAGS_cups := $(shell cups-config --cflags) ++LDFLAGS_cups := $(shell cups-config --ldflags) ++LIBS_cups := -lcups # $(shell cups-config --libs) ++CXXFLAGS += $(CXXFLAGS_cups) -Iinclude -Wall -I/opt/csw/include + DEBUG_CXXFLAGS += -DDEBUG -DDUMP_CACHE +-OPTIM_CXXFLAGS += -g +-rastertoqpdl_LDFLAGS := `cups-config --ldflags` -L/opt/local/lib +-rastertoqpdl_LIBS := `cups-config --libs` -lcupsimage +-pstoqpdl_LDFLAGS := `cups-config --ldflags` +-pstoqpdl_LIBS := `cups-config --libs` -lcupsimage ++OPTIM_CXXFLAGS += ++rastertoqpdl_LDFLAGS := $(LDFLAGS_cups) -L/opt/csw/lib ++rastertoqpdl_LIBS := $(LIBS_cups) -lcupsimage ++pstoqpdl_LDFLAGS := $(LDFLAGS_cups) ++pstoqpdl_LIBS := $(LIBS_cups) -lcupsimage + + + # Update compilation flags with defined options +@@ -54,15 +57,15 @@ endif + + + # Get some information +-CUPSFILTER := `cups-config --serverbin`/filter +-CUPSPPD := `cups-config --datadir`/model ++CUPSFILTER := $(shell cups-config --serverbin)/filter ++CUPSPPD := $(shell cups-config --datadir)/model + ifeq ($(ARCHI),Darwin) + PSTORASTER := pstocupsraster + else + PSTORASTER := pstoraster + endif + GSTORASTER := gstoraster +-CUPSPROFILE := `cups-config --datadir`/profiles ++CUPSPROFILE := $(shell cups-config --datadir)/profiles + export CUPSFILTER CUPSPPD + + +diff --git a/rules.mk b/rules.mk +index 7f99787..c7cbebd 100644 +--- a/rules.mk ++++ b/rules.mk +@@ -19,11 +19,11 @@ cmd_install_raster = INSTALL $(rastertoqpdl_TARGET) + cmd_install_ps = INSTALL $(pstoqpdl_TARGET) + cmd_install_cms = INSTALL color profile files + install: $(rastertoqpdl_TARGET) $(pstoqpdl_TARGET) +- $(Q)mkdir -p $(DESTDIR)${CUPSFILTER} ++ $(Q)ginstall -d $(DESTDIR)${CUPSFILTER} + $(call printCmd, $(cmd_install_raster)) +- $(Q)install -m 755 -s $(rastertoqpdl_TARGET) $(DESTDIR)${CUPSFILTER} ++ $(Q)ginstall -m 755 $(rastertoqpdl_TARGET) $(DESTDIR)${CUPSFILTER} + $(call printCmd, $(cmd_install_ps)) +- $(Q)install -m 755 -s $(pstoqpdl_TARGET) $(DESTDIR)${CUPSFILTER} ++ $(Q)ginstall -m 755 $(pstoqpdl_TARGET) $(DESTDIR)${CUPSFILTER} + $(Q)$(MAKE) --no-print-directory -C ppd install Q=$(Q) \ + DESTDIR=$(abspath $(DESTDIR)) DISABLE_JBIG=$(DISABLE_JBIG) + @echo "" +@@ -34,8 +34,8 @@ install: $(rastertoqpdl_TARGET) $(pstoqpdl_TARGET) + installcms: + @if [ "$$CMSDIR" -a -d "$$CMSDIR" ]; then \ + CMSBASE=$(CUPSPROFILE)/$$MANUFACTURER; \ +- mkdir -p $(DESTDIR)$$CMSBASE; \ +- install -m 644 "$(CMSDIR)"/* $(DESTDIR)$$CMSBASE; \ ++ ginstall -d $(DESTDIR)$$CMSBASE; \ ++ ginstall -m 644 "$(CMSDIR)"/* $(DESTDIR)$$CMSBASE; \ + if [ $$? = 0 ]; then \ + echo "Color profile files has been copied."; \ + fi; \ +-- +1.7.9 + Added: csw/mgar/pkg/splix/trunk/files/0002-use-gsed-in-compile.sh.patch =================================================================== --- csw/mgar/pkg/splix/trunk/files/0002-use-gsed-in-compile.sh.patch (rev 0) +++ csw/mgar/pkg/splix/trunk/files/0002-use-gsed-in-compile.sh.patch 2012-02-21 13:38:45 UTC (rev 17112) @@ -0,0 +1,31 @@ +From 73362724d0a0b9b1ed55fa351e5f4078b4de6925 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Tue, 21 Feb 2012 13:38:17 +0100 +Subject: [PATCH] use gsed in compile.sh + +--- + ppd/compile.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ppd/compile.sh b/ppd/compile.sh +index f4947fe..80184e6 100755 +--- a/ppd/compile.sh ++++ b/ppd/compile.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + # + # compile.sh (C) 2007, Aur?lien Croc (AP?C) + # +@@ -16,7 +16,7 @@ + parseFile() { + while read LINE; do + if [ -n "`echo "$LINE" | grep '^[ \t]*#import[ \t]*"[a-zA-Z0-9\.\-]*"'`" ]; then +- FILE=`echo "$LINE" | sed -re 's/[ \t]*#import[ \t]"([a-zA-Z0-9\.\-]*)"/\1/'` ++ FILE=`echo "$LINE" | gsed -re 's/[ \t]*#import[ \t]"([a-zA-Z0-9\.\-]*)"/\1/'` + parseFile $FILE $2 + else + echo "$LINE" >> $2 +-- +1.7.9 + Added: csw/mgar/pkg/splix/trunk/files/0003-use-ginstall-in-ppd-makefile.patch =================================================================== --- csw/mgar/pkg/splix/trunk/files/0003-use-ginstall-in-ppd-makefile.patch (rev 0) +++ csw/mgar/pkg/splix/trunk/files/0003-use-ginstall-in-ppd-makefile.patch 2012-02-21 13:38:45 UTC (rev 17112) @@ -0,0 +1,75 @@ +From f4b1db15e8df233603eaff8f8a951719748dcf6a Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Tue, 21 Feb 2012 14:06:18 +0100 +Subject: [PATCH] use ginstall in ppd makefile + +--- + ppd/Makefile | 30 +++++++++++++++--------------- + 1 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/ppd/Makefile b/ppd/Makefile +index 618388b..48bd80b 100644 +--- a/ppd/Makefile ++++ b/ppd/Makefile +@@ -97,43 +97,43 @@ cmd_install_toshiba = INSTALL Toshiba PPD files + .PHONY: install + install: + $(call printCmd, $(cmd_install_samsung)) +- $(Q)install -d -m 755 ${DESTDIR}${CUPSPPD}/samsung ++ $(Q)ginstall -d -m 755 ${DESTDIR}${CUPSPPD}/samsung + $(Q)for filename in ${SAMSUNG}; do \ +- install -m 644 $$filename.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/samsung;\ ++ ginstall -m 644 $$filename.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/samsung;\ + for lang in ${LANGUAGES}; do \ +- install -m 644 $$filename$$lang.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/samsung;\ ++ ginstall -m 644 $$filename$$lang.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/samsung;\ + done; \ + done; + $(call printCmd, $(cmd_install_xerox)) +- $(Q)install -d -m 755 ${DESTDIR}${CUPSPPD}/xerox ++ $(Q)ginstall -d -m 755 ${DESTDIR}${CUPSPPD}/xerox + $(Q)for filename in ${XEROX}; do \ +- install -m 644 $$filename.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/xerox;\ ++ ginstall -m 644 $$filename.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/xerox;\ + for lang in ${LANGUAGES}; do \ +- install -m 644 $$filename$$lang.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/xerox;\ ++ ginstall -m 644 $$filename$$lang.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/xerox;\ + done; \ + done; + $(call printCmd, $(cmd_install_dell)) +- $(Q)install -d -m 755 ${DESTDIR}${CUPSPPD}/dell ++ $(Q)ginstall -d -m 755 ${DESTDIR}${CUPSPPD}/dell + $(Q)for filename in ${DELL}; do \ +- install -m 644 $$filename.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/dell;\ ++ ginstall -m 644 $$filename.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/dell;\ + for lang in ${LANGUAGES}; do \ +- install -m 644 $$filename$$lang.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/dell;\ ++ ginstall -m 644 $$filename$$lang.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/dell;\ + done; \ + done; + $(call printCmd, $(cmd_install_lexmark)) +- $(Q)install -d -m 755 ${DESTDIR}${CUPSPPD}/lexmark ++ $(Q)ginstall -d -m 755 ${DESTDIR}${CUPSPPD}/lexmark + $(Q)for filename in ${LEXMARK}; do \ +- install -m 644 $$filename.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/lexmark;\ ++ ginstall -m 644 $$filename.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/lexmark;\ + for lang in ${LANGUAGES}; do \ +- install -m 644 $$filename$$lang.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/lexmark;\ ++ ginstall -m 644 $$filename$$lang.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/lexmark;\ + done; \ + done; + $(call printCmd, $(cmd_install_toshiba)) +- $(Q)install -d -m 755 ${DESTDIR}${CUPSPPD}/toshiba ++ $(Q)ginstall -d -m 755 ${DESTDIR}${CUPSPPD}/toshiba + $(Q)for filename in ${TOSHIBA}; do \ +- install -m 644 $$filename.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/toshiba;\ ++ ginstall -m 644 $$filename.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/toshiba;\ + for lang in ${LANGUAGES}; do \ +- install -m 644 $$filename$$lang.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/toshiba;\ ++ ginstall -m 644 $$filename$$lang.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/toshiba;\ + done; \ + done; + +-- +1.7.9 + Added: csw/mgar/pkg/splix/trunk/files/postinstall =================================================================== --- csw/mgar/pkg/splix/trunk/files/postinstall (rev 0) +++ csw/mgar/pkg/splix/trunk/files/postinstall 2012-02-21 13:38:45 UTC (rev 17112) @@ -0,0 +1,31 @@ +#/bin/ksh + +MANUFACTURER=samsung +CMS_ARCH=${MANUFACTURER}_cms.tar.bz2 +SITE=splix.ap2c.org +DESTDIR=$(cups-config --datadir)/profiles/$MANAUFACTURER + +echo "try to download CMS Profile from $SITE for $MANUFACTURER, now" +echo "for other Manufacturers see hints on Web" + +mkdir /tmp/splixcms$$ +cd /tmp/splixcms$$ +# download +wget http://$SITE/${CMS_ARCH} +if [ $? -ne 0 ]; then + echo "ERROR: Download failed, clould not install Color Management Profiles" + echo "You must install CMS files manually!" + exit; +fi +# extract +bzcat ${CMS_ARCH} | tar xf - +cd cms; pwd +# create destination +ginstall -d -m 755 $DESTDIR +# copy cms files +for f in $(ls) ; do + ginstall -m 644 $f $DESTDIR +done +cd +# cleanup +rm -rf /tmp/splixcms$$ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Feb 21 14:55:59 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 21 Feb 2012 13:55:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17113] csw/mgar/pkg/splix/trunk/Makefile Message-ID: Revision: 17113 http://gar.svn.sourceforge.net/gar/?rev=17113&view=rev Author: cgrzemba Date: 2012-02-21 13:55:59 +0000 (Tue, 21 Feb 2012) Log Message: ----------- splix/trunk: add platform Modified Paths: -------------- csw/mgar/pkg/splix/trunk/Makefile Modified: csw/mgar/pkg/splix/trunk/Makefile =================================================================== --- csw/mgar/pkg/splix/trunk/Makefile 2012-02-21 13:38:45 UTC (rev 17112) +++ csw/mgar/pkg/splix/trunk/Makefile 2012-02-21 13:55:59 UTC (rev 17113) @@ -22,7 +22,7 @@ VENDOR_URL = http://splix.ap2c.org -PACKAGING_PLATFORMS = solaris10-i386 +PACKAGING_PLATFORMS = solaris10-i386 solaris-sparc GARCOMPILER = GNU PATCHFILES += 0001-make-patch.patch PATCHFILES += 0002-use-gsed-in-compile.sh.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 Tue Feb 21 14:59:07 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 21 Feb 2012 13:59:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17114] csw/mgar/pkg/lang-python/webpy/trunk Message-ID: Revision: 17114 http://gar.svn.sourceforge.net/gar/?rev=17114&view=rev Author: wahwah Date: 2012-02-21 13:59:07 +0000 (Tue, 21 Feb 2012) Log Message: ----------- lang-python/webpy/trunk: Version bump to 0.36 Modified Paths: -------------- csw/mgar/pkg/lang-python/webpy/trunk/Makefile csw/mgar/pkg/lang-python/webpy/trunk/checksums Modified: csw/mgar/pkg/lang-python/webpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/webpy/trunk/Makefile 2012-02-21 13:55:59 UTC (rev 17113) +++ csw/mgar/pkg/lang-python/webpy/trunk/Makefile 2012-02-21 13:59:07 UTC (rev 17114) @@ -3,7 +3,7 @@ # $Id$ NAME = web -VERSION = 0.34 +VERSION = 0.36 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Simple web framework for Python Modified: csw/mgar/pkg/lang-python/webpy/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/webpy/trunk/checksums 2012-02-21 13:55:59 UTC (rev 17113) +++ csw/mgar/pkg/lang-python/webpy/trunk/checksums 2012-02-21 13:59:07 UTC (rev 17114) @@ -1 +1 @@ -bc4f8b23c25358f75e2712c8cecca516 web.py-0.34.tar.gz +3f9ee778c5c34357a0233c1f0e024d00 web.py-0.36.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 Feb 21 15:00:44 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 21 Feb 2012 14:00:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17115] csw/mgar/pkg/mule/trunk Message-ID: Revision: 17115 http://gar.svn.sourceforge.net/gar/?rev=17115&view=rev Author: idogan23 Date: 2012-02-21 14:00:44 +0000 (Tue, 21 Feb 2012) Log Message: ----------- mule: conf dir can be owned by root Modified Paths: -------------- csw/mgar/pkg/mule/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mule/trunk/files/0001-runasusermule.patch Modified: csw/mgar/pkg/mule/trunk/Makefile =================================================================== --- csw/mgar/pkg/mule/trunk/Makefile 2012-02-21 13:59:07 UTC (rev 17114) +++ csw/mgar/pkg/mule/trunk/Makefile 2012-02-21 14:00:44 UTC (rev 17115) @@ -15,6 +15,7 @@ DISTFILES += cswmule.xml PATCHFILES += 0001-javapath.patch +PATCHFILES += 0001-runasusermule.patch PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 @@ -40,7 +41,7 @@ USERGROUP = /etc/opt/csw/pkg/CSWmule/cswusergroup PROTOTYPE_MODIFIERS = mule_ugfiles -MULE_UGFILES = /opt/csw/mule/conf /var/opt/csw/mule/logs +MULE_UGFILES = /var/opt/csw/mule/logs PROTOTYPE_FILES_mule_ugfiles = $(MULE_UGFILES) PROTOTYPE_USER_mule_ugfiles = mule PROTOTYPE_GROUP_mule_ugfiles = mule @@ -51,7 +52,7 @@ @cp -rp $(WORKDIR)/$(DISTNAME)/* $(DESTDIR)/opt/csw/$(NAME) @ginstall -d $(DESTDIR)/var/opt/csw/mule @mv $(DESTDIR)/opt/csw/mule/logs $(DESTDIR)/var/opt/csw/mule - @ln -s $(DESTDIR)/var/opt/csw/mule/logs $(DESTDIR)/opt/csw/mule/logs + @ln -s /var/opt/csw/mule/logs $(DESTDIR)/opt/csw/mule/logs @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/cswmule $(DESTDIR)/etc/opt/csw/init.d/cswmule @ginstall -d $(DESTDIR)/var/opt/csw/svc/manifest/application Added: csw/mgar/pkg/mule/trunk/files/0001-runasusermule.patch =================================================================== --- csw/mgar/pkg/mule/trunk/files/0001-runasusermule.patch (rev 0) +++ csw/mgar/pkg/mule/trunk/files/0001-runasusermule.patch 2012-02-21 14:00:44 UTC (rev 17115) @@ -0,0 +1,25 @@ +From 22d7685bba0acec845bc7f11236ccc48e8fff3c8 Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Tue, 21 Feb 2012 14:04:02 +0100 +Subject: [PATCH] runasusermule + +--- + bin/mule | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/bin/mule b/bin/mule +index 467b4c6..b1f4161 100755 +--- a/bin/mule ++++ b/bin/mule +@@ -140,7 +140,7 @@ PIDDIR="." + # NOTE - This will set the user which is used to run the Wrapper as well as + # the JVM and is not useful in situations where a privileged resource or + # port needs to be allocated prior to the user being changed. +-#RUN_AS_USER= ++RUN_AS_USER=mule + + # The following two lines are used by the chkconfig command. Change as is + # appropriate for your application. They should remain commented. +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Feb 21 15:09:34 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 21 Feb 2012 14:09:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17116] csw/mgar/pkg/splix/trunk/Makefile Message-ID: Revision: 17116 http://gar.svn.sourceforge.net/gar/?rev=17116&view=rev Author: cgrzemba Date: 2012-02-21 14:09:33 +0000 (Tue, 21 Feb 2012) Log Message: ----------- splix/trunk: fix platform Modified Paths: -------------- csw/mgar/pkg/splix/trunk/Makefile Modified: csw/mgar/pkg/splix/trunk/Makefile =================================================================== --- csw/mgar/pkg/splix/trunk/Makefile 2012-02-21 14:00:44 UTC (rev 17115) +++ csw/mgar/pkg/splix/trunk/Makefile 2012-02-21 14:09:33 UTC (rev 17116) @@ -22,7 +22,7 @@ VENDOR_URL = http://splix.ap2c.org -PACKAGING_PLATFORMS = solaris10-i386 solaris-sparc +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc GARCOMPILER = GNU PATCHFILES += 0001-make-patch.patch PATCHFILES += 0002-use-gsed-in-compile.sh.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Feb 21 15:29:53 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 21 Feb 2012 14:29:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17117] csw/mgar/pkg/splix/trunk/Makefile Message-ID: Revision: 17117 http://gar.svn.sourceforge.net/gar/?rev=17117&view=rev Author: cgrzemba Date: 2012-02-21 14:29:52 +0000 (Tue, 21 Feb 2012) Log Message: ----------- splix/trunk: add runtime dependency Modified Paths: -------------- csw/mgar/pkg/splix/trunk/Makefile Modified: csw/mgar/pkg/splix/trunk/Makefile =================================================================== --- csw/mgar/pkg/splix/trunk/Makefile 2012-02-21 14:09:33 UTC (rev 17116) +++ csw/mgar/pkg/splix/trunk/Makefile 2012-02-21 14:29:52 UTC (rev 17117) @@ -36,6 +36,7 @@ RUNTIME_DEP_PKGS_CSWsplix += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsplix += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWsplix += CSWlibjbig85-2 +RUNTIME_DEP_PKGS_CSWsplix += CSWcups 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 Feb 21 15:30:30 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 21 Feb 2012 14:30:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17118] csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile Message-ID: Revision: 17118 http://gar.svn.sourceforge.net/gar/?rev=17118&view=rev Author: dmichelsen Date: 2012-02-21 14:30:29 +0000 (Tue, 21 Feb 2012) Log Message: ----------- cpan/Test-Exception/trunk: Update package dep Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile 2012-02-21 14:29:52 UTC (rev 17117) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile 2012-02-21 14:30:29 UTC (rev 17118) @@ -17,7 +17,7 @@ SPKG_DESC_CSWpm-test-exception = Test exception based code ARCHALL_CSWpm-test-exception = 1 RUNTIME_DEP_PKGS_CSWpm-test-exception += CSWpm-sub-uplevel -OBSOLETED_BY_CSWpm-test-exception += CSWpmtstexcept -CATALOGNAME_CSWpmtstexcept = pm_tstexcept_stub +OBSOLETED_BY_CSWpm-test-exception += CSWpmtstexception +CATALOGNAME_CSWpmtstexception = pm_tstexception_stub include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Feb 21 15:36:21 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 21 Feb 2012 14:36:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17119] csw/mgar/pkg/splix/trunk/Makefile Message-ID: Revision: 17119 http://gar.svn.sourceforge.net/gar/?rev=17119&view=rev Author: cgrzemba Date: 2012-02-21 14:36:20 +0000 (Tue, 21 Feb 2012) Log Message: ----------- splix/trunk: add checkpkg override Modified Paths: -------------- csw/mgar/pkg/splix/trunk/Makefile Modified: csw/mgar/pkg/splix/trunk/Makefile =================================================================== --- csw/mgar/pkg/splix/trunk/Makefile 2012-02-21 14:30:29 UTC (rev 17118) +++ csw/mgar/pkg/splix/trunk/Makefile 2012-02-21 14:36:20 UTC (rev 17119) @@ -37,6 +37,7 @@ RUNTIME_DEP_PKGS_CSWsplix += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWsplix += CSWlibjbig85-2 RUNTIME_DEP_PKGS_CSWsplix += CSWcups +CHECKPKG_OVERRIDES_CSWsplix += surplus-dependency|CSWcups include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Feb 21 16:06:40 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 21 Feb 2012 15:06:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[17120] csw/mgar/pkg/splix/trunk/Makefile Message-ID: Revision: 17120 http://gar.svn.sourceforge.net/gar/?rev=17120&view=rev Author: cgrzemba Date: 2012-02-21 15:06:40 +0000 (Tue, 21 Feb 2012) Log Message: ----------- splix/trunk: fix postinstall Modified Paths: -------------- csw/mgar/pkg/splix/trunk/Makefile Modified: csw/mgar/pkg/splix/trunk/Makefile =================================================================== --- csw/mgar/pkg/splix/trunk/Makefile 2012-02-21 14:36:20 UTC (rev 17119) +++ csw/mgar/pkg/splix/trunk/Makefile 2012-02-21 15:06:40 UTC (rev 17120) @@ -14,7 +14,7 @@ MASTER_SITES =$(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += postinstall +DISTFILES += CSWsplix.postinstall # MASTER_SITES = svn-http://$(NAME).svn.sourceforge.net/svnroot/$(NAME) # DISTFILES = $(VERSION) # NOCHECKSUM = $(VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Feb 21 16:15:41 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 21 Feb 2012 15:15:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17121] csw/mgar/pkg/splix/trunk/files Message-ID: Revision: 17121 http://gar.svn.sourceforge.net/gar/?rev=17121&view=rev Author: cgrzemba Date: 2012-02-21 15:15:41 +0000 (Tue, 21 Feb 2012) Log Message: ----------- splix/trunk: fix filename Added Paths: ----------- csw/mgar/pkg/splix/trunk/files/CSWsplix.postinstall Removed Paths: ------------- csw/mgar/pkg/splix/trunk/files/postinstall Added: csw/mgar/pkg/splix/trunk/files/CSWsplix.postinstall =================================================================== --- csw/mgar/pkg/splix/trunk/files/CSWsplix.postinstall (rev 0) +++ csw/mgar/pkg/splix/trunk/files/CSWsplix.postinstall 2012-02-21 15:15:41 UTC (rev 17121) @@ -0,0 +1,31 @@ +#/bin/ksh + +MANUFACTURER=samsung +CMS_ARCH=${MANUFACTURER}_cms.tar.bz2 +SITE=splix.ap2c.org +DESTDIR=$(cups-config --datadir)/profiles/$MANAUFACTURER + +echo "try to download CMS Profile from $SITE for $MANUFACTURER, now" +echo "for other Manufacturers see hints on Web" + +mkdir /tmp/splixcms$$ +cd /tmp/splixcms$$ +# download +wget http://$SITE/${CMS_ARCH} +if [ $? -ne 0 ]; then + echo "ERROR: Download failed, clould not install Color Management Profiles" + echo "You must install CMS files manually!" + exit; +fi +# extract +bzcat ${CMS_ARCH} | tar xf - +cd cms; pwd +# create destination +ginstall -d -m 755 $DESTDIR +# copy cms files +for f in $(ls) ; do + ginstall -m 644 $f $DESTDIR +done +cd +# cleanup +rm -rf /tmp/splixcms$$ Deleted: csw/mgar/pkg/splix/trunk/files/postinstall =================================================================== --- csw/mgar/pkg/splix/trunk/files/postinstall 2012-02-21 15:06:40 UTC (rev 17120) +++ csw/mgar/pkg/splix/trunk/files/postinstall 2012-02-21 15:15:41 UTC (rev 17121) @@ -1,31 +0,0 @@ -#/bin/ksh - -MANUFACTURER=samsung -CMS_ARCH=${MANUFACTURER}_cms.tar.bz2 -SITE=splix.ap2c.org -DESTDIR=$(cups-config --datadir)/profiles/$MANAUFACTURER - -echo "try to download CMS Profile from $SITE for $MANUFACTURER, now" -echo "for other Manufacturers see hints on Web" - -mkdir /tmp/splixcms$$ -cd /tmp/splixcms$$ -# download -wget http://$SITE/${CMS_ARCH} -if [ $? -ne 0 ]; then - echo "ERROR: Download failed, clould not install Color Management Profiles" - echo "You must install CMS files manually!" - exit; -fi -# extract -bzcat ${CMS_ARCH} | tar xf - -cd cms; pwd -# create destination -ginstall -d -m 755 $DESTDIR -# copy cms files -for f in $(ls) ; do - ginstall -m 644 $f $DESTDIR -done -cd -# cleanup -rm -rf /tmp/splixcms$$ 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 Feb 21 16:51:41 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 21 Feb 2012 15:51:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17122] csw/mgar/pkg/mule/trunk Message-ID: Revision: 17122 http://gar.svn.sourceforge.net/gar/?rev=17122&view=rev Author: idogan23 Date: 2012-02-21 15:51:40 +0000 (Tue, 21 Feb 2012) Log Message: ----------- mule: few packaging fixes Modified Paths: -------------- csw/mgar/pkg/mule/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mule/trunk/files/0001-piddir.patch csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall Modified: csw/mgar/pkg/mule/trunk/Makefile =================================================================== --- csw/mgar/pkg/mule/trunk/Makefile 2012-02-21 15:15:41 UTC (rev 17121) +++ csw/mgar/pkg/mule/trunk/Makefile 2012-02-21 15:51:40 UTC (rev 17122) @@ -13,9 +13,12 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += cswusergroup DISTFILES += cswmule.xml +DISTFILES += cswmule +DISTFILES += CSWmule.postinstall PATCHFILES += 0001-javapath.patch PATCHFILES += 0001-runasusermule.patch +PATCHFILES += 0001-piddir.patch PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 @@ -37,11 +40,11 @@ SPKG_CLASSES = none cswinitsmf cswsampleconf cswusergroup ugfiles INITSMF = /etc/opt/csw/init.d/cswmule -PRESERVECONF = /opt/csw/mule/conf/.* +PRESERVECONF = /etc/opt/csw/mule/.* USERGROUP = /etc/opt/csw/pkg/CSWmule/cswusergroup PROTOTYPE_MODIFIERS = mule_ugfiles -MULE_UGFILES = /var/opt/csw/mule/logs +MULE_UGFILES = /var/opt/csw/mule/logs /var/opt/csw/mule/pid PROTOTYPE_FILES_mule_ugfiles = $(MULE_UGFILES) PROTOTYPE_USER_mule_ugfiles = mule PROTOTYPE_GROUP_mule_ugfiles = mule @@ -53,12 +56,16 @@ @ginstall -d $(DESTDIR)/var/opt/csw/mule @mv $(DESTDIR)/opt/csw/mule/logs $(DESTDIR)/var/opt/csw/mule @ln -s /var/opt/csw/mule/logs $(DESTDIR)/opt/csw/mule/logs + @ginstall -d $(DESTDIR)/etc/opt/csw + @mv $(DESTDIR)/opt/csw/mule/conf $(DESTDIR)/etc/opt/csw/mule + @ln -s /etc/opt/csw/mule $(DESTDIR)/opt/csw/mule/conf @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/cswmule $(DESTDIR)/etc/opt/csw/init.d/cswmule @ginstall -d $(DESTDIR)/var/opt/csw/svc/manifest/application @ginstall -m 644 $(FILEDIR)/cswmule.xml $(DESTDIR)/var/opt/csw/svc/manifest/application/cswmule.xml @ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWmule @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWmule/cswusergroup + @ginstall -d $(DESTDIR)/var/opt/csw/mule/pid @$(MAKECOOKIE) include gar/category.mk Added: csw/mgar/pkg/mule/trunk/files/0001-piddir.patch =================================================================== --- csw/mgar/pkg/mule/trunk/files/0001-piddir.patch (rev 0) +++ csw/mgar/pkg/mule/trunk/files/0001-piddir.patch 2012-02-21 15:51:40 UTC (rev 17122) @@ -0,0 +1,25 @@ +From 0fce78cdc5e186ec46881d054fc66d6232c21006 Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Tue, 21 Feb 2012 15:16:11 +0100 +Subject: [PATCH] piddir + +--- + bin/mule | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/bin/mule b/bin/mule +index 467b4c6..f9a9c7f 100755 +--- a/bin/mule ++++ b/bin/mule +@@ -125,7 +125,7 @@ JPDA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 + PRIORITY= + + # Location of the pid file. +-PIDDIR="." ++PIDDIR="/var/opt/csw/mule/pid" + + # If uncommented, causes the Wrapper to be shutdown using an anchor file. + # When launched with the 'start' command, it will also ignore all INT and +-- +1.7.9 + Added: csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall =================================================================== --- csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall (rev 0) +++ csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall 2012-02-21 15:51:40 UTC (rev 17122) @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ ! /etc/opt/csw/mule/wrapper-additional.conf ] +then + touch /etc/opt/csw/mule/wrapper-additional.conf + chown mule:mule /etc/opt/csw/mule/wrapper-additional.conf +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 Tue Feb 21 17:12:02 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 21 Feb 2012 16:12:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[17123] csw/mgar/pkg/openslp/trunk/Makefile Message-ID: Revision: 17123 http://gar.svn.sourceforge.net/gar/?rev=17123&view=rev Author: dmichelsen Date: 2012-02-21 16:12:02 +0000 (Tue, 21 Feb 2012) Log Message: ----------- openslp/trunk: Add 64 bit, move from *-devel to *-dev, add binary package Modified Paths: -------------- csw/mgar/pkg/openslp/trunk/Makefile Modified: csw/mgar/pkg/openslp/trunk/Makefile =================================================================== --- csw/mgar/pkg/openslp/trunk/Makefile 2012-02-21 15:51:40 UTC (rev 17122) +++ csw/mgar/pkg/openslp/trunk/Makefile 2012-02-21 16:12:02 UTC (rev 17123) @@ -4,29 +4,49 @@ NAME = openslp VERSION = 1.2.1 -# http://prdownloads.sourceforge.net/openslp/openslp-1.2.1.tar.gz?download CATEGORIES = lib GARTYPE = v2 -DESCRIPTION = Service Location Protocol + +DESCRIPTION = Service location protocol define BLURB endef -SPKG_SOURCEURL = http://www.openslp.org/ + MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = http://www.openslp.org/ + PACKAGES += CSWlibslp1 -CATALOGNAME_CSWlibslp1 = libslp1 -PKGFILES_CSWlibslp1 += $(call baseisadirs,$(libdir),libslp\.so\.1\.0\.1) -PKGFILES_CSWlibslp1 += $(call baseisadirs,$(libdir),libslp\.so\.1(\.\d+)*) -SPKG_DESC_CSWlibslp1 += Service Location Protocol, libslp.so.1 -RUNTIME_DEP_PKGS_CSWlibslp1 += CSWosslrt +PKGFILES_CSWlibslp1 += $(call pkgfiles_lib,libslp.so.1) +SPKG_DESC_CSWlibslp1 += Service location protocol, libslp.so.1 +RUNTIME_DEP_PKGS_CSWlibslp1 += CSWlibssl0-9-8 -PACKAGES += CSWopenslp-devel -CATALOGNAME_CSWopenslp-devel = openslp_devel -SPKG_DESC_CSWopenslp-devel = $(DESCRIPTION), development files -PKGFILES_CSWopenslp-devel += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWopenslp += CSWosslrt +PACKAGES += CSWlibslp-dev +SPKG_DESC_CSWlibslp-dev = Development files for libslp.so.1 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibslp-dev += CSWlibslp1 +RUNTIME_DEP_PKGS_CSWlibslp-dev += CSWlibssl-dev +OBSOLETED_BY_CSWlibslp-dev += CSWopenslp-devel +# These are just docs +CHECKPKG_OVERRIDES_CSWlibslp-dev += file-with-bad-content|/usr/local|root/opt/csw/doc/openslp-1.2.1/html/UsersGuide/Installation.html +CHECKPKG_OVERRIDES_CSWlibslp-dev += file-with-bad-content|/usr/share|root/opt/csw/doc/openslp-1.2.1/html/UsersGuide/FileLocations.html + +PACKAGES += CSWopenslp +SPKG_DESC_CSWopenslp = Open service locator protocol +PKGFILES_CSWopenslp += $(sysconfdir)/.* +PKGFILES_CSWopenslp += $(bindir)/.* +PKGFILES_CSWopenslp += $(sbindir)/.* +RUNTIME_DEP_PKGS_CSWopenslp += CSWlibslp1 +RUNTIME_DEP_PKGS_CSWopenslp += CSWlibssl0-9-8 + +BUILD64_LIBS_ONLY = 1 + +PRESERVECONF += $(sysconfdir)/slp.conf +PRESERVECONF += $(sysconfdir)/slp.reg +PRESERVECONF += $(sysconfdir)/slp.spi + +# Testsuite must be run as root +SKIPTEST ?= 1 + 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 Feb 21 17:17:46 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 21 Feb 2012 16:17:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17124] csw/mgar/pkg/cpan Message-ID: Revision: 17124 http://gar.svn.sourceforge.net/gar/?rev=17124&view=rev Author: dmichelsen Date: 2012-02-21 16:17:46 +0000 (Tue, 21 Feb 2012) Log Message: ----------- cpan/Class-MethodMaker/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Class-MethodMaker/ csw/mgar/pkg/cpan/Class-MethodMaker/branches/ csw/mgar/pkg/cpan/Class-MethodMaker/tags/ csw/mgar/pkg/cpan/Class-MethodMaker/trunk/ csw/mgar/pkg/cpan/Class-MethodMaker/trunk/Makefile csw/mgar/pkg/cpan/Class-MethodMaker/trunk/checksums csw/mgar/pkg/cpan/Class-MethodMaker/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Class-MethodMaker/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Class-MethodMaker/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-MethodMaker/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Class-MethodMaker/trunk/Makefile 2012-02-21 16:17:46 UTC (rev 17124) @@ -0,0 +1,23 @@ +NAME = Class-MethodMaker +VERSION = 2.18 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = SCHWIGON + +DESCRIPTION = A module for creating generic methods +define BLURB +endef + +CATALOG_RELEASE = unstable + +PACKAGES += CSWpm-class-methodmaker +CATALOGNAME_CSWpm-class-methodmaker = pm_class_methodmaker +SPKG_DESC_CSWpm-class-methodmaker = A module for creating generic methods + +# These is really no license file in the package +CHECKPKG_OVERRIDES_CSWpm-class-methodmaker += license-missing|/opt/csw/share/doc/pm_class_methodmaker/license + +# Too many args confuse MakeMaker +CONFIGURE_ARGS = + +include gar/category.mk Added: csw/mgar/pkg/cpan/Class-MethodMaker/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-MethodMaker/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Class-MethodMaker/trunk/checksums 2012-02-21 16:17:46 UTC (rev 17124) @@ -0,0 +1 @@ +99435d78e0a1754b102fe39597c6c3df Class-MethodMaker-2.18.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 Feb 21 22:28:20 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 21 Feb 2012 21:28:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17125] csw/mgar/pkg/miltergreylist/trunk Message-ID: Revision: 17125 http://gar.svn.sourceforge.net/gar/?rev=17125&view=rev Author: bonivart Date: 2012-02-21 21:28:19 +0000 (Tue, 21 Feb 2012) Log Message: ----------- miltergreylist/trunk: test build 4.4 alpha 1 Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile csw/mgar/pkg/miltergreylist/trunk/checksums csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2012-02-21 16:17:46 UTC (rev 17124) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2012-02-21 21:28:19 UTC (rev 17125) @@ -1,8 +1,8 @@ NAME = miltergreylist -VERSION = 4.2.7 -#RELEASE = rc1 -#DISTVERSION = $(VERSION)$(RELEASE) -DISTVERSION = $(VERSION) +VERSION = 4.4 +RELEASE = a1 +DISTVERSION = $(VERSION)$(RELEASE) +#DISTVERSION = $(VERSION) DISTNAME = milter-greylist-$(DISTVERSION) WORKSRC = $(WORKDIR)/$(DISTNAME) CATEGORIES = net @@ -17,12 +17,16 @@ DISTFILES = milter-greylist-$(DISTVERSION).tgz DISTFILES += COPYING -RUNTIME_DEP_PKGS = CSWcurlrt CSWgeoip CSWlibspf2 +BUILD_DEP_PKGS = CSWlibspf2-dev +GARCOMPILER = GNU +RUNTIME_DEP_PKGS = CSWgeoip +RUNTIME_DEP_PKGS += CSWlibspf2-2 +#RUNTIME_DEP_PKGS += CSWcurlrt + PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -CHECKPKG_OVERRIDES += surplus-dependency|CSWgeoip CHECKPKG_OVERRIDES += file-with-bad-content PATCHFILES += 0001-Path-and-user-changes-in-conf-file.patch @@ -37,9 +41,9 @@ CONFIGURE_ARGS += --enable-stdio-hack CONFIGURE_ARGS += --localstatedir=/var/opt/csw/miltergreylist CONFIGURE_ARGS += --with-libGeoIP=/opt/csw/lib -CONFIGURE_ARGS += --with-libcurl=/opt/csw/lib CONFIGURE_ARGS += --with-libspf2=/opt/csw/lib CONFIGURE_ARGS += --mandir=/opt/csw/share/man +#CONFIGURE_ARGS += --with-libcurl=/opt/csw/lib # milter-greylist has no tests TEST_SCRIPTS = @@ -63,9 +67,7 @@ include gar/category.mk -#WORKSRC := $(WORKDIR)/$(NAME)-$(VERSION)b1 SPKG_SOURCEURL = http://hcpnet.free.fr/milter-greylist -#SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) DOCLIST = README ChangeLog greylist.conf greylist2.conf milter-greylist.m4 @@ -74,12 +76,9 @@ @( cd $(WORKSRC) ; \ gmake DESTDIR=$(DESTDIR) install ) @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw - @mv $(DESTDIR)/etc/mail/greylist.conf $(DESTDIR)/etc/opt/csw/greylist.conf - @rmdir $(DESTDIR)/etc/mail @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(NAME) @$(foreach DOC,$(DOCLIST),cp $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(NAME);) @ginstall -d -m 755 $(DESTDIR)/var/opt/csw/$(NAME) - @rmdir $(DESTDIR)/var/milter-greylist @ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/pkg/CSW$(NAME) @cp $(FILEDIR)/CSWmiltergreylist.ug $(DESTDIR)/opt/csw/etc/pkg/CSW$(NAME)/cswusergroup @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/init.d Modified: csw/mgar/pkg/miltergreylist/trunk/checksums =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/checksums 2012-02-21 16:17:46 UTC (rev 17124) +++ csw/mgar/pkg/miltergreylist/trunk/checksums 2012-02-21 21:28:19 UTC (rev 17125) @@ -1 +1 @@ -a47d70e0b8a73d341f0d511b3f693650 milter-greylist-4.2.7.tgz +17a8d280f31d0441a1bb9efaa03aa157 milter-greylist-4.4a1.tgz Modified: csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch 2012-02-21 16:17:46 UTC (rev 17124) +++ csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch 2012-02-21 21:28:19 UTC (rev 17125) @@ -12,7 +12,7 @@ --- a/greylist.conf +++ b/greylist.conf @@ -5,11 +5,11 @@ - # $Id: greylist.conf,v 1.45.2.1 2009/02/12 22:39:01 manu Exp $ + # $Id: greylist.conf,v 1.48 2010/04/15 07:51:29 manu Exp $ # -pidfile "/var/run/milter-greylist.pid" 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 Feb 22 02:35:50 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 22 Feb 2012 01:35:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[17126] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17126 http://gar.svn.sourceforge.net/gar/?rev=17126&view=rev Author: bdwalton Date: 2012-02-22 01:35:50 +0000 (Wed, 22 Feb 2012) Log Message: ----------- ruby19/trunk: capture all of libdir/ruby in the library package Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-21 21:28:19 UTC (rev 17125) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-22 01:35:50 UTC (rev 17126) @@ -75,6 +75,7 @@ SPKG_DESC_CSWruby193-dev = Ruby $(VERSION) Extension Development Files PKGFILES_CSWlibruby193-1 += $(call baseisadirs,$(libdir),lib$(NAME)\.so\.1.*) +PKGFILES_CSWlibruby193-1 += $(libdir)/ruby/.* PKGFILES_CSWruby193-samples = $(docdir)/$(NAME)/sample.* 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 Feb 22 09:57:30 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 22 Feb 2012 08:57:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17127] csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall Message-ID: Revision: 17127 http://gar.svn.sourceforge.net/gar/?rev=17127&view=rev Author: idogan23 Date: 2012-02-22 08:57:29 +0000 (Wed, 22 Feb 2012) Log Message: ----------- mule: postinstall script changed Modified Paths: -------------- csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall Modified: csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall =================================================================== --- csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall 2012-02-22 01:35:50 UTC (rev 17126) +++ csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall 2012-02-22 08:57:29 UTC (rev 17127) @@ -1,7 +1,7 @@ #!/bin/sh -if [ ! /etc/opt/csw/mule/wrapper-additional.conf ] +if [ ! $PKG_INSTALL_ROOT/etc/opt/csw/mule/wrapper-additional.conf ] then - touch /etc/opt/csw/mule/wrapper-additional.conf - chown mule:mule /etc/opt/csw/mule/wrapper-additional.conf + touch $PKG_INSTALL_ROOT/etc/opt/csw/mule/wrapper-additional.conf + chown mule:mule $PKG_INSTALL_ROOT/etc/opt/csw/mule/wrapper-additional.conf fi 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 Feb 22 12:58:09 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 22 Feb 2012 11:58:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17128] csw/mgar/pkg/cpan Message-ID: Revision: 17128 http://gar.svn.sourceforge.net/gar/?rev=17128&view=rev Author: idogan23 Date: 2012-02-22 11:58:09 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Email-MIME: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Email-MIME/ csw/mgar/pkg/cpan/Email-MIME/branches/ csw/mgar/pkg/cpan/Email-MIME/tags/ csw/mgar/pkg/cpan/Email-MIME/trunk/ csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile csw/mgar/pkg/cpan/Email-MIME/trunk/checksums csw/mgar/pkg/cpan/Email-MIME/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Email-MIME/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile 2012-02-22 11:58:09 UTC (rev 17128) @@ -0,0 +1,16 @@ +NAME = Email-MIME +VERSION = 1.910 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = RJBS + +DESCRIPTION = Easy MIME message parsing +define BLURB + Easy MIME message parsing +endef + +PACKAGES = CSWpm-email-mime +CATALOGNAME = pm_email-mime + +include gar/category.mk + Added: csw/mgar/pkg/cpan/Email-MIME/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-MIME/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Email-MIME/trunk/checksums 2012-02-22 11:58:09 UTC (rev 17128) @@ -0,0 +1 @@ +ec7b9c5162f2479b4c3d62d7b64f1b07 Email-MIME-1.910.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 Wed Feb 22 14:23:20 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 22 Feb 2012 13:23:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17129] csw/mgar/pkg/cpan Message-ID: Revision: 17129 http://gar.svn.sourceforge.net/gar/?rev=17129&view=rev Author: idogan23 Date: 2012-02-22 13:23:20 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Email-MessageID: initial commitEmail-MessageID Added Paths: ----------- csw/mgar/pkg/cpan/Email-MessageID/ csw/mgar/pkg/cpan/Email-MessageID/branches/ csw/mgar/pkg/cpan/Email-MessageID/tags/ csw/mgar/pkg/cpan/Email-MessageID/trunk/ csw/mgar/pkg/cpan/Email-MessageID/trunk/Makefile csw/mgar/pkg/cpan/Email-MessageID/trunk/checksums csw/mgar/pkg/cpan/Email-MessageID/trunk/files/ csw/mgar/pkg/cpan/HTML-Entities/ csw/mgar/pkg/cpan/HTML-Entities/branches/ csw/mgar/pkg/cpan/HTML-Entities/tags/ Property changes on: csw/mgar/pkg/cpan/Email-MessageID/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/cpan/Email-MessageID/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MessageID/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Email-MessageID/trunk/Makefile 2012-02-22 13:23:20 UTC (rev 17129) @@ -0,0 +1,16 @@ +NAME = Email-MessageID +VERSION = 1.402 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = RJBS + +DESCRIPTION = Generate world unique message-ids +define BLURB + Generate world unique message-ids +endef + +PACKAGES = CSWpm-email-messageid +CATALOGNAME = pm_email-messageid + +include gar/category.mk + Added: csw/mgar/pkg/cpan/Email-MessageID/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-MessageID/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Email-MessageID/trunk/checksums 2012-02-22 13:23:20 UTC (rev 17129) @@ -0,0 +1 @@ +ceadc7110336fa0de0da5e2c49be8235 Email-MessageID-1.402.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 Wed Feb 22 14:36:01 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 22 Feb 2012 13:36:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[17130] csw/mgar/pkg/cpan/Email-Date-Format/trunk/Makefile Message-ID: Revision: 17130 http://gar.svn.sourceforge.net/gar/?rev=17130&view=rev Author: dmichelsen Date: 2012-02-22 13:36:00 +0000 (Wed, 22 Feb 2012) Log Message: ----------- cpan/Email-Date-Format/trunk: Sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Email-Date-Format/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-Date-Format/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-Date-Format/trunk/Makefile 2012-02-22 13:23:20 UTC (rev 17129) +++ csw/mgar/pkg/cpan/Email-Date-Format/trunk/Makefile 2012-02-22 13:36:00 UTC (rev 17130) @@ -4,13 +4,19 @@ GARTYPE = v2 AUTHOR = RJBS -DESCRIPTION = Perl Email::Date::Format module to emit RFC 2822 style date strings +DESCRIPTION = Produce RFC 8822 date strings define BLURB endef -PACKAGES = CSWpmemaildateformat -CATALOGNAME = pm_emaildateformat +CATALOG_RELEASE = unstable -ARCHALL = 1 +LICENSE = LICENSE +PACKAGES += CSWpm-email-date-format +CATALOGNAME_CSWpm-email-date-format = pm_email_date_format +SPKG_DESC_CSWpm-email-date-format = Produce RFC 8822 date strings +ARCHALL_CSWpm-email-date-format = 1 +OBSOLETED_BY_CSWpm-email-date-format += CSWpmemaildateformat +CATALOGNAME_CSWpmemaildateformat = pm_emaildateformat_stub + 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 Wed Feb 22 14:48:16 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 22 Feb 2012 13:48:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17131] csw/mgar/pkg/cpan/Email-Simple/trunk Message-ID: Revision: 17131 http://gar.svn.sourceforge.net/gar/?rev=17131&view=rev Author: dmichelsen Date: 2012-02-22 13:48:16 +0000 (Wed, 22 Feb 2012) Log Message: ----------- cpan/Email-Simple/trunk: Update to 2.101 and sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile csw/mgar/pkg/cpan/Email-Simple/trunk/checksums Modified: csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile 2012-02-22 13:36:00 UTC (rev 17130) +++ csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile 2012-02-22 13:48:16 UTC (rev 17131) @@ -1,20 +1,23 @@ NAME = Email-Simple -VERSION = 2.100 +VERSION = 2.101 CATEGORIES = cpan GARTYPE = v2 AUTHOR = RJBS -DESCRIPTION = Perl Email::Simple module for RFC2822 message format and headers +DESCRIPTION = RFC2822 message format and headers define BLURB endef -RUNTIME_DEP_PKGS = CSWpmemaildateformat +CATALOG_RELEASE = unstable -PACKAGES = CSWpmemailsimple -CATALOGNAME = pm_emailsimple - LICENSE = LICENSE -ARCHALL = 1 +PACKAGES += CSWpm-email-simple +CATALOGNAME_CSWpm-email-simple = pm_email_simple +SPKG_DESC_CSWpm-email-simple = RFC2822 message format and headers +ARCHALL_CSWpm-email-simple = 1 +RUNTIME_DEP_PKGS_CSWpm-email-simple += CSWpm-email-date-format +OBSOLETED_BY_CSWpm-email-simple += CSWpmemailsimple +CATALOGNAME_CSWpmemailsimple = pm_emailsimple_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/Email-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-Simple/trunk/checksums 2012-02-22 13:36:00 UTC (rev 17130) +++ csw/mgar/pkg/cpan/Email-Simple/trunk/checksums 2012-02-22 13:48:16 UTC (rev 17131) @@ -1 +1 @@ -38205400f9b6b5f1d9b6ae45183cb71f Email-Simple-2.100.tar.gz +6d1aad80176b630629a8344ef06cff78 Email-Simple-2.101.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 Feb 22 15:38:32 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 22 Feb 2012 14:38:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17132] csw/mgar/pkg/lighttpd/trunk Message-ID: Revision: 17132 http://gar.svn.sourceforge.net/gar/?rev=17132&view=rev Author: wahwah Date: 2012-02-22 14:38:32 +0000 (Wed, 22 Feb 2012) Log Message: ----------- lighttpd/trunk: version bump to 1.4.30 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 2012-02-22 13:48:16 UTC (rev 17131) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2012-02-22 14:38:32 UTC (rev 17132) @@ -1,6 +1,6 @@ # $Id$ NAME = lighttpd -VERSION = 1.4.29 +VERSION = 1.4.30 CATEGORIES = server GARTYPE = v2 Modified: csw/mgar/pkg/lighttpd/trunk/checksums =================================================================== --- csw/mgar/pkg/lighttpd/trunk/checksums 2012-02-22 13:48:16 UTC (rev 17131) +++ csw/mgar/pkg/lighttpd/trunk/checksums 2012-02-22 14:38:32 UTC (rev 17132) @@ -1 +1 @@ -4130d2440777b7911e62de6a89c98a90 lighttpd-1.4.29.tar.gz +7f0bbb66a05099f634ea8f63af99cfed lighttpd-1.4.30.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 Feb 22 16:23:37 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 22 Feb 2012 15:23:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17133] csw/mgar/pkg/lighttpd/trunk/Makefile Message-ID: Revision: 17133 http://gar.svn.sourceforge.net/gar/?rev=17133&view=rev Author: wahwah Date: 2012-02-22 15:23:37 +0000 (Wed, 22 Feb 2012) Log Message: ----------- lighttpd/trunk: Update library dependencies Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2012-02-22 14:38:32 UTC (rev 17132) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2012-02-22 15:23:37 UTC (rev 17133) @@ -37,10 +37,10 @@ PACKAGES += CSWlighttpd CATALOGNAME_CSWlighttpd = lighttpd SPKG_DESC_CSWlighttpd = HTTP server built for security, speed, compliance, and flexibility -RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibpcre0 RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlighttpd += CSWosslrt EXTRA_LINKER_FLAGS += -lsendfile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From adamsedgar at users.sourceforge.net Wed Feb 22 16:50:40 2012 From: adamsedgar at users.sourceforge.net (adamsedgar at users.sourceforge.net) Date: Wed, 22 Feb 2012 15:50:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[17134] csw/mgar/pkg/ksh/trunk Message-ID: Revision: 17134 http://gar.svn.sourceforge.net/gar/?rev=17134&view=rev Author: adamsedgar Date: 2012-02-22 15:50:40 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Updated filenames for download and check sum. Next I need to updated build commands Modified Paths: -------------- csw/mgar/pkg/ksh/trunk/Makefile csw/mgar/pkg/ksh/trunk/checksums Modified: csw/mgar/pkg/ksh/trunk/Makefile =================================================================== --- csw/mgar/pkg/ksh/trunk/Makefile 2012-02-22 15:23:37 UTC (rev 17133) +++ csw/mgar/pkg/ksh/trunk/Makefile 2012-02-22 15:50:40 UTC (rev 17134) @@ -12,12 +12,12 @@ endef # Main archive location -MASTER_SITES = http://www.research.att.com/~gsf/download/tgz/ -DISTFILES += ast-ksh.2010-02-02.tgz -DISTFILES += INIT.2010-02-02.tgz +MASTER_SITES = http://www2.research.att.com/~gsf/download/tgz/ +DISTFILES += ast-ksh.2011-02-08.tgz +DISTFILES += INIT.2012-01-01.tgz #DISTFILES = $(NAME)-$(VERSION).tar.gz -WGET_OPTS = --user="I accept www.opensource.org/licenses/cpl" --password="." +WGET_OPTS = --user="I accept www.opensource.org/licenses/eclipse" --password="." # We define upstream file regex so we can be notifed of new upstream software release # UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/ksh/trunk/checksums =================================================================== --- csw/mgar/pkg/ksh/trunk/checksums 2012-02-22 15:23:37 UTC (rev 17133) +++ csw/mgar/pkg/ksh/trunk/checksums 2012-02-22 15:50:40 UTC (rev 17134) @@ -1,2 +1,2 @@ -9c96ca12947f52274606a0625466b6dc INIT.2010-02-02.tgz -00282866e979eb21403f0fa73212e3c5 ast-ksh.2010-02-02.tgz +313f62fb15ab454ce72294139cec603d INIT.2012-01-01.tgz +5481d41adf067503afbad92d048ff91a ast-ksh.2011-02-08.tgz 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 Feb 22 20:52:21 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 22 Feb 2012 19:52:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17135] csw/mgar/pkg/miltergreylist/trunk Message-ID: Revision: 17135 http://gar.svn.sourceforge.net/gar/?rev=17135&view=rev Author: bonivart Date: 2012-02-22 19:52:21 +0000 (Wed, 22 Feb 2012) Log Message: ----------- miltergreylist/trunk: test upstream patch for urlcheck.c Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/miltergreylist/trunk/files/0003-upstream-bug-fixes.patch Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2012-02-22 15:50:40 UTC (rev 17134) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2012-02-22 19:52:21 UTC (rev 17135) @@ -21,8 +21,8 @@ GARCOMPILER = GNU RUNTIME_DEP_PKGS = CSWgeoip +RUNTIME_DEP_PKGS += CSWlibcurl4 RUNTIME_DEP_PKGS += CSWlibspf2-2 -#RUNTIME_DEP_PKGS += CSWcurlrt PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 @@ -31,6 +31,7 @@ PATCHFILES += 0001-Path-and-user-changes-in-conf-file.patch PATCHFILES += 0002-change-socket-path.patch +PATCHFILES += 0003-upstream-bug-fixes.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS = --prefix=/opt/csw @@ -43,7 +44,7 @@ CONFIGURE_ARGS += --with-libGeoIP=/opt/csw/lib CONFIGURE_ARGS += --with-libspf2=/opt/csw/lib CONFIGURE_ARGS += --mandir=/opt/csw/share/man -#CONFIGURE_ARGS += --with-libcurl=/opt/csw/lib +CONFIGURE_ARGS += --with-libcurl=/opt/csw/lib # milter-greylist has no tests TEST_SCRIPTS = Added: csw/mgar/pkg/miltergreylist/trunk/files/0003-upstream-bug-fixes.patch =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/0003-upstream-bug-fixes.patch (rev 0) +++ csw/mgar/pkg/miltergreylist/trunk/files/0003-upstream-bug-fixes.patch 2012-02-22 19:52:21 UTC (rev 17135) @@ -0,0 +1,48 @@ +From d677e25bf0b5092fb780b2caa8989809f30a0808 Mon Sep 17 00:00:00 2001 +From: Peter Bonivart +Date: Wed, 22 Feb 2012 20:25:29 +0100 +Subject: [PATCH] upstream-bug-fixes + +--- + urlcheck.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/urlcheck.c b/urlcheck.c +index df627fb..d34b313 100644 +--- a/urlcheck.c ++++ b/urlcheck.c +@@ -299,7 +299,7 @@ find_boundary(priv, boundary) + goto next; + + TAILQ_FOREACH(l, &priv->priv_body, l_list) +- if (strstr(l->l_lines, boundary) != NULL) ++ if (strstr(l->l_line, boundary) != NULL) + goto next; + + return 0; +@@ -362,7 +362,7 @@ curl_post(buffer, size, nmemb, userp) + * the body on next time we are called. + */ + if (pd->pd_curhdr == NULL) +- pd->pd_curptr = pd->pd_curbody->b_lines; ++ pd->pd_curptr = pd->pd_curbody->l_line; + else + pd->pd_curptr = pd->pd_curhdr->l_line; + +@@ -388,11 +388,11 @@ curl_post(buffer, size, nmemb, userp) + + /* Move to the next one */ + pd->pd_curbody = +- TAILQ_NEXT(pd->pd_curbody, b_list); ++ TAILQ_NEXT(pd->pd_curbody, l_list); + + /* If it's not the last one... */ + if (pd->pd_curbody != NULL) +- pd->pd_curptr = pd->pd_curbody->b_lines; ++ pd->pd_curptr = pd->pd_curbody->l_line; + else + pd->pd_curptr = NULL; + } else { +-- +1.7.9 + 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 Feb 22 21:13:55 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 22 Feb 2012 20:13:55 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[611] buildfarm/cgi-bin/ Message-ID: Revision: 611 http://opencsw.svn.sourceforge.net/opencsw/?rev=611&view=rev Author: dmichelsen Date: 2012-02-22 20:13:55 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Add buildfarm/cgi/bin Added Paths: ----------- buildfarm/cgi-bin/ 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 Feb 22 21:42:06 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 22 Feb 2012 20:42:06 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[612] buildfarm/bin Message-ID: Revision: 612 http://opencsw.svn.sourceforge.net/opencsw/?rev=612&view=rev Author: dmichelsen Date: 2012-02-22 20:42:05 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Add REST catalog interfacing Added Paths: ----------- buildfarm/bin/rest-interface/ buildfarm/bin/rest-interface/catalogname4pkg buildfarm/bin/rest-interface/getcatalog Added: buildfarm/bin/rest-interface/catalogname4pkg =================================================================== --- buildfarm/bin/rest-interface/catalogname4pkg (rev 0) +++ buildfarm/bin/rest-interface/catalogname4pkg 2012-02-22 20:42:05 UTC (rev 612) @@ -0,0 +1,42 @@ +#!/opt/csw/bin/perl + +use warnings; +use strict; +use LWP::Simple; +use JSON; +use Data::Dumper; + +require LWP::UserAgent; + +my $ua = LWP::UserAgent->new; +$ua->timeout(300); + +my $catalog = "unstable"; +my $arch = "sparc"; +my $rel = "SunOS5.10"; +my $pkg = shift @ARGV; + +my $url = "http://buildfarm.opencsw.org/pkgdb/rest/catalogs/$catalog/$arch/$rel/pkgnames/$pkg/"; + +print $url, "\n"; + +my $response = $ua->get( $url ); + +my $json_string; +if ($response->is_success) { + $json_string = $response->decoded_content; # or whatever +} else { + die "Error getting $url\n" . $response->status_line; +} + +if( $json_string eq "null" ) { + print "Paket $pkg konnte nicht gefunden werden in $catalog:$arch:$rel\n"; + exit( 1 ); +} + +print "Decoding JSON... $json_string\n"; +my $data = decode_json $json_string; + +my $cname = $data->{catalogname}; + +print "$cname\n"; Property changes on: buildfarm/bin/rest-interface/catalogname4pkg ___________________________________________________________________ Added: svn:executable + * Added: buildfarm/bin/rest-interface/getcatalog =================================================================== --- buildfarm/bin/rest-interface/getcatalog (rev 0) +++ buildfarm/bin/rest-interface/getcatalog 2012-02-22 20:42:05 UTC (rev 612) @@ -0,0 +1,118 @@ +#!/opt/csw/bin/perl + +use strict; +use warnings; + +use LWP::Simple; +use JSON; +use DB_File; +use Data::Dumper; +use Parallel::ForkManager; +use LWP::UserAgent; + +my $ua = LWP::UserAgent->new; +$ua->timeout(600); + +my %md5cache; + +my $db = tie %md5cache, "DB_File", "pkgcache.dbfile"; + +print "Grabbing catalog...\n"; +my $response = $ua->get( 'http://buildfarm.opencsw.org/pkgdb/rest/catalogs/unstable/sparc/SunOS5.10/?quick=true' ); +my $json_string; +if ($response->is_success) { +print "Decoding JSON...\n"; + $json_string = $response->decoded_content; # or whatever +} else { + print Dumper( $response ); + die $response->status_line; +} + +#my $url = 'http://buildfarm.opencsw.org/pkgdb/rest/catalogs/unstable/sparc/SunOS5.10/'; +#my $json_string = get $url; +# die "Couldn't get $url" unless defined $json_string; +my $catalog_data = decode_json $json_string; + +# print Dumper($catalog_data); + +#$VAR1 = { +# 'catalogname' => 'dovecot_dev', +# 'version_string' => '2.0.17,REV=2012.01.20', +# 'vendor_url' => 'http://dovecot.org/', +# 'md5_sum' => '62713e60bc4d8f8c895c11db84942c67', +# 'arch' => 'sparc', +# 'osrel' => 'SunOS5.9', +# 'size' => 188321, +# 'file_basename' => 'dovecot_dev-2.0.17,REV=2012.01.20-SunOS5.9-sparc-CSW.pkg.gz', +# 'maintainer_email' => 'jgoerzen at opencsw.org', +# 'maintainer_id' => 15, +# 'version' => '2.0.17,REV=2012.01.20', +# 'mtime' => '2012-01-20 19:26:57', +# 'pkgname' => 'CSWdovecot-dev', +# 'repository_url' => 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/dovecot/trunk/Makefile', +# 'basename' => 'dovecot_dev-2.0.17,REV=2012.01.20-SunOS5.9-sparc-CSW.pkg.gz', +# 'maintainer_full_name' => 'Jake Goerzen', +# 'filename_arch' => 'sparc', +# 'rev' => '2012.01.20' +# }; + + +my $pm = new Parallel::ForkManager(10, '/home/web/rest-interface/tmp' ); + +# data structure retrieval and handling +$pm -> run_on_finish ( # called BEFORE the first call to start() + sub { + my ($pid, $exit_code, $ident, $exit_signal, $core_dump, $data_structure_reference) = @_; + + # retrieve data structure from child + if (defined($data_structure_reference)) { + my ($md5, $stats) = @{$data_structure_reference}; + $md5cache{$md5} = $stats; + $db->sync; + } else { + print qq|No message received from child process $pid!\n|; + } + } +); + +# Retreive the missing data +foreach my $pkg (@$catalog_data) { + my $md5 = $pkg->{md5_sum}; + + my $url = "http://buildfarm.opencsw.org/pkgdb/rest/srv4/${md5}/pkg-stats/"; + + if( exists $md5cache{$md5} ) { + print "Having $md5\n"; + } else { + $pm->start() and next; + + print "Retreiving $md5\n"; + my $stats = get $url; + print "Done $md5\n"; + $pm->finish( 0, [ $md5, $stats ] ); + } +} + +$pm->wait_all_children; + +open( C, ">catalog.new" ); + +foreach my $pkg (@$catalog_data) { + my $md5 = $pkg->{md5_sum}; + my $stats = $md5cache{$md5}; + my $json_stats = decode_json( $stats ); + + my @depends = map { $_->[0] } @{$json_stats->{depends}}; + my @i_depends = @{$json_stats->{i_depends}}; + + +# print C join( ' ', $pkg->{catalogname}, $pkg->{version}, $pkg->{pkgname}, $pkg->{file_basename}, $pkg->{md5_sum}, $pkg->{size}, + print C join( ' ', $pkg->{catalogname}, $pkg->{version}, $json_stats->{pkginfo}->{PKG}, $pkg->{file_basename}, $pkg->{md5_sum}, $pkg->{size}, + join( '|', @depends ) || 'none', join( '|', @i_depends ) || 'none', 'none', $json_stats->{pkginfo}->{OPENCSW_BUNDLE} || 'none' ), "\n"; +} + +close C; + +unlink( "catalog" ); +link( "catalog.new", "catalog" ); +unlink( "catalog.new" ); Property changes on: buildfarm/bin/rest-interface/getcatalog ___________________________________________________________________ Added: svn:executable + * 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 Feb 22 21:43:08 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 22 Feb 2012 20:43:08 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[613] buildfarm/cgi-bin Message-ID: Revision: 613 http://opencsw.svn.sourceforge.net/opencsw/?rev=613&view=rev Author: dmichelsen Date: 2012-02-22 20:43:08 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Add CGI scripts for dependency graphs and ATOM feeds Added Paths: ----------- buildfarm/cgi-bin/OpenCSW/ buildfarm/cgi-bin/OpenCSW/Catalog.pm buildfarm/cgi-bin/dograph buildfarm/cgi-bin/experimental.atom buildfarm/cgi-bin/testing.atom Added: buildfarm/cgi-bin/OpenCSW/Catalog.pm =================================================================== --- buildfarm/cgi-bin/OpenCSW/Catalog.pm (rev 0) +++ buildfarm/cgi-bin/OpenCSW/Catalog.pm 2012-02-22 20:43:08 UTC (rev 613) @@ -0,0 +1,244 @@ +package OpenCSW::Catalog; + +sub new { + my ($class,$catalogfile) = @_; + + my %catalog; + my %pkg2catalog; + + open F, $catalogfile or die "Cannot open $catalogfile"; + while( ) { + # 9menu 1.8,REV=2006.05.19 CSW9menu 9menu-1.8,REV=2006.05.19-SunOS5.8-i386-CSW.pkg.gz 51eaeee15a71a4290789729feb956759 12196 CSWcommon non + + last if( /^-----BEGIN PGP SIGNATURE-----/ ); + next if( /^(----.*|Hash:.*|#.*|)$/ ); + + chomp; + my @fields = split(/\s+/); + if( @fields < 5 || @fields > 10 ) { + print "ERROR: ", scalar( @fields ), " $_\n"; + next; + } + + my ($cname,$version,$pkgname,$pkgfile,$md5,$size,$deps,$ideps,$category, $bundle) = split(/\s+/); + $catalog{$cname} = { + catalogname => $cname, + version => $version, + pkgname => $pkgname, + pkgfile => $pkgfile, + md5 => $md5, + size => $size, + deps => ($deps eq 'none' ? [] : [ split( /\|/, $deps ) ]), + ideps => ($ideps eq 'none' ? [] : [ split( /\|/, $ideps ) ]), + category => $category, + bundle => $bundle, + }; + $pkg2catalog{$pkgname} = $cname; + } + close F; + + return bless { + catalog => \%catalog, + pkg2catalog => \%pkg2catalog, + }, ref( $class ) || $class; +} + +sub catalogname { + my ($this,%args) = @_; + my $line = $this->_getline( %args ); + my $catalogname = $line ? $line->{catalogname} : undef; + return $catalogname; +} + +sub pkgname { + my ($this,%args) = @_; + my $line = $this->_getline( %args ); + my $pkgname = $line ? $line->{pkgname} : undef; + return $pkgname; +} + +sub size { + my ($this,%args) = @_; + my $line = $this->_getline( %args ); + my $size = $line ? $line->{size} : undef; + return $size; +} + +sub deps { + my ($this,%args) = @_; + my $line = $this->_getline( %args ); + my @deps = $line ? @{$line->{deps}} : (); + return @deps; +} + +sub bundle { + my ($this,%args) = @_; + my $line = $this->_getline( %args ); + my $bundle = $line ? $line->{bundle} : undef; + return $bundle; +} + +sub _getline { + my ($this,%args) = @_; + if( exists $args{name} ) { + my $name = $args{name}; + if( exists $this->{catalog}->{$name} ) { + return $this->{catalog}->{$name}; + } elsif( exists $this->{pkg2catalog}->{$name} ) { + return $this->{catalog}->{$this->{pkg2catalog}->{$name}}; + } else { + return undef; + } + } elsif( exists $args{catalogname} ) { + return $this->{catalog}->{$args{catalogname}}; + } elsif( exists $args{pkg} ) { + return $this->{catalog}->{$this->{pkg2catalog}->{$args{pkg}}}; + } else { + print "Option unknown\n"; + } +} + +1; + +__END__ + +sub _equal { + my ($e1, $e2) = @_; + return ($e1->{version} eq $e2->{version} && + $e1->{pkgname} eq $e2->{pkgname} && + $e1->{pkgfile} eq $e2->{pkgfile} && + $e1->{md5} eq $e2->{md5} && + $e1->{size} eq $e2->{size} && + join('|', @{$e1->{deps}}) eq join('|', @{$e2->{deps}}) && + join('|', @{$e1->{ideps}}) eq join('|', @{$e2->{ideps}}) + ); +} + +sub _depcompare { + my ($a1, $a2) = @_; + + my %a1; + my (@additions, at removals); + foreach my $a1 (@$a1) { + $a1{$a1} = 1; + } + foreach my $a2 (@$a2) { + if( exists $a1{$a2} ) { + delete $a1{$a2}; + } else { + push @additions, $a2; + } + } + @removals = keys %a1; + return [\@removals,\@additions]; +} + +sub _extract_version { + my ($v) = @_; + $v =~ s/,REV=\d{4}\.\d{2}\.\d{2}//; + return $v; +} + +sub _eq_version { + # 2009.09.09,REV=2009.09.09 + my ($v1,$v2) = @_; + $v1 = _extract_version( $v1 ); + $v2 = _extract_version( $v2 ); + + return $v1 eq $v2; +} + +sub _compare_rev { + # 2009.09.09,REV=2009.09.09 + my ($v1,$v2) = @_; + + my ($y1,$m1,$d1) = ($v1 =~ /,REV=(\d{4})\.(\d{2})\.(\d{2})/); + my ($y2,$m2,$d2) = ($v2 =~ /,REV=(\d{4})\.(\d{2})\.(\d{2})/); + + if( !defined $y1 || !defined $m1 || !defined $d1 ) { + return 0 if( !defined $y2 || !defined $m2 || !defined $d2 ); + return 1; + } + return -1 if( !defined $y2 || !defined $m2 || !defined $d2 ); + + return ($y1 cmp $y2)*4 + ($m1 cmp $m2)*2 + ($d1 cmp $d2); +} + +sub compare { + my ($co1, $co2) = @_; + my %c1 = %$co1; + my %c2 = %$co2; + + my %hchanges; + + my (%pc1, %pc2); + $pc1{$_->{pkgname}} = $_ foreach (values %c1); + $pc2{$_->{pkgname}} = $_ foreach (values %c2); + + # 1. Find differences in attributes for packages with same catalog name + # (additions, updates, removals) + foreach my $p1 (keys %c1) { + if( exists( $c2{$p1} ) ) { + # Entries with same catalog name exist in catalog 1 and 2 + if( !_equal( $c1{$p1}, $c2{$p1} ) ) { + # Package as been updated + $hchanges{$p1}->{_pkgname} = $c1{$p1}->{pkgname}; + my %e1 = %{$c1{$p1}}; + my %e2 = %{$c2{$p1}}; + my $versiondiff = $e1{version} ne $e2{version}; + my $pkgnamediff = $e1{pkgname} ne $e2{pkgname}; + my $pkgfilediff = $e1{pkgfile} ne $e2{pkgfile}; + my $md5diff = $e1{md5} ne $e2{md5}; + my $sizediff = $e1{size} ne $e2{size}; + if( $versiondiff ) { + my ($v1,$v2) = ($e1{version}, $e2{version}); + if( _eq_version( $v1, $v2 ) ) { + $hchanges{$p1}->{version} = { type => "Respin", from => $e1{version}, to => $e2{version} }; + } elsif( _compare_rev( $v1, $v2 ) ) { + $hchanges{$p1}->{version} = { type => "Update", from => $e1{version}, to => $e2{version} }; + } else { + $hchanges{$p1}->{version} = { type => "Sameday update", from => $e1{version}, to => $e2{version} }; + } + } else { + # If the version has been updated we have another package, so differences on the other fields are pretty obvious + $hchanges{$p1}->{pkgname} = { type => "Changed", from => $e1{pkgname}, to => $e2{pkgname} } if( $pkgnamediff ); + $hchanges{$p1}->{pkgfile} = { type => "Changed", from => $e1{pkgfile}, to => $e2{pkgfile} } if( $pkgfilediff ); + $hchanges{$p1}->{md5} = { type => "Changed", from => $e1{md5}, to => $e2{md5} } if( $md5diff ); + $hchanges{$p1}->{size} = { type => "Changed", from => $e1{size}, to => $e2{size} } if( $sizediff ); + } + my $dep = _depcompare( $e1{deps}, $e2{deps} ); + if( @{$dep->[0]} > 0 || @{$dep->[1]} > 0 ) { + $hchanges{$p1}->{deps} = { type => "Changed", removed => $dep->[0], added => $dep->[1] }; + } + my $idep = _depcompare( $e1{ideps}, $e2{ideps} ); + if( @{$idep->[0]} > 0 || @{$idep->[1]} > 0 ) { + $hchanges{$p1}->{ideps} = { type => "Changed", removed => $idep->[0], added => $idep->[1] }; + } + } else { + # Package is same, ignore. + } + delete $c2{$p1}; + } else { + # Catalogname is in catalog 1 only, deletion + my $pkgname = $c1{$p1}->{pkgname}; + $hchanges{$p1}->{_pkgname} = $pkgname; + if( exists $pc2{$pkgname} && $pc2{$pkgname}->{catalogname} ne $c1{$p1}->{catalogname} ) { + $hchanges{$p1}->{catalogname} = { type => "Changed", from => $c1{$p1}->{catalogname}, to => $pc2{$pkgname}->{catalogname} }; + # If it was a rename we processed it, so remove it here + delete $c2{$pc2{$pkgname}->{catalogname}}; + } else { + $hchanges{$p1}->{package} = { type => "Deleted", pkg => $c1{$p1}->{pkgname} }; + } + } + } + + # What is left in catalog 2 are additions + foreach my $p2 (keys %c2) { + $hchanges{$p2}->{_pkgname} = $c2{$p2}->{pkgname}; + $hchanges{$p2}->{package} = { type => "Added", pkg => $c2{$p2}->{pkgname} }; + } + + return \%hchanges; +} + +1; Property changes on: buildfarm/cgi-bin/OpenCSW/Catalog.pm ___________________________________________________________________ Added: svn:executable + * Added: buildfarm/cgi-bin/dograph =================================================================== --- buildfarm/cgi-bin/dograph (rev 0) +++ buildfarm/cgi-bin/dograph 2012-02-22 20:43:08 UTC (rev 613) @@ -0,0 +1,286 @@ +#!/bin/sh +#! -*- perl -*- +eval 'PATH=/opt/csw/bin:$PATH:/usr/perl5/bin exec perl -x -w $0 ${1+"$@"}' + if 0; + +# TBD: +# - Add number of packages to collapsed bundles +# - Add total size of packages to collapsed bundles + +use strict; +use warnings; +use Getopt::Long; +use OpenCSW::Catalog; + +my $_catalog = OpenCSW::Catalog->new( "/home/web/bin/rest-interface/catalog" ); + +sub format_byte { + my ($size) = @_; + my $suffix = "B"; + + if ( $size > 1024 ) { + $size /= 1024; + $suffix = "KB"; + } + if ( $size > 1024 ) { + $size /= 1024; + $suffix = "MB"; + } + if ( $size > 1024 ) { + $size /= 1024; + $suffix = "GB"; + } + return sprintf( "%1.1f %s", $size, $suffix ); +} + + +# Direct dependencies for package +sub deps { + my ($pkg) = @_; + return $_catalog->deps( name => $pkg ); +} + +sub size { + my ($pkg) = @_; + return $_catalog->size( name => $pkg ); +} + +# This package plus all its dependencies +sub _depsize { + my ($pkg, $total) = @_; + + $total = {} if( !defined $total ); + return $total if( exists $total->{$pkg} ); + if( $pkg eq "CSWcommon" || $pkg eq "CSWisaexec" || $pkg =~ /^CSWcas-/ ) { + $total->{$pkg} = 0; + } else { + $total->{$pkg} = size( $pkg ); + } + foreach (deps( $pkg )) { + next if( exists $total->{$_} ); + depsize( $_, $total ); + $total->{$pkg} += $total->{$_} || 0; + } + + return $total; +} + +# Return for a given package the depth of all packages { => , ... } +sub fulldeps { + my (@pkglist) = @_; + + my %depth; + $depth{$_} = 0 foreach (@pkglist); + my @todo = @pkglist; + + #my $maxdep = 0; + foreach (@todo) { + my @deps = deps($_); + foreach my $d (@deps) { + next if( exists $depth{$d} ); + $depth{$d} = $depth{$_} + 1; + #$maxdep = $depth{$d} if( $depth{$d} > $maxdep ); + push @todo, $d; + } + } + return \%depth; +} + +sub depsize { + my (@pkglist) = @_; + + my $total = 0; + my $deps = fulldeps( @pkglist ); + foreach (keys %$deps) { + next if( $_ eq "CSWcommon" || $_ eq "CSWisaexec" || $_ =~ /^CSWcas-/ ); + $total += size( $_ ); + } + return $total; +} + + + +# Display package dependencies as DOT graph +sub depgraph { + my (%args) = @_; + my %done; # If package is in this hash it is processed + my %size; # Size in bytes of the package + my @todo = @{$args{pkg}}; + my %collapse_bundles = (); + %collapse_bundles = %{$args{collapse_bundles}} if( exists $args{collapse_bundles} ); + my $autocollapse = $args{autocollapse}; + my $collapseall = $args{collapseall}; + + print "digraph \"Package Dependencies ", join( ", ", @todo ), "\" {\n"; + + # Make sure we have package names + @todo = map { $_catalog->pkgname( name => $_ ) } @todo; + + # Lets see how far we can dive + my $show_up_to = 0; + my %showpkg; + my %bundle; + my %bundles; + my %node2print; + foreach (@todo) { + my $fulldeps = fulldeps( $_ ); + my %depthcount; + while( my ($pkg, $depth) = each %$fulldeps ) { + push @{$depthcount{$depth}}, $pkg; + } + my @showpkgs; + foreach my $i (sort keys %depthcount) { + my @levelpkg = @{$depthcount{$i}}; + if( scalar @showpkgs + scalar @levelpkg > 1000 ) { + $show_up_to = $i; + last; + } + push @showpkgs, @levelpkg; + }; + @showpkgs = grep { $_catalog->pkgname( name => $_ ) } @showpkgs; # Exclude SUNW packages not in catalog + foreach (@showpkgs) { + next if( $_ eq "CSWcommon" || $_ eq "CSWisaexec" || $_ =~ /^CSWcas-/ ); + $showpkg{$_} = 1; + $node2print{$_} = $_; + my $b = $_catalog->bundle( name => $_ ); + if( defined $b && $b ne 'none' ) { + push @{$bundles{$b}}, $_; + $bundle{$_} = $b; + # $node2print{$_} = $b if( $collapse_bundles{$b} ); + } + } + } + + foreach my $b (keys %bundles) { + my @pkgs4bundle = @{$bundles{$b}}; + $collapse_bundles{$b} = 1 if( $autocollapse && @pkgs4bundle > 3 || $collapseall && @pkgs4bundle > 1 ); + foreach my $p (@pkgs4bundle) { + $node2print{$p} = $b if( $collapse_bundles{$b} ); + } + } + + # Now iterate over all dependencies + my $sizes; + foreach (@todo) { + my $catalog = $_catalog->catalogname( name => $_ ); + my $pkg = $_catalog->pkgname( name => $_ ); + next if( !defined $pkg ); + $size{$pkg} = $_catalog->size( name => $_ ); + + $done{$pkg} = 1; + + foreach my $p (deps($pkg)) { + my $s = $_catalog->size( name => $p ); + next if( $p eq "CSWcommon" || $p eq "CSWisaexec" || $p =~ /^CSWcas-/ ); + + # The edge is between nodes in the same bundle. Print only if the bundle is not collapsed. + if( $node2print{$pkg} ne $node2print{$p} && + # Show edge only if target node is shown + exists $showpkg{$p} ) { + print " \"", $node2print{$pkg}, "\""; + print " -> "; + print '"', $node2print{$p}, '";', "\n"; + } + if( !exists $done{$p} ) { + push @todo, $p; + $done{$p} = 1; + } + } + } + + my $total = 0; + $total += $size{$_} foreach (keys %size); + + print " label = \"Number of packages: ", scalar keys( %size ), "\\n\"\n"; + print " + \"Total size of packages: ", format_byte( $total ), "\\n\"\n"; + print " + \" Clipped to ", $show_up_to + 1, " levels\\n\"\n" if( $show_up_to ); + print " labelloc = t\n"; + print " labeljust = l\n"; + + # We are traversing all the packages. When a bundle is collapsed for a package we remember + # that and do not print the bundle again next time we visist another package from it. + my %bundle_done; + +# foreach (keys %done) { + foreach (keys %node2print) { + next if( !exists $showpkg{$_} ); + + if( $node2print{$_} ne $_ ) { + # Collapsed node + my $b = $node2print{$_}; # Bundle name + next if( $bundle_done{$b} ); # We printed this before + + my $obsoleted = 0; + foreach (@{$bundles{$b}}) { + $obsoleted = 1 if( $_catalog->catalogname( name => $_ ) =~ /_stub$/ ); + } + + print " \"", $b, "\" [ shape=box; "; + print " label=\"", $b, "\\n", scalar( grep { exists $showpkg{$_} } @{$bundles{$b}} ), " packages\\n"; + print "[", format_byte( depsize( @{$bundles{$b}} ) ), "]\"; "; + print " style=filled fillcolor=\"#ff8080\"" if( $obsoleted ); + print " URL=\"/cgi-bin/depgraph2?pkg=", $todo[0], "&collapse_bundles=", join( ',', grep { $_ ne $b } keys %collapse_bundles ), "\"; "; + print " ]\n"; + $bundle_done{$b} = 1; + } else { + print " \"$_\" ["; + my $catalog = $_catalog->catalogname( name => $_ ); + next if( !$catalog ); + if( $catalog =~ /_stub$/ ) { + print " style=filled fillcolor=\"#ff8080\"" if( $catalog =~ /_stub$/ ); + } else { + print " URL=\"http://www.opencsw.org/p/$_\""; + print " comment=\"$_\""; + print " label=\"$_\\n(", format_byte( $size{$_} ), ")"; + my $depsize = depsize( $_ ); + print "\\n[", format_byte( $depsize ), "]" if( $size{$_} != $depsize ); + print "\""; + } + print "]\n"; + } + } + +#QUERY_STRING=pkg=gnuplot_wx&collapse_bundles=gtk2 +#REQUEST_URI=/cgi-bin/depgraph2?pkg=gnuplot_wx&collapse_bundles=gtk2 + + foreach (keys %bundles) { + my @b = @{$bundles{$_}}; # These are the packages for the bundle + next if( @b <= 1 ); # Do not show a bundle if there is only one package from it drawn + next if( $collapse_bundles{$_} ); # Do not show this bundle as it is collapsed + print " subgraph \"cluster_$_\" { label=\"$_\\n", scalar( grep { exists $showpkg{$_} } @b ), " packages\\n"; + print "[", format_byte( depsize( @b ) ), "]\"; "; + # print " bgcolor=lightgrey"; + print " URL=\"/cgi-bin/depgraph2?pkg=", $todo[0], "&collapse_bundles=", join( ',', $_, keys %collapse_bundles ), "\"; "; + foreach my $pp (@b) { + next if( !exists $showpkg{$pp} ); + print "\"$pp\"; "; + } + print "}\n"; + } + + print "}\n"; +} + +my $color_stubs; +my $collapse_bundles = undef; +my %collapse_bundles; + +use Data::Dumper; +# print STDERR "D: ", Dumper( @ARGV ); + +my $result = GetOptions ( + "color_stubs" => \$color_stubs, # numeric + "collapse_bundles:s" => \$collapse_bundles, +); # flag + +if( !defined $collapse_bundles ) { + # Auto-detect + depgraph( pkg => \@ARGV, autocollapse => 1 ); +} elsif( $collapse_bundles eq "all" ) { + depgraph( pkg => \@ARGV, collapseall => 1 ); +} else { + $collapse_bundles{$_} = 1 foreach (split /,/, $collapse_bundles); + depgraph( pkg => \@ARGV, collapse_bundles => \%collapse_bundles ); +} + + Property changes on: buildfarm/cgi-bin/dograph ___________________________________________________________________ Added: svn:executable + * Added: buildfarm/cgi-bin/experimental.atom =================================================================== --- buildfarm/cgi-bin/experimental.atom (rev 0) +++ buildfarm/cgi-bin/experimental.atom 2012-02-22 20:43:08 UTC (rev 613) @@ -0,0 +1,58 @@ +#!/opt/csw/bin/perl -w + +use strict; +use POSIX qw( strftime ); +use XML::Atom::SimpleFeed; + +my $DIR = "/home/experimental"; + +my $feed = XML::Atom::SimpleFeed->new( + title => "OpenCSW Experimental Packages", + subtitle => "Test at your own risk", + logo => "http://gar.opencsw.org/trac/chrome/common/trac_banner.png", + link => "http://mirror.opencsw.org/experimental.html", + link => { + rel => 'self', + href => 'http://buildfarm.opencsw.org/cgi-bin/experimental.atom', + }, + id => "http://mirror.opencsw.org/testing.html", + author => "OpenCSW Maintainers", +# updated => $updated, +); + + +opendir T, $DIR || die "Can't open $DIR"; +my @projects = grep { !/^\./ && -d "$DIR/$_" } readdir T; +closedir T; + +foreach my $project (@projects) { + opendir T, "$DIR/$project" || die "Can't open $DIR/$project"; + my @pkgs = grep { !/^\./ && -f "$DIR/$project/$_" } readdir T; + closedir T; + + foreach my $pkg (@pkgs) { + # rubytk-1.8.7,REV=2008.09.19_p72-SunOS5.8-sparc-CSW.pkg.gz + my ($cname,$vers,$y,$m,$d,$os,$arch) = ($pkg =~ /^([^-]+)-([^-]+),REV=(\d{4})\.(\d{2})\.(\d{2})[^-]*-SunOS([^-]+)-([^-]+)-CSW\./); + + my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) + = stat( "$DIR/$project/$pkg" ); + + + next if( !defined $cname || !defined $y || !defined $m || !defined $d ); + # my $date = "${y}-${m}-${d}T00:00:00Z"; + + my $date = strftime '%Y-%m-%dT%H:%M:%SZ', gmtime( $mtime ); + + + $feed->add_entry( + title => "Project $project: $cname $vers for Solaris $os $arch", + link => "http://mirror.opencsw.org/experimental/$project/$pkg", + id => "http://mirror.opencsw.org/experimental/$project/$pkg", + summary => "$pkg", + updated => $date, + ); + } +} + +print "Content-type: text/xml; charset=us-ascii\n\n"; +$feed->print(); Property changes on: buildfarm/cgi-bin/experimental.atom ___________________________________________________________________ Added: svn:executable + * Added: buildfarm/cgi-bin/testing.atom =================================================================== --- buildfarm/cgi-bin/testing.atom (rev 0) +++ buildfarm/cgi-bin/testing.atom 2012-02-22 20:43:08 UTC (rev 613) @@ -0,0 +1,49 @@ +#!/opt/csw/bin/perl -w + +use strict; +use POSIX qw( strftime ); +use XML::Atom::SimpleFeed; + +my $feed = XML::Atom::SimpleFeed->new( + title => "OpenCSW Testing Packages", + subtitle => "Test at your own risk", + logo => "http://gar.opencsw.org/trac/chrome/common/trac_banner.png", + link => "http://buildfarm.opencsw.org/testing.html", + link => { + rel => 'self', + href => 'http://buildfarm.opencsw.org/cgi-bin/testing.atom', + }, + id => "http://buildfarm.opencsw.org/testing.html", + author => "OpenCSW Maintainers", +# updated => $updated, +); + +opendir T, "/home/testing"; +my @pkgs = readdir T; +closedir T; + +foreach my $pkg (@pkgs) { + # rubytk-1.8.7,REV=2008.09.19_p72-SunOS5.8-sparc-CSW.pkg.gz + my ($cname,$vers,$y,$m,$d,$os,$arch) = ($pkg =~ /^([^-]+)-([^-]+),REV=(\d{4})\.(\d{2})\.(\d{2})[^-]*-SunOS([^-]+)-([^-]+)-CSW\./); + + my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) + = stat( "/home/testing/$pkg" ); + + + next if( !defined $cname || !defined $y || !defined $m || !defined $d ); + # my $date = "${y}-${m}-${d}T00:00:00Z"; + + my $date = strftime '%Y-%m-%dT%H:%M:%SZ', gmtime( $mtime ); + + + $feed->add_entry( + title => "$cname $vers for Solaris $os $arch", + link => "http://buildfarm.opencsw.org/testing/$pkg", + id => "http://buildfarm.opencsw.org/testing/$pkg", + summary => "$pkg", + updated => $date, + ); +} + +print "Content-type: text/xml; charset=us-ascii\n\n"; +$feed->print(); Property changes on: buildfarm/cgi-bin/testing.atom ___________________________________________________________________ Added: svn:executable + * 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 Feb 22 23:13:17 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 22 Feb 2012 22:13:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17136] csw/mgar/pkg/miltergreylist/trunk/Makefile Message-ID: Revision: 17136 http://gar.svn.sourceforge.net/gar/?rev=17136&view=rev Author: bonivart Date: 2012-02-22 22:13:17 +0000 (Wed, 22 Feb 2012) Log Message: ----------- miltergreylist/trunk: fix state dir Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2012-02-22 19:52:21 UTC (rev 17135) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2012-02-22 22:13:17 UTC (rev 17136) @@ -40,7 +40,7 @@ CONFIGURE_ARGS += --with-conffile=/etc/opt/csw/greylist.conf CONFIGURE_ARGS += --enable-dnsrbl CONFIGURE_ARGS += --enable-stdio-hack -CONFIGURE_ARGS += --localstatedir=/var/opt/csw/miltergreylist +CONFIGURE_ARGS += --localstatedir=/var/opt/csw CONFIGURE_ARGS += --with-libGeoIP=/opt/csw/lib CONFIGURE_ARGS += --with-libspf2=/opt/csw/lib CONFIGURE_ARGS += --mandir=/opt/csw/share/man @@ -61,7 +61,7 @@ MIGRATE_DEST_DIR = /etc/opt/csw PROTOTYPE_MODIFIERS = 1 -PROTOTYPE_FILES_1 = /var/opt/csw/miltergreylist +PROTOTYPE_FILES_1 = /var/opt/csw/milter-greylist PROTOTYPE_CLASS_1 = ugfiles PROTOTYPE_PERMS_1 = 0700 PROTOTYPE_USER_1 = greylist @@ -79,7 +79,6 @@ @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(NAME) @$(foreach DOC,$(DOCLIST),cp $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(NAME);) - @ginstall -d -m 755 $(DESTDIR)/var/opt/csw/$(NAME) @ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/pkg/CSW$(NAME) @cp $(FILEDIR)/CSWmiltergreylist.ug $(DESTDIR)/opt/csw/etc/pkg/CSW$(NAME)/cswusergroup @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/init.d 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 Feb 23 00:52:36 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 22 Feb 2012 23:52:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[17137] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17137 http://gar.svn.sourceforge.net/gar/?rev=17137&view=rev Author: bdwalton Date: 2012-02-22 23:52:35 +0000 (Wed, 22 Feb 2012) Log Message: ----------- ruby19/trunk: switch back to api version for naming. Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-22 22:13:17 UTC (rev 17136) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-22 23:52:35 UTC (rev 17137) @@ -1,5 +1,7 @@ -NAME = ruby193 +NAME = ruby191 VERSION = 1.9.3 +# Change this when the build starts putting files in $(libdir)/ruby/$(newver) +API_VERSION = 1.9.1 PATCHLEVEL = p0 CATEGORIES = lang GARTYPE = v2 @@ -34,56 +36,56 @@ closures. endef -PACKAGES = CSWruby193 CSWruby193-samples CSWruby193-ri CSWruby193-tk -PACKAGES += CSWruby193-dev CSWlibruby193-1 +PACKAGES = CSWruby191 CSWruby191-samples CSWruby191-ri CSWruby191-tk +PACKAGES += CSWruby191-dev CSWlibruby191-1 -ARCHALL_CSWruby193-samples = 1 -ARCHALL_CSWruby193-ri = 1 +ARCHALL_CSWruby191-samples = 1 +ARCHALL_CSWruby191-ri = 1 # checkpkg overrides -CHECKPKG_OVERRIDES_CSWruby193-samples += missing-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWruby193-samples += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWruby193-samples += file-with-bad-content -CHECKPKG_OVERRIDES_CSWruby193 += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby191-samples += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWruby191-samples += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWruby191-samples += file-with-bad-content +CHECKPKG_OVERRIDES_CSWruby191 += missing-dependency|CSWruby # the next two have /usr/local/bin from dln_find.c. it should be innocuous and # not worth patching -CHECKPKG_OVERRIDES_CSWlibruby193-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby193.so.1 -CHECKPKG_OVERRIDES_CSWruby193-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby193-static.a +CHECKPKG_OVERRIDES_CSWlibruby191-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby191.so.1 +CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby191-static.a # -CHECKPKG_OVERRIDES_CSWruby193-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb -CHECKPKG_OVERRIDES_CSWruby193-ri += file-with-bad-content +CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb +CHECKPKG_OVERRIDES_CSWruby191-ri += file-with-bad-content -RUNTIME_DEP_PKGS_CSWruby193 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWruby193 += CSWlibssl0-9-8 CSWlibyaml -RUNTIME_DEP_PKGS_CSWruby193 += CSWlibreadline6 CSWlibz1 CSWlibffi4 -RUNTIME_DEP_PKGS_CSWruby193 += CSWlibruby193-1 -RUNTIME_DEP_PKGS_CSWruby193-samples = CSWruby193 -RUNTIME_DEP_PKGS_CSWruby193-tk = CSWruby193 CSWlibruby193-1 CSWtk CSWtcl CSWlibx11 -RUNTIME_DEP_PKGS_CSWruby193-dev = CSWruby193 -RUNTIME_DEP_PKGS_CSWruby193-ri = CSWruby193 +RUNTIME_DEP_PKGS_CSWruby191 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWruby191 += CSWlibssl0-9-8 CSWlibyaml +RUNTIME_DEP_PKGS_CSWruby191 += CSWlibreadline6 CSWlibz1 CSWlibffi4 +RUNTIME_DEP_PKGS_CSWruby191 += CSWlibruby191-1 +RUNTIME_DEP_PKGS_CSWruby191-samples = CSWruby191 +RUNTIME_DEP_PKGS_CSWruby191-tk = CSWruby191 CSWlibruby191-1 CSWtk CSWtcl CSWlibx11 +RUNTIME_DEP_PKGS_CSWruby191-dev = CSWruby191 +RUNTIME_DEP_PKGS_CSWruby191-ri = CSWruby191 -SPKG_DESC_CSWruby193 = $(DESCRIPTION) +SPKG_DESC_CSWruby191 = $(DESCRIPTION) -SPKG_DESC_CSWlibruby193-1 = The libruby shared object files (Ruby $(VERSION)) +SPKG_DESC_CSWlibruby191-1 = The libruby shared object files (Ruby $(VERSION), API $(API_VERSION)) -SPKG_DESC_CSWruby193-samples = Example programs for Ruby $(VERSION) +SPKG_DESC_CSWruby191-samples = Example programs for Ruby $(VERSION) -SPKG_DESC_CSWruby193-ri = Ruby $(VERSION) Interactive Reference +SPKG_DESC_CSWruby191-ri = Ruby $(VERSION) Interactive Reference -SPKG_DESC_CSWruby193-tk = Ruby $(VERSION) Tcl/TK Extension +SPKG_DESC_CSWruby191-tk = Ruby $(VERSION) Tcl/TK Extension -SPKG_DESC_CSWruby193-dev = Ruby $(VERSION) Extension Development Files +SPKG_DESC_CSWruby191-dev = Ruby $(VERSION) Extension Development Files -PKGFILES_CSWlibruby193-1 += $(call baseisadirs,$(libdir),lib$(NAME)\.so\.1.*) -PKGFILES_CSWlibruby193-1 += $(libdir)/ruby/.* +PKGFILES_CSWlibruby191-1 += $(call baseisadirs,$(libdir),lib$(NAME)\.so\.1.*) +PKGFILES_CSWlibruby191-1 += $(libdir)/ruby/.* -PKGFILES_CSWruby193-samples = $(docdir)/$(NAME)/sample.* +PKGFILES_CSWruby191-samples = $(docdir)/$(NAME)/sample.* -PKGFILES_CSWruby193-ri = $(datadir)/ri/.* $(bindir)/ri19 +PKGFILES_CSWruby191-ri = $(datadir)/ri/.* $(bindir)/ri19 -PKGFILES_CSWruby193-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb +PKGFILES_CSWruby191-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb -PKGFILES_CSWruby193-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a +PKGFILES_CSWruby191-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ DISTFILES = $(DISTNAME).tar.gz @@ -102,26 +104,16 @@ # UPSTREAM_MASTER_SITES = CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --program-suffix=$(subst .,,$(VERSION)) +CONFIGURE_ARGS += --program-suffix=$(subst ruby,,$(NAME)) CONFIGURE_ARGS += --enable-shared -CONFIGURE_ARGS += --with-soname=$(NAME) +CONFIGURE_ARGS += --with-soname=ruby$(API_VERSION) -#NOTE: We force this so that we can sanely provide multiple versions -#of ruby 1.9.x if required. The API (as of 1.9.3) was still 1.9.1. -#This makes it challenging to deliver multiple CSWlibruby19 packages, -#leave binary gem paths unaltered, etc. Instead, we override the API -#version which affects .so naming and a few directory paths. It's -#ugly but it should make progressing through potential API changes -#later much easier as we can deliver multiple versions of 1.9.x side -#by side. -CONFIGURE_ARGS += --with-ruby-version=$(VERSION) - EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib #GARCOMPILER = GCC4 -# RUNTIME_DEP_PKGS_CSWruby193 += CSWgcc4corert -# RUNTIME_DEP_PKGS_CSWruby193-dev += CSWgcc4core +# RUNTIME_DEP_PKGS_CSWruby191 += CSWgcc4corert +# RUNTIME_DEP_PKGS_CSWruby191-dev += CSWgcc4core # # This is for rbconfig.rb: without this, modules built may not get a # # proper setting. # EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) @@ -151,7 +143,7 @@ post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) -multiconfig: RBCONFIG=/opt/csw/lib/ruby/$(VERSION)/$(GARCH)-solaris2.10/rbconfig.rb +multiconfig: RBCONFIG=/opt/csw/lib/ruby/$(API_VERSION)/$(GARCH)-solaris2.10/rbconfig.rb multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12 @@ -166,7 +158,7 @@ # Fix up rbconfig rbconfig: @gsed -i -e s,$(DESTDIR),, \ - $(DESTDIR)$(libdir)/ruby/$(VERSION)/$(GARCH)-solaris2.10/rbconfig.rb + $(DESTDIR)$(libdir)/ruby/$(API_VERSION)/$(GARCH)-solaris2.10/rbconfig.rb @$(MAKECOOKIE) # Copy samples 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 Feb 23 00:58:26 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 22 Feb 2012 23:58:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17138] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17138 http://gar.svn.sourceforge.net/gar/?rev=17138&view=rev Author: bdwalton Date: 2012-02-22 23:58:26 +0000 (Wed, 22 Feb 2012) Log Message: ----------- ruby19/trunk: reorganize packaging statements for nicer grouping Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-22 23:52:35 UTC (rev 17137) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-22 23:58:26 UTC (rev 17138) @@ -39,53 +39,42 @@ PACKAGES = CSWruby191 CSWruby191-samples CSWruby191-ri CSWruby191-tk PACKAGES += CSWruby191-dev CSWlibruby191-1 -ARCHALL_CSWruby191-samples = 1 -ARCHALL_CSWruby191-ri = 1 - -# checkpkg overrides -CHECKPKG_OVERRIDES_CSWruby191-samples += missing-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWruby191-samples += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWruby191-samples += file-with-bad-content -CHECKPKG_OVERRIDES_CSWruby191 += missing-dependency|CSWruby -# the next two have /usr/local/bin from dln_find.c. it should be innocuous and -# not worth patching -CHECKPKG_OVERRIDES_CSWlibruby191-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby191.so.1 -CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby191-static.a -# -CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb -CHECKPKG_OVERRIDES_CSWruby191-ri += file-with-bad-content - +SPKG_DESC_CSWruby191 = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWruby191 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 RUNTIME_DEP_PKGS_CSWruby191 += CSWlibssl0-9-8 CSWlibyaml RUNTIME_DEP_PKGS_CSWruby191 += CSWlibreadline6 CSWlibz1 CSWlibffi4 RUNTIME_DEP_PKGS_CSWruby191 += CSWlibruby191-1 -RUNTIME_DEP_PKGS_CSWruby191-samples = CSWruby191 -RUNTIME_DEP_PKGS_CSWruby191-tk = CSWruby191 CSWlibruby191-1 CSWtk CSWtcl CSWlibx11 -RUNTIME_DEP_PKGS_CSWruby191-dev = CSWruby191 -RUNTIME_DEP_PKGS_CSWruby191-ri = CSWruby191 +CHECKPKG_OVERRIDES_CSWruby191 += missing-dependency|CSWruby -SPKG_DESC_CSWruby191 = $(DESCRIPTION) - SPKG_DESC_CSWlibruby191-1 = The libruby shared object files (Ruby $(VERSION), API $(API_VERSION)) - -SPKG_DESC_CSWruby191-samples = Example programs for Ruby $(VERSION) - -SPKG_DESC_CSWruby191-ri = Ruby $(VERSION) Interactive Reference - -SPKG_DESC_CSWruby191-tk = Ruby $(VERSION) Tcl/TK Extension - -SPKG_DESC_CSWruby191-dev = Ruby $(VERSION) Extension Development Files - PKGFILES_CSWlibruby191-1 += $(call baseisadirs,$(libdir),lib$(NAME)\.so\.1.*) PKGFILES_CSWlibruby191-1 += $(libdir)/ruby/.* +# the next two have /usr/local/bin from dln_find.c. it should be innocuous and +# not worth patching +CHECKPKG_OVERRIDES_CSWlibruby191-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby191.so.1 +ARCHALL_CSWruby191-samples = 1 +SPKG_DESC_CSWruby191-samples = Example programs for Ruby $(VERSION) PKGFILES_CSWruby191-samples = $(docdir)/$(NAME)/sample.* +RUNTIME_DEP_PKGS_CSWruby191-samples = CSWruby191 +CHECKPKG_OVERRIDES_CSWruby191-samples += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWruby191-samples += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWruby191-samples += file-with-bad-content +ARCHALL_CSWruby191-ri = 1 +SPKG_DESC_CSWruby191-ri = Ruby $(VERSION) Interactive Reference PKGFILES_CSWruby191-ri = $(datadir)/ri/.* $(bindir)/ri19 +RUNTIME_DEP_PKGS_CSWruby191-ri = CSWruby191 +CHECKPKG_OVERRIDES_CSWruby191-ri += file-with-bad-content +SPKG_DESC_CSWruby191-tk = Ruby $(VERSION) Tcl/TK Extension +RUNTIME_DEP_PKGS_CSWruby191-tk = CSWruby191 CSWlibruby191-1 CSWtk CSWtcl CSWlibx11 PKGFILES_CSWruby191-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb - +SPKG_DESC_CSWruby191-dev = Ruby $(VERSION) Extension Development Files PKGFILES_CSWruby191-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a +RUNTIME_DEP_PKGS_CSWruby191-dev = CSWruby191 +CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby191-static.a +CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ DISTFILES = $(DISTNAME).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 Thu Feb 23 04:09:22 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 23 Feb 2012 03:09:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[17139] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17139 http://gar.svn.sourceforge.net/gar/?rev=17139&view=rev Author: bdwalton Date: 2012-02-23 03:09:21 +0000 (Thu, 23 Feb 2012) Log Message: ----------- ruby19/trunk: disable tk extension, shift dependencies to library package after reorg Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-22 23:58:26 UTC (rev 17138) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-23 03:09:21 UTC (rev 17139) @@ -36,22 +36,22 @@ closures. endef -PACKAGES = CSWruby191 CSWruby191-samples CSWruby191-ri CSWruby191-tk +PACKAGES = CSWruby191 CSWruby191-samples CSWruby191-ri PACKAGES += CSWruby191-dev CSWlibruby191-1 SPKG_DESC_CSWruby191 = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWruby191 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWruby191 += CSWlibssl0-9-8 CSWlibyaml -RUNTIME_DEP_PKGS_CSWruby191 += CSWlibreadline6 CSWlibz1 CSWlibffi4 RUNTIME_DEP_PKGS_CSWruby191 += CSWlibruby191-1 CHECKPKG_OVERRIDES_CSWruby191 += missing-dependency|CSWruby SPKG_DESC_CSWlibruby191-1 = The libruby shared object files (Ruby $(VERSION), API $(API_VERSION)) -PKGFILES_CSWlibruby191-1 += $(call baseisadirs,$(libdir),lib$(NAME)\.so\.1.*) +RUNTIME_DEP_PKGS_CSWlibruby191 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWlibruby191 += CSWlibssl0-9-8 CSWlibyaml +RUNTIME_DEP_PKGS_CSWlibruby191 += CSWlibreadline6 CSWlibz1 CSWlibffi4 +PKGFILES_CSWlibruby191-1 += $(call baseisadirs,$(libdir),libruby$(API_VERSION)\.so\.1.*) PKGFILES_CSWlibruby191-1 += $(libdir)/ruby/.* # the next two have /usr/local/bin from dln_find.c. it should be innocuous and # not worth patching -CHECKPKG_OVERRIDES_CSWlibruby191-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby191.so.1 +CHECKPKG_OVERRIDES_CSWlibruby191-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby1.9.1.so.1 ARCHALL_CSWruby191-samples = 1 SPKG_DESC_CSWruby191-samples = Example programs for Ruby $(VERSION) @@ -67,9 +67,10 @@ RUNTIME_DEP_PKGS_CSWruby191-ri = CSWruby191 CHECKPKG_OVERRIDES_CSWruby191-ri += file-with-bad-content -SPKG_DESC_CSWruby191-tk = Ruby $(VERSION) Tcl/TK Extension -RUNTIME_DEP_PKGS_CSWruby191-tk = CSWruby191 CSWlibruby191-1 CSWtk CSWtcl CSWlibx11 -PKGFILES_CSWruby191-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb +# SPKG_DESC_CSWruby191-tk = Ruby $(VERSION) Tcl/TK Extension +# RUNTIME_DEP_PKGS_CSWruby191-tk = CSWruby191 CSWlibruby191-1 CSWtk CSWtcl CSWlibx11 +# PKGFILES_CSWruby191-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb + SPKG_DESC_CSWruby191-dev = Ruby $(VERSION) Extension Development Files PKGFILES_CSWruby191-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a RUNTIME_DEP_PKGS_CSWruby191-dev = CSWruby191 @@ -96,6 +97,7 @@ CONFIGURE_ARGS += --program-suffix=$(subst ruby,,$(NAME)) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --with-soname=ruby$(API_VERSION) +CONFIGURE_ARGS += --with-out-ext=tk EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/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 Thu Feb 23 04:11:43 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 23 Feb 2012 03:11:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[17140] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17140 http://gar.svn.sourceforge.net/gar/?rev=17140&view=rev Author: bdwalton Date: 2012-02-23 03:11:43 +0000 (Thu, 23 Feb 2012) Log Message: ----------- ruby19/trunk: rename library package to match soname Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-23 03:09:21 UTC (rev 17139) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-23 03:11:43 UTC (rev 17140) @@ -37,21 +37,21 @@ endef PACKAGES = CSWruby191 CSWruby191-samples CSWruby191-ri -PACKAGES += CSWruby191-dev CSWlibruby191-1 +PACKAGES += CSWruby191-dev CSWlibruby1-9-1-1 SPKG_DESC_CSWruby191 = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWruby191 += CSWlibruby191-1 +RUNTIME_DEP_PKGS_CSWruby191 += CSWlibruby1-9-1-1 CHECKPKG_OVERRIDES_CSWruby191 += missing-dependency|CSWruby -SPKG_DESC_CSWlibruby191-1 = The libruby shared object files (Ruby $(VERSION), API $(API_VERSION)) -RUNTIME_DEP_PKGS_CSWlibruby191 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWlibruby191 += CSWlibssl0-9-8 CSWlibyaml -RUNTIME_DEP_PKGS_CSWlibruby191 += CSWlibreadline6 CSWlibz1 CSWlibffi4 -PKGFILES_CSWlibruby191-1 += $(call baseisadirs,$(libdir),libruby$(API_VERSION)\.so\.1.*) -PKGFILES_CSWlibruby191-1 += $(libdir)/ruby/.* +SPKG_DESC_CSWlibruby1-9-1-1 = The libruby shared object files (Ruby $(VERSION), API $(API_VERSION)) +RUNTIME_DEP_PKGS_CSWlibruby-1-9-1-1 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWlibruby1-9-1- += CSWlibssl0-9-8 CSWlibyaml +RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 += CSWlibreadline6 CSWlibz1 CSWlibffi4 +PKGFILES_CSWlibruby1-9-1-1 += $(call baseisadirs,$(libdir),libruby$(API_VERSION)\.so\.1.*) +PKGFILES_CSWlibruby1-9-1-1 += $(libdir)/ruby/.* # the next two have /usr/local/bin from dln_find.c. it should be innocuous and # not worth patching -CHECKPKG_OVERRIDES_CSWlibruby191-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby1.9.1.so.1 +CHECKPKG_OVERRIDES_CSWlibruby1-9-1-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby1.9.1.so.1 ARCHALL_CSWruby191-samples = 1 SPKG_DESC_CSWruby191-samples = Example programs for Ruby $(VERSION) @@ -68,13 +68,13 @@ CHECKPKG_OVERRIDES_CSWruby191-ri += file-with-bad-content # SPKG_DESC_CSWruby191-tk = Ruby $(VERSION) Tcl/TK Extension -# RUNTIME_DEP_PKGS_CSWruby191-tk = CSWruby191 CSWlibruby191-1 CSWtk CSWtcl CSWlibx11 +# RUNTIME_DEP_PKGS_CSWruby191-tk = CSWruby191 CSWlibruby1-9-1-1 CSWtk CSWtcl CSWlibx11 # PKGFILES_CSWruby191-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb SPKG_DESC_CSWruby191-dev = Ruby $(VERSION) Extension Development Files PKGFILES_CSWruby191-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a RUNTIME_DEP_PKGS_CSWruby191-dev = CSWruby191 -CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby191-static.a +CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby1.9.1-static.a CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ 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 Feb 23 04:29:43 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 23 Feb 2012 03:29:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[17141] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17141 http://gar.svn.sourceforge.net/gar/?rev=17141&view=rev Author: bdwalton Date: 2012-02-23 03:29:43 +0000 (Thu, 23 Feb 2012) Log Message: ----------- ruby19/trunk: correct deps on libruby Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-23 03:11:43 UTC (rev 17140) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-23 03:29:43 UTC (rev 17141) @@ -44,8 +44,8 @@ CHECKPKG_OVERRIDES_CSWruby191 += missing-dependency|CSWruby SPKG_DESC_CSWlibruby1-9-1-1 = The libruby shared object files (Ruby $(VERSION), API $(API_VERSION)) -RUNTIME_DEP_PKGS_CSWlibruby-1-9-1-1 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWlibruby1-9-1- += CSWlibssl0-9-8 CSWlibyaml +RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 += CSWlibssl0-9-8 CSWlibyaml RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 += CSWlibreadline6 CSWlibz1 CSWlibffi4 PKGFILES_CSWlibruby1-9-1-1 += $(call baseisadirs,$(libdir),libruby$(API_VERSION)\.so\.1.*) PKGFILES_CSWlibruby1-9-1-1 += $(libdir)/ruby/.* 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 Feb 23 10:45:10 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 09:45:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17142] csw/mgar/pkg/file/trunk Message-ID: Revision: 17142 http://gar.svn.sourceforge.net/gar/?rev=17142&view=rev Author: dmichelsen Date: 2012-02-23 09:45:09 +0000 (Thu, 23 Feb 2012) Log Message: ----------- file/trunk: Update to 5.11 Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2012-02-23 03:29:43 UTC (rev 17141) +++ csw/mgar/pkg/file/trunk/Makefile 2012-02-23 09:45:09 UTC (rev 17142) @@ -1,7 +1,7 @@ # $Id$ NAME = file -VERSION = 5.10 +VERSION = 5.11 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums 2012-02-23 03:29:43 UTC (rev 17141) +++ csw/mgar/pkg/file/trunk/checksums 2012-02-23 09:45:09 UTC (rev 17142) @@ -1 +1 @@ -4cea34b087b060772511e066e2038196 file-5.10.tar.gz +16a407bd66d6c7a832f3a5c0d609c27b file-5.11.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 Feb 23 10:55:21 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 09:55:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17143] csw/mgar/pkg/ddrescue/trunk Message-ID: Revision: 17143 http://gar.svn.sourceforge.net/gar/?rev=17143&view=rev Author: dmichelsen Date: 2012-02-23 09:55:21 +0000 (Thu, 23 Feb 2012) Log Message: ----------- ddrescue/trunk: Update to 1.15 Modified Paths: -------------- csw/mgar/pkg/ddrescue/trunk/Makefile csw/mgar/pkg/ddrescue/trunk/checksums csw/mgar/pkg/ddrescue/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h.patch Modified: csw/mgar/pkg/ddrescue/trunk/Makefile =================================================================== --- csw/mgar/pkg/ddrescue/trunk/Makefile 2012-02-23 09:45:09 UTC (rev 17142) +++ csw/mgar/pkg/ddrescue/trunk/Makefile 2012-02-23 09:55:21 UTC (rev 17143) @@ -1,6 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ NAME = ddrescue -VERSION = 1.14 +VERSION = 1.15 CATEGORIES = utils GARTYPE = v2 @@ -11,12 +11,11 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.lz +DISTFILES = $(DISTNAME).tar.lz PATCHFILES += 0001-Use-inttypes.h-instead-of-stdint.h.patch -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.lz +EXTRA_LDFLAGS += -norunpath CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += CXX="$(CXX)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" Modified: csw/mgar/pkg/ddrescue/trunk/checksums =================================================================== --- csw/mgar/pkg/ddrescue/trunk/checksums 2012-02-23 09:45:09 UTC (rev 17142) +++ csw/mgar/pkg/ddrescue/trunk/checksums 2012-02-23 09:55:21 UTC (rev 17143) @@ -1 +1 @@ -122d628c884a170659ac4c227cc484bc ddrescue-1.14.tar.lz +c0566c2648c3738390a8dda2f37a9824 ddrescue-1.15.tar.lz Modified: csw/mgar/pkg/ddrescue/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/ddrescue/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h.patch 2012-02-23 09:45:09 UTC (rev 17142) +++ csw/mgar/pkg/ddrescue/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h.patch 2012-02-23 09:55:21 UTC (rev 17143) @@ -1,20 +1,21 @@ -From 1663750c7ed123dc247d26a41a4fdbdead4ccb1c Mon Sep 17 00:00:00 2001 +From 15db7fb3672d81bed1b00e2f4a94cab3bb331d55 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Tue, 25 Jan 2011 09:52:33 +0100 +Date: Thu, 23 Feb 2012 10:39:18 +0100 Subject: [PATCH] Use inttypes.h instead of stdint.h --- - block.cc | 2 +- - ddrescue.cc | 2 +- - fillbook.cc | 2 +- - genbook.cc | 2 +- - logbook.cc | 2 +- - main.cc | 2 +- - rescuebook.cc | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) + block.cc | 2 +- + ddrescuelog.cc | 2 +- + fillbook.cc | 2 +- + genbook.cc | 2 +- + io.cc | 2 +- + logbook.cc | 2 +- + main.cc | 2 +- + rescuebook.cc | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/block.cc b/block.cc -index 5b80fdc..2ec989b 100644 +index 2f14ada..b8d29e9 100644 --- a/block.cc +++ b/block.cc @@ -23,7 +23,7 @@ @@ -26,21 +27,21 @@ #include "block.h" #include "ddrescue.h" -diff --git a/ddrescue.cc b/ddrescue.cc -index 3acca37..6b4657d 100644 ---- a/ddrescue.cc -+++ b/ddrescue.cc +diff --git a/ddrescuelog.cc b/ddrescuelog.cc +index 40a64ae..b908392 100644 +--- a/ddrescuelog.cc ++++ b/ddrescuelog.cc @@ -28,7 +28,7 @@ - #include + #include #include #include -#include +#include - #include + #include "arg_parser.h" #include "block.h" diff --git a/fillbook.cc b/fillbook.cc -index 7c7be61..533b346 100644 +index 5b249a5..66aed40 100644 --- a/fillbook.cc +++ b/fillbook.cc @@ -22,7 +22,7 @@ @@ -53,7 +54,7 @@ #include "block.h" #include "ddrescue.h" diff --git a/genbook.cc b/genbook.cc -index 0106edd..5760fe7 100644 +index d864a8f..b74bb64 100644 --- a/genbook.cc +++ b/genbook.cc @@ -24,7 +24,7 @@ @@ -65,8 +66,21 @@ #include #include "block.h" +diff --git a/io.cc b/io.cc +index 902ce12..a921b87 100644 +--- a/io.cc ++++ b/io.cc +@@ -28,7 +28,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "block.h" diff --git a/logbook.cc b/logbook.cc -index c5bed8d..13eb69d 100644 +index bee8754..12c5bad 100644 --- a/logbook.cc +++ b/logbook.cc @@ -27,7 +27,7 @@ @@ -79,7 +93,7 @@ #include "block.h" diff --git a/main.cc b/main.cc -index 9397965..dbcfd1d 100644 +index a200763..7238998 100644 --- a/main.cc +++ b/main.cc @@ -32,7 +32,7 @@ @@ -92,7 +106,7 @@ #include diff --git a/rescuebook.cc b/rescuebook.cc -index 8da4269..dce76ab 100644 +index 0dbbeb9..562e442 100644 --- a/rescuebook.cc +++ b/rescuebook.cc @@ -24,7 +24,7 @@ @@ -105,5 +119,5 @@ #include "block.h" -- -1.7.3.2 +1.7.9 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 Feb 23 10:57:59 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 09:57:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17144] csw/mgar/pkg/cpan Message-ID: Revision: 17144 http://gar.svn.sourceforge.net/gar/?rev=17144&view=rev Author: dmichelsen Date: 2012-02-23 09:57:58 +0000 (Thu, 23 Feb 2012) Log Message: ----------- Sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Locale-gettext/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/Locale-gettext/ Removed Paths: ------------- csw/mgar/pkg/cpan/Locale-Gettext/ Modified: csw/mgar/pkg/cpan/Locale-gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile 2012-02-01 18:13:41 UTC (rev 16968) +++ csw/mgar/pkg/cpan/Locale-gettext/trunk/Makefile 2012-02-23 09:57:58 UTC (rev 17144) @@ -4,28 +4,26 @@ GARTYPE = v2 AUTHOR = PVANDRY -DESCRIPTION = Message handling functions +DESCRIPTION = Multilanguage messages define BLURB - The gettext module permits access from perl to the gettext() family - of functions for retrieving message strings from databases constructed - to internationalize software. endef -DISTFILES = COPYING +DISTFILES += COPYING # Compatibility patches for Perl 5.10.1 from # https://rt.cpan.org/Public/Bug/Display.html?id=35680 -PATCHFILES = compatibility-with-POSIX-module.diff +PATCHFILES += compatibility-with-POSIX-module.diff PATCHFILES += doc-update.diff -PACKAGES = CSWpmlocalegettext -CATALOGNAME = pm_localegettext +CATALOG_RELEASE = unstable -RUNTIME_DEP_PKGS = CSWggettextrt +PACKAGES += CSWpm-locale-gettext +CATALOGNAME_CSWpm-locale-gettext = pm_locale_gettext +SPKG_DESC_CSWpm-locale-gettext = Multilanguage messages +RUNTIME_DEP_PKGS_CSWpm-locale-gettext += CSWlibintl8 +OBSOLETED_BY_CSWpm-locale-gettext += CSWpmlocalegettext +CATALOGNAME_CSWpmlocalegettext = pm_localegettext_stub -# The Perl module really does not start with uppercase... -CHECKPKG_OVERRIDES_CSWpmlocalegettext += pkginfo-description-not-starting-with-uppercase +BUILD_ARGS += OTHERLDFLAGS="-lintl -R$(libdir)" include gar/category.mk - -BUILD_ARGS += OTHERLDFLAGS="-lintl -R$(libdir)" 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 Feb 23 11:09:14 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 10:09:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17145] csw/mgar/pkg/help2man/trunk Message-ID: Revision: 17145 http://gar.svn.sourceforge.net/gar/?rev=17145&view=rev Author: dmichelsen Date: 2012-02-23 10:09:14 +0000 (Thu, 23 Feb 2012) Log Message: ----------- help2man/trunk: Update to 1.40.5 and reinplacements Modified Paths: -------------- csw/mgar/pkg/help2man/trunk/Makefile csw/mgar/pkg/help2man/trunk/checksums Modified: csw/mgar/pkg/help2man/trunk/Makefile =================================================================== --- csw/mgar/pkg/help2man/trunk/Makefile 2012-02-23 09:57:58 UTC (rev 17144) +++ csw/mgar/pkg/help2man/trunk/Makefile 2012-02-23 10:09:14 UTC (rev 17145) @@ -1,5 +1,5 @@ NAME = help2man -VERSION = 1.39.2 +VERSION = 1.40.5 CATEGORIES = devel GARTYPE = v2 @@ -13,19 +13,21 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWhelp2man +SPKG_DESC_CSWhelp2man = A tool for automatically generating simple manual pages from program output +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWhelp2man += CSWpm-locale-gettext +# Perl module dependency cannot be tracked by checkpkg +CHECKPKG_OVERRIDES_CSWhelp2man += surplus-dependency|CSWpm-locale-gettext -DEP_PKGS = CSWpmlocalegettext +REINPLACE_USRSHARE += help2man.info -CONFIGURE_ARGS = $(DIRPATHS) +REINPLACEMENTS += usrlib +REINPLACE_MATCH_usrlib = /usr/lib +REINPLACE_WITH_usrlib = $(libdir) +REINPLACE_FILES_usrlib += help2man.info +# There is no testsuite TEST_SCRIPTS = -CHECKPKG_OVERRIDES_CSWhelp2man += surplus-dependency|CSWpmlocalegettext - include gar/category.mk - -post-install-modulated: - -perl -pi -e 's,/usr/lib,$(libdir),g;' \ - -e 's,/usr/share,$(sharedstatedir),g;' \ - $(DESTDIR)$(infodir)/help2man.info Modified: csw/mgar/pkg/help2man/trunk/checksums =================================================================== --- csw/mgar/pkg/help2man/trunk/checksums 2012-02-23 09:57:58 UTC (rev 17144) +++ csw/mgar/pkg/help2man/trunk/checksums 2012-02-23 10:09:14 UTC (rev 17145) @@ -1 +1 @@ -36659da3ba7a9a51813e1c4848900a28 help2man-1.39.2.tar.gz +75a7d2f93765cd367aab98986a75f88c help2man-1.40.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 Thu Feb 23 11:22:37 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 10:22:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17146] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 17146 http://gar.svn.sourceforge.net/gar/?rev=17146&view=rev Author: dmichelsen Date: 2012-02-23 10:22:37 +0000 (Thu, 23 Feb 2012) Log Message: ----------- mGAR v2: In collapsed modulation names fall back to 'extra' if 'default64' is not defined Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2012-02-23 10:09:14 UTC (rev 17145) +++ csw/mgar/gar/v2/gar.mk 2012-02-23 10:22:37 UTC (rev 17146) @@ -234,6 +234,7 @@ define modulationvalue $(strip $(or $($(1)_$(MODULATION)),\ $($(1)_$(MODULATION_ISACOLLAPSED)),\ + $($(1)_$(MODULATION_ISACOLLAPSEDEXTRA)),\ )) endef 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 Feb 23 11:31:27 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 10:31:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[17147] csw/mgar/pkg/libcurl4/trunk Message-ID: Revision: 17147 http://gar.svn.sourceforge.net/gar/?rev=17147&view=rev Author: dmichelsen Date: 2012-02-23 10:31:27 +0000 (Thu, 23 Feb 2012) Log Message: ----------- libcurl4/trunk: Update to 7.24.0 and updated deps naming Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile csw/mgar/pkg/libcurl4/trunk/checksums Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2012-02-23 10:22:37 UTC (rev 17146) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2012-02-23 10:31:27 UTC (rev 17147) @@ -1,9 +1,5 @@ -# TBD: -# - Link against new libfbopenssl0 -# - Link against new librtmp0 - NAME = curl -VERSION = 7.23.1 +VERSION = 7.24.0 CATEGORIES = net GARTYPE = v2 @@ -33,7 +29,7 @@ SPKG_DESC_CSWlibcurl4 = Library for client-side URL transfers, libcurl.so.4 PKGFILES_CSWlibcurl4 = $(call pkgfiles_lib,libcurl.so.4) OBSOLETED_BY_CSWlibcurl4 = CSWcurlrt -RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibidn11 @@ -44,9 +40,10 @@ RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibfbopenssl0 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWoldaprt -RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibssh2 +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibssh2-1 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibcares2 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibrtmp0 @@ -71,7 +68,7 @@ RUNTIME_DEP_PKGS_CSWcurl += CSWlibz1 RUNTIME_DEP_PKGS_CSWcurl += CSWlibidn11 RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWcurl += CSWosslrt +RUNTIME_DEP_PKGS_CSWcurl += CSWlibssl0-9-8 # Double-legacy packages may not even depend on CSWcurlrt, so we must # also directly depend on CSWlibcurl2 and CSWlibcurl3 RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl2 @@ -79,10 +76,10 @@ CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcurl2 CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcurl3 -BUILD_DEP_PKGS += CSWoldapdevel -BUILD_DEP_PKGS += CSWossldevel +BUILD_DEP_PKGS += CSWopenldap-dev +BUILD_DEP_PKGS += CSWlibssl-dev BUILD_DEP_PKGS += CSWlibcares-dev -BUILD_DEP_PKGS += CSWlibssh2devel +BUILD_DEP_PKGS += CSWlibssh2-dev BUILD_DEP_PKGS += CSWlibfbopenssl-dev BUILD_DEP_PKGS += CSWlibrtmp-dev Modified: csw/mgar/pkg/libcurl4/trunk/checksums =================================================================== --- csw/mgar/pkg/libcurl4/trunk/checksums 2012-02-23 10:22:37 UTC (rev 17146) +++ csw/mgar/pkg/libcurl4/trunk/checksums 2012-02-23 10:31:27 UTC (rev 17147) @@ -1 +1 @@ -0296d3196b4bf82c896a869b38dbc5f2 curl-7.23.1.tar.bz2 +f912221d75eb8d8fe08900eaf011b023 curl-7.24.0.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 Thu Feb 23 13:30:55 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 12:30:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[17148] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 17148 http://gar.svn.sourceforge.net/gar/?rev=17148&view=rev Author: dmichelsen Date: 2012-02-23 12:30:55 +0000 (Thu, 23 Feb 2012) Log Message: ----------- cups/trunk: Preserve config files, reworks deps, readd client.conf Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2012-02-23 10:31:27 UTC (rev 17147) +++ csw/mgar/pkg/cups/trunk/Makefile 2012-02-23 12:30:55 UTC (rev 17148) @@ -65,11 +65,11 @@ LICENSE = LICENSE.txt -BUILD_DEP_PKGS = CSWggettext -BUILD_DEP_PKGS += CSWjpeg -BUILD_DEP_PKGS += CSWoldapdevel -BUILD_DEP_PKGS += CSWossldevel -BUILD_DEP_PKGS += CSWtiff +BUILD_DEP_PKGS = CSWggettext-dev +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWopenldap-dev +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibtiff-dev BUILD_DEP_PKGS += CSWlibkrb5-dev BUILD_DEP_PKGS += CSWlibgcrypt-dev BUILD_DEP_PKGS += CSWlibgpg-error-dev @@ -143,7 +143,7 @@ RUNTIME_DEP_PKGS_CSWcupsd += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibslp1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibz1 -RUNTIME_DEP_PKGS_CSWcupsd += CSWoldaprt +RUNTIME_DEP_PKGS_CSWcupsd += CSWlibldap2-4-2 PACKAGES += CSWcupsclient SPKG_DESC_CSWcupsclient = CUPS client binaries @@ -154,6 +154,7 @@ PKGFILES_CSWcupsclient += $(bindir)/(lp(|options|passwd|q|r|rm|stat)) PKGFILES_CSWcupsclient += $(bindir)/ipptool PKGFILES_CSWcupsclient += $(mandir)/man1/ipptool.1 +PKGFILES_CSWcupsclient += $(mandir)/man5/ipptoolfile.5 PKGFILES_CSWcupsclient += $(sharedstatedir)/cups/ipptool/.* PKGFILES_CSWcupsclient += $(mandir)/man1/(cancel|cupstest(dsc|ppd)|lp).1 PKGFILES_CSWcupsclient += $(mandir)/man1/(lpoptions|lppasswd|lpq|lpr|lprm).1 @@ -261,7 +262,7 @@ PACKAGES += CSWlibcupsimage2 SPKG_DESC_CSWlibcupsimage2 = CUPS libraries, libcupsimage.so.2 PKGFILES_CSWlibcupsimage2 += $(call pkgfiles_lib,libcupsimage.so.2) -RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWjpeg +RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibcups2 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibgcrypt11 @@ -271,7 +272,7 @@ RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWtiff +RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibtiff3 OBSOLETED_BY_CSWlibcupsimage2 += CSWlibcups PACKAGES += CSWlibcupsmime1 @@ -350,6 +351,8 @@ INSTALL_OVERRIDE_VARS = DSTROOT INSTALL_OVERRIDE_VAR_DSTROOT = $(DESTDIR) +EXTRA_MERGE_EXCLUDE_FILES += .*\.default + PROTOTYPE_MODIFIERS = lp_group_etc PROTOTYPE_FILES_lp_group_etc = $(sysconfdir).* PROTOTYPE_GROUP_lp_group_etc = lp @@ -359,34 +362,27 @@ PROTOTYPE_GROUP_lp_group_var = lp # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html -SAMPLECONF += $(sysconfdir)/cups/client\.conf\.CSW +PRESERVECONF += $(sysconfdir)/cups/client\.conf +PRESERVECONF += $(sysconfdir)/cups/cupsd\.conf INITSMF = $(sysconfdir)/init\.d/cswcups include gar/category.mk -dont-post-install-modulated: $(CUPSLINKS_TARGET) - (cd $(DESTDIR)$(sysconfdir)/cups; \ - echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \ - for i in cupsd.conf; do \ - if [ -r "$$i" ]; then \ - echo "$$i -> $$i.CSW"; \ - mv "$$i" "$$i.CSW"; \ - chmod 0644 "$$i.CSW"; \ - fi \ - done) +post-install-modulated: ginstall -m 644 \ - $(FILEDIR)/client.conf.CSW \ + $(WORKDIR)/client.conf.CSW \ $(DESTDIR)$(sysconfdir)/cups/client.conf.CSW - for f in $(DESTDIR)$(libdir)/cups/backend/*; do \ + for f in $(DESTDIR)$(libdir_install)/cups/backend/*; do \ chmod 0700 $${f}; \ done # https://www.opencsw.org/mantis/view.php?id=4532 ginstall -m 755 -d $(DESTDIR)$(datadir)/doc/cupsclient - ginstall -m 755 $(DOWNLOADDIR)/CSWcupsclient.README \ + ginstall -m 755 $(WORKDIR)/CSWcupsclient.README \ $(DESTDIR)$(datadir)/doc/cupsclient/README @$(MAKECOOKIE) -dont-cupslinks: +# This has been disabled and should be pulled in through post-install-modulated +cupslinks: # https://www.opencsw.org/mantis/view.php?id=2924 ginstall -d -m 755 $(DESTDIR)/usr/bin for f in cancel lp lpoptions lppassd lpq lpr lprm lpstat; do \ 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 Feb 23 14:04:15 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 23 Feb 2012 13:04:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17149] csw/mgar/pkg/cpan/Email-MessageID/trunk/Makefile Message-ID: Revision: 17149 http://gar.svn.sourceforge.net/gar/?rev=17149&view=rev Author: idogan23 Date: 2012-02-23 13:04:15 +0000 (Thu, 23 Feb 2012) Log Message: ----------- Email-MessageID: fixed CATALOGNAME Modified Paths: -------------- csw/mgar/pkg/cpan/Email-MessageID/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-MessageID/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MessageID/trunk/Makefile 2012-02-23 12:30:55 UTC (rev 17148) +++ csw/mgar/pkg/cpan/Email-MessageID/trunk/Makefile 2012-02-23 13:04:15 UTC (rev 17149) @@ -10,7 +10,13 @@ endef PACKAGES = CSWpm-email-messageid -CATALOGNAME = pm_email-messageid +CATALOGNAME = pm_email_messageid +ARCHALL = 1 + +RUNTIME_DEP_PKGS = CSWpm-email-address + +LICENSE = LICENSE + 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 Feb 23 14:54:01 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 13:54:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[17150] csw/mgar/pkg/webalizer/trunk/Makefile Message-ID: Revision: 17150 http://gar.svn.sourceforge.net/gar/?rev=17150&view=rev Author: dmichelsen Date: 2012-02-23 13:54:01 +0000 (Thu, 23 Feb 2012) Log Message: ----------- webalizer: Add vendor URL Modified Paths: -------------- csw/mgar/pkg/webalizer/trunk/Makefile Modified: csw/mgar/pkg/webalizer/trunk/Makefile =================================================================== --- csw/mgar/pkg/webalizer/trunk/Makefile 2012-02-23 13:04:15 UTC (rev 17149) +++ csw/mgar/pkg/webalizer/trunk/Makefile 2012-02-23 13:54:01 UTC (rev 17150) @@ -21,6 +21,8 @@ # so we disable the test below and re-add the definition manually in webalizer.h PATCHFILES += 0002-Re-add-definition-on-u_int64_t.patch +VENDOR_URL = http://www.webalizer.org + BUILD_DEP_PKGS += CSWlibgd-dev BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWlibz-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Feb 23 16:08:24 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 23 Feb 2012 15:08:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17151] csw/mgar/pkg/splix/trunk/Makefile Message-ID: Revision: 17151 http://gar.svn.sourceforge.net/gar/?rev=17151&view=rev Author: cgrzemba Date: 2012-02-23 15:08:24 +0000 (Thu, 23 Feb 2012) Log Message: ----------- splix/trunk: add dependency Ghostscript, Sol10 SFW ghostscript has no cups driver Modified Paths: -------------- csw/mgar/pkg/splix/trunk/Makefile Modified: csw/mgar/pkg/splix/trunk/Makefile =================================================================== --- csw/mgar/pkg/splix/trunk/Makefile 2012-02-23 13:54:01 UTC (rev 17150) +++ csw/mgar/pkg/splix/trunk/Makefile 2012-02-23 15:08:24 UTC (rev 17151) @@ -37,7 +37,9 @@ RUNTIME_DEP_PKGS_CSWsplix += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWsplix += CSWlibjbig85-2 RUNTIME_DEP_PKGS_CSWsplix += CSWcups +RUNTIME_DEP_PKGS_CSWsplix += CSWghostscript CHECKPKG_OVERRIDES_CSWsplix += surplus-dependency|CSWcups +CHECKPKG_OVERRIDES_CSWsplix += surplus-dependency|CSWghostscript 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 Feb 23 16:12:45 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 15:12:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17152] csw/mgar/pkg/gtk-doc/trunk Message-ID: Revision: 17152 http://gar.svn.sourceforge.net/gar/?rev=17152&view=rev Author: dmichelsen Date: 2012-02-23 15:12:45 +0000 (Thu, 23 Feb 2012) Log Message: ----------- gtk-doc/trunk: Update to 1.18 and new depe Modified Paths: -------------- csw/mgar/pkg/gtk-doc/trunk/Makefile csw/mgar/pkg/gtk-doc/trunk/checksums Modified: csw/mgar/pkg/gtk-doc/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk-doc/trunk/Makefile 2012-02-23 15:08:24 UTC (rev 17151) +++ csw/mgar/pkg/gtk-doc/trunk/Makefile 2012-02-23 15:12:45 UTC (rev 17152) @@ -1,5 +1,5 @@ NAME = gtk-doc -VERSION = 1.11 +VERSION = 1.18 CATEGORIES = gnome GARTYPE = v2 @@ -11,29 +11,55 @@ endef MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(DISTNAME).tar.xz DISTFILES += CSWgtk-doc.postinstall DISTFILES += CSWgtk-doc.postremove -CATALOGNAME_CSWgtk-doc = gtk_doc -BUILD_DEP_PKGS += CSWsgmlcommon CSWxmlcommon CSWdocbookxsl -BUILD_DEP_PKGS += CSWopenjade CSWgnomedocutils +BUILD_DEP_PKGS += CSWsgmlcommon +BUILD_DEP_PKGS += CSWxmlcommon +BUILD_DEP_PKGS += CSWdocbookxsl +BUILD_DEP_PKGS += CSWopenjade +BUILD_DEP_PKGS += CSWgnomedocutils +BUILD_DEP_PKGS += CSWpy-libxml2 -RUNTIME_DEP_PKGS += CSWperl CSWpython CSWsgmlcommon CSWxmlcommon -RUNTIME_DEP_PKGS += CSWdocbookxsl CSWopenjade CSWgnomedocutils +RUNTIME_DEP_PKGS += CSWperl +RUNTIME_DEP_PKGS += CSWpython +RUNTIME_DEP_PKGS += CSWsgmlcommon +RUNTIME_DEP_PKGS += CSWxmlcommon +RUNTIME_DEP_PKGS += CSWdocbookxsl +RUNTIME_DEP_PKGS += CSWopenjade +RUNTIME_DEP_PKGS += CSWgnomedocutils -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# The dependencies can not be detected by checkpkg +CHECKPKG_OVERRIDES_CSWgtk-doc += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWgtk-doc += surplus-dependency|CSWsgmlcommon +CHECKPKG_OVERRIDES_CSWgtk-doc += surplus-dependency|CSWxmlcommon +CHECKPKG_OVERRIDES_CSWgtk-doc += surplus-dependency|CSWdocbookxsl +CHECKPKG_OVERRIDES_CSWgtk-doc += surplus-dependency|CSWopenjade +CHECKPKG_OVERRIDES_CSWgtk-doc += surplus-dependency|CSWgnomedocutils +# These are just docs +CHECKPKG_OVERRIDES_CSWgtk-doc += file-with-bad-content|/usr/share|root/opt/csw/share/gnome/help/gtk-doc-manual/C/gtk-doc-manual.xml +CHECKPKG_OVERRIDES_CSWgtk-doc += file-with-bad-content|/usr/share|root/opt/csw/share/gnome/help/gtk-doc-manual/fr/gtk-doc-manual.xml +CHECKPKG_OVERRIDES_CSWgtk-doc += file-with-bad-content|/usr/share|root/opt/csw/share/gnome/help/gtk-doc-manual/bn_IN/gtk-doc-manual.xml +CHECKPKG_OVERRIDES_CSWgtk-doc += file-with-bad-content|/usr/share|root/opt/csw/share/gnome/help/gtk-doc-manual/gu/gtk-doc-manual.xml +CHECKPKG_OVERRIDES_CSWgtk-doc += file-with-bad-content|/usr/share|root/opt/csw/share/gnome/help/gtk-doc-manual/es/gtk-doc-manual.xml +CHECKPKG_OVERRIDES_CSWgtk-doc += file-with-bad-content|/usr/share|root/opt/csw/share/gnome/help/gtk-doc-manual/sl/gtk-doc-manual.xml +CHECKPKG_OVERRIDES_CSWgtk-doc += file-with-bad-content|/usr/share|root/opt/csw/share/gnome/help/gtk-doc-manual/ta/gtk-doc-manual.xml +CHECKPKG_OVERRIDES_CSWgtk-doc += file-with-bad-content|/usr/share|root/opt/csw/share/gnome/help/gtk-doc-manual/en_GB/gtk-doc-manual.xml +CHECKPKG_OVERRIDES_CSWgtk-doc += file-with-bad-content|/usr/share|root/opt/csw/share/gnome/help/gtk-doc-manual/el/gtk-doc-manual.xml +CHECKPKG_OVERRIDES_CSWgtk-doc += file-with-bad-content|/usr/share|root/opt/csw/share/gnome/help/gtk-doc-manual/de/gtk-doc-manual.xml +CHECKPKG_OVERRIDES_CSWgtk-doc += file-with-bad-content|/usr/share|root/opt/csw/share/gnome/help/gtk-doc-manual/sv/gtk-doc-manual.xml +CHECKPKG_OVERRIDES_CSWgtk-doc += file-with-bad-content|/usr/share|root/opt/csw/share/gnome/help/gtk-doc-manual/te/gtk-doc-manual.xml + ARCHALL = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-xml-catalog=/opt/csw/etc/xml/catalog +CONFIGURE_ARGS += --with-xml-catalog=/etc/opt/csw/xml/catalog CONFIGURE_ARGS += --disable-scrollkeeper # xmllint test fail on buildfarm due to proxy requirement # some other tests fail due to gtk-doc not installed (doh!) -#TEST_TARGET = check -TEST_TARGET = +SKIPTEST ?= 1 include gar/category.mk Modified: csw/mgar/pkg/gtk-doc/trunk/checksums =================================================================== --- csw/mgar/pkg/gtk-doc/trunk/checksums 2012-02-23 15:08:24 UTC (rev 17151) +++ csw/mgar/pkg/gtk-doc/trunk/checksums 2012-02-23 15:12:45 UTC (rev 17152) @@ -1,3 +1 @@ -94e02c937b6970e79657c705159b7d17 download/gtk-doc-1.11.tar.gz -72e00cf77c92c916732b8f0d9f8b29f0 download/CSWgtk-doc.postinstall -72e00cf77c92c916732b8f0d9f8b29f0 download/CSWgtk-doc.postremove +3927bed60fdd0fc9093a1d00018e746a gtk-doc-1.18.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Feb 23 16:18:06 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 23 Feb 2012 15:18:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17153] csw/mgar/pkg/splix/trunk/Makefile Message-ID: Revision: 17153 http://gar.svn.sourceforge.net/gar/?rev=17153&view=rev Author: cgrzemba Date: 2012-02-23 15:18:05 +0000 (Thu, 23 Feb 2012) Log Message: ----------- splix/trunk: correct add dependency Ghostscript, Sol10 SFW ghostscript has no cups driver Modified Paths: -------------- csw/mgar/pkg/splix/trunk/Makefile Modified: csw/mgar/pkg/splix/trunk/Makefile =================================================================== --- csw/mgar/pkg/splix/trunk/Makefile 2012-02-23 15:12:45 UTC (rev 17152) +++ csw/mgar/pkg/splix/trunk/Makefile 2012-02-23 15:18:05 UTC (rev 17153) @@ -37,9 +37,9 @@ RUNTIME_DEP_PKGS_CSWsplix += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWsplix += CSWlibjbig85-2 RUNTIME_DEP_PKGS_CSWsplix += CSWcups -RUNTIME_DEP_PKGS_CSWsplix += CSWghostscript +RUNTIME_DEP_PKGS_CSWsplix += CSWgs CHECKPKG_OVERRIDES_CSWsplix += surplus-dependency|CSWcups -CHECKPKG_OVERRIDES_CSWsplix += surplus-dependency|CSWghostscript +CHECKPKG_OVERRIDES_CSWsplix += surplus-dependency|CSWgs 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 Feb 23 16:50:44 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 15:50:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17154] csw/mgar/pkg/gobject-introspection/trunk Message-ID: Revision: 17154 http://gar.svn.sourceforge.net/gar/?rev=17154&view=rev Author: dmichelsen Date: 2012-02-23 15:50:44 +0000 (Thu, 23 Feb 2012) Log Message: ----------- gobject-introspection/trunk: Update to 0.10.8, rework packages, still does not compile Modified Paths: -------------- csw/mgar/pkg/gobject-introspection/trunk/Makefile csw/mgar/pkg/gobject-introspection/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gobject-introspection/trunk/files/0001-Use-named-union.patch Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-02-23 15:18:05 UTC (rev 17153) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-02-23 15:50:44 UTC (rev 17154) @@ -1,5 +1,5 @@ NAME = gobject-introspection -VERSION = 0.6.7 +VERSION = 0.10.8 CATEGORIES = gnome GARTYPE = v2 @@ -13,111 +13,40 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -PACKAGES = CSWgobjintrospect CSWgobjintrospectdev -CATALOGNAME_CSWgobjintrospect = gobj_introspect -CATALOGNAME_CSWgobjintrospectdev = gobj_introspect_dev +PATCHFILES += 0001-Use-named-union.patch -SPKG_DESC_CSWgobjintrospect = $(DESCRIPTION) -SPKG_DESC_CSWgobjintrospectdev = $(DESCRIPTION) - developer package +VENDOR_URL = http://live.gnome.org/GObjectIntrospection -PKGFILES_CSWgobjintrospectdev = $(PKGFILES_DEVEL) +PACKAGING_PLATFORMS = solaris10-sparc soalris10-i386 -ARCHALL_CSWgobjintrospectdoc = 1 +BUILD_DEP_PKGS += CSWbison +BUILD_DEP_PKGS += CSWlibffi-dev +BUILD_DEP_PKGS += CSWgtk-doc -BUILD_DEP_PKGS += CSWbison CSWlibffi +# PACKAGES = CSWgobjintrospect +# CATALOGNAME_CSWgobjintrospect = gobj_introspect +# SPKG_DESC_CSWgobjintrospect = $(DESCRIPTION) +# RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWggettextrt +# RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWglib2 +# RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWlibffi +# RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWpython -RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWggettextrt -RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWglib2 -RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWlibffi -RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWpython -RUNTIME_DEP_PKGS_CSWgobjintrospectdev += CSWgobjintrospect +# PACKAGES += CSWgobjintrospectdev +# CATALOGNAME_CSWgobjintrospectdev = gobj_introspect_dev +# SPKG_DESC_CSWgobjintrospectdev = $(DESCRIPTION) - developer package +# PKGFILES_CSWgobjintrospectdev = $(PKGFILES_DEVEL) +# RUNTIME_DEP_PKGS_CSWgobjintrospectdev += CSWgobjintrospect -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationparser.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationparser.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/ast.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/ast.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/cachestore.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/cachestore.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/config.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/config.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/dumper.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/dumper.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girparser.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girparser.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girwriter.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girwriter.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/glibast.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/glibast.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/glibtransformer.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/glibtransformer.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/libtoolimporter.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/libtoolimporter.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/minixpath.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/minixpath.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/odict.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/odict.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/scannermain.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/scannermain.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/shlibs.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/shlibs.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/sourcescanner.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/sourcescanner.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/transformer.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/transformer.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/utils.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/utils.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/xmlwriter.pyc -CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/xmlwriter.pyo -CHECKPKG_OVERRIDES_CSWgobjintrospectdev += surplus-dependency|CSWgobjintrospect - -PATCHFILES += gobject-introspection-01-ginvoke.diff -PATCHFILES += gobject-introspection-02-glib-compilation.diff -PATCHFILES += gobject-introspection-03-ginfo.diff -PATCHFILES += gobject-introspection-04-big-ending.diff -PATCHFILES += sunstudio.patch - -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - -SPKG_SOURCEURL = http://live.gnome.org/GObjectIntrospection - -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib - -#NOISAEXEC = 1 # Python isn't 64-bit yet #BUILD64 = 1 +PYCOMPILE = 1 + BUILD_OVERRIDE_VARS = V BUILD_OVERRIDE_VARS_V = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --x-include=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) CONFIGURE_ARGS += --disable-silent-rules CONFIGURE_ARGS += --enable-gtk-doc -#SHELL = /opt/csw/bin/bash - -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - include gar/category.mk - -pre-configure-modulated: - ( cd $(WORKSRC); \ - rm -f m4/lt~obsolete.m4 ; \ - rm -f m4/ltoptions.m4 ; \ - rm -f m4/libtool.m4 ; \ - rm -f m4/ltsugar.m4 ; \ - rm -f m4/ltversion.m4 ; \ - libtoolize --copy --force ; \ - aclocal -I m4 ; \ - autoheader ; \ - automake -a -c -f ; \ - autoconf ; \ - ) - $(MAKECOOKIE) Modified: csw/mgar/pkg/gobject-introspection/trunk/checksums =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/checksums 2012-02-23 15:18:05 UTC (rev 17153) +++ csw/mgar/pkg/gobject-introspection/trunk/checksums 2012-02-23 15:50:44 UTC (rev 17154) @@ -1,6 +1 @@ -41205c14cbd86632806578448e29bd30 gobject-introspection-0.6.7.tar.bz2 -948f52dc7a6649f6e83a7b5bb4f905e8 gobject-introspection-01-ginvoke.diff -e09b30913029fffced1d9dc6f96e6a2e gobject-introspection-02-glib-compilation.diff -aa7aa32091d3c7a4cddbf78abe20d5d1 gobject-introspection-03-ginfo.diff -ab2070d09322745c666f303da35c837f gobject-introspection-04-big-ending.diff -924f1a75b7190abbf49183b1081448cd sunstudio.patch +b5da58a5327d13b4d1e08b8e42b2456d gobject-introspection-0.10.8.tar.bz2 Added: csw/mgar/pkg/gobject-introspection/trunk/files/0001-Use-named-union.patch =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/files/0001-Use-named-union.patch (rev 0) +++ csw/mgar/pkg/gobject-introspection/trunk/files/0001-Use-named-union.patch 2012-02-23 15:50:44 UTC (rev 17154) @@ -0,0 +1,159 @@ +From 166f665729d0fd3c13bd8527822e5e829c15995d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 23 Feb 2012 16:27:32 +0100 +Subject: [PATCH] Use named union + +--- + girepository/cmph/chd.c | 2 +- + girepository/cmph/chd_ph.c | 38 +++++++++++++++++++------------------- + 2 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/girepository/cmph/chd.c b/girepository/cmph/chd.c +index 7fb3b8b..70ce8d8 100644 +--- a/girepository/cmph/chd.c ++++ b/girepository/cmph/chd.c +@@ -203,7 +203,7 @@ int chd_dump(cmph_t *mphf, FILE *fd) + nbytes = fwrite(&data->packed_chd_phf_size, sizeof(cmph_uint32), (size_t)1, fd); + nbytes = fwrite(data->packed_chd_phf, data->packed_chd_phf_size, (size_t)1, fd); + +- DEBUGP("Dumping compressed rank structure with %u bytes to disk\n", buflen); ++ DEBUGP("Dumping compressed rank structure with %u bytes to disk\n", data->packed_cr_size); + nbytes = fwrite(&data->packed_cr_size, sizeof(cmph_uint32), (size_t)1, fd); + nbytes = fwrite(data->packed_cr, data->packed_cr_size, (size_t)1, fd); + +diff --git a/girepository/cmph/chd_ph.c b/girepository/cmph/chd_ph.c +index 71f83fb..5b7ab1d 100644 +--- a/girepository/cmph/chd_ph.c ++++ b/girepository/cmph/chd_ph.c +@@ -46,7 +46,7 @@ struct _chd_ph_bucket_t + { + cmph_uint32 size; + cmph_uint32 bucket_id; +- }; ++ } u; + }; + + typedef struct _chd_ph_bucket_t chd_ph_bucket_t; +@@ -75,9 +75,9 @@ void chd_ph_bucket_clean(chd_ph_bucket_t * buckets, cmph_uint32 nbuckets) + register cmph_uint32 i = 0; + assert(buckets); + for(i = 0; i < nbuckets; i++) +- buckets[i].size = 0; ++ buckets[i].u.size = 0; + } +-static cmph_uint8 chd_ph_bucket_insert(chd_ph_bucket_t * buckets,chd_ph_map_item_t * map_items, chd_ph_item_t * items, ++cmph_uint8 chd_ph_bucket_insert(chd_ph_bucket_t * buckets,chd_ph_map_item_t * map_items, chd_ph_item_t * items, + cmph_uint32 nbuckets,cmph_uint32 item_idx) + { + register cmph_uint32 i = 0; +@@ -86,7 +86,7 @@ static cmph_uint8 chd_ph_bucket_insert(chd_ph_bucket_t * buckets,chd_ph_map_item + register chd_ph_bucket_t * bucket = buckets + tmp_map_item->bucket_num; + tmp_item = items + bucket->items_list; + +- for(i = 0; i < bucket->size; i++) ++ for(i = 0; i < bucket->u.size; i++) + { + if(tmp_item->f == tmp_map_item->f && tmp_item->h == tmp_map_item->h) + { +@@ -97,7 +97,7 @@ static cmph_uint8 chd_ph_bucket_insert(chd_ph_bucket_t * buckets,chd_ph_map_item + }; + tmp_item->f = tmp_map_item->f; + tmp_item->h = tmp_map_item->h; +- bucket->size++; ++ bucket->u.size++; + return 1; + }; + void chd_ph_bucket_destroy(chd_ph_bucket_t * buckets) +@@ -251,19 +251,19 @@ cmph_uint8 chd_ph_mapping(cmph_config_t *mph, chd_ph_bucket_t * buckets, chd_ph_ + // DEBUGP("BUCKET = %u -- SIZE = %u -- MAXIMUM SIZE = %u\n", g, buckets[g].size, (chd_ph->keys_per_bucket << 2)); + // goto error; + // } +- buckets[g].size++; +- if(buckets[g].size > *max_bucket_size) ++ buckets[g].u.size++; ++ if(buckets[g].u.size > *max_bucket_size) + { +- *max_bucket_size = buckets[g].size; ++ *max_bucket_size = buckets[g].u.size; + } + } + buckets[0].items_list = 0; + for(i = 1; i < chd_ph->nbuckets; i++) + { +- buckets[i].items_list = buckets[i-1].items_list + buckets[i - 1].size; +- buckets[i - 1].size = 0; ++ buckets[i].items_list = buckets[i-1].items_list + buckets[i - 1].u.size; ++ buckets[i - 1].u.size = 0; + }; +- buckets[i - 1].size = 0; ++ buckets[i - 1].u.size = 0; + for(i = 0; i < chd_ph->m; i++) + { + map_item = (map_items + i); +@@ -303,7 +303,7 @@ chd_ph_sorted_list_t * chd_ph_ordering(chd_ph_bucket_t ** _buckets, chd_ph_item_ + // Determine size of each list of buckets + for(i = 0; i < nbuckets; i++) + { +- bucket_size = input_buckets[i].size; ++ bucket_size = input_buckets[i].u.size; + if(bucket_size == 0) + continue; + sorted_lists[bucket_size].size++; +@@ -322,14 +322,14 @@ chd_ph_sorted_list_t * chd_ph_ordering(chd_ph_bucket_t ** _buckets, chd_ph_item_ + + for(i = 0; i < nbuckets; i++) + { +- bucket_size = input_buckets[i].size; ++ bucket_size = input_buckets[i].u.size; + if(bucket_size == 0) + { + // non_empty_buckets--; + continue; + }; + position = sorted_lists[bucket_size].buckets_list + sorted_lists[bucket_size].size; +- output_buckets[position].bucket_id = i; ++ output_buckets[position].u.bucket_id = i; + output_buckets[position].items_list = input_buckets[i].items_list; + sorted_lists[bucket_size].size++; + }; +@@ -450,7 +450,7 @@ static inline cmph_uint8 place_bucket(chd_ph_config_data_t *chd_ph, chd_ph_bucke + { + if(place_bucket_probe(chd_ph, buckets, items, probe0_num, probe1_num, bucket_num,size)) + { +- disp_table[buckets[bucket_num].bucket_id] = probe0_num + probe1_num * chd_ph->n; ++ disp_table[buckets[bucket_num].u.bucket_id] = probe0_num + probe1_num * chd_ph->n; + return 1; + } + probe0_num++; +@@ -517,7 +517,7 @@ static inline cmph_uint8 place_buckets2(chd_ph_config_data_t *chd_ph, chd_ph_buc + // if bucket is successfully placed remove it from list + if(place_bucket_probe(chd_ph, buckets, items, probe0_num, probe1_num, curr_bucket, i)) + { +- disp_table[buckets[curr_bucket].bucket_id] = probe0_num + probe1_num * chd_ph->n; ++ disp_table[buckets[curr_bucket].u.bucket_id] = probe0_num + probe1_num * chd_ph->n; + // DEBUGP("BUCKET %u PLACED --- DISPLACEMENT = %u\n", curr_bucket, disp_table[curr_bucket]); + } + else +@@ -528,7 +528,7 @@ static inline cmph_uint8 place_buckets2(chd_ph_config_data_t *chd_ph, chd_ph_buc + bucket_id = buckets[non_placed_bucket + sorted_lists[i].buckets_list].bucket_id; + #endif + buckets[non_placed_bucket + sorted_lists[i].buckets_list].items_list = buckets[curr_bucket].items_list; +- buckets[non_placed_bucket + sorted_lists[i].buckets_list].bucket_id = buckets[curr_bucket].bucket_id; ++ buckets[non_placed_bucket + sorted_lists[i].buckets_list].u.bucket_id = buckets[curr_bucket].u.bucket_id; + #ifdef DEBUG + buckets[curr_bucket].items_list=items_list; + buckets[curr_bucket].bucket_id=bucket_id; +@@ -589,8 +589,8 @@ static inline cmph_uint8 chd_ph_check_bin_hashing(chd_ph_config_data_t *chd_ph, + { + j = bucket_size; + item = items + buckets[i].items_list; +- probe0_num = disp_table[buckets[i].bucket_id] % chd_ph->n; +- probe1_num = disp_table[buckets[i].bucket_id] / chd_ph->n; ++ probe0_num = disp_table[buckets[i].u.bucket_id] % chd_ph->n; ++ probe1_num = disp_table[buckets[i].u.bucket_id] / chd_ph->n; + for(; j > 0; j--) + { + m++; +-- +1.7.9 + 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 Feb 23 17:09:24 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 16:09:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17155] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 17155 http://gar.svn.sourceforge.net/gar/?rev=17155&view=rev Author: dmichelsen Date: 2012-02-23 16:09:24 +0000 (Thu, 23 Feb 2012) Log Message: ----------- cups/trunk: Move docs over to main package Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2012-02-23 15:50:44 UTC (rev 17154) +++ csw/mgar/pkg/cups/trunk/Makefile 2012-02-23 16:09:24 UTC (rev 17155) @@ -109,6 +109,7 @@ PKGFILES_CSWcupsd += $(datadir)/cups/(banners|data|profiles|charsets).* PKGFILES_CSWcupsd += $(datadir)/cups/(fonts|templates|charmaps|model).* PKGFILES_CSWcupsd += $(datadir)/cups/mime.* +PKGFILES_CSWcupsd += $(datadir)/doc/cups/.* PKGFILES_CSWcupsd += $(datadir)/icons.* PKGFILES_CSWcupsd += $(datadir)/locale/.* PKGFILES_CSWcupsd += $(libdir)/cups/.* @@ -145,6 +146,17 @@ RUNTIME_DEP_PKGS_CSWcupsd += CSWlibz1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibldap2-4-2 +# Just docs +CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/spec-banner.html +CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/api-cups.html +CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/api-httpipp.html +CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/ref-cupsd-conf.html +CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/spec-ppd.html +CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/translation.html +CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/options.html +CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/ref-cupsd-conf.html +CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/network.html + PACKAGES += CSWcupsclient SPKG_DESC_CSWcupsclient = CUPS client binaries PKGFILES_CSWcupsclient = $(sbindir)/(accept|reject|cups(addsmb|ctl|(en|dis)able)) @@ -186,7 +198,6 @@ PKGFILES_CSWcups-dev += $(PKGFILES_DEVEL) PKGFILES_CSWcups-dev += $(datadir)/cups/ppdc.* PKGFILES_CSWcups-dev += $(datadir)/cups/drv.* -PKGFILES_CSWcups-dev += $(datadir)/doc/cups/.* PKGFILES_CSWcups-dev += $(datadir)/cups/examples.* # The development package needs all the libraries RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsppdc1 @@ -199,17 +210,6 @@ OBSOLETED_BY_CSWcups-dev += CSWcupsdev OBSOLETED_BY_CSWcups-dev += CSWcupsdoc -# Just docs -CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/spec-banner.html -CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/api-cups.html -CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/api-httpipp.html -CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/ref-cupsd-conf.html -CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/spec-ppd.html -CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/translation.html -CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/options.html -CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/ref-cupsd-conf.html -CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/network.html - # The problematic cupslinks package # PACKAGES += CSWcupslinks CATALOGNAME_CSWcupslinks = cups_links 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 Feb 23 21:12:23 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 20:12:23 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[614] web/wordpresscsw/wp-content/themes/opencsw/ package.php Message-ID: Revision: 614 http://opencsw.svn.sourceforge.net/opencsw/?rev=614&view=rev Author: dmichelsen Date: 2012-02-23 20:12:22 +0000 (Thu, 23 Feb 2012) Log Message: ----------- Fix typo in package view and offer search on unknown package Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/package.php Modified: web/wordpresscsw/wp-content/themes/opencsw/package.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/package.php 2012-02-22 20:43:08 UTC (rev 613) +++ web/wordpresscsw/wp-content/themes/opencsw/package.php 2012-02-23 20:12:22 UTC (rev 614) @@ -43,6 +43,7 @@ print "

"; print "
"; print "

The requested software $pkgName does not exist in our package database.

"; + print "

Try searching for it.

"; print "
"; print " "; print " "; @@ -143,7 +144,7 @@ print ""; print ""; - print "

Reverse dependencies ( " . count($arrayReverse) . ")

"; + print "

Reverse dependencies ( " . count($arrayReverse) . " )

"; print "

Reverse dependencies are Solaris packages that depends on $softwareName.

"; print ""; print ""; 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 Feb 23 21:12:58 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Feb 2012 20:12:58 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[615] web/wordpresscsw/wp-content/themes/opencsw/ qa-package.php Message-ID: Revision: 615 http://opencsw.svn.sourceforge.net/opencsw/?rev=615&view=rev Author: dmichelsen Date: 2012-02-23 20:12:57 +0000 (Thu, 23 Feb 2012) Log Message: ----------- Show dependency tree on package qa page Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/qa-package.php Modified: web/wordpresscsw/wp-content/themes/opencsw/qa-package.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/qa-package.php 2012-02-23 20:12:22 UTC (rev 614) +++ web/wordpresscsw/wp-content/themes/opencsw/qa-package.php 2012-02-23 20:12:57 UTC (rev 615) @@ -243,6 +243,10 @@ print ""; print "
"; + print "

Dependency Tree

"; + print "

Just the graph

\n"; + print ""; + print "
"; print "
"; 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 Fri Feb 24 02:40:57 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 24 Feb 2012 01:40:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17156] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 17156 http://gar.svn.sourceforge.net/gar/?rev=17156&view=rev Author: bdwalton Date: 2012-02-24 01:40:57 +0000 (Fri, 24 Feb 2012) Log Message: ----------- php5/trunk: build all modules regardless of modulation; Mantis 4904 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-02-23 16:09:24 UTC (rev 17155) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-02-24 01:40:57 UTC (rev 17156) @@ -234,6 +234,8 @@ sysconfdir = /etc$(prefix)/php5 +MYSQL_VER = 5.0 + CONFIGURE_ARGS += --prefix=$(prefix)/php5 CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) ## build this static, php can not run without it. @@ -245,10 +247,6 @@ CONFIGURE_ARGS += --with-libxml-dir=$(prefix) CONFIGURE_ARGS += --with-config-file-path=$(sysconfdir) CONFIGURE_ARGS += --with-config-file-scan-dir=$(sysconfdir)/conf.d - -ifeq ($(SAPI),ap2) -MYSQL_VER = 5.0 - CONFIGURE_ARGS += --enable-bcmath=shared CONFIGURE_ARGS += --enable-calendar=shared CONFIGURE_ARGS += --enable-cli @@ -332,9 +330,7 @@ CONFIGURE_ARGS += --with-xsl=shared,$(prefix) CONFIGURE_ARGS += --with-zlib-dir=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) -endif - # Disable Tests (report submitted to PHP QA) #SKIPTEST = 1 #ENABLE_CHECK = 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 Feb 24 02:59:01 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 24 Feb 2012 01:59:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[17157] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17157 http://gar.svn.sourceforge.net/gar/?rev=17157&view=rev Author: bdwalton Date: 2012-02-24 01:59:01 +0000 (Fri, 24 Feb 2012) Log Message: ----------- ruby19/trunk: leave mkmf.rb in the library package instead of devel Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-24 01:40:57 UTC (rev 17156) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-24 01:59:01 UTC (rev 17157) @@ -72,7 +72,7 @@ # PKGFILES_CSWruby191-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb SPKG_DESC_CSWruby191-dev = Ruby $(VERSION) Extension Development Files -PKGFILES_CSWruby191-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a +PKGFILES_CSWruby191-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*static.a RUNTIME_DEP_PKGS_CSWruby191-dev = CSWruby191 CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby1.9.1-static.a CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb 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 Feb 24 03:19:17 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 24 Feb 2012 02:19:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17158] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 17158 http://gar.svn.sourceforge.net/gar/?rev=17158&view=rev Author: bdwalton Date: 2012-02-24 02:19:16 +0000 (Fri, 24 Feb 2012) Log Message: ----------- php5/trunk: adjust for mysql packaging changes Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-02-24 01:59:01 UTC (rev 17157) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-02-24 02:19:16 UTC (rev 17158) @@ -234,8 +234,6 @@ sysconfdir = /etc$(prefix)/php5 -MYSQL_VER = 5.0 - CONFIGURE_ARGS += --prefix=$(prefix)/php5 CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) ## build this static, php can not run without it. @@ -304,14 +302,14 @@ CONFIGURE_ARGS += --with-mm=$(prefix) CONFIGURE_ARGS += --with-mssql=shared,$(prefix) CONFIGURE_ARGS += --with-mysql=shared,$(prefix) -CONFIGURE_ARGS += --with-mysqli=shared,$(prefix)/bin/mysql_config-$(MYSQL_VER) +CONFIGURE_ARGS += --with-mysqli=shared,$(prefix)/bin/mysql_config CONFIGURE_ARGS += --with-ndbm CONFIGURE_ARGS += --with-openssl=shared,$(prefix) CONFIGURE_ARGS += --with-pcre-dir=$(prefix) CONFIGURE_ARGS += --with-pcre-regex # not documented, but you can pass the path to mysql_config directly # we need the 32-bit version, so we have to force this -CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/bin/mysql_config-$(MYSQL_VER) +CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/bin/mysql_config CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix) CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(prefix)/postgresql CONFIGURE_ARGS += --with-pdo-sqlite=shared,$(prefix) 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 Feb 24 03:20:43 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 24 Feb 2012 02:20:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[17159] csw/mgar/gar/v2/lib/python/dependency_checks.py Message-ID: Revision: 17159 http://gar.svn.sourceforge.net/gar/?rev=17159&view=rev Author: bdwalton Date: 2012-02-24 02:20:43 +0000 (Fri, 24 Feb 2012) Log Message: ----------- gar/v2: allow ruby deps on the library package too Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2012-02-24 02:19:16 UTC (rev 17158) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2012-02-24 02:20:43 UTC (rev 17159) @@ -32,7 +32,7 @@ (r".*\.pl$", (u"CSWperl",)), (r".*\.pm$", (u"CSWperl",)), (r".*\.py$", (u"CSWpython",)), - (r".*\.rb$", (u"CSWruby", u"CSWruby18", u"CSWruby193")), + (r".*\.rb$", (u"CSWruby", u"CSWruby18", u"CSWruby191", u"CSWlibruby1-9-1-1")), (r".*\.elc?$", (u"CSWemacscommon",)), (r"/opt/csw/apache2/", (u"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 Fri Feb 24 04:06:52 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 24 Feb 2012 03:06:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17160] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17160 http://gar.svn.sourceforge.net/gar/?rev=17160&view=rev Author: bdwalton Date: 2012-02-24 03:06:52 +0000 (Fri, 24 Feb 2012) Log Message: ----------- ruby19/trunk: update overrides, add notes as to why Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-24 02:20:43 UTC (rev 17159) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-24 03:06:52 UTC (rev 17160) @@ -52,6 +52,20 @@ # the next two have /usr/local/bin from dln_find.c. it should be innocuous and # not worth patching CHECKPKG_OVERRIDES_CSWlibruby1-9-1-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby1.9.1.so.1 +# a few examples in the comment +CHECKPKG_OVERRIDES_CSWlibruby1-9-1-1 += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/1.9.1/open3.rb +# comments +CHECKPKG_OVERRIDES_CSWlibruby1-9-1-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/minitest/unit.rb +# comments +CHECKPKG_OVERRIDES_CSWlibruby1-9-1-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/rubygems/gem_path_searcher.rb +# comments +CHECKPKG_OVERRIDES_CSWlibruby1-9-1-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/rubygems/specification.rb +# a fallback if $PATH isn't set. let it stand. +CHECKPKG_OVERRIDES_CSWlibruby1-9-1-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb +# comments +CHECKPKG_OVERRIDES_CSWlibruby1-9-1-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/fileutils.rb +# comments +CHECKPKG_OVERRIDES_CSWlibruby1-9-1-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/pathname.rb ARCHALL_CSWruby191-samples = 1 SPKG_DESC_CSWruby191-samples = Example programs for Ruby $(VERSION) @@ -75,7 +89,6 @@ PKGFILES_CSWruby191-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*static.a RUNTIME_DEP_PKGS_CSWruby191-dev = CSWruby191 CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby1.9.1-static.a -CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/mkmf.rb MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ DISTFILES = $(DISTNAME).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 Fri Feb 24 11:06:59 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 10:06:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17161] csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile Message-ID: Revision: 17161 http://gar.svn.sourceforge.net/gar/?rev=17161&view=rev Author: idogan23 Date: 2012-02-24 10:06:58 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Email-MIME: added RUNTIME_DEP_PKGS Modified Paths: -------------- csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile 2012-02-24 03:06:52 UTC (rev 17160) +++ csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile 2012-02-24 10:06:58 UTC (rev 17161) @@ -10,7 +10,10 @@ endef PACKAGES = CSWpm-email-mime -CATALOGNAME = pm_email-mime +CATALOGNAME = pm_email_mime +RUNTIME_DEP_PKGS = CSWpm-email-simple +RUNTIME_DEP_PKGS += CSWpm-email-messageid + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Feb 24 11:42:16 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 10:42:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17162] csw/mgar/pkg/cpan Message-ID: Revision: 17162 http://gar.svn.sourceforge.net/gar/?rev=17162&view=rev Author: idogan23 Date: 2012-02-24 10:42:16 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Email-MIME-Encodings: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Email-MIME-Encodings/ csw/mgar/pkg/cpan/Email-MIME-Encodings/branches/ csw/mgar/pkg/cpan/Email-MIME-Encodings/tags/ csw/mgar/pkg/cpan/Email-MIME-Encodings/trunk/ csw/mgar/pkg/cpan/Email-MIME-Encodings/trunk/Makefile csw/mgar/pkg/cpan/Email-MIME-Encodings/trunk/checksums csw/mgar/pkg/cpan/Email-MIME-Encodings/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Email-MIME-Encodings/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/cpan/Email-MIME-Encodings/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-Encodings/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Email-MIME-Encodings/trunk/Makefile 2012-02-24 10:42:16 UTC (rev 17162) @@ -0,0 +1,20 @@ +NAME = Email-MIME-Encodings +VERSION = 1.313 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = RJBS + +DESCRIPTION = A unified interface to MIME encoding and decoding +define BLURB + A unified interface to MIME encoding and decoding +endef + +PACKAGES = CSWpm-email-mime-encodings +CATALOGNAME = pm_email_mime_encodings + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk + Added: csw/mgar/pkg/cpan/Email-MIME-Encodings/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-Encodings/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Email-MIME-Encodings/trunk/checksums 2012-02-24 10:42:16 UTC (rev 17162) @@ -0,0 +1 @@ +f2580c816fb0c4b2a256540a385bf4fb Email-MIME-Encodings-1.313.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 Feb 24 11:50:19 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 10:50:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[17163] csw/mgar/pkg Message-ID: Revision: 17163 http://gar.svn.sourceforge.net/gar/?rev=17163&view=rev Author: dmichelsen Date: 2012-02-24 10:50:18 +0000 (Fri, 24 Feb 2012) Log Message: ----------- nodejs: Initial commit Added Paths: ----------- csw/mgar/pkg/nodejs/ csw/mgar/pkg/nodejs/Makefile csw/mgar/pkg/nodejs/branches/ csw/mgar/pkg/nodejs/tags/ csw/mgar/pkg/nodejs/trunk/ csw/mgar/pkg/nodejs/trunk/Makefile csw/mgar/pkg/nodejs/trunk/checksums csw/mgar/pkg/nodejs/trunk/files/ Copied: csw/mgar/pkg/nodejs/Makefile (from rev 16833, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nodejs/Makefile (rev 0) +++ csw/mgar/pkg/nodejs/Makefile 2012-02-24 10:50:18 UTC (rev 17163) @@ -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/nodejs/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/nodejs/trunk/Makefile =================================================================== --- csw/mgar/pkg/nodejs/trunk/Makefile (rev 0) +++ csw/mgar/pkg/nodejs/trunk/Makefile 2012-02-24 10:50:18 UTC (rev 17163) @@ -0,0 +1,33 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = nodejs +VERSION = 0.6.7 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Node.js JavaScript interpreter +define BLURB +endef + +MASTER_SITES = http://nodejs.org/dist/v$(VERSION)/ +DISTNAME = node-v$(VERSION) +DISTFILES += $(DISTNAME).tar.gz + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --openssl-includes=$(includedir) +CONFIGURE_ARGS += --openssl-libpath=$(libdir) + +#CONFIGURE_SCRIPTS = custom +TEST_TARGET = check + +EXTRA_CONFIGURE_EXPORTS += PWD +CONFIGURE_ENV_PWD = $(abspath $(WORKSRC)) + +include gar/category.mk + +configure-custom: + cd $(WORKSRC) && /usr/bin/env -i $(CONFIGURE_ENV) PWD=$(abspath $(WORKSRC)) ./configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/nodejs/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/nodejs/trunk/checksums =================================================================== --- csw/mgar/pkg/nodejs/trunk/checksums (rev 0) +++ csw/mgar/pkg/nodejs/trunk/checksums 2012-02-24 10:50:18 UTC (rev 17163) @@ -0,0 +1 @@ +e7b238356ea7fb230b956010931ca468 node-v0.6.7.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 Fri Feb 24 12:20:23 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 11:20:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17164] csw/mgar/pkg/cpan Message-ID: Revision: 17164 http://gar.svn.sourceforge.net/gar/?rev=17164&view=rev Author: idogan23 Date: 2012-02-24 11:20:22 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Email-MIME-ContentType: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Email-MIME-ContentType/ csw/mgar/pkg/cpan/Email-MIME-ContentType/branches/ csw/mgar/pkg/cpan/Email-MIME-ContentType/tags/ csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/ csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/Makefile csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/checksums csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/Makefile 2012-02-24 11:20:22 UTC (rev 17164) @@ -0,0 +1,18 @@ +NAME = Email-MIME-ContentType +VERSION = 1.015 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = RJBS + +DESCRIPTION = Parse a MIME Content-Type Header +define BLURB + LParse a MIME Content-Type Headerong description +endef + +PACKAGES = CSWpm-email-mime-contenttype +CATALOGNAME = pm_email_mime_contenttype + +ARCHALL = 1 + +include gar/category.mk + Added: csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/checksums 2012-02-24 11:20:22 UTC (rev 17164) @@ -0,0 +1 @@ +f098ffed16ccab03a3bd51449eba175f Email-MIME-ContentType-1.015.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 Fri Feb 24 12:22:24 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 11:22:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17165] csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/ Makefile Message-ID: Revision: 17165 http://gar.svn.sourceforge.net/gar/?rev=17165&view=rev Author: idogan23 Date: 2012-02-24 11:22:23 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Email-MIME-ContentType: added missing license Modified Paths: -------------- csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/Makefile 2012-02-24 11:20:22 UTC (rev 17164) +++ csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/Makefile 2012-02-24 11:22:23 UTC (rev 17165) @@ -12,6 +12,8 @@ PACKAGES = CSWpm-email-mime-contenttype CATALOGNAME = pm_email_mime_contenttype +LICENCSE = LICENSE + ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Feb 24 12:25:24 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 11:25:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17166] csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/ Makefile Message-ID: Revision: 17166 http://gar.svn.sourceforge.net/gar/?rev=17166&view=rev Author: idogan23 Date: 2012-02-24 11:25:23 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Email-MIME-ContentType: fixed typo Modified Paths: -------------- csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/Makefile 2012-02-24 11:22:23 UTC (rev 17165) +++ csw/mgar/pkg/cpan/Email-MIME-ContentType/trunk/Makefile 2012-02-24 11:25:23 UTC (rev 17166) @@ -12,7 +12,7 @@ PACKAGES = CSWpm-email-mime-contenttype CATALOGNAME = pm_email_mime_contenttype -LICENCSE = LICENSE +LICENSE = LICENSE ARCHALL = 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 Fri Feb 24 12:29:32 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 11:29:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17167] csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile Message-ID: Revision: 17167 http://gar.svn.sourceforge.net/gar/?rev=17167&view=rev Author: idogan23 Date: 2012-02-24 11:29:32 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Email-MIME: added dependancy Modified Paths: -------------- csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile 2012-02-24 11:25:23 UTC (rev 17166) +++ csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile 2012-02-24 11:29:32 UTC (rev 17167) @@ -14,6 +14,7 @@ RUNTIME_DEP_PKGS = CSWpm-email-simple RUNTIME_DEP_PKGS += CSWpm-email-messageid +RUNTIME_DEP_PKGS += CSWpm-email-mime-contenttype include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Feb 24 12:39:04 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 11:39:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17168] csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile Message-ID: Revision: 17168 http://gar.svn.sourceforge.net/gar/?rev=17168&view=rev Author: idogan23 Date: 2012-02-24 11:39:04 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Email-MIME: added dependancy Modified Paths: -------------- csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile 2012-02-24 11:29:32 UTC (rev 17167) +++ csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile 2012-02-24 11:39:04 UTC (rev 17168) @@ -15,6 +15,7 @@ RUNTIME_DEP_PKGS = CSWpm-email-simple RUNTIME_DEP_PKGS += CSWpm-email-messageid RUNTIME_DEP_PKGS += CSWpm-email-mime-contenttype +RUNTIME_DEP_PKGS += CSWpmmimetypes include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Feb 24 13:01:37 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 12:01:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17169] csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile Message-ID: Revision: 17169 http://gar.svn.sourceforge.net/gar/?rev=17169&view=rev Author: idogan23 Date: 2012-02-24 12:01:37 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Email-MIME: added license, set architecture to all Modified Paths: -------------- csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile 2012-02-24 11:39:04 UTC (rev 17168) +++ csw/mgar/pkg/cpan/Email-MIME/trunk/Makefile 2012-02-24 12:01:37 UTC (rev 17169) @@ -12,6 +12,9 @@ PACKAGES = CSWpm-email-mime CATALOGNAME = pm_email_mime +ARCHALL = 1 +LICENSE = LICENSE + RUNTIME_DEP_PKGS = CSWpm-email-simple RUNTIME_DEP_PKGS += CSWpm-email-messageid RUNTIME_DEP_PKGS += CSWpm-email-mime-contenttype This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Feb 24 13:08:49 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 12:08:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17170] csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/ trunk/Makefile Message-ID: Revision: 17170 http://gar.svn.sourceforge.net/gar/?rev=17170&view=rev Author: idogan23 Date: 2012-02-24 12:08:48 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Email-MIME-Attachment-Stripper: added license, set architecture to all, fixed CATALOGNAME, added dependancies Modified Paths: -------------- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile 2012-02-24 12:01:37 UTC (rev 17169) +++ csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile 2012-02-24 12:08:48 UTC (rev 17170) @@ -10,7 +10,13 @@ endef PACKAGES = CSWpm-email-mime-attachment-stripper -CATALOGNAME = pm_email-mime-attachment-stripper +CATALOGNAME = pm_email_mime-attachment_stripper +ARCHALL = 1 +LICENSE = LICENSE + +RUNTIME_DEP_PKGS += CSWpm-email-mime-contenttype +RUNTIME_DEP_PKGS += CSWpm-email-mime + 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 Fri Feb 24 13:15:36 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 12:15:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[17171] csw/mgar/pkg/cpan/Test-Differences/trunk Message-ID: Revision: 17171 http://gar.svn.sourceforge.net/gar/?rev=17171&view=rev Author: dmichelsen Date: 2012-02-24 12:15:36 +0000 (Fri, 24 Feb 2012) Log Message: ----------- cpan/Test-Differences/trunk: Move to dynamic gspec, updateto 0.61, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Differences/trunk/Makefile csw/mgar/pkg/cpan/Test-Differences/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Test-Differences/trunk/files/CSWpmtestdiff.depend csw/mgar/pkg/cpan/Test-Differences/trunk/files/CSWpmtestdiff.gspec csw/mgar/pkg/cpan/Test-Differences/trunk/files/CSWpmtestdiff.prototype Modified: csw/mgar/pkg/cpan/Test-Differences/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Differences/trunk/Makefile 2012-02-24 12:08:48 UTC (rev 17170) +++ csw/mgar/pkg/cpan/Test-Differences/trunk/Makefile 2012-02-24 12:15:36 UTC (rev 17171) @@ -1,18 +1,22 @@ NAME = Test-Differences -VERSION = 0.47 +VERSION = 0.61 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = RBS +AUTHOR = OVID -DESCRIPTION = test strings and data structures and show differences +DESCRIPTION = Test strings and data structures and show differences if not ok define BLURB - When the code you're testing returns multiple lines, records or data - structures and they're just plain wrong, an equivalent to the Unix diff - utility may be just what's needed. endef -DISTFILES += $(call admfiles,CSWpmtestdiff,depend prototype) +CATALOG_RELEASE = unstable -DEPENDS += cpan/Text-Diff +LICENSE = README +PACKAGES += CSWpm-test-differences +CATALOGNAME_CSWpm-test-differences = pm_test_differences +SPKG_DESC_CSWpm-test-differences = Test strings and data structures and show differences if not ok +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-test-differences = 1 +RUNTIME_DEP_PKGS_CSWpm-test-differences += CSWpmtextdiff + include gar/category.mk Modified: csw/mgar/pkg/cpan/Test-Differences/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Differences/trunk/checksums 2012-02-24 12:08:48 UTC (rev 17170) +++ csw/mgar/pkg/cpan/Test-Differences/trunk/checksums 2012-02-24 12:15:36 UTC (rev 17171) @@ -1,4 +1 @@ -18eaf2b0a8149956614f9196efe4d4a9 download/CSWpmtestdiff.gspec -a7864fa64516a9f4bb7f7c45129739a1 download/CSWpmtestdiff.depend -76b45e75c880c10f9d8914e32af7076e download/CSWpmtestdiff.prototype -e4fa76bb11b0d1db2d4213390413f5af download/Test-Differences-0.47.tar.gz +8728047fbd04a32ffdbbc4304d635eb1 Test-Differences-0.61.tar.gz Deleted: csw/mgar/pkg/cpan/Test-Differences/trunk/files/CSWpmtestdiff.depend =================================================================== --- csw/mgar/pkg/cpan/Test-Differences/trunk/files/CSWpmtestdiff.depend 2012-02-24 12:08:48 UTC (rev 17170) +++ csw/mgar/pkg/cpan/Test-Differences/trunk/files/CSWpmtestdiff.depend 2012-02-24 12:15:36 UTC (rev 17171) @@ -1 +0,0 @@ -P CSWpmtextdiff pm_textdiff - perform diffs on files and record sets Deleted: csw/mgar/pkg/cpan/Test-Differences/trunk/files/CSWpmtestdiff.gspec =================================================================== --- csw/mgar/pkg/cpan/Test-Differences/trunk/files/CSWpmtestdiff.gspec 2012-02-24 12:08:48 UTC (rev 17170) +++ csw/mgar/pkg/cpan/Test-Differences/trunk/files/CSWpmtestdiff.gspec 2012-02-24 12:15:36 UTC (rev 17171) @@ -1,9 +0,0 @@ -%var bitname pm_testdiff -%var pkgname CSWpmtestdiff -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 2001 Barrie Slaymaker, All Rights Reserved. - -You may use this software under the terms of the GNU public license, any -version, or the Artistic license. Deleted: csw/mgar/pkg/cpan/Test-Differences/trunk/files/CSWpmtestdiff.prototype =================================================================== --- csw/mgar/pkg/cpan/Test-Differences/trunk/files/CSWpmtestdiff.prototype 2012-02-24 12:08:48 UTC (rev 17170) +++ csw/mgar/pkg/cpan/Test-Differences/trunk/files/CSWpmtestdiff.prototype 2012-02-24 12:15:36 UTC (rev 17171) @@ -1,14 +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/Test 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Test/Differences 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Test/Differences/.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/Test::Differences.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -f none /opt/csw/share/perl/csw/Test/Differences.pm 0444 root bin 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 Feb 24 13:28:18 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 12:28:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17172] csw/mgar/pkg/cpan/Text-Diff/trunk Message-ID: Revision: 17172 http://gar.svn.sourceforge.net/gar/?rev=17172&view=rev Author: dmichelsen Date: 2012-02-24 12:28:17 +0000 (Fri, 24 Feb 2012) Log Message: ----------- cpan/Text-Diff/trunk: Update to dynamic gspec, version 1.41 and sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Text-Diff/trunk/Makefile csw/mgar/pkg/cpan/Text-Diff/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Text-Diff/trunk/files/CSWpmtextdiff.depend csw/mgar/pkg/cpan/Text-Diff/trunk/files/CSWpmtextdiff.gspec csw/mgar/pkg/cpan/Text-Diff/trunk/files/CSWpmtextdiff.prototype Modified: csw/mgar/pkg/cpan/Text-Diff/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-Diff/trunk/Makefile 2012-02-24 12:15:36 UTC (rev 17171) +++ csw/mgar/pkg/cpan/Text-Diff/trunk/Makefile 2012-02-24 12:28:17 UTC (rev 17172) @@ -1,20 +1,24 @@ NAME = Text-Diff -VERSION = 0.35 +VERSION = 1.41 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = RBS +AUTHOR = OVID -DESCRIPTION = perform diffs on files and record sets +DESCRIPTION = Perform diffs on files and record sets define BLURB - diff() provides a basic set of services akin to the GNU diff utility. It is - not anywhere near as feature complete as GNU diff, but it is better - integrated with Perl and available on all platforms. It is often faster than - shelling out to a system's diff executable for small files, and generally - slower on larger files. endef -DISTFILES = $(call admfiles,CSWpmtextdiff,depend prototype) +CATALOG_RELEASE = unstable -DEPENDS += cpan/Algorithm-Diff +LICENSE = LICENSE +PACKAGES += CSWpm-text-diff +CATALOGNAME_CSWpm-text-diff = pm_text_diff +SPKG_DESC_CSWpm-text-diff = Perform diffs on files and record sets +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-text-diff = 1 +RUNTIME_DEP_PKGS_CSWpm-text-diff += CSWpm-algorithm-diff +OBSOLETED_BY_CSWpm-text-diff += CSWpmtextdiff +CATALOGNAME_CSWpmtextdiff = pm_textdiff_stub + include gar/category.mk Modified: csw/mgar/pkg/cpan/Text-Diff/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-Diff/trunk/checksums 2012-02-24 12:15:36 UTC (rev 17171) +++ csw/mgar/pkg/cpan/Text-Diff/trunk/checksums 2012-02-24 12:28:17 UTC (rev 17172) @@ -1,4 +1 @@ -032308a9b14f7c38ef994e2b10b2f941 download/CSWpmtextdiff.gspec -afb75d0c51760413788a9a9c2bacb889 download/CSWpmtextdiff.depend -5a570bbf775434b6d7f88ea78d31f036 download/CSWpmtextdiff.prototype -4931662ea353384dec2a54a71b26ee8c download/Text-Diff-0.35.tar.gz +30d56e6dd5551ca16b8e16cc7299dc21 Text-Diff-1.41.tar.gz Deleted: csw/mgar/pkg/cpan/Text-Diff/trunk/files/CSWpmtextdiff.depend =================================================================== --- csw/mgar/pkg/cpan/Text-Diff/trunk/files/CSWpmtextdiff.depend 2012-02-24 12:15:36 UTC (rev 17171) +++ csw/mgar/pkg/cpan/Text-Diff/trunk/files/CSWpmtextdiff.depend 2012-02-24 12:28:17 UTC (rev 17172) @@ -1 +0,0 @@ -P CSWpmalgdiff pm_algorithmdiff - compute intelligent differences between two files/lists Deleted: csw/mgar/pkg/cpan/Text-Diff/trunk/files/CSWpmtextdiff.gspec =================================================================== --- csw/mgar/pkg/cpan/Text-Diff/trunk/files/CSWpmtextdiff.gspec 2012-02-24 12:15:36 UTC (rev 17171) +++ csw/mgar/pkg/cpan/Text-Diff/trunk/files/CSWpmtextdiff.gspec 2012-02-24 12:28:17 UTC (rev 17172) @@ -1,9 +0,0 @@ -%var bitname pm_textdiff -%var pkgname CSWpmtextdiff -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 2001, Barrie Slaymaker. All Rights Reserved. - -You may use this under the terms of either the Artistic License or GNU Public -License v 2.0 or greater. Deleted: csw/mgar/pkg/cpan/Text-Diff/trunk/files/CSWpmtextdiff.prototype =================================================================== --- csw/mgar/pkg/cpan/Text-Diff/trunk/files/CSWpmtextdiff.prototype 2012-02-24 12:15:36 UTC (rev 17171) +++ csw/mgar/pkg/cpan/Text-Diff/trunk/files/CSWpmtextdiff.prototype 2012-02-24 12:28:17 UTC (rev 17172) @@ -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/Text 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Text/Diff 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Text/Diff/.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/Text::Diff.3perl 0444 root bin -f none /opt/csw/share/man/man3/Text::Diff::Table.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/Text 0755 root bin -d none /opt/csw/share/perl/csw/Text/Diff 0755 root bin -f none /opt/csw/share/perl/csw/Text/Diff.pm 0444 root bin -f none /opt/csw/share/perl/csw/Text/Diff/Table.pm 0444 root bin 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 Feb 24 13:40:10 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 12:40:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17173] csw/mgar/pkg/cpan/Test-Differences/trunk/Makefile Message-ID: Revision: 17173 http://gar.svn.sourceforge.net/gar/?rev=17173&view=rev Author: dmichelsen Date: 2012-02-24 12:40:10 +0000 (Fri, 24 Feb 2012) Log Message: ----------- cpan/Test-Differences/trunk: Update dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Differences/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-Differences/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Differences/trunk/Makefile 2012-02-24 12:28:17 UTC (rev 17172) +++ csw/mgar/pkg/cpan/Test-Differences/trunk/Makefile 2012-02-24 12:40:10 UTC (rev 17173) @@ -17,6 +17,6 @@ SPKG_DESC_CSWpm-test-differences = Test strings and data structures and show differences if not ok # There was no information if this is pure Perl or not. Please remove if necessary. ARCHALL_CSWpm-test-differences = 1 -RUNTIME_DEP_PKGS_CSWpm-test-differences += CSWpmtextdiff +RUNTIME_DEP_PKGS_CSWpm-test-differences += CSWpm-text-diff 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 Fri Feb 24 13:54:04 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 12:54:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17174] csw/mgar/pkg/cpan/POE-Test-Loops/trunk Message-ID: Revision: 17174 http://gar.svn.sourceforge.net/gar/?rev=17174&view=rev Author: dmichelsen Date: 2012-02-24 12:54:04 +0000 (Fri, 24 Feb 2012) Log Message: ----------- cpan/POE-Test-Loops/trunk: Update to 1.350, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/POE-Test-Loops/trunk/Makefile csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/POE-Test-Loops/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/POE-Test-Loops/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/POE-Test-Loops/trunk/Makefile 2012-02-24 12:40:10 UTC (rev 17173) +++ csw/mgar/pkg/cpan/POE-Test-Loops/trunk/Makefile 2012-02-24 12:54:04 UTC (rev 17174) @@ -1,5 +1,5 @@ NAME = POE-Test-Loops -VERSION = 1.033 +VERSION = 1.350 CATEGORIES = cpan GARTYPE = v2 AUTHOR = RCAPUTO @@ -8,11 +8,15 @@ define BLURB endef -DISTFILES = COPYING +CATALOG_RELEASE = unstable -PACKAGES = CSWpoetestloops -CATALOGNAME = pm_poetestloops +LICENSE = LICENSE -ARCHALL = 1 +PACKAGES += CSWpm-poe-test-loops +CATALOGNAME_CSWpm-poe-test-loops = pm_poe_test_loops +SPKG_DESC_CSWpm-poe-test-loops = Reusable tests for POE::Loop authors +ARCHALL_CSWpm-poe-test-loops = 1 +OBSOLETED_BY_CSWpm-poe-test-loops += CSWpoetestloops +CATALOGNAME_CSWpoetestloops = pm_poetestloops_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums 2012-02-24 12:40:10 UTC (rev 17173) +++ csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums 2012-02-24 12:54:04 UTC (rev 17174) @@ -1,2 +1 @@ -cddd7c392e43f3a1acb8342d9051be64 COPYING -f109a514da1d002cab60966ed304bbb7 POE-Test-Loops-1.033.tar.gz +0ac7131832b3cd9f03edfcae53d634c0 POE-Test-Loops-1.350.tar.gz Deleted: csw/mgar/pkg/cpan/POE-Test-Loops/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/POE-Test-Loops/trunk/files/COPYING 2012-02-24 12:40:10 UTC (rev 17173) +++ csw/mgar/pkg/cpan/POE-Test-Loops/trunk/files/COPYING 2012-02-24 12:54:04 UTC (rev 17174) @@ -1,12 +0,0 @@ -AUTHOR & COPYRIGHT - -Rocco Caputo . Benjamin Smith . -Countless other people. - -These tests are Copyright 1998-2009 by Rocco Caputo, Benjamin Smith, -and countless contributors. All rights are reserved. These tests are -free software; you may redistribute them and/or modify them under the -same terms as Perl itself. - -Thanks to Martijn van Beers for beta testing and suggestions. - 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 Feb 24 13:58:43 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 12:58:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[17175] csw/mgar/pkg/cpan/IO-Tty/trunk/Makefile Message-ID: Revision: 17175 http://gar.svn.sourceforge.net/gar/?rev=17175&view=rev Author: dmichelsen Date: 2012-02-24 12:58:43 +0000 (Fri, 24 Feb 2012) Log Message: ----------- cpan/IO-Tty/trunk: Add license Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Tty/trunk/Makefile Modified: csw/mgar/pkg/cpan/IO-Tty/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Tty/trunk/Makefile 2012-02-24 12:54:04 UTC (rev 17174) +++ csw/mgar/pkg/cpan/IO-Tty/trunk/Makefile 2012-02-24 12:58:43 UTC (rev 17175) @@ -8,10 +8,12 @@ define BLURB endef +CATALOG_RELEASE = unstable + +LICENSE = README + BUILD_DEP_PKGS += CSWpm-test-simple -CATALOG_RELEASE = unstable - PACKAGES += CSWpm-io-tty CATALOGNAME_CSWpm-io-tty = pm_io_tty SPKG_DESC_CSWpm-io-tty = Pseudo ttys and constants 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 Feb 24 14:04:51 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 13:04:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17176] csw/mgar/gar Message-ID: Revision: 17176 http://gar.svn.sourceforge.net/gar/?rev=17176&view=rev Author: dmichelsen Date: 2012-02-24 13:04:51 +0000 (Fri, 24 Feb 2012) Log Message: ----------- mGAR v2-ips: Create branch, first changes Modified Paths: -------------- csw/mgar/gar/v2-ips/gar.conf.mk csw/mgar/gar/v2-ips/gar.mk csw/mgar/gar/v2-ips/gar.pkg.mk Added Paths: ----------- csw/mgar/gar/v2-ips/ Modified: csw/mgar/gar/v2-ips/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2012-02-11 15:58:24 UTC (rev 17020) +++ csw/mgar/gar/v2-ips/gar.conf.mk 2012-02-24 13:04:51 UTC (rev 17176) @@ -18,7 +18,7 @@ # On these platforms packages are built. # They will include binaries for all ISAs that are specified for the platform. -PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 solaris11-sparc solaris11-i386 # This is the platform we are currently building. It is either set when # invoked from "gmake platforms" or when you build a package on a host @@ -82,6 +82,11 @@ # Space separated list of paths to search for DISTFILES. GARCHIVEPATH ?= $(GARCHIVEDIR) +# Architecture +GARCHLIST ?= sparc i386 +GARCH := $(if $(GARCH),$(GARCH),$(shell /usr/bin/uname -p)) +GAROSREL := $(if $(GAROSREL),$(GAROSREL),$(shell /usr/bin/uname -r)) + # Select compiler # GARCOMPILER can be either GNU/SUN which selects the default # Sun or GNU compiler, or the specific verions SOS11/SOS12/SOS12U1/SOS12U2/SOS12U3/GCC3/GCC4 @@ -91,8 +96,12 @@ # We have parameters for the following compilers GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 SOS12U1 SOS12U2 SOS12U3 +GARCOMPILER-SUN-5.9 = SOS12 +GARCOMPILER-SUN-5.10 = SOS12 +GARCOMPILER-SUN-5.11 = SOS12U2 + ifeq ($(GARCOMPILER),SUN) - GARCOMPILER = SOS12 + GARCOMPILER = $(GARCOMPILER-SUN-$(GAROSREL)) endif ifeq ($(GARCOMPILER),GNU) @@ -106,12 +115,7 @@ # Build flavor (OPT/DBG) GARFLAVOR ?= OPT -# Architecture -GARCHLIST ?= sparc i386 -GARCH := $(if $(GARCH),$(GARCH),$(shell /usr/bin/uname -p)) -GAROSREL := $(if $(GAROSREL),$(GAROSREL),$(shell /usr/bin/uname -r)) - # These are the standard directory name variables from all GNU # makefiles. They're also used by autoconf, and can be adapted # for a variety of build systems. @@ -457,12 +461,16 @@ # Raise these in your .garrc if needed ISA_DEFAULT_sparc-5.9 ?= sparcv8 ISA_DEFAULT_sparc-5.10 ?= sparcv8plus +ISA_DEFAULT_sparc-5.11 ?= sparcv8plus ISA_DEFAULT_i386-5.9 ?= i386 ISA_DEFAULT_i386-5.10 ?= pentium_pro +ISA_DEFAULT_i386-5.11 ?= pentium_pro ISA_DEFAULT64_sparc-5.9 ?= sparcv9 ISA_DEFAULT64_sparc-5.10 ?= sparcv9 +ISA_DEFAULT64_sparc-5.11 ?= sparcv9 ISA_DEFAULT64_i386-5.9 ?= amd64 ISA_DEFAULT64_i386-5.10 ?= amd64 +ISA_DEFAULT64_i386-5.11 ?= amd64 ISA_DEFAULT_sparc ?= $(ISA_DEFAULT_sparc-$(GAROSREL)) ISA_DEFAULT_i386 ?= $(ISA_DEFAULT_i386-$(GAROSREL)) Modified: csw/mgar/gar/v2-ips/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2012-02-11 15:58:24 UTC (rev 17020) +++ csw/mgar/gar/v2-ips/gar.mk 2012-02-24 13:04:51 UTC (rev 17176) @@ -234,6 +234,7 @@ define modulationvalue $(strip $(or $($(1)_$(MODULATION)),\ $($(1)_$(MODULATION_ISACOLLAPSED)),\ + $($(1)_$(MODULATION_ISACOLLAPSEDEXTRA)),\ )) endef Modified: csw/mgar/gar/v2-ips/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2012-02-11 15:58:24 UTC (rev 17020) +++ csw/mgar/gar/v2-ips/gar.pkg.mk 2012-02-24 13:04:51 UTC (rev 17176) @@ -93,6 +93,8 @@ _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) $(if $(_PKG_SPECS),,$(error No packages for building defined)) +_PKG_SPECS_IPS = $(NAME) + # The is the name of the package containing the sourcefiles for all packages generated from this GAR recipe. # It defaults to the first defined package name or gspec. SRCPACKAGE_BASE is guaranteed # to be one of the real packages built. @@ -688,7 +690,23 @@ ) >$@ $(if $(ALLOW_RELOCATE),echo "BASEDIR=$(RELOCATE_PREFIX)" >>$@) +$(warning W: $(WORKDIR)) +$(WORKDIR)/%.proto: $(WORKDIR) + $(_DBG)(cd $(PKGROOT) && pkgsend generate .) >$@ + +$(WORKDIR)/%.meta: $(WORKDIR) + $(_DBG)(echo "set name=pkg.fmri value=$*@$(VERSION)"; \ + echo "set name=pkg.summary value=\"$(SPKG_DESC)\""; \ + echo "set name=pkg.description value=\"$(SPKG_DESC)\""; \ + echo "set name=variant.arch value=$(GARCH)"; \ + echo "set name=info.classification value=org.opencsw.category.2012:$(CATEGORY)"; \ + $(_CATEGORY_IPS_META) \ + ) >$@ + +packageips-%: $(WORKDIR)/%.proto $(WORKDIR)/%.meta + cd $(WORKDIR) && pkgmogrify $*.proto $*.meta > $*.p5m + # findlicensefile - Find an existing file for a given license name # define findlicensefile @@ -873,6 +891,8 @@ PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC)) +PACKAGE_TARGETS_IPS = $(foreach SPEC,$(_PKG_SPECS_IPS),packageips-$(SPEC)) + SPKG_DESTDIRS = $(SPKG_SPOOLDIR) $(SPKG_EXPORT) $(SPKG_DESTDIRS): @@ -913,10 +933,19 @@ done)),) _buildpackage: pre-package $(PACKAGE_TARGETS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck) +_buildpackage-ips: pre-package $(PACKAGE_TARGETS_IPS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck) + _package: validateplatform extract-global merge $(SPKG_DESTDIRS) _buildpackage @$(MAKECOOKIE) -package: _package +PKGFORMAT-5.8 = svr4 +PKGFORMAT-5.9 = svr4 +PKGFORMAT-5.10 = svr4 +PKGFORMAT-5.11 = ips + +package: package-$(PKGFORMAT-$(GAROSREL)) + +package-svr4: _package @echo @echo "The following packages have been built:" @echo @@ -924,6 +953,9 @@ @echo @$(DONADA) +package-ips: validateplatform extract-global merge $(SPKG_DESTDIRS) _buildpackage-ips + @$(MAKECOOKIE) + dirpackage: _DIRPACKAGE=1 dirpackage: ENABLE_CHECK= dirpackage: _package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Feb 24 14:20:48 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 24 Feb 2012 13:20:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17178] csw/mgar/pkg/389-adminutil/trunk/Makefile Message-ID: Revision: 17178 http://gar.svn.sourceforge.net/gar/?rev=17178&view=rev Author: cgrzemba Date: 2012-02-24 13:20:48 +0000 (Fri, 24 Feb 2012) Log Message: ----------- 389-adminutil/trunk: bump version Modified Paths: -------------- csw/mgar/pkg/389-adminutil/trunk/Makefile Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-adminutil/trunk/Makefile 2012-02-24 13:19:52 UTC (rev 17177) +++ csw/mgar/pkg/389-adminutil/trunk/Makefile 2012-02-24 13:20:48 UTC (rev 17178) @@ -1,7 +1,7 @@ # $Id$ # NAME = 389-adminutil -VERSION = 1.1.14 +VERSION = 1.1.15 GARTYPE = v2 CATEGORIES = lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Feb 24 14:19:52 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 24 Feb 2012 13:19:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17177] csw/mgar/pkg/389-dsgw/trunk Message-ID: Revision: 17177 http://gar.svn.sourceforge.net/gar/?rev=17177&view=rev Author: cgrzemba Date: 2012-02-24 13:19:52 +0000 (Fri, 24 Feb 2012) Log Message: ----------- 389-dsgw/trunk: bump version Modified Paths: -------------- csw/mgar/pkg/389-dsgw/trunk/Makefile csw/mgar/pkg/389-dsgw/trunk/checksums Added Paths: ----------- csw/mgar/pkg/389-dsgw/trunk/files/0001-change-include-path-preferences-in-Makefile.am.patch Removed Paths: ------------- csw/mgar/pkg/389-dsgw/trunk/files/0001-change-include-path-preference-in-Makefile.am.patch Modified: csw/mgar/pkg/389-dsgw/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-dsgw/trunk/Makefile 2012-02-24 13:04:51 UTC (rev 17176) +++ csw/mgar/pkg/389-dsgw/trunk/Makefile 2012-02-24 13:19:52 UTC (rev 17177) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = 389-dsgw -VERSION = 1.1.7 +VERSION = 1.1.9 GARTYPE = v2 CATEGORIES = server @@ -44,19 +44,19 @@ RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibssl3 CHECKPKG_OVERRIDES_CSW389-dsgw += file-with-bad-content|/usr/local|root/opt/csw/share/dirsrv/manual/en/dsgw/attribut.htm -PATCHFILES += 0001-change-include-path-preference-in-Makefile.am.patch +PATCHFILES += 0001-change-include-path-preferences-in-Makefile.am.patch CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv -CONFIGURE_ARGS_OPT += --with-ldapsdk-lib=/opt/csw/lib -CONFIGURE_ARGS_OPT += --with-ldapsdk-bin=/opt/csw/dirsrv/bin -CONFIGURE_ARGS_OPT += --with-icu-inc=/opt/csw/include -CONFIGURE_ARGS_OPT += --with-icu-lib=/opt/csw/lib -CONFIGURE_ARGS_OPT += --with-icu-bin=/opt/csw/bin -CONFIGURE_ARGS_OPT += --with-sasl-inc=/opt/csw/include/sasl -CONFIGURE_ARGS_OPT += --with-sasl-lib=/opt/csw/lib -CONFIGURE_ARGS_OPT += --with-nspr-lib=/opt/csw/lib -CONFIGURE_ARGS_OPT += --with-nspr-inc=/opt/csw/include/nspr +CONFIGURE_ARGS += --with-ldapsdk-inc=/opt/csw/include/dirsrv +CONFIGURE_ARGS += --with-ldapsdk-lib=/opt/csw/lib +CONFIGURE_ARGS += --with-ldapsdk-bin=/opt/csw/dirsrv/bin +CONFIGURE_ARGS += --with-icu-inc=/opt/csw/include +CONFIGURE_ARGS += --with-icu-lib=/opt/csw/lib +CONFIGURE_ARGS += --with-icu-bin=/opt/csw/bin +CONFIGURE_ARGS += --with-sasl-inc=/opt/csw/include/sasl +CONFIGURE_ARGS += --with-sasl-lib=/opt/csw/lib +CONFIGURE_ARGS += --with-nspr-lib=/opt/csw/lib +CONFIGURE_ARGS += --with-nspr-inc=/opt/csw/include/nspr CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) include gar/category.mk Modified: csw/mgar/pkg/389-dsgw/trunk/checksums =================================================================== --- csw/mgar/pkg/389-dsgw/trunk/checksums 2012-02-24 13:04:51 UTC (rev 17176) +++ csw/mgar/pkg/389-dsgw/trunk/checksums 2012-02-24 13:19:52 UTC (rev 17177) @@ -1 +1 @@ -367537e786006adf8f204974b62c282b 389-dsgw-1.1.7.tar.bz2 +a622d6e4ed636b831fdaa8dea6bef1f9 389-dsgw-1.1.9.tar.bz2 Deleted: csw/mgar/pkg/389-dsgw/trunk/files/0001-change-include-path-preference-in-Makefile.am.patch =================================================================== --- csw/mgar/pkg/389-dsgw/trunk/files/0001-change-include-path-preference-in-Makefile.am.patch 2012-02-24 13:04:51 UTC (rev 17176) +++ csw/mgar/pkg/389-dsgw/trunk/files/0001-change-include-path-preference-in-Makefile.am.patch 2012-02-24 13:19:52 UTC (rev 17177) @@ -1,38795 +0,0 @@ -From 61297c8e9549854b0b12707158ec5dce5e41785c Mon Sep 17 00:00:00 2001 -From: Carsten Grzemba -Date: Thu, 19 Jan 2012 11:59:37 +0100 -Subject: [PATCH] change include path preference in Makefile.am - ---- - Makefile.am | 2 +- - Makefile.in | 102 +- - aclocal.m4 | 8501 ++++++++++++++++++++++++++++++++- - compile | 173 +- - config.guess | 235 +- - config.h.in | 3 + - config.sub | 184 +- - configure |15121 +++++++++++++++++++++++++--------------------------------- - depcomp | 74 +- - install-sh | 29 +- - ltmain.sh | 3977 ++++++++++------ - 11 files changed, 18090 insertions(+), 10311 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 212e6c3..7951f18 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -52,7 +52,7 @@ endif - - DSGW_VER_STR := "Directory-Server-Gateway/$(PACKAGE_VERSION)" - --AM_CPPFLAGS = -DDSGW_VER_STR=\"$(DSGW_VER_STR)\" $(DEBUG_DEFINES) @adminutil_inc@ @icu_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ \ -+AM_CPPFLAGS = -DDSGW_VER_STR=\"$(DSGW_VER_STR)\" $(DEBUG_DEFINES) @adminutil_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ @icu_inc@ \ - -I$(srcdir)/include -I$(srcdir)/include/base - if WINNT - AM_CPPFLAGS += -DXP_WINNT -diff --git a/Makefile.in b/Makefile.in -index 08cd8cb..a648ca9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.11.2 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -+# Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -76,10 +76,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_config_DATA) \ - ChangeLog NEWS compile config.guess config.sub depcomp \ - install-sh ltmain.sh missing - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ -- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ -- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ -- $(top_srcdir)/m4/fhs.m4 $(top_srcdir)/m4/nspr.m4 \ -+am__aclocal_m4_deps = $(top_srcdir)/m4/fhs.m4 $(top_srcdir)/m4/nspr.m4 \ - $(top_srcdir)/m4/nss.m4 $(top_srcdir)/m4/sasl.m4 \ - $(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/mozldap.m4 \ - $(top_srcdir)/m4/icu.m4 $(top_srcdir)/m4/adminutil.m4 \ -@@ -240,6 +237,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - SCRIPTS = $(cgibin_SCRIPTS) $(nodist_sbin_SCRIPTS) - DEFAULT_INCLUDES = -I. at am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -290,6 +293,8 @@ am__remove_distdir = \ - DIST_ARCHIVES = $(distdir).tar.gz - GZIP_ENV = --best - distuninstallcheck_listfiles = find . -type f -print -+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ -+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' - distcleancheck_listfiles = find . -type f -print - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -@@ -310,6 +315,7 @@ CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -340,6 +346,7 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -353,6 +360,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ -@@ -367,6 +375,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -424,7 +433,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - manualdir = $(datadir)@manualdir@ - manualsubdir = @manualsubdir@ -@@ -708,7 +716,7 @@ all: config.h - - .SUFFIXES: - .SUFFIXES: .c .cpp .lo .o .obj --am--refresh: -+am--refresh: Makefile - @: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ -@@ -744,10 +752,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - $(am__aclocal_m4_deps): - - config.h: stamp-h1 -- @if test ! -f $@; then \ -- rm -f stamp-h1; \ -- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ -- else :; fi -+ @if test ! -f $@; then rm -f stamp-h1; else :; fi -+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi - - stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 -@@ -884,9 +890,7 @@ uninstall-cgibinSCRIPTS: - @list='$(cgibin_SCRIPTS)'; test -n "$(cgibindir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ -- test -n "$$list" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(cgibindir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(cgibindir)" && rm -f $$files -+ dir='$(DESTDIR)$(cgibindir)'; $(am__uninstall_files_from_dir) - install-nodist_sbinSCRIPTS: $(nodist_sbin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" -@@ -918,9 +922,7 @@ uninstall-nodist_sbinSCRIPTS: - @list='$(nodist_sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ -- test -n "$$list" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(sbindir)" && rm -f $$files -+ dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -1039,9 +1041,7 @@ uninstall-dist_configDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_config_DATA)'; test -n "$(configdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- test -n "$$files" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(configdir)" && rm -f $$files -+ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir) - install-dist_htmlDATA: $(dist_html_DATA) - @$(NORMAL_INSTALL) - test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" -@@ -1059,9 +1059,7 @@ uninstall-dist_htmlDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- test -n "$$files" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(htmldir)" && rm -f $$files -+ dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir) - install-dist_maninstDATA: $(dist_maninst_DATA) - @$(NORMAL_INSTALL) - test -z "$(maninstdir)" || $(MKDIR_P) "$(DESTDIR)$(maninstdir)" -@@ -1079,9 +1077,7 @@ uninstall-dist_maninstDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_maninst_DATA)'; test -n "$(maninstdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- test -n "$$files" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(maninstdir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(maninstdir)" && rm -f $$files -+ dir='$(DESTDIR)$(maninstdir)'; $(am__uninstall_files_from_dir) - install-dist_orghtmlDATA: $(dist_orghtml_DATA) - @$(NORMAL_INSTALL) - test -z "$(orghtmldir)" || $(MKDIR_P) "$(DESTDIR)$(orghtmldir)" -@@ -1099,9 +1095,7 @@ uninstall-dist_orghtmlDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_orghtml_DATA)'; test -n "$(orghtmldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- test -n "$$files" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(orghtmldir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(orghtmldir)" && rm -f $$files -+ dir='$(DESTDIR)$(orghtmldir)'; $(am__uninstall_files_from_dir) - install-dist_pbconfigDATA: $(dist_pbconfig_DATA) - @$(NORMAL_INSTALL) - test -z "$(pbconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pbconfigdir)" -@@ -1119,9 +1113,7 @@ uninstall-dist_pbconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_pbconfig_DATA)'; test -n "$(pbconfigdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- test -n "$$files" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(pbconfigdir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(pbconfigdir)" && rm -f $$files -+ dir='$(DESTDIR)$(pbconfigdir)'; $(am__uninstall_files_from_dir) - install-dist_pbhtmlDATA: $(dist_pbhtml_DATA) - @$(NORMAL_INSTALL) - test -z "$(pbhtmldir)" || $(MKDIR_P) "$(DESTDIR)$(pbhtmldir)" -@@ -1139,9 +1131,7 @@ uninstall-dist_pbhtmlDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_pbhtml_DATA)'; test -n "$(pbhtmldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- test -n "$$files" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(pbhtmldir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(pbhtmldir)" && rm -f $$files -+ dir='$(DESTDIR)$(pbhtmldir)'; $(am__uninstall_files_from_dir) - install-nodist_contextDATA: $(nodist_context_DATA) - @$(NORMAL_INSTALL) - test -z "$(contextdir)" || $(MKDIR_P) "$(DESTDIR)$(contextdir)" -@@ -1159,9 +1149,7 @@ uninstall-nodist_contextDATA: - @$(NORMAL_UNINSTALL) - @list='$(nodist_context_DATA)'; test -n "$(contextdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- test -n "$$files" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(contextdir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(contextdir)" && rm -f $$files -+ dir='$(DESTDIR)$(contextdir)'; $(am__uninstall_files_from_dir) - install-nodist_propertyDATA: $(nodist_property_DATA) - @$(NORMAL_INSTALL) - test -z "$(propertydir)" || $(MKDIR_P) "$(DESTDIR)$(propertydir)" -@@ -1179,9 +1167,7 @@ uninstall-nodist_propertyDATA: - @$(NORMAL_UNINSTALL) - @list='$(nodist_property_DATA)'; test -n "$(propertydir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- test -n "$$files" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(propertydir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(propertydir)" && rm -f $$files -+ dir='$(DESTDIR)$(propertydir)'; $(am__uninstall_files_from_dir) - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -@@ -1279,7 +1265,7 @@ dist-gzip: distdir - $(am__remove_distdir) - - dist-bzip2: distdir -- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 -+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - - dist-lzma: distdir -@@ -1287,7 +1273,7 @@ dist-lzma: distdir - $(am__remove_distdir) - - dist-xz: distdir -- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz -+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) - - dist-tarZ: distdir -@@ -1337,6 +1323,7 @@ distcheck: dist - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ -+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ -@@ -1365,8 +1352,16 @@ distcheck: dist - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' - distuninstallcheck: -- @$(am__cd) '$(distuninstallcheck_dir)' \ -- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -+ @test -n '$(distuninstallcheck_dir)' || { \ -+ echo 'ERROR: trying to run $@ with an empty' \ -+ '$$(distuninstallcheck_dir)' >&2; \ -+ exit 1; \ -+ }; \ -+ $(am__cd) '$(distuninstallcheck_dir)' || { \ -+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ -+ exit 1; \ -+ }; \ -+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ -@@ -1399,10 +1394,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) - -diff --git a/aclocal.m4 b/aclocal.m4 -index ef89f4a..6623d7d 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1,7 +1,8 @@ --# generated automatically by aclocal 1.11.1 -*- Autoconf -*- -+# generated automatically by aclocal 1.11.2 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -+# Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -13,18 +14,8448 @@ - - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl --m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, --[m4_warning([this file was generated for autoconf 2.63. -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -+[m4_warning([this file was generated for autoconf 2.68. - You have another version of autoconf. It may work, but is not guaranteed to. - If you have problems, you may need to regenerate the build system entirely. - To do so, use the procedure documented by the package, typically `autoreconf'.])]) - --# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+m4_define([_LT_COPYING], [dnl -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is part of GNU Libtool. -+# -+# GNU Libtool 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 2 of -+# the License, or (at your option) any later version. -+# -+# As a special exception to the GNU General Public License, -+# if you distribute this file as part of a program or library that -+# is built using GNU Libtool, you may include this file under the -+# same distribution terms that you use for the rest of that program. -+# -+# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -+# obtained by writing to the Free Software Foundation, Inc., -+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+]) -+ -+# serial 57 LT_INIT -+ -+ -+# LT_PREREQ(VERSION) -+# ------------------ -+# Complain and exit if this libtool version is less that VERSION. -+m4_defun([LT_PREREQ], -+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, -+ [m4_default([$3], -+ [m4_fatal([Libtool version $1 or higher is required], -+ 63)])], -+ [$2])]) -+ -+ -+# _LT_CHECK_BUILDDIR -+# ------------------ -+# Complain if the absolute build directory name contains unusual characters -+m4_defun([_LT_CHECK_BUILDDIR], -+[case `pwd` in -+ *\ * | *\ *) -+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -+esac -+]) -+ -+ -+# LT_INIT([OPTIONS]) -+# ------------------ -+AC_DEFUN([LT_INIT], -+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -+AC_BEFORE([$0], [LT_LANG])dnl -+AC_BEFORE([$0], [LT_OUTPUT])dnl -+AC_BEFORE([$0], [LTDL_INIT])dnl -+m4_require([_LT_CHECK_BUILDDIR])dnl -+ -+dnl Autoconf doesn't catch unexpanded LT_ macros by default: -+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -+dnl unless we require an AC_DEFUNed macro: -+AC_REQUIRE([LTOPTIONS_VERSION])dnl -+AC_REQUIRE([LTSUGAR_VERSION])dnl -+AC_REQUIRE([LTVERSION_VERSION])dnl -+AC_REQUIRE([LTOBSOLETE_VERSION])dnl -+m4_require([_LT_PROG_LTMAIN])dnl -+ -+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) -+ -+dnl Parse OPTIONS -+_LT_SET_OPTIONS([$0], [$1]) -+ -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ltmain" -+ -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+AC_SUBST(LIBTOOL)dnl -+ -+_LT_SETUP -+ -+# Only expand once: -+m4_define([LT_INIT]) -+])# LT_INIT -+ -+# Old names: -+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -+dnl AC_DEFUN([AM_PROG_LIBTOOL], []) -+ -+ -+# _LT_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+m4_defun([_LT_CC_BASENAME], -+[for cc_temp in $1""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -+]) -+ -+ -+# _LT_FILEUTILS_DEFAULTS -+# ---------------------- -+# It is okay to use these file commands and assume they have been set -+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -+m4_defun([_LT_FILEUTILS_DEFAULTS], -+[: ${CP="cp -f"} -+: ${MV="mv -f"} -+: ${RM="rm -f"} -+])# _LT_FILEUTILS_DEFAULTS -+ -+ -+# _LT_SETUP -+# --------- -+m4_defun([_LT_SETUP], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl -+ -+_LT_DECL([], [host_alias], [0], [The host system])dnl -+_LT_DECL([], [host], [0])dnl -+_LT_DECL([], [host_os], [0])dnl -+dnl -+_LT_DECL([], [build_alias], [0], [The build system])dnl -+_LT_DECL([], [build], [0])dnl -+_LT_DECL([], [build_os], [0])dnl -+dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([LT_PATH_LD])dnl -+AC_REQUIRE([LT_PATH_NM])dnl -+dnl -+AC_REQUIRE([AC_PROG_LN_S])dnl -+test -z "$LN_S" && LN_S="ln -s" -+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -+dnl -+AC_REQUIRE([LT_CMD_MAX_LEN])dnl -+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -+dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl -+m4_require([_LT_CMD_RELOAD])dnl -+m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl -+m4_require([_LT_CMD_OLD_ARCHIVE])dnl -+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+m4_require([_LT_WITH_SYSROOT])dnl -+ -+_LT_CONFIG_LIBTOOL_INIT([ -+# See if we are running on zsh, and set the options which allow our -+# commands through without removal of \ escapes INIT. -+if test -n "\${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+fi -+]) -+if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+fi -+ -+_LT_CHECK_OBJDIR -+ -+m4_require([_LT_TAG_COMPILER])dnl -+ -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+ fi -+ ;; -+esac -+ -+# Global variables: -+ofile=libtool -+can_build_shared=yes -+ -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+ -+with_gnu_ld="$lt_cv_prog_gnu_ld" -+ -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" -+ -+# Set sane defaults for various variables -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+test -z "$LD" && LD=ld -+test -z "$ac_objext" && ac_objext=o -+ -+_LT_CC_BASENAME([$compiler]) -+ -+# Only perform the check for file, if the check method requires it -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ _LT_PATH_MAGIC -+ fi -+ ;; -+esac -+ -+# Use C for the default configuration in the libtool script -+LT_SUPPORTED_TAG([CC]) -+_LT_LANG_C_CONFIG -+_LT_LANG_DEFAULT_CONFIG -+_LT_CONFIG_COMMANDS -+])# _LT_SETUP -+ -+ -+# _LT_PREPARE_SED_QUOTE_VARS -+# -------------------------- -+# Define a few sed substitution that help us do robust quoting. -+m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -+[# Backslashify metacharacters that are still active within -+# double-quoted strings. -+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' -+ -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\([["`\\]]\)/\\\1/g' -+ -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to delay expansion of an escaped single quote. -+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+]) -+ -+# _LT_PROG_LTMAIN -+# --------------- -+# Note that this code is called both from `configure', and `config.status' -+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -+# `config.status' has no value for ac_aux_dir unless we are using Automake, -+# so we pass a copy along to make sure it has a sensible value anyway. -+m4_defun([_LT_PROG_LTMAIN], -+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -+ltmain="$ac_aux_dir/ltmain.sh" -+])# _LT_PROG_LTMAIN -+ -+ -+ -+# So that we can recreate a full libtool script including additional -+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -+# in macros and then make a single call at the end using the `libtool' -+# label. -+ -+ -+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -+# ---------------------------------------- -+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -+m4_define([_LT_CONFIG_LIBTOOL_INIT], -+[m4_ifval([$1], -+ [m4_append([_LT_OUTPUT_LIBTOOL_INIT], -+ [$1 -+])])]) -+ -+# Initialize. -+m4_define([_LT_OUTPUT_LIBTOOL_INIT]) -+ -+ -+# _LT_CONFIG_LIBTOOL([COMMANDS]) -+# ------------------------------ -+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -+m4_define([_LT_CONFIG_LIBTOOL], -+[m4_ifval([$1], -+ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], -+ [$1 -+])])]) -+ -+# Initialize. -+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) -+ -+ -+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -+# ----------------------------------------------------- -+m4_defun([_LT_CONFIG_SAVE_COMMANDS], -+[_LT_CONFIG_LIBTOOL([$1]) -+_LT_CONFIG_LIBTOOL_INIT([$2]) -+]) -+ -+ -+# _LT_FORMAT_COMMENT([COMMENT]) -+# ----------------------------- -+# Add leading comment marks to the start of each line, and a trailing -+# full-stop to the whole comment if one is not present already. -+m4_define([_LT_FORMAT_COMMENT], -+[m4_ifval([$1], [ -+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], -+ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -+)]) -+ -+ -+ -+ -+ -+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -+# ------------------------------------------------------------------- -+# CONFIGNAME is the name given to the value in the libtool script. -+# VARNAME is the (base) name used in the configure script. -+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -+# VARNAME. Any other value will be used directly. -+m4_define([_LT_DECL], -+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], -+ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], -+ [m4_ifval([$1], [$1], [$2])]) -+ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) -+ m4_ifval([$4], -+ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) -+ lt_dict_add_subkey([lt_decl_dict], [$2], -+ [tagged?], [m4_ifval([$5], [yes], [no])])]) -+]) -+ -+ -+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -+# -------------------------------------------------------- -+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) -+ -+ -+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -+# ------------------------------------------------ -+m4_define([lt_decl_tag_varnames], -+[_lt_decl_filter([tagged?], [yes], $@)]) -+ -+ -+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -+# --------------------------------------------------------- -+m4_define([_lt_decl_filter], -+[m4_case([$#], -+ [0], [m4_fatal([$0: too few arguments: $#])], -+ [1], [m4_fatal([$0: too few arguments: $#: $1])], -+ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], -+ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], -+ [lt_dict_filter([lt_decl_dict], $@)])[]dnl -+]) -+ -+ -+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -+# -------------------------------------------------- -+m4_define([lt_decl_quote_varnames], -+[_lt_decl_filter([value], [1], $@)]) -+ -+ -+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -+# --------------------------------------------------- -+m4_define([lt_decl_dquote_varnames], -+[_lt_decl_filter([value], [2], $@)]) -+ -+ -+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -+# --------------------------------------------------- -+m4_define([lt_decl_varnames_tagged], -+[m4_assert([$# <= 2])dnl -+_$0(m4_quote(m4_default([$1], [[, ]])), -+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), -+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -+m4_define([_lt_decl_varnames_tagged], -+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) -+ -+ -+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -+# ------------------------------------------------ -+m4_define([lt_decl_all_varnames], -+[_$0(m4_quote(m4_default([$1], [[, ]])), -+ m4_if([$2], [], -+ m4_quote(lt_decl_varnames), -+ m4_quote(m4_shift($@))))[]dnl -+]) -+m4_define([_lt_decl_all_varnames], -+[lt_join($@, lt_decl_varnames_tagged([$1], -+ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -+]) -+ -+ -+# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -+# ------------------------------------ -+# Quote a variable value, and forward it to `config.status' so that its -+# declaration there will have the same value as in `configure'. VARNAME -+# must have a single quote delimited value for this to work. -+m4_define([_LT_CONFIG_STATUS_DECLARE], -+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) -+ -+ -+# _LT_CONFIG_STATUS_DECLARATIONS -+# ------------------------------ -+# We delimit libtool config variables with single quotes, so when -+# we write them to config.status, we have to be sure to quote all -+# embedded single quotes properly. In configure, this macro expands -+# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -+# -+# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' -+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), -+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) -+ -+ -+# _LT_LIBTOOL_TAGS -+# ---------------- -+# Output comment and list of tags supported by the script -+m4_defun([_LT_LIBTOOL_TAGS], -+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -+available_tags="_LT_TAGS"dnl -+]) -+ -+ -+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -+# ----------------------------------- -+# Extract the dictionary values for VARNAME (optionally with TAG) and -+# expand to a commented shell variable setting: -+# -+# # Some comment about what VAR is for. -+# visible_name=$lt_internal_name -+m4_define([_LT_LIBTOOL_DECLARE], -+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], -+ [description])))[]dnl -+m4_pushdef([_libtool_name], -+ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), -+ [0], [_libtool_name=[$]$1], -+ [1], [_libtool_name=$lt_[]$1], -+ [2], [_libtool_name=$lt_[]$1], -+ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -+]) -+ -+ -+# _LT_LIBTOOL_CONFIG_VARS -+# ----------------------- -+# Produce commented declarations of non-tagged libtool config variables -+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -+# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -+# section) are produced by _LT_LIBTOOL_TAG_VARS. -+m4_defun([_LT_LIBTOOL_CONFIG_VARS], -+[m4_foreach([_lt_var], -+ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), -+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) -+ -+ -+# _LT_LIBTOOL_TAG_VARS(TAG) -+# ------------------------- -+m4_define([_LT_LIBTOOL_TAG_VARS], -+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), -+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) -+ -+ -+# _LT_TAGVAR(VARNAME, [TAGNAME]) -+# ------------------------------ -+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) -+ -+ -+# _LT_CONFIG_COMMANDS -+# ------------------- -+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -+# variables for single and double quote escaping we saved from calls -+# to _LT_DECL, we can put quote escaped variables declarations -+# into `config.status', and then the shell code to quote escape them in -+# for loops in `config.status'. Finally, any additional code accumulated -+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -+m4_defun([_LT_CONFIG_COMMANDS], -+[AC_PROVIDE_IFELSE([LT_OUTPUT], -+ dnl If the libtool generation code has been placed in $CONFIG_LT, -+ dnl instead of duplicating it all over again into config.status, -+ dnl then we will have config.status run $CONFIG_LT later, so it -+ dnl needs to know what name is stored there: -+ [AC_CONFIG_COMMANDS([libtool], -+ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], -+ dnl If the libtool generation code is destined for config.status, -+ dnl expand the accumulated commands and init code now: -+ [AC_CONFIG_COMMANDS([libtool], -+ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -+])#_LT_CONFIG_COMMANDS -+ -+ -+# Initialize. -+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -+[ -+ -+# The HP-UX ksh and POSIX shell print the target directory to stdout -+# if CDPATH is set. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+sed_quote_subst='$sed_quote_subst' -+double_quote_subst='$double_quote_subst' -+delay_variable_subst='$delay_variable_subst' -+_LT_CONFIG_STATUS_DECLARATIONS -+LTCC='$LTCC' -+LTCFLAGS='$LTCFLAGS' -+compiler='$compiler_DEFAULT' -+ -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+\$[]1 -+_LTECHO_EOF' -+} -+ -+# Quote evaled strings. -+for var in lt_decl_all_varnames([[ \ -+]], lt_decl_quote_varnames); do -+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in -+ *[[\\\\\\\`\\"\\\$]]*) -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -+ ;; -+ *) -+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ ;; -+ esac -+done -+ -+# Double-quote double-evaled strings. -+for var in lt_decl_all_varnames([[ \ -+]], lt_decl_dquote_varnames); do -+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in -+ *[[\\\\\\\`\\"\\\$]]*) -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ ;; -+ *) -+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ ;; -+ esac -+done -+ -+_LT_OUTPUT_LIBTOOL_INIT -+]) -+ -+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -+# ------------------------------------ -+# Generate a child script FILE with all initialization necessary to -+# reuse the environment learned by the parent script, and make the -+# file executable. If COMMENT is supplied, it is inserted after the -+# `#!' sequence but before initialization text begins. After this -+# macro, additional text can be appended to FILE to form the body of -+# the child script. The macro ends with non-zero status if the -+# file could not be fully written (such as if the disk is full). -+m4_ifdef([AS_INIT_GENERATED], -+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -+[m4_defun([_LT_GENERATED_FILE_INIT], -+[m4_require([AS_PREPARE])]dnl -+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -+[lt_write_fail=0 -+cat >$1 <<_ASEOF || lt_write_fail=1 -+#! $SHELL -+# Generated by $as_me. -+$2 -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$1 <<\_ASEOF || lt_write_fail=1 -+AS_SHELL_SANITIZE -+_AS_PREPARE -+exec AS_MESSAGE_FD>&1 -+_ASEOF -+test $lt_write_fail = 0 && chmod +x $1[]dnl -+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT -+ -+# LT_OUTPUT -+# --------- -+# This macro allows early generation of the libtool script (before -+# AC_OUTPUT is called), incase it is used in configure for compilation -+# tests. -+AC_DEFUN([LT_OUTPUT], -+[: ${CONFIG_LT=./config.lt} -+AC_MSG_NOTICE([creating $CONFIG_LT]) -+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -+[# Run this file to recreate a libtool stub with the current configuration.]) -+ -+cat >>"$CONFIG_LT" <<\_LTEOF -+lt_cl_silent=false -+exec AS_MESSAGE_LOG_FD>>config.log -+{ -+ echo -+ AS_BOX([Running $as_me.]) -+} >&AS_MESSAGE_LOG_FD -+ -+lt_cl_help="\ -+\`$as_me' creates a local libtool stub from the current configuration, -+for use in further configure time tests before the real libtool is -+generated. -+ -+Usage: $[0] [[OPTIONS]] -+ -+ -h, --help print this help, then exit -+ -V, --version print version number, then exit -+ -q, --quiet do not print progress messages -+ -d, --debug don't remove temporary files -+ -+Report bugs to ." -+ -+lt_cl_version="\ -+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -+configured by $[0], generated by m4_PACKAGE_STRING. -+ -+Copyright (C) 2010 Free Software Foundation, Inc. -+This config.lt script is free software; the Free Software Foundation -+gives unlimited permision to copy, distribute and modify it." -+ -+while test $[#] != 0 -+do -+ case $[1] in -+ --version | --v* | -V ) -+ echo "$lt_cl_version"; exit 0 ;; -+ --help | --h* | -h ) -+ echo "$lt_cl_help"; exit 0 ;; -+ --debug | --d* | -d ) -+ debug=: ;; -+ --quiet | --q* | --silent | --s* | -q ) -+ lt_cl_silent=: ;; -+ -+ -*) AC_MSG_ERROR([unrecognized option: $[1] -+Try \`$[0] --help' for more information.]) ;; -+ -+ *) AC_MSG_ERROR([unrecognized argument: $[1] -+Try \`$[0] --help' for more information.]) ;; -+ esac -+ shift -+done -+ -+if $lt_cl_silent; then -+ exec AS_MESSAGE_FD>/dev/null -+fi -+_LTEOF -+ -+cat >>"$CONFIG_LT" <<_LTEOF -+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -+_LTEOF -+ -+cat >>"$CONFIG_LT" <<\_LTEOF -+AC_MSG_NOTICE([creating $ofile]) -+_LT_OUTPUT_LIBTOOL_COMMANDS -+AS_EXIT(0) -+_LTEOF -+chmod +x "$CONFIG_LT" -+ -+# configure is writing to config.log, but config.lt does its own redirection, -+# appending to config.log, which fails on DOS, as config.log is still kept -+# open by configure. Here we exec the FD to /dev/null, effectively closing -+# config.log, so it can be properly (re)opened and appended to by config.lt. -+lt_cl_success=: -+test "$silent" = yes && -+ lt_config_lt_args="$lt_config_lt_args --quiet" -+exec AS_MESSAGE_LOG_FD>/dev/null -+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -+exec AS_MESSAGE_LOG_FD>>config.log -+$lt_cl_success || AS_EXIT(1) -+])# LT_OUTPUT -+ -+ -+# _LT_CONFIG(TAG) -+# --------------- -+# If TAG is the built-in tag, create an initial libtool script with a -+# default configuration from the untagged config vars. Otherwise add code -+# to config.status for appending the configuration named by TAG from the -+# matching tagged config vars. -+m4_defun([_LT_CONFIG], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+_LT_CONFIG_SAVE_COMMANDS([ -+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl -+ m4_if(_LT_TAG, [C], [ -+ # See if we are running on zsh, and set the options which allow our -+ # commands through without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ -+ cfgfile="${ofile}T" -+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 -+ $RM "$cfgfile" -+ -+ cat <<_LT_EOF >> "$cfgfile" -+#! $SHELL -+ -+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+# NOTE: Changes made to this file will be lost: look at ltmain.sh. -+# -+_LT_COPYING -+_LT_LIBTOOL_TAGS -+ -+# ### BEGIN LIBTOOL CONFIG -+_LT_LIBTOOL_CONFIG_VARS -+_LT_LIBTOOL_TAG_VARS -+# ### END LIBTOOL CONFIG -+ -+_LT_EOF -+ -+ case $host_os in -+ aix3*) -+ cat <<\_LT_EOF >> "$cfgfile" -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+_LT_EOF -+ ;; -+ esac -+ -+ _LT_PROG_LTMAIN -+ -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # if finds mixed CR/LF and LF-only lines. Since sed operates in -+ # text mode, it properly converts lines to CR/LF. This bash problem -+ # is reportedly fixed, but why not run on old versions too? -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) -+ -+ _LT_PROG_REPLACE_SHELLFNS -+ -+ mv -f "$cfgfile" "$ofile" || -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" -+], -+[cat <<_LT_EOF >> "$ofile" -+ -+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -+dnl in a comment (ie after a #). -+# ### BEGIN LIBTOOL TAG CONFIG: $1 -+_LT_LIBTOOL_TAG_VARS(_LT_TAG) -+# ### END LIBTOOL TAG CONFIG: $1 -+_LT_EOF -+])dnl /m4_if -+], -+[m4_if([$1], [], [ -+ PACKAGE='$PACKAGE' -+ VERSION='$VERSION' -+ TIMESTAMP='$TIMESTAMP' -+ RM='$RM' -+ ofile='$ofile'], []) -+])dnl /_LT_CONFIG_SAVE_COMMANDS -+])# _LT_CONFIG -+ -+ -+# LT_SUPPORTED_TAG(TAG) -+# --------------------- -+# Trace this macro to discover what tags are supported by the libtool -+# --tag option, using: -+# autoconf --trace 'LT_SUPPORTED_TAG:$1' -+AC_DEFUN([LT_SUPPORTED_TAG], []) -+ -+ -+# C support is built-in for now -+m4_define([_LT_LANG_C_enabled], []) -+m4_define([_LT_TAGS], []) -+ -+ -+# LT_LANG(LANG) -+# ------------- -+# Enable libtool support for the given language if not already enabled. -+AC_DEFUN([LT_LANG], -+[AC_BEFORE([$0], [LT_OUTPUT])dnl -+m4_case([$1], -+ [C], [_LT_LANG(C)], -+ [C++], [_LT_LANG(CXX)], -+ [Java], [_LT_LANG(GCJ)], -+ [Fortran 77], [_LT_LANG(F77)], -+ [Fortran], [_LT_LANG(FC)], -+ [Windows Resource], [_LT_LANG(RC)], -+ [m4_ifdef([_LT_LANG_]$1[_CONFIG], -+ [_LT_LANG($1)], -+ [m4_fatal([$0: unsupported language: "$1"])])])dnl -+])# LT_LANG -+ -+ -+# _LT_LANG(LANGNAME) -+# ------------------ -+m4_defun([_LT_LANG], -+[m4_ifdef([_LT_LANG_]$1[_enabled], [], -+ [LT_SUPPORTED_TAG([$1])dnl -+ m4_append([_LT_TAGS], [$1 ])dnl -+ m4_define([_LT_LANG_]$1[_enabled], [])dnl -+ _LT_LANG_$1_CONFIG($1)])dnl -+])# _LT_LANG -+ -+ -+# _LT_LANG_DEFAULT_CONFIG -+# ----------------------- -+m4_defun([_LT_LANG_DEFAULT_CONFIG], -+[AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [LT_LANG(CXX)], -+ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) -+ -+AC_PROVIDE_IFELSE([AC_PROG_F77], -+ [LT_LANG(F77)], -+ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) -+ -+AC_PROVIDE_IFELSE([AC_PROG_FC], -+ [LT_LANG(FC)], -+ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) -+ -+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -+dnl pulling things in needlessly. -+AC_PROVIDE_IFELSE([AC_PROG_GCJ], -+ [LT_LANG(GCJ)], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -+ [LT_LANG(GCJ)], -+ [AC_PROVIDE_IFELSE([LT_PROG_GCJ], -+ [LT_LANG(GCJ)], -+ [m4_ifdef([AC_PROG_GCJ], -+ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) -+ m4_ifdef([A][M_PROG_GCJ], -+ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) -+ m4_ifdef([LT_PROG_GCJ], -+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) -+ -+AC_PROVIDE_IFELSE([LT_PROG_RC], -+ [LT_LANG(RC)], -+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -+])# _LT_LANG_DEFAULT_CONFIG -+ -+# Obsolete macros: -+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -+dnl AC_DEFUN([AC_LIBTOOL_F77], []) -+dnl AC_DEFUN([AC_LIBTOOL_FC], []) -+dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -+dnl AC_DEFUN([AC_LIBTOOL_RC], []) -+ -+ -+# _LT_TAG_COMPILER -+# ---------------- -+m4_defun([_LT_TAG_COMPILER], -+[AC_REQUIRE([AC_PROG_CC])dnl -+ -+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+])# _LT_TAG_COMPILER -+ -+ -+# _LT_COMPILER_BOILERPLATE -+# ------------------------ -+# Check for compiler boilerplate output or warnings with -+# the simple compiler test code. -+m4_defun([_LT_COMPILER_BOILERPLATE], -+[m4_require([_LT_DECL_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$RM conftest* -+])# _LT_COMPILER_BOILERPLATE -+ -+ -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+m4_defun([_LT_LINKER_BOILERPLATE], -+[m4_require([_LT_DECL_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$RM -r conftest* -+])# _LT_LINKER_BOILERPLATE -+ -+# _LT_REQUIRED_DARWIN_CHECKS -+# ------------------------- -+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ -+ case $host_os in -+ rhapsody* | darwin*) -+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) -+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -+ AC_CHECK_TOOL([LIPO], [lipo], [:]) -+ AC_CHECK_TOOL([OTOOL], [otool], [:]) -+ AC_CHECK_TOOL([OTOOL64], [otool64], [:]) -+ _LT_DECL([], [DSYMUTIL], [1], -+ [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) -+ _LT_DECL([], [NMEDIT], [1], -+ [Tool to change global to local symbols on Mac OS X]) -+ _LT_DECL([], [LIPO], [1], -+ [Tool to manipulate fat objects and archives on Mac OS X]) -+ _LT_DECL([], [OTOOL], [1], -+ [ldd/readelf like tool for Mach-O binaries on Mac OS X]) -+ _LT_DECL([], [OTOOL64], [1], -+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) -+ -+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], -+ [lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ rm -rf libconftest.dylib* -+ echo "int foo(void){return 1;}" > conftest.c -+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err -+ _lt_result=$? -+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then -+ lt_cv_apple_cc_single_mod=yes -+ else -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ fi -+ rm -rf libconftest.dylib* -+ rm -f conftest.* -+ fi]) -+ AC_CACHE_CHECK([for -exported_symbols_list linker flag], -+ [lt_cv_ld_exported_symbols_list], -+ [lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [lt_cv_ld_exported_symbols_list=yes], -+ [lt_cv_ld_exported_symbols_list=no]) -+ LDFLAGS="$save_LDFLAGS" -+ ]) -+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], -+ [lt_cv_ld_force_load=no -+ cat > conftest.c << _LT_EOF -+int forced_loaded() { return 2;} -+_LT_EOF -+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD -+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD -+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD -+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD -+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD -+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD -+ cat > conftest.c << _LT_EOF -+int main() { return 0;} -+_LT_EOF -+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD -+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err -+ _lt_result=$? -+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then -+ lt_cv_ld_force_load=yes -+ else -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ fi -+ rm -f conftest.err libconftest.a conftest conftest.c -+ rm -rf conftest.dSYM -+ ]) -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) # darwin 5.x on -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[[012]]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then -+ _lt_dsymutil='~$DSYMUTIL $lib || :' -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+]) -+ -+ -+# _LT_DARWIN_LINKER_FEATURES -+# -------------------------- -+# Checks for linker and compiler features on darwin -+m4_defun([_LT_DARWIN_LINKER_FEATURES], -+[ -+ m4_require([_LT_REQUIRED_DARWIN_CHECKS]) -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ if test "$lt_cv_ld_force_load" = "yes"; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' -+ else -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='' -+ fi -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -+ case $cc_basename in -+ ifort*) _lt_dar_can_shared=yes ;; -+ *) _lt_dar_can_shared=$GCC ;; -+ esac -+ if test "$_lt_dar_can_shared" = "yes"; then -+ output_verbose_link_cmd=func_echo_all -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ m4_if([$1], [CXX], -+[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi -+],[]) -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+]) -+ -+# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -+# ---------------------------------- -+# Links a minimal program and checks the executable -+# for the system default hardcoded library path. In most cases, -+# this is /usr/lib:/lib, but when the MPI compilers are used -+# the location of the communication and MPI libs are included too. -+# If we don't find anything, use the default library path according -+# to the aix ld manual. -+# Store the results from the different compilers for each TAGNAME. -+# Allow to override them for all tags through lt_cv_aix_libpath. -+m4_defun([_LT_SYS_MODULE_PATH_AIX], -+[m4_require([_LT_DECL_SED])dnl -+if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], -+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ -+ lt_aix_libpath_sed='[ -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }]' -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi],[]) -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" -+ fi -+ ]) -+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -+fi -+])# _LT_SYS_MODULE_PATH_AIX -+ -+ -+# _LT_SHELL_INIT(ARG) -+# ------------------- -+m4_define([_LT_SHELL_INIT], -+[m4_divert_text([M4SH-INIT], [$1 -+])])# _LT_SHELL_INIT -+ -+ -+ -+# _LT_PROG_ECHO_BACKSLASH -+# ----------------------- -+# Find how we can fake an echo command that does not interpret backslash. -+# In particular, with Autoconf 2.60 or later we add some code to the start -+# of the generated configure script which will find a shell with a builtin -+# printf (which we can use as an echo command). -+m4_defun([_LT_PROG_ECHO_BACKSLASH], -+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -+ -+AC_MSG_CHECKING([how to print strings]) -+# Test print first, because it will be a builtin if present. -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ -+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then -+ ECHO='print -r --' -+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -+ ECHO='printf %s\n' -+else -+ # Use this function as a fallback that always works. -+ func_fallback_echo () -+ { -+ eval 'cat <<_LTECHO_EOF -+$[]1 -+_LTECHO_EOF' -+ } -+ ECHO='func_fallback_echo' -+fi -+ -+# func_echo_all arg... -+# Invoke $ECHO with all args, space-separated. -+func_echo_all () -+{ -+ $ECHO "$*" -+} -+ -+case "$ECHO" in -+ printf*) AC_MSG_RESULT([printf]) ;; -+ print*) AC_MSG_RESULT([print -r]) ;; -+ *) AC_MSG_RESULT([cat]) ;; -+esac -+ -+m4_ifdef([_AS_DETECT_SUGGESTED], -+[_AS_DETECT_SUGGESTED([ -+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( -+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -+ PATH=/empty FPATH=/empty; export PATH FPATH -+ test "X`printf %s $ECHO`" = "X$ECHO" \ -+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) -+ -+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) -+])# _LT_PROG_ECHO_BACKSLASH -+ -+ -+# _LT_WITH_SYSROOT -+# ---------------- -+AC_DEFUN([_LT_WITH_SYSROOT], -+[AC_MSG_CHECKING([for sysroot]) -+AC_ARG_WITH([sysroot], -+[ --with-sysroot[=DIR] Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified).], -+[], [with_sysroot=no]) -+ -+dnl lt_sysroot will always be passed unquoted. We quote it here -+dnl in case the user passed a directory name. -+lt_sysroot= -+case ${with_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ AC_MSG_RESULT([${with_sysroot}]) -+ AC_MSG_ERROR([The sysroot must be an absolute path.]) -+ ;; -+esac -+ -+ AC_MSG_RESULT([${lt_sysroot:-no}]) -+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -+[dependent libraries, and in which our libraries should be installed.])]) -+ -+# _LT_ENABLE_LOCK -+# --------------- -+m4_defun([_LT_ENABLE_LOCK], -+[AC_ARG_ENABLE([libtool-lock], -+ [AS_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+ia64-*-hpux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ fi -+ rm -rf conftest* -+ ;; -+ -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|s390*-*tpf*|sparc*-*linux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *32-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *64-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_x86_64" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*|s390*-*tpf*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -+ [AC_LANG_PUSH(C) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -+ AC_LANG_POP]) -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+sparc*-*solaris*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+esac -+ -+need_locks="$enable_libtool_lock" -+])# _LT_ENABLE_LOCK -+ -+ -+# _LT_PROG_AR -+# ----------- -+m4_defun([_LT_PROG_AR], -+[AC_CHECK_TOOLS(AR, [ar], false) -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+_LT_DECL([], [AR], [1], [The archiver]) -+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) -+ -+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], -+ [lt_cv_ar_at_file=no -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], -+ [echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ ]) -+ ]) -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+_LT_DECL([], [archiver_list_spec], [1], -+ [How to feed a file listing to the archiver]) -+])# _LT_PROG_AR -+ -+ -+# _LT_CMD_OLD_ARCHIVE -+# ------------------- -+m4_defun([_LT_CMD_OLD_ARCHIVE], -+[_LT_PROG_AR -+ -+AC_CHECK_TOOL(STRIP, strip, :) -+test -z "$STRIP" && STRIP=: -+_LT_DECL([], [STRIP], [1], [A symbol stripping program]) -+ -+AC_CHECK_TOOL(RANLIB, ranlib, :) -+test -z "$RANLIB" && RANLIB=: -+_LT_DECL([], [RANLIB], [1], -+ [Commands used to install an old-style archive]) -+ -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= -+ -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi -+ -+case $host_os in -+ darwin*) -+ lock_old_archive_extraction=yes ;; -+ *) -+ lock_old_archive_extraction=no ;; -+esac -+_LT_DECL([], [old_postinstall_cmds], [2]) -+_LT_DECL([], [old_postuninstall_cmds], [2]) -+_LT_TAGDECL([], [old_archive_cmds], [2], -+ [Commands used to build an old-style archive]) -+_LT_DECL([], [lock_old_archive_extraction], [0], -+ [Whether to use a lock for old archive extraction]) -+])# _LT_CMD_OLD_ARCHIVE -+ -+ -+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------------------- -+# Check whether the given compiler option works -+AC_DEFUN([_LT_COMPILER_OPTION], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_SED])dnl -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$3" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ 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. -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ fi -+ $RM conftest* -+]) -+ -+if test x"[$]$2" = xyes; then -+ m4_if([$5], , :, [$5]) -+else -+ m4_if([$6], , :, [$6]) -+fi -+])# _LT_COMPILER_OPTION -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) -+ -+ -+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------- -+# Check whether the given linker option works -+AC_DEFUN([_LT_LINKER_OPTION], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_SED])dnl -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $3" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&AS_MESSAGE_LOG_FD -+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ else -+ $2=yes -+ fi -+ fi -+ $RM -r conftest* -+ LDFLAGS="$save_LDFLAGS" -+]) -+ -+if test x"[$]$2" = xyes; then -+ m4_if([$4], , :, [$4]) -+else -+ m4_if([$5], , :, [$5]) -+fi -+])# _LT_LINKER_OPTION -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) -+ -+ -+# LT_CMD_MAX_LEN -+#--------------- -+AC_DEFUN([LT_CMD_MAX_LEN], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+# find the maximum length of command line arguments -+AC_MSG_CHECKING([the maximum length of command line arguments]) -+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl -+ i=0 -+ teststring="ABCD" -+ -+ case $build_os in -+ msdosdjgpp*) -+ # On DJGPP, this test can blow up pretty badly due to problems in libc -+ # (any single argument exceeding 2000 bytes causes a buffer overrun -+ # during glob expansion). Even if it were fixed, the result of this -+ # check would be larger than it should be. -+ lt_cv_sys_max_cmd_len=12288; # 12K is about right -+ ;; -+ -+ gnu*) -+ # Under GNU Hurd, this test is not required because there is -+ # no limit to the length of command line arguments. -+ # Libtool will interpret -1 as no limit whatsoever -+ lt_cv_sys_max_cmd_len=-1; -+ ;; -+ -+ cygwin* | mingw* | cegcc*) -+ # On Win9x/ME, this test blows up -- it succeeds, but takes -+ # about 5 minutes as the teststring grows exponentially. -+ # Worse, since 9x/ME are not pre-emptively multitasking, -+ # you end up with a "frozen" computer, even though with patience -+ # the test eventually succeeds (with a max line length of 256k). -+ # Instead, let's just punt: use the minimum linelength reported by -+ # all of the supported platforms: 8192 (on NT/2K/XP). -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ mint*) -+ # On MiNT this can take a long time and run out of memory. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; -+ -+ interix*) -+ # We know the value 262144 and hardcode it with a safety zone (like BSD) -+ lt_cv_sys_max_cmd_len=196608 -+ ;; -+ -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ sco3.2v5*) -+ lt_cv_sys_max_cmd_len=102400 -+ ;; -+ sysv5* | sco5v6* | sysv4.2uw2*) -+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -+ if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` -+ else -+ lt_cv_sys_max_cmd_len=32768 -+ fi -+ ;; -+ *) -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ else -+ # Make teststring a little bigger before we do anything with it. -+ # a 1K string should be a reasonable start. -+ for i in 1 2 3 4 5 6 7 8 ; do -+ teststring=$teststring$teststring -+ done -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ # If test is not a shell built-in, we'll probably end up computing a -+ # maximum length that is only half of the actual maximum length, but -+ # we can't tell. -+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ -+ = "X$teststring$teststring"; } >/dev/null 2>&1 && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ # Only check the string length outside the loop. -+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on -+ # massive amounts of additional arguments before passing them to the -+ # linker. It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ fi -+ ;; -+ esac -+]) -+if test -n $lt_cv_sys_max_cmd_len ; then -+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -+else -+ AC_MSG_RESULT(none) -+fi -+max_cmd_len=$lt_cv_sys_max_cmd_len -+_LT_DECL([], [max_cmd_len], [0], -+ [What is the maximum length of a command?]) -+])# LT_CMD_MAX_LEN -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) -+ -+ -+# _LT_HEADER_DLFCN -+# ---------------- -+m4_defun([_LT_HEADER_DLFCN], -+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -+])# _LT_HEADER_DLFCN -+ -+ -+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -+# ---------------------------------------------------------------- -+m4_defun([_LT_TRY_DLOPEN_SELF], -+[m4_require([_LT_HEADER_DLFCN])dnl -+if test "$cross_compiling" = yes; then : -+ [$4] -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext <<_LT_EOF -+[#line $LINENO "configure" -+#include "confdefs.h" -+ -+#if HAVE_DLFCN_H -+#include -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+/* When -fvisbility=hidden is used, assume the code has been annotated -+ correspondingly for the symbols needed. */ -+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+int fnord () __attribute__((visibility("default"))); -+#endif -+ -+int fnord () { return 42; } -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else -+ { -+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else puts (dlerror ()); -+ } -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); -+ -+ return status; -+}] -+_LT_EOF -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) $1 ;; -+ x$lt_dlneed_uscore) $2 ;; -+ x$lt_dlunknown|x*) $3 ;; -+ esac -+ else : -+ # compilation failed -+ $3 -+ fi -+fi -+rm -fr conftest* -+])# _LT_TRY_DLOPEN_SELF -+ -+ -+# LT_SYS_DLOPEN_SELF -+# ------------------ -+AC_DEFUN([LT_SYS_DLOPEN_SELF], -+[m4_require([_LT_HEADER_DLFCN])dnl -+if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= -+ -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; -+ -+ mingw* | pw32* | cegcc*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ darwin*) -+ # if libdl is installed we need to link against it -+ AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ]) -+ ;; -+ -+ *) -+ AC_CHECK_FUNC([shl_load], -+ [lt_cv_dlopen="shl_load"], -+ [AC_CHECK_LIB([dld], [shl_load], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], -+ [AC_CHECK_FUNC([dlopen], -+ [lt_cv_dlopen="dlopen"], -+ [AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -+ [AC_CHECK_LIB([svld], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -+ [AC_CHECK_LIB([dld], [dld_link], -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ;; -+ esac -+ -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi -+ -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ -+ save_LDFLAGS="$LDFLAGS" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" -+ -+ AC_CACHE_CHECK([whether a program can dlopen itself], -+ lt_cv_dlopen_self, [dnl -+ _LT_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, -+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) -+ ]) -+ -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], -+ lt_cv_dlopen_self_static, [dnl -+ _LT_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, -+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) -+ ]) -+ fi -+ -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac -+ -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac -+ -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+_LT_DECL([dlopen_support], [enable_dlopen], [0], -+ [Whether dlopen is supported]) -+_LT_DECL([dlopen_self], [enable_dlopen_self], [0], -+ [Whether dlopen of programs is supported]) -+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], -+ [Whether dlopen of statically linked programs is supported]) -+])# LT_SYS_DLOPEN_SELF -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) -+ -+ -+# _LT_COMPILER_C_O([TAGNAME]) -+# --------------------------- -+# Check to see if options -c and -o are simultaneously supported by compiler. -+# This macro does not hard code the compiler like AC_PROG_CC_C_O. -+m4_defun([_LT_COMPILER_C_O], -+[m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_TAG_COMPILER])dnl -+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], -+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -+ $RM -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ fi -+ fi -+ chmod u+w . 2>&AS_MESSAGE_LOG_FD -+ $RM conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -+ $RM out/* && rmdir out -+ cd .. -+ $RM -r conftest -+ $RM conftest* -+]) -+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], -+ [Does compiler simultaneously support -c and -o options?]) -+])# _LT_COMPILER_C_O -+ -+ -+# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -+# ---------------------------------- -+# Check to see if we can do hard links to lock some files if needed -+m4_defun([_LT_COMPILER_FILE_LOCKS], -+[m4_require([_LT_ENABLE_LOCK])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+_LT_COMPILER_C_O([$1]) -+ -+hard_links="nottested" -+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ AC_MSG_CHECKING([if we can lock with hard links]) -+ hard_links=yes -+ $RM conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ AC_MSG_RESULT([$hard_links]) -+ if test "$hard_links" = no; then -+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -+])# _LT_COMPILER_FILE_LOCKS -+ -+ -+# _LT_CHECK_OBJDIR -+# ---------------- -+m4_defun([_LT_CHECK_OBJDIR], -+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -+[rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null]) -+objdir=$lt_cv_objdir -+_LT_DECL([], [objdir], [0], -+ [The name of the directory that contains temporary libtool files])dnl -+m4_pattern_allow([LT_OBJDIR])dnl -+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", -+ [Define to the sub-directory in which libtool stores uninstalled libraries.]) -+])# _LT_CHECK_OBJDIR -+ -+ -+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -+# -------------------------------------- -+# Check hardcoding attributes. -+m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -+[AC_MSG_CHECKING([how to hardcode library paths into programs]) -+_LT_TAGVAR(hardcode_action, $1)= -+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || -+ test -n "$_LT_TAGVAR(runpath_var, $1)" || -+ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then -+ -+ # We can hardcode non-existent directories. -+ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && -+ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then -+ # Linking always hardcodes the temporary library directory. -+ _LT_TAGVAR(hardcode_action, $1)=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ _LT_TAGVAR(hardcode_action, $1)=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ _LT_TAGVAR(hardcode_action, $1)=unsupported -+fi -+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -+ -+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || -+ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+_LT_TAGDECL([], [hardcode_action], [0], -+ [How to hardcode a shared library path into an executable]) -+])# _LT_LINKER_HARDCODE_LIBPATH -+ -+ -+# _LT_CMD_STRIPLIB -+# ---------------- -+m4_defun([_LT_CMD_STRIPLIB], -+[m4_require([_LT_DECL_EGREP]) -+striplib= -+old_striplib= -+AC_MSG_CHECKING([whether stripping libraries is possible]) -+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ AC_MSG_RESULT([yes]) -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ old_striplib="$STRIP -S" -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ fi -+ ;; -+ *) -+ AC_MSG_RESULT([no]) -+ ;; -+ esac -+fi -+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -+_LT_DECL([], [striplib], [1]) -+])# _LT_CMD_STRIPLIB -+ -+ -+# _LT_SYS_DYNAMIC_LINKER([TAG]) -+# ----------------------------- -+# PORTME Fill in your ld.so characteristics -+m4_defun([_LT_SYS_DYNAMIC_LINKER], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_OBJDUMP])dnl -+m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+AC_MSG_CHECKING([dynamic linker characteristics]) -+m4_if([$1], -+ [], [ -+if test "$GCC" = yes; then -+ case $host_os in -+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -+ *) lt_awk_arg="/^libraries:/" ;; -+ esac -+ case $host_os in -+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; -+ *) lt_sed_strip_eq="s,=/,/,g" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` -+ case $lt_search_path_spec in -+ *\;*) -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` -+ ;; -+ *) -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ esac -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ # AWK program above erroneously prepends '/' to C:/dos/paths -+ # for these hosts. -+ case $host_os in -+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ -+ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; -+ esac -+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi]) -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix[[4-9]]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[[01]] | aix4.[[01]].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; -+ -+amigaos*) -+ case $host_cpu in -+ powerpc) -+ # Since July 2007 AmigaOS4 officially supports .so libraries. -+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ ;; -+ m68k) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ esac -+ ;; -+ -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; -+ -+bsdi[[45]]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32* | cegcc*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname~ -+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then -+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; -+ fi' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) -+ ;; -+ mingw* | cegcc*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' -+ ;; -+ -+ *) -+ # Assume MSVC wrapper -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ esac -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; -+ -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[[123]]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[[01]]* | freebsdelf3.[[01]]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ -+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; -+ -+haiku*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ dynamic_linker="$host_os runtime_loader" -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LIBRARY_PATH -+ shlibpath_overrides_runpath=yes @@ 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 cgrzemba at users.sourceforge.net Fri Feb 24 14:31:20 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 24 Feb 2012 13:31:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17179] csw/mgar/pkg/389-adminutil/trunk Message-ID: Revision: 17179 http://gar.svn.sourceforge.net/gar/?rev=17179&view=rev Author: cgrzemba Date: 2012-02-24 13:31:20 +0000 (Fri, 24 Feb 2012) Log Message: ----------- 389-adminutil/trunk: update runtime dependencies Modified Paths: -------------- csw/mgar/pkg/389-adminutil/trunk/Makefile csw/mgar/pkg/389-adminutil/trunk/checksums Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-adminutil/trunk/Makefile 2012-02-24 13:20:48 UTC (rev 17178) +++ csw/mgar/pkg/389-adminutil/trunk/Makefile 2012-02-24 13:31:20 UTC (rev 17179) @@ -32,11 +32,13 @@ RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicuuc48 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicui18n48 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicudata48 -RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWsasl RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibnss3 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibldap60 +RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibssl3 +RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibsasl2-2 + PACKAGES += CSWlibadmsslutil0 CATALOGNAME_CSWlibadmsslutil0 = libadmsslutil0 SPKG_DESC_CSWlibadmsslutil0 += $(DESCRIPTION), libadmsslutil @@ -48,11 +50,12 @@ RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibicuuc48 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibicui18n48 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibicudata48 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWsasl RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibnss3 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibldap60 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibadminutil0 +RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibssl3 +RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibsasl2-2 PACKAGES += CSW389-adminutil-dev CATALOGNAME_CSW389-adminutil-dev = 389_adminutil_dev Modified: csw/mgar/pkg/389-adminutil/trunk/checksums =================================================================== --- csw/mgar/pkg/389-adminutil/trunk/checksums 2012-02-24 13:20:48 UTC (rev 17178) +++ csw/mgar/pkg/389-adminutil/trunk/checksums 2012-02-24 13:31:20 UTC (rev 17179) @@ -1 +1 @@ -3854174fef3276686896825ea19ccf53 389-adminutil-1.1.14.tar.bz2 +189fd6848fcc532e063b628a23436c18 389-adminutil-1.1.15.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 Fri Feb 24 14:48:34 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 13:48:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17180] csw/mgar/pkg/cpan/Task-Weaken/trunk Message-ID: Revision: 17180 http://gar.svn.sourceforge.net/gar/?rev=17180&view=rev Author: dmichelsen Date: 2012-02-24 13:48:34 +0000 (Fri, 24 Feb 2012) Log Message: ----------- cpan/Task-Weaken/trunk: Update to 1.04, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile csw/mgar/pkg/cpan/Task-Weaken/trunk/checksums Modified: csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile 2012-02-24 13:31:20 UTC (rev 17179) +++ csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile 2012-02-24 13:48:34 UTC (rev 17180) @@ -1,5 +1,5 @@ NAME = Task-Weaken -VERSION = 1.03 +VERSION = 1.04 CATEGORIES = cpan GARTYPE = v2 AUTHOR = ADAMK @@ -8,11 +8,15 @@ define BLURB endef -PACKAGES = CSWpmtaskweaken -CATALOGNAME = pm_taskweaken +CATALOG_RELEASE = unstable LICENSE = LICENSE -ARCHALL = 1 +PACKAGES += CSWpm-task-weaken +CATALOGNAME_CSWpm-task-weaken = pm_task_weaken +SPKG_DESC_CSWpm-task-weaken = Ensure that a platform has weaken support +ARCHALL_CSWpm-task-weaken = 1 +OBSOLETED_BY_CSWpm-task-weaken += CSWpmtaskweaken +CATALOGNAME_CSWpmtaskweaken = pm_taskweaken_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/Task-Weaken/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Task-Weaken/trunk/checksums 2012-02-24 13:31:20 UTC (rev 17179) +++ csw/mgar/pkg/cpan/Task-Weaken/trunk/checksums 2012-02-24 13:48:34 UTC (rev 17180) @@ -1 +1 @@ -056ce36c576450d22e6b23b4dbfacd02 Task-Weaken-1.03.tar.gz +affd0c395515bb95d29968404d7fe6de Task-Weaken-1.04.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 Fri Feb 24 14:50:50 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 13:50:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[17181] csw/mgar/pkg/libldns/trunk Message-ID: Revision: 17181 http://gar.svn.sourceforge.net/gar/?rev=17181&view=rev Author: idogan23 Date: 2012-02-24 13:50:50 +0000 (Fri, 24 Feb 2012) Log Message: ----------- libldns: bump version to 1.6.12 Modified Paths: -------------- csw/mgar/pkg/libldns/trunk/Makefile csw/mgar/pkg/libldns/trunk/checksums Modified: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile 2012-02-24 13:48:34 UTC (rev 17180) +++ csw/mgar/pkg/libldns/trunk/Makefile 2012-02-24 13:50:50 UTC (rev 17181) @@ -1,5 +1,5 @@ NAME = ldns -VERSION = 1.6.10 +VERSION = 1.6.12 CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/libldns/trunk/checksums =================================================================== --- csw/mgar/pkg/libldns/trunk/checksums 2012-02-24 13:48:34 UTC (rev 17180) +++ csw/mgar/pkg/libldns/trunk/checksums 2012-02-24 13:50:50 UTC (rev 17181) @@ -1 +1 @@ -fadf8e38fbd2d3434a2c46097d9932d5 ldns-1.6.10.tar.gz +e7428ed0d19baed02459e2c55660c9b3 ldns-1.6.12.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 Feb 24 14:58:34 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 13:58:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17182] csw/mgar/pkg/cpan Message-ID: Revision: 17182 http://gar.svn.sourceforge.net/gar/?rev=17182&view=rev Author: dmichelsen Date: 2012-02-24 13:58:34 +0000 (Fri, 24 Feb 2012) Log Message: ----------- cpan/Object-Pluggable/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Object-Pluggable/ csw/mgar/pkg/cpan/Object-Pluggable/branches/ csw/mgar/pkg/cpan/Object-Pluggable/tags/ csw/mgar/pkg/cpan/Object-Pluggable/trunk/ csw/mgar/pkg/cpan/Object-Pluggable/trunk/Makefile csw/mgar/pkg/cpan/Object-Pluggable/trunk/checksums csw/mgar/pkg/cpan/Object-Pluggable/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Object-Pluggable/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Object-Pluggable/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Object-Pluggable/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Object-Pluggable/trunk/Makefile 2012-02-24 13:58:34 UTC (rev 17182) @@ -0,0 +1,21 @@ +NAME = Object-Pluggable +VERSION = 1.29 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = HINRIK + +DESCRIPTION = A base class for creating plugin-enabled objects +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +PACKAGES += CSWpm-object-pluggable +CATALOGNAME_CSWpm-object-pluggable = pm_object_pluggable +SPKG_DESC_CSWpm-object-pluggable = A base class for creating plugin-enabled objects +ARCHALL_CSWpm-object-pluggable = 1 +RUNTIME_DEP_PKGS_CSWpm-object-pluggable += CSWpm-task-weaken + +include gar/category.mk Added: csw/mgar/pkg/cpan/Object-Pluggable/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Object-Pluggable/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Object-Pluggable/trunk/checksums 2012-02-24 13:58:34 UTC (rev 17182) @@ -0,0 +1 @@ +25d2c1a2ad5bc129e677738172734a8e Object-Pluggable-1.29.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 Fri Feb 24 15:01:11 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 14:01:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17183] csw/mgar/pkg/ldns_drill/trunk/Makefile Message-ID: Revision: 17183 http://gar.svn.sourceforge.net/gar/?rev=17183&view=rev Author: idogan23 Date: 2012-02-24 14:01:11 +0000 (Fri, 24 Feb 2012) Log Message: ----------- ldns_drill: bump version to 1.6.12 Modified Paths: -------------- csw/mgar/pkg/ldns_drill/trunk/Makefile Modified: csw/mgar/pkg/ldns_drill/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns_drill/trunk/Makefile 2012-02-24 13:58:34 UTC (rev 17182) +++ csw/mgar/pkg/ldns_drill/trunk/Makefile 2012-02-24 14:01:11 UTC (rev 17183) @@ -1,5 +1,5 @@ NAME = ldns_drill -VERSION = 1.6.9 +VERSION = 1.6.12 CATEGORIES = utils GARTYPE = v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Feb 24 15:03:49 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 14:03:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17184] csw/mgar/pkg/ldns_drill/trunk/checksums Message-ID: Revision: 17184 http://gar.svn.sourceforge.net/gar/?rev=17184&view=rev Author: idogan23 Date: 2012-02-24 14:03:49 +0000 (Fri, 24 Feb 2012) Log Message: ----------- ldns_drill: bump version to 1.6.12 Modified Paths: -------------- csw/mgar/pkg/ldns_drill/trunk/checksums Modified: csw/mgar/pkg/ldns_drill/trunk/checksums =================================================================== --- csw/mgar/pkg/ldns_drill/trunk/checksums 2012-02-24 14:01:11 UTC (rev 17183) +++ csw/mgar/pkg/ldns_drill/trunk/checksums 2012-02-24 14:03:49 UTC (rev 17184) @@ -1 +1 @@ -fc9db99cfe7c9d7f86da8f53efdbbbd6 ldns-1.6.9.tar.gz +e7428ed0d19baed02459e2c55660c9b3 ldns-1.6.12.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 Fri Feb 24 15:17:18 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 14:17:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17185] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 17185 http://gar.svn.sourceforge.net/gar/?rev=17185&view=rev Author: idogan23 Date: 2012-02-24 14:17:18 +0000 (Fri, 24 Feb 2012) Log Message: ----------- unbound: bump version to 1.4.16 Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unbound/trunk/checksums Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2012-02-24 14:03:49 UTC (rev 17184) +++ csw/mgar/pkg/unbound/trunk/Makefile 2012-02-24 14:17:18 UTC (rev 17185) @@ -1,5 +1,5 @@ NAME = unbound -VERSION = 1.4.13 +VERSION = 1.4.16 CATEGORIES = server GARTYPE = v2 DESCRIPTION = A validating, recursive, and caching DNS resolver Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2012-02-24 14:03:49 UTC (rev 17184) +++ csw/mgar/pkg/unbound/trunk/checksums 2012-02-24 14:17:18 UTC (rev 17185) @@ -1 +1 @@ -7e3b27dee2b97640dd2e1783253317ab unbound-1.4.13.tar.gz +5158d03d2ab0a8e60925c7a9b9903631 unbound-1.4.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Feb 24 15:24:58 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 24 Feb 2012 14:24:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17186] csw/mgar/pkg/389-admin/trunk Message-ID: Revision: 17186 http://gar.svn.sourceforge.net/gar/?rev=17186&view=rev Author: cgrzemba Date: 2012-02-24 14:24:58 +0000 (Fri, 24 Feb 2012) Log Message: ----------- 389-admin/trunk: bump version 1.1.27 and unify package name Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile csw/mgar/pkg/389-admin/trunk/checksums Added Paths: ----------- csw/mgar/pkg/389-admin/trunk/files/CSW389-admin.preremove Removed Paths: ------------- csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2012-02-24 14:17:18 UTC (rev 17185) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2012-02-24 14:24:58 UTC (rev 17186) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = 389-admin -VERSION = 1.1.23 +VERSION = 1.1.27 GARTYPE = v2 CATEGORIES = lib @@ -13,7 +13,7 @@ MASTER_SITES = http://port389.org/sources DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += CSW389admin.preremove +DISTFILES += CSW389-admin.preremove # BUILD64 = 1 PACKAGING_PLATFORMS += solaris10-sparc @@ -41,45 +41,44 @@ RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibiconv2 -PACKAGES += CSW389admin-dev -CATALOGNAME_CSW389admin-dev = 389admin_dev -SPKG_DESC_CSW389admin-dev += $(DESCRIPTION), development files -PKGFILES_CSW389admin-dev += /opt/csw/lib/libds-admin-serv.so -RUNTIME_DEP_PKGS_CSW389admin-dev += CSWlibds-admin-serv0 +PACKAGES += CSW389-admin-dev +SPKG_DESC_CSW389-admin-dev += $(DESCRIPTION), development files +PKGFILES_CSW389-admin-dev += /opt/csw/lib/libds-admin-serv.so +RUNTIME_DEP_PKGS_CSW389-admin-dev += CSWlibds-admin-serv0 -PACKAGES += CSW389admin -SPKG_DESC_CSW389admin += $(DESCRIPTION) +PACKAGES += CSW389-admin +SPKG_DESC_CSW389-admin += $(DESCRIPTION) INITSMF = /etc/opt/csw/init.d/dirsrv-admin -RUNTIME_DEP_PKGS_CSW389admin += CSWap2worker -RUNTIME_DEP_PKGS_CSW389admin += CSWap2modnss -RUNTIME_DEP_PKGS_CSW389admin += CSWlibprldap60 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibldif60 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibicudata48 -RUNTIME_DEP_PKGS_CSW389admin += CSWperl -RUNTIME_DEP_PKGS_CSW389admin += CSWlibadmsslutil0 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibplc4 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibssldap60 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibnspr4 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibicui18n48 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibds-admin-serv0 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibadminutil0 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibplds4 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibldap60 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibsoftokn3 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibsmime3 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibssl3 -RUNTIME_DEP_PKGS_CSW389admin += CSWlibnss3 -RUNTIME_DEP_PKGS_CSW389admin += CSW389-admin-console -RUNTIME_DEP_PKGS_CSW389admin += CSW389-ds-console -CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWap2modnss -CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWap2worker -CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSW389-admin-console -CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSW389-ds-console -CHECKPKG_OVERRIDES_CSW389admin += unidentified-dependency|CSW389-admin-console -CHECKPKG_OVERRIDES_CSW389admin += unidentified-dependency|CSW389-ds-console +RUNTIME_DEP_PKGS_CSW389-admin += CSWap2worker +RUNTIME_DEP_PKGS_CSW389-admin += CSWap2modnss +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibprldap60 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldif60 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicudata48 +RUNTIME_DEP_PKGS_CSW389-admin += CSWperl +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibadmsslutil0 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibplc4 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibssldap60 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibnspr4 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicuuc48 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicui18n48 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibds-admin-serv0 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibadminutil0 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibplds4 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldap60 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibsoftokn3 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibsmime3 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibssl3 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibnss3 +RUNTIME_DEP_PKGS_CSW389-admin += CSW389-admin-console +RUNTIME_DEP_PKGS_CSW389-admin += CSW389-ds-console +CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSWap2modnss +CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSWap2worker +CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSW389-admin-console +CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSW389-ds-console +CHECKPKG_OVERRIDES_CSW389-admin += unidentified-dependency|CSW389-admin-console +CHECKPKG_OVERRIDES_CSW389-admin += unidentified-dependency|CSW389-ds-console # remove -I/opt/csw/include CPPFLAGS = Modified: csw/mgar/pkg/389-admin/trunk/checksums =================================================================== --- csw/mgar/pkg/389-admin/trunk/checksums 2012-02-24 14:17:18 UTC (rev 17185) +++ csw/mgar/pkg/389-admin/trunk/checksums 2012-02-24 14:24:58 UTC (rev 17186) @@ -1 +1 @@ -34d7608a1b4b7c1b56d649a3dc407682 389-admin-1.1.23.tar.bz2 +3891cdd71e00b5040a8e84c66b490fc1 389-admin-1.1.27.tar.bz2 Added: csw/mgar/pkg/389-admin/trunk/files/CSW389-admin.preremove =================================================================== --- csw/mgar/pkg/389-admin/trunk/files/CSW389-admin.preremove (rev 0) +++ csw/mgar/pkg/389-admin/trunk/files/CSW389-admin.preremove 2012-02-24 14:24:58 UTC (rev 17186) @@ -0,0 +1,6 @@ +( cd /etc/opt/csw/dirsrv/admin-serv + cp -p console.conf console.conf.configured + cp -p httpd.conf httpd.conf.configured + cp -p admserv.conf admserv.conf.configured + cp -p nss.conf nss.conf.configured +) Deleted: csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove =================================================================== --- csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove 2012-02-24 14:17:18 UTC (rev 17185) +++ csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove 2012-02-24 14:24:58 UTC (rev 17186) @@ -1,6 +0,0 @@ -( cd /etc/opt/csw/dirsrv/admin-serv - cp -p console.conf console.conf.configured - cp -p httpd.conf httpd.conf.configured - cp -p admserv.conf admserv.conf.configured - cp -p nss.conf nss.conf.configured -) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Feb 24 15:29:53 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 14:29:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17187] csw/mgar/pkg/libldns/trunk/Makefile Message-ID: Revision: 17187 http://gar.svn.sourceforge.net/gar/?rev=17187&view=rev Author: idogan23 Date: 2012-02-24 14:29:52 +0000 (Fri, 24 Feb 2012) Log Message: ----------- libldns: fixed dependency Modified Paths: -------------- csw/mgar/pkg/libldns/trunk/Makefile Modified: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile 2012-02-24 14:24:58 UTC (rev 17186) +++ csw/mgar/pkg/libldns/trunk/Makefile 2012-02-24 14:29:52 UTC (rev 17187) @@ -42,7 +42,7 @@ EXTRA_BUILD_ISAS_sparc = sparcv8plus EXTRA_BUILD_ISAS_sparc += sparcv8plus+vis -RUNTIME_DEP_PKGS_CSWlibldns1 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibldns1 += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWlibldns-devel += CSWlibldns1 INCOMPATIBLE_PKGS_CSWlibldns1 = CSWldns This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Feb 24 16:05:46 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 15:05:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17188] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 17188 http://gar.svn.sourceforge.net/gar/?rev=17188&view=rev Author: idogan23 Date: 2012-02-24 15:05:46 +0000 (Fri, 24 Feb 2012) Log Message: ----------- unbound: fixed dependency Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2012-02-24 14:29:52 UTC (rev 17187) +++ csw/mgar/pkg/unbound/trunk/Makefile 2012-02-24 15:05:46 UTC (rev 17188) @@ -88,14 +88,14 @@ RUNTIME_DEP_PKGS_CSWunbound += CSWlibunbound2 RUNTIME_DEP_PKGS_CSWunbound += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWunbound += CSWlibldns1 -RUNTIME_DEP_PKGS_CSWunbound += CSWosslrt +RUNTIME_DEP_PKGS_CSWunbound += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWunbound += CSWlibevent2-0-5 CATALOGNAME_CSWlibunbound2 = libunbound2 SPKG_DESC_CSWlibunbound2 = Library implementing DNS resolution and validation PKGFILES_CSWlibunbound2 += $(PKGFILES_RT) RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibldns1 -RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibevent2-0-5 CATALOGNAME_CSWunbound-devel = unbound_devel @@ -108,7 +108,7 @@ PKGFILES_CSWunbound-host += $(sbindir)/unbound-host PKGFILES_CSWunbound-host += $(mandir)/man1/unbound-host.1 RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibldns1 -RUNTIME_DEP_PKGS_CSWunbound-host += CSWosslrt +RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibunbound2 RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibevent2-0-5 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 Feb 24 16:08:57 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 15:08:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17189] csw/mgar/pkg Message-ID: Revision: 17189 http://gar.svn.sourceforge.net/gar/?rev=17189&view=rev Author: dmichelsen Date: 2012-02-24 15:08:57 +0000 (Fri, 24 Feb 2012) Log Message: ----------- celt/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/celt/ csw/mgar/pkg/celt/Makefile csw/mgar/pkg/celt/branches/ csw/mgar/pkg/celt/tags/ csw/mgar/pkg/celt/trunk/ csw/mgar/pkg/celt/trunk/Makefile csw/mgar/pkg/celt/trunk/checksums csw/mgar/pkg/celt/trunk/files/ Added: csw/mgar/pkg/celt/Makefile =================================================================== --- csw/mgar/pkg/celt/Makefile (rev 0) +++ csw/mgar/pkg/celt/Makefile 2012-02-24 15:08:57 UTC (rev 17189) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/celt/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/celt/trunk/Makefile =================================================================== --- csw/mgar/pkg/celt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/celt/trunk/Makefile 2012-02-24 15:08:57 UTC (rev 17189) @@ -0,0 +1,40 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = celt +VERSION = 0.11.1 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = The CELT ultra-low delay audio codec +define BLURB +endef + +MASTER_SITES = http://downloads.xiph.org/releases/celt/ +DISTFILES = $(DISTNAME).tar.gz + +# Solaris 9 is lacking getopt_long +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +BUILD_DEP_PKGS += CSWlibogg-dev + +PACKAGES += CSWlibcelt0-2 +SPKG_DESC_CSWlibcelt0-2 = The CELT ultra-low delay audio codec library, libcelt0.so.2 +PKGFILES_CSWlibcelt0-2 += $(call pkgfiles_lib,libcelt0.so.2) +RUNTIME_DEP_PKGS_CSWcelt += CSWlibogg0 + +PACKAGES += CSWlibcelt0-dev +SPKG_DESC_CSWlibcelt0-dev = Development files for libcelt0.so.2 +PKGFILES_CSWlibcelt0-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibcelt0-dev += CSWlibcelt0-2 + +PACKAGES += CSWcelt +SPKG_DESC_CSWcelt = The CELT ultra-low delay audio codec utilities +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWcelt += CSWlibcelt0-2 + +BUILD64 = 1 +ISAEXEC = 1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/celt/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/celt/trunk/checksums =================================================================== --- csw/mgar/pkg/celt/trunk/checksums (rev 0) +++ csw/mgar/pkg/celt/trunk/checksums 2012-02-24 15:08:57 UTC (rev 17189) @@ -0,0 +1 @@ +94fe4acd241da8702c295bcd13a555e6 celt-0.11.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Feb 24 16:18:40 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 24 Feb 2012 15:18:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[17190] csw/mgar/pkg/389-admin/trunk/Makefile Message-ID: Revision: 17190 http://gar.svn.sourceforge.net/gar/?rev=17190&view=rev Author: cgrzemba Date: 2012-02-24 15:18:39 +0000 (Fri, 24 Feb 2012) Log Message: ----------- 389-admin/trunk: unify package name and obsolete the old Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2012-02-24 15:08:57 UTC (rev 17189) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2012-02-24 15:18:39 UTC (rev 17190) @@ -42,11 +42,13 @@ RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibiconv2 PACKAGES += CSW389-admin-dev +OBSOLETED_BY_CSW389-admin-dev = CSW389admin-dev SPKG_DESC_CSW389-admin-dev += $(DESCRIPTION), development files PKGFILES_CSW389-admin-dev += /opt/csw/lib/libds-admin-serv.so RUNTIME_DEP_PKGS_CSW389-admin-dev += CSWlibds-admin-serv0 PACKAGES += CSW389-admin +OBSOLETED_BY_CSW389-admin = CSW389admin SPKG_DESC_CSW389-admin += $(DESCRIPTION) INITSMF = /etc/opt/csw/init.d/dirsrv-admin RUNTIME_DEP_PKGS_CSW389-admin += CSWap2worker 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 Feb 24 16:32:28 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 15:32:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17191] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 17191 http://gar.svn.sourceforge.net/gar/?rev=17191&view=rev Author: dmichelsen Date: 2012-02-24 15:32:28 +0000 (Fri, 24 Feb 2012) Log Message: ----------- mGAR v2: Enhancements to WAF builds Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2012-02-24 15:18:39 UTC (rev 17190) +++ csw/mgar/gar/v2/gar.lib.mk 2012-02-24 15:32:28 UTC (rev 17191) @@ -882,7 +882,7 @@ # WAF build, for details see http://code.google.com/p/waf/ build-%/waf: @echo " ==> Running waf build in $*" - @$(cd $* ; (BUILD_ENV) ./waf build $(BUILD_ARGS) ) + (cd $* ; $(BUILD_ENV) ./waf build $(BUILD_ARGS) ) @$(MAKECOOKIE) # This can be: build, build_py, build_ext, build_clib, build_scripts @@ -959,6 +959,12 @@ @( cd $* ; cd $(OBJDIR) ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +test-%/waf: + @echo " ==> Running waf $(TEST_TARGET) in $*" + (cd $* ; $(BUILD_ENV) ./waf $(TEST_TARGET) ) + @$(MAKECOOKIE) + test-%/setup.py: @echo " ==> Running setup.py test in $*" @( cd $* ; cd $(OBJDIR) ; $(TEST_ENV) python ./setup.py test $(TEST_ARGS) ) 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 Feb 24 16:36:30 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 15:36:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17192] csw/mgar/pkg Message-ID: Revision: 17192 http://gar.svn.sourceforge.net/gar/?rev=17192&view=rev Author: dmichelsen Date: 2012-02-24 15:36:29 +0000 (Fri, 24 Feb 2012) Log Message: ----------- portaudio/trunk: Initial commit, does not compile yet Added Paths: ----------- csw/mgar/pkg/portaudio/ csw/mgar/pkg/portaudio/Makefile csw/mgar/pkg/portaudio/branches/ csw/mgar/pkg/portaudio/tags/ csw/mgar/pkg/portaudio/trunk/ csw/mgar/pkg/portaudio/trunk/Makefile csw/mgar/pkg/portaudio/trunk/checksums csw/mgar/pkg/portaudio/trunk/files/ Added: csw/mgar/pkg/portaudio/Makefile =================================================================== --- csw/mgar/pkg/portaudio/Makefile (rev 0) +++ csw/mgar/pkg/portaudio/Makefile 2012-02-24 15:36:29 UTC (rev 17192) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/portaudio/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/portaudio/trunk/Makefile =================================================================== --- csw/mgar/pkg/portaudio/trunk/Makefile (rev 0) +++ csw/mgar/pkg/portaudio/trunk/Makefile 2012-02-24 15:36:29 UTC (rev 17192) @@ -0,0 +1,27 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = portaudio +VERSION = 19_20111121 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Portable cross-platform audio I/O +define BLURB +endef + +MASTER_SITES = http://www.portaudio.com/archives/ +DISTFILES = pa_stable_v$(VERSION).tgz + +DISTNAME = $(NAME) + +PACKAGES += CSWmypkg +SPKG_DESC_CSWmypkg = My package +PKGFILES_CSWmypkg += $(call pkgfiles_lib,libabc.so.1) +PKGFILES_CSWmypkg += $(call baseisadirs,$(bindir),myexec) +PKGFILES_CSWmypkg += $(sysconfdir)/myconf + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/portaudio/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/portaudio/trunk/checksums =================================================================== --- csw/mgar/pkg/portaudio/trunk/checksums (rev 0) +++ csw/mgar/pkg/portaudio/trunk/checksums 2012-02-24 15:36:29 UTC (rev 17192) @@ -0,0 +1 @@ +25c85c1cc5e9e657486cbc299c6c035a pa_stable_v19_20111121.tgz 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 Feb 24 16:38:21 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 15:38:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17193] csw/mgar/pkg/jack/trunk Message-ID: Revision: 17193 http://gar.svn.sourceforge.net/gar/?rev=17193&view=rev Author: dmichelsen Date: 2012-02-24 15:38:21 +0000 (Fri, 24 Feb 2012) Log Message: ----------- jack/trunk: Update to 1.9.8, add celtic support, still does not compile Modified Paths: -------------- csw/mgar/pkg/jack/trunk/Makefile csw/mgar/pkg/jack/trunk/checksums Modified: csw/mgar/pkg/jack/trunk/Makefile =================================================================== --- csw/mgar/pkg/jack/trunk/Makefile 2012-02-24 15:36:29 UTC (rev 17192) +++ csw/mgar/pkg/jack/trunk/Makefile 2012-02-24 15:38:21 UTC (rev 17193) @@ -1,5 +1,5 @@ NAME = jack -VERSION = 1.9.3 +VERSION = 1.9.8 CATEGORIES = lib GARTYPE = v2 @@ -16,20 +16,24 @@ endef MASTER_SITES = http://www.grame.fr/~letz/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES += $(DISTNAME).tgz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +# libcelt is only available on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +GARCOMPILER = GCC4 + BUILD64_LIBS_ONLY = 1 -CONFIGURE_SCRIPTS = $(WORKSRC)/waf +CONFIGURE_SCRIPTS = $(WORKSRC)/$(DISTNAME)/waf CONFIGURE_ARGS = configure --prefix=$(prefix) -BUILD_SCRIPTS = $(WORKSRC)/waf -BUILD_ARGS = build +BUILD_SCRIPTS = $(WORKSRC)/$(DISTNAME)/waf +# BUILD_ARGS = build -INSTALL_SCRIPTS = $(WORKSRC)/waf -INSTALL_ARGS = install --destdir=$(DESTDIR) +TEST_SCRIPTS = $(WORKSRC)/$(DISTNAME)/waf +INSTALL_SCRIPTS = $(WORKSRC)/$(DISTNAME)/waf +INSTALL_ARGS = --destdir=$(DESTDIR) + include gar/category.mk Modified: csw/mgar/pkg/jack/trunk/checksums =================================================================== --- csw/mgar/pkg/jack/trunk/checksums 2012-02-24 15:36:29 UTC (rev 17192) +++ csw/mgar/pkg/jack/trunk/checksums 2012-02-24 15:38:21 UTC (rev 17193) @@ -1 +1 @@ -b83e6c48345410d693550cec90a89f4e jack-1.9.3.tar.bz2 +1dd2ff054cab79dfc11d134756f27165 jack-1.9.8.tgz 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 Feb 24 16:43:11 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 15:43:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17194] csw/mgar/pkg/cpan/POE/trunk Message-ID: Revision: 17194 http://gar.svn.sourceforge.net/gar/?rev=17194&view=rev Author: dmichelsen Date: 2012-02-24 15:43:11 +0000 (Fri, 24 Feb 2012) Log Message: ----------- cpan/POE/trunk: Update to 1.350, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/POE/trunk/Makefile csw/mgar/pkg/cpan/POE/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/POE/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/POE/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/POE/trunk/Makefile 2012-02-24 15:38:21 UTC (rev 17193) +++ csw/mgar/pkg/cpan/POE/trunk/Makefile 2012-02-24 15:43:11 UTC (rev 17194) @@ -1,31 +1,30 @@ NAME = POE -VERSION = 1.287 +VERSION = 1.350 CATEGORIES = cpan GARTYPE = v2 AUTHOR = RCAPUTO -DESCRIPTION = Portable multitasking and networking framework for Perl +DESCRIPTION = Portable, event-loop agnostic eventy networking and multitasking define BLURB - POE is a framework for cooperative, event driven multitasking in Perl. Other - languages have similar frameworks. Python has Twisted. TCL has "the event - loop". - - POE originally was developed as the core of a persistent object server and - runtime environment. It has evolved into a general purpose multitasking and - networking framework, encompassing and providing a consistent interface to - other event loops such as Event and the Tk and Gtk toolkits. endef -DISTFILES = COPYING +CATALOG_RELEASE = unstable -PACKAGES = CSWpmpoe -CATALOGNAME = pm_poe +LICENSE = README -RUNTIME_DEP_PKGS = CSWpmiotty -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWpoetestloops +BUILD_DEP_PKGS += CSWpm-poe-test-loops -ARCHALL = 1 +PACKAGES += CSWpm-poe +CATALOGNAME_CSWpm-poe = pm_poe +SPKG_DESC_CSWpm-poe = Portable, event-loop agnostic eventy networking and multitasking. +ARCHALL_CSWpm-poe = 1 +RUNTIME_DEP_PKGS_CSWpm-poe += CSWpm-io-tty +RUNTIME_DEP_PKGS_CSWpm-poe += CSWpm-poe-test-loops +OBSOLETED_BY_CSWpm-poe += CSWpmpoe +CATALOGNAME_CSWpmpoe = pm_poe_stub -CONFIGURE_ARGS = --default +# These are just examples: +CHECKPKG_OVERRIDES_CSWpm-poe += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/POE.3perl +CHECKPKG_OVERRIDES_CSWpm-poe += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/POE.pm include gar/category.mk Modified: csw/mgar/pkg/cpan/POE/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/POE/trunk/checksums 2012-02-24 15:38:21 UTC (rev 17193) +++ csw/mgar/pkg/cpan/POE/trunk/checksums 2012-02-24 15:43:11 UTC (rev 17194) @@ -1,2 +1 @@ -504b863dc2c2daabccc36f07e44a2619 COPYING -26c12727cf34190507c249a2dc5c58ce POE-1.287.tar.gz +c45669f433fef93b8fb76ecfa204fcb3 POE-1.350.tar.gz Deleted: csw/mgar/pkg/cpan/POE/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/POE/trunk/files/COPYING 2012-02-24 15:38:21 UTC (rev 17193) +++ csw/mgar/pkg/cpan/POE/trunk/files/COPYING 2012-02-24 15:43:11 UTC (rev 17194) @@ -1,3 +0,0 @@ -Except where otherwise noted, POE is Copyright 1998-2009 Rocco Caputo. -All rights reserved. POE is free software; you may 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 Fri Feb 24 17:11:05 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 16:11:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[17195] csw/mgar/pkg Message-ID: Revision: 17195 http://gar.svn.sourceforge.net/gar/?rev=17195&view=rev Author: dmichelsen Date: 2012-02-24 16:11:04 +0000 (Fri, 24 Feb 2012) Log Message: ----------- oss/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/oss/ csw/mgar/pkg/oss/Makefile csw/mgar/pkg/oss/branches/ csw/mgar/pkg/oss/tags/ csw/mgar/pkg/oss/trunk/ csw/mgar/pkg/oss/trunk/Makefile csw/mgar/pkg/oss/trunk/checksums csw/mgar/pkg/oss/trunk/files/ Added: csw/mgar/pkg/oss/Makefile =================================================================== --- csw/mgar/pkg/oss/Makefile (rev 0) +++ csw/mgar/pkg/oss/Makefile 2012-02-24 16:11:04 UTC (rev 17195) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/oss/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/oss/trunk/Makefile =================================================================== --- csw/mgar/pkg/oss/trunk/Makefile (rev 0) +++ csw/mgar/pkg/oss/trunk/Makefile 2012-02-24 16:11:04 UTC (rev 17195) @@ -0,0 +1,38 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# ! The kernel modules need to be installed manually +# ! Fill stub with useful information + +NAME = oss +VERSION = 4.2 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://www.4front-tech.com/developer/sources/stable/cddl/ +DISTNAME = $(NAME)-v$(VERSION)-build2006-src-cddl +DISTFILES += $(DISTNAME).tar.bz2 + +# stdint.h is not on Solaris 9 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +PACKAGES += CSWmypkg +SPKG_DESC_CSWmypkg = My package +PKGFILES_CSWmypkg += $(call pkgfiles_lib,libabc.so.1) +PKGFILES_CSWmypkg += $(call baseisadirs,$(bindir),myexec) +PKGFILES_CSWmypkg += $(sysconfdir)/myconf + +LDFLAGS = + +OBJDIR = solaris +CONFIGURE_ARGS = + +# There is no testsuite +TEST_SCRIPTS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/oss/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/oss/trunk/checksums =================================================================== --- csw/mgar/pkg/oss/trunk/checksums (rev 0) +++ csw/mgar/pkg/oss/trunk/checksums 2012-02-24 16:11:04 UTC (rev 17195) @@ -0,0 +1 @@ +d79c3e653892f74861096ad0686b6018 oss-v4.2-build2006-src-cddl.tar.bz2 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 Feb 24 17:24:54 2012 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Fri, 24 Feb 2012 16:24:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17196] csw/mgar/pkg/zsh/trunk Message-ID: Revision: 17196 http://gar.svn.sourceforge.net/gar/?rev=17196&view=rev Author: opk Date: 2012-02-24 16:24:54 +0000 (Fri, 24 Feb 2012) Log Message: ----------- update to zsh 4.3.17 Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile csw/mgar/pkg/zsh/trunk/checksums Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2012-02-24 16:11:04 UTC (rev 17195) +++ csw/mgar/pkg/zsh/trunk/Makefile 2012-02-24 16:24:54 UTC (rev 17196) @@ -1,5 +1,5 @@ NAME = zsh -VERSION = 4.3.15 +VERSION = 4.3.17 CATEGORIES = devel GARTYPE = v2 @@ -19,7 +19,7 @@ LICENSE = LICENCE -RUNTIME_DEP_PKGS = CSWlibiconv2 CSWlibncursesw5 CSWlibpcre0 CSWlibgdbm4 +RUNTIME_DEP_PKGS = CSWlibiconv2 CSWlibncursesw5 CSWlibpcre1 CSWlibgdbm4 BUILD_DEP_PKGS = CSWpcre SPKG_SOURCEURL = http://www.zsh.org Modified: csw/mgar/pkg/zsh/trunk/checksums =================================================================== --- csw/mgar/pkg/zsh/trunk/checksums 2012-02-24 16:11:04 UTC (rev 17195) +++ csw/mgar/pkg/zsh/trunk/checksums 2012-02-24 16:24:54 UTC (rev 17196) @@ -1 +1 @@ -11766b0dd674a513810903cd33ffcac4 zsh-4.3.15.tar.bz2 +8258967060b2654f30001a011946ac6a zsh-4.3.17.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 Fri Feb 24 17:25:35 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Feb 2012 16:25:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[17197] csw/mgar/pkg/cpan Message-ID: Revision: 17197 http://gar.svn.sourceforge.net/gar/?rev=17197&view=rev Author: dmichelsen Date: 2012-02-24 16:25:35 +0000 (Fri, 24 Feb 2012) Log Message: ----------- cpan/POE-Filter-IRCD/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/POE-Filter-IRCD/ csw/mgar/pkg/cpan/POE-Filter-IRCD/branches/ csw/mgar/pkg/cpan/POE-Filter-IRCD/tags/ csw/mgar/pkg/cpan/POE-Filter-IRCD/trunk/ csw/mgar/pkg/cpan/POE-Filter-IRCD/trunk/Makefile csw/mgar/pkg/cpan/POE-Filter-IRCD/trunk/checksums csw/mgar/pkg/cpan/POE-Filter-IRCD/trunk/files/ Property changes on: csw/mgar/pkg/cpan/POE-Filter-IRCD/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/POE-Filter-IRCD/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/POE-Filter-IRCD/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/POE-Filter-IRCD/trunk/Makefile 2012-02-24 16:25:35 UTC (rev 17197) @@ -0,0 +1,21 @@ +NAME = POE-Filter-IRCD +VERSION = 2.42 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = BINGOS + +DESCRIPTION = A POE-based parser for the IRC protocol +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +PACKAGES += CSWpm-poe-filter-ircd +CATALOGNAME_CSWpm-poe-filter-ircd = pm_poe_filter_ircd +SPKG_DESC_CSWpm-poe-filter-ircd = A POE-based parser for the IRC protocol +ARCHALL_CSWpm-poe-filter-ircd = 1 +RUNTIME_DEP_PKGS_CSWpm-poe-filter-ircd += CSWpm-poe + +include gar/category.mk Added: csw/mgar/pkg/cpan/POE-Filter-IRCD/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/POE-Filter-IRCD/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/POE-Filter-IRCD/trunk/checksums 2012-02-24 16:25:35 UTC (rev 17197) @@ -0,0 +1 @@ +41f2f915aa2e6040e67168f77c4933d9 POE-Filter-IRCD-2.42.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 Fri Feb 24 21:04:09 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 20:04:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17198] csw/mgar/pkg/nsd/trunk Message-ID: Revision: 17198 http://gar.svn.sourceforge.net/gar/?rev=17198&view=rev Author: idogan23 Date: 2012-02-24 20:04:09 +0000 (Fri, 24 Feb 2012) Log Message: ----------- nsd: bump version to 3.2.10 Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/Makefile csw/mgar/pkg/nsd/trunk/checksums Modified: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile 2012-02-24 16:25:35 UTC (rev 17197) +++ csw/mgar/pkg/nsd/trunk/Makefile 2012-02-24 20:04:09 UTC (rev 17198) @@ -1,5 +1,5 @@ NAME = nsd -VERSION = 3.2.8 +VERSION = 3.2.10 CATEGORIES = server GARTYPE = v2 @@ -20,7 +20,7 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWnsd -RUNTIME_DEP_PKGS = CSWosslrt +RUNTIME_DEP_PKGS = CSWlibssl0-9-8 CATALOGNAME = nsd SPKG_DESC = An authoritative only non-recursive name server PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 Modified: csw/mgar/pkg/nsd/trunk/checksums =================================================================== --- csw/mgar/pkg/nsd/trunk/checksums 2012-02-24 16:25:35 UTC (rev 17197) +++ csw/mgar/pkg/nsd/trunk/checksums 2012-02-24 20:04:09 UTC (rev 17198) @@ -1 +1 @@ -963c2123853e7759ffb772da40c68838 nsd-3.2.8.tar.gz +befbacb3d57b7aac5b6af477c8ee75e3 nsd-3.2.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 Fri Feb 24 21:10:52 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 24 Feb 2012 20:10:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17199] csw/mgar/pkg/nsd/trunk/Makefile Message-ID: Revision: 17199 http://gar.svn.sourceforge.net/gar/?rev=17199&view=rev Author: idogan23 Date: 2012-02-24 20:10:52 +0000 (Fri, 24 Feb 2012) Log Message: ----------- nsd: no tests required Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/Makefile Modified: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile 2012-02-24 20:04:09 UTC (rev 17198) +++ csw/mgar/pkg/nsd/trunk/Makefile 2012-02-24 20:10:52 UTC (rev 17199) @@ -41,6 +41,8 @@ CONFIGURE_ARGS += --with-difffile=/var/opt/csw/nsd/ixfr.db CONFIGURE_ARGS += --with-xfrdfile=/var/opt/csw/nsd/xfrd.state +SKIPTEST = 1 + post-install-modulated: @ginstall -d $(DESTDIR)/var/opt/csw/nsd @ginstall -d $(DESTDIR)/etc/opt/csw/init.d 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 Feb 25 02:15:24 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 25 Feb 2012 01:15:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17200] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17200 http://gar.svn.sourceforge.net/gar/?rev=17200&view=rev Author: bdwalton Date: 2012-02-25 01:15:23 +0000 (Sat, 25 Feb 2012) Log Message: ----------- ruby19/trunk: change deps for ri and dev splits Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-24 20:10:52 UTC (rev 17199) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 01:15:23 UTC (rev 17200) @@ -77,8 +77,8 @@ ARCHALL_CSWruby191-ri = 1 SPKG_DESC_CSWruby191-ri = Ruby $(VERSION) Interactive Reference -PKGFILES_CSWruby191-ri = $(datadir)/ri/.* $(bindir)/ri19 -RUNTIME_DEP_PKGS_CSWruby191-ri = CSWruby191 +PKGFILES_CSWruby191-ri = $(datadir)/ri/.* $(bindir)/ri$(API_VERSION) +RUNTIME_DEP_PKGS_CSWruby191-ri = CSWlibruby1-9-1-1 CHECKPKG_OVERRIDES_CSWruby191-ri += file-with-bad-content # SPKG_DESC_CSWruby191-tk = Ruby $(VERSION) Tcl/TK Extension @@ -87,7 +87,7 @@ SPKG_DESC_CSWruby191-dev = Ruby $(VERSION) Extension Development Files PKGFILES_CSWruby191-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*static.a -RUNTIME_DEP_PKGS_CSWruby191-dev = CSWruby191 +RUNTIME_DEP_PKGS_CSWruby191-dev = CSWlibruby1-9-1-1 CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby1.9.1-static.a MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ 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 Feb 25 02:58:44 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 25 Feb 2012 01:58:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17201] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17201 http://gar.svn.sourceforge.net/gar/?rev=17201&view=rev Author: bdwalton Date: 2012-02-25 01:58:44 +0000 (Sat, 25 Feb 2012) Log Message: ----------- ruby19/trunk: simplify split for the -dev package Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 01:15:23 UTC (rev 17200) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 01:58:44 UTC (rev 17201) @@ -86,7 +86,7 @@ # PKGFILES_CSWruby191-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb SPKG_DESC_CSWruby191-dev = Ruby $(VERSION) Extension Development Files -PKGFILES_CSWruby191-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*static.a +PKGFILES_CSWruby191-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWruby191-dev = CSWlibruby1-9-1-1 CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby1.9.1-static.a 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 Feb 25 03:01:21 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 25 Feb 2012 02:01:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17202] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17202 http://gar.svn.sourceforge.net/gar/?rev=17202&view=rev Author: bdwalton Date: 2012-02-25 02:01:19 +0000 (Sat, 25 Feb 2012) Log Message: ----------- ruby19/trunk: fix binary pickup in -ri split Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 01:58:44 UTC (rev 17201) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 02:01:19 UTC (rev 17202) @@ -2,6 +2,7 @@ VERSION = 1.9.3 # Change this when the build starts putting files in $(libdir)/ruby/$(newver) API_VERSION = 1.9.1 +API_SHORT = $(subst .,,$(API_VERSION)) PATCHLEVEL = p0 CATEGORIES = lang GARTYPE = v2 @@ -77,7 +78,7 @@ ARCHALL_CSWruby191-ri = 1 SPKG_DESC_CSWruby191-ri = Ruby $(VERSION) Interactive Reference -PKGFILES_CSWruby191-ri = $(datadir)/ri/.* $(bindir)/ri$(API_VERSION) +PKGFILES_CSWruby191-ri = $(datadir)/ri/.* $(bindir)/ri$(API_SHORT) RUNTIME_DEP_PKGS_CSWruby191-ri = CSWlibruby1-9-1-1 CHECKPKG_OVERRIDES_CSWruby191-ri += file-with-bad-content 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 Feb 25 03:58:15 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 25 Feb 2012 02:58:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17203] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17203 http://gar.svn.sourceforge.net/gar/?rev=17203&view=rev Author: bdwalton Date: 2012-02-25 02:58:14 +0000 (Sat, 25 Feb 2012) Log Message: ----------- ruby19/trunk: fix a bad path in the primary manpage Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 02:01:19 UTC (rev 17202) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 02:58:14 UTC (rev 17203) @@ -143,7 +143,7 @@ COMPILE_ELISP = 1 -PI_TARGETS = samples rbconfig rbscripts +PI_TARGETS = samples rbconfig pathfixes post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) @@ -176,8 +176,10 @@ @$(MAKECOOKIE) # Some scripts come with /usr/local/bin/ruby hard coded. -rbscripts: +pathfixes: @echo " ==> Fixing shebang path in distributed ruby scripts" @find $(DESTDIR)$(prefix) -type f -name '*.rb' -exec \ perl -i -plne "s{^#!/usr/local/bin/ruby}{#!$(bindir)/$(NAME)}g" {} \; + @echo " ==> Fixing paths in manpages" + @( cd $(DESTDIR)$(mandir)/man1; perl -pi -e 's/usr\/local\/bin\/ruby/opt\/csw\/bin\/ruby191/g' ruby191.1 ) @$(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 Feb 25 04:24:25 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 25 Feb 2012 03:24:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17204] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17204 http://gar.svn.sourceforge.net/gar/?rev=17204&view=rev Author: bdwalton Date: 2012-02-25 03:24:25 +0000 (Sat, 25 Feb 2012) Log Message: ----------- ruby19/trunk: cleanup the manpage fix for readability Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 02:58:14 UTC (rev 17203) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 03:24:25 UTC (rev 17204) @@ -181,5 +181,5 @@ @find $(DESTDIR)$(prefix) -type f -name '*.rb' -exec \ perl -i -plne "s{^#!/usr/local/bin/ruby}{#!$(bindir)/$(NAME)}g" {} \; @echo " ==> Fixing paths in manpages" - @( cd $(DESTDIR)$(mandir)/man1; perl -pi -e 's/usr\/local\/bin\/ruby/opt\/csw\/bin\/ruby191/g' ruby191.1 ) + @( cd $(DESTDIR)$(mandir)/man1; perl -pi -e 's!usr/local/bin/ruby!opt/csw/bin/ruby191!g' ruby191.1 ) @$(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 Feb 25 04:52:15 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 25 Feb 2012 03:52:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17205] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17205 http://gar.svn.sourceforge.net/gar/?rev=17205&view=rev Author: bdwalton Date: 2012-02-25 03:52:15 +0000 (Sat, 25 Feb 2012) Log Message: ----------- ruby19/trunk: switch the ri dep to ruby since it needs an interpreter; override surplus deps from ri and samples packages Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 03:24:25 UTC (rev 17204) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 03:52:15 UTC (rev 17205) @@ -75,12 +75,14 @@ CHECKPKG_OVERRIDES_CSWruby191-samples += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWruby191-samples += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWruby191-samples += file-with-bad-content +CHECKPKG_OVERRIDES_CSWruby191-samples += surplus-dependency|CSWruby191 ARCHALL_CSWruby191-ri = 1 SPKG_DESC_CSWruby191-ri = Ruby $(VERSION) Interactive Reference PKGFILES_CSWruby191-ri = $(datadir)/ri/.* $(bindir)/ri$(API_SHORT) -RUNTIME_DEP_PKGS_CSWruby191-ri = CSWlibruby1-9-1-1 +RUNTIME_DEP_PKGS_CSWruby191-ri = CSWruby$(API_SHORT) CHECKPKG_OVERRIDES_CSWruby191-ri += file-with-bad-content +CHECKPKG_OVERRIDES_CSWruby191-ri += surplus-dependency|CSWruby$(API_SHORT) # SPKG_DESC_CSWruby191-tk = Ruby $(VERSION) Tcl/TK Extension # RUNTIME_DEP_PKGS_CSWruby191-tk = CSWruby191 CSWlibruby1-9-1-1 CSWtk CSWtcl CSWlibx11 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 Feb 25 16:21:52 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 25 Feb 2012 15:21:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17206] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 17206 http://gar.svn.sourceforge.net/gar/?rev=17206&view=rev Author: wahwah Date: 2012-02-25 15:21:52 +0000 (Sat, 25 Feb 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: Version bump to 5.5.21 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-02-25 03:52:15 UTC (rev 17205) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-02-25 15:21:52 UTC (rev 17206) @@ -13,7 +13,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 20 +PATCHLEVEL = 21 ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2012-02-25 03:52:15 UTC (rev 17205) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2012-02-25 15:21:52 UTC (rev 17206) @@ -1 +1 @@ -375794ebf84b4c7b63f1676bc7416cd0 mysql-5.5.20.tar.gz +86d6bd335054a0aed1756ed60574c16d mysql-5.5.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat Feb 25 16:23:43 2012 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Sat, 25 Feb 2012 15:23:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[16228] csw/mgar/pkg/dovecot/trunk In-Reply-To: References: Message-ID: <20120225152343.GA3341@quince.home.blizinski.pl> jake_goerzen at users.sourceforge.net wrote: > CONFIGURE_ARGS += MYSQL_LIBS="-L/opt/csw/mysql5/lib MySQL libraries are now in /opt/csw/lib. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From maciej at opencsw.org Sat Feb 25 16:41:04 2012 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Sat, 25 Feb 2012 15:41:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[16280] csw/mgar/pkg/ganglia/trunk/Makefile In-Reply-To: References: Message-ID: <20120225154104.GA3507@quince.home.blizinski.pl> d_pocock at users.sourceforge.net wrote: > -CATALOGNAME_CSWganglia-dev = ganglia-dev > +CATALOGNAME_CSWganglia-dev = ganglia_dev This is now automatic, GAR replaces dashes with underscores now. You can omit the CATALOGNAME line unless you're doing something unusual. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From maciej at opencsw.org Sat Feb 25 16:44:45 2012 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Sat, 25 Feb 2012 15:44:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[16283] csw/mgar/pkg/ganglia/trunk/Makefile In-Reply-To: References: Message-ID: <20120225154445.GA4706@quince.home.blizinski.pl> d_pocock at users.sourceforge.net wrote: > -#ARCHALL_CSWgangliadevel = 1 > +ARCHALL_CSWganglia-dev = 1 There's no problem in keeping the dev packages arch-specific. Sometimes the installed devel files depend on the architecture. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From bdwalton at users.sourceforge.net Sun Feb 26 00:03:13 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 25 Feb 2012 23:03:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17207] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17207 http://gar.svn.sourceforge.net/gar/?rev=17207&view=rev Author: bdwalton Date: 2012-02-25 23:03:12 +0000 (Sat, 25 Feb 2012) Log Message: ----------- ruby19/trunk: move a few installation fixups to post-merge instead of post-install Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 15:21:52 UTC (rev 17206) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-25 23:03:12 UTC (rev 17207) @@ -145,11 +145,15 @@ COMPILE_ELISP = 1 -PI_TARGETS = samples rbconfig pathfixes +PI_TARGETS = samples rbconfig +PM_TARGETS = pathfixes post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) +post-merge: $(PM_TARGETS) + @$(MAKECOOKIE) + multiconfig: RBCONFIG=/opt/csw/lib/ruby/$(API_VERSION)/$(GARCH)-solaris2.10/rbconfig.rb multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @@ -180,8 +184,8 @@ # Some scripts come with /usr/local/bin/ruby hard coded. pathfixes: @echo " ==> Fixing shebang path in distributed ruby scripts" - @find $(DESTDIR)$(prefix) -type f -name '*.rb' -exec \ + @find $(PKGROOT)$(prefix) -type f -name '*.rb' -exec \ perl -i -plne "s{^#!/usr/local/bin/ruby}{#!$(bindir)/$(NAME)}g" {} \; @echo " ==> Fixing paths in manpages" - @( cd $(DESTDIR)$(mandir)/man1; perl -pi -e 's!usr/local/bin/ruby!opt/csw/bin/ruby191!g' ruby191.1 ) + @( cd $(PKGROOT)$(mandir)/man1; perl -pi -e 's!usr/local/bin/ruby!opt/csw/bin/ruby191!g' ruby191.1 ) @$(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 Sun Feb 26 13:29:43 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 26 Feb 2012 12:29:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[17208] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 17208 http://gar.svn.sourceforge.net/gar/?rev=17208&view=rev Author: wahwah Date: 2012-02-26 12:29:43 +0000 (Sun, 26 Feb 2012) Log Message: ----------- subversion/trunk: GCC 4.x is now in /opt/csw/bin. Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-02-25 23:03:12 UTC (rev 17207) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-02-26 12:29:43 UTC (rev 17208) @@ -306,8 +306,8 @@ -e 's,-mt|*,,' \ -e 's,-xO3,-pipe -O2,' \ -e 's,KPIC,fPIC,' \ - -e 's,/opt/SUNWspro/bin/cc,/opt/csw/gcc4/bin/gcc,' \ - -e 's,/opt/SUNWspro/bin/CC,/opt/csw/gcc4/bin/g++,' \ + -e 's,/opt/SUNWspro/bin/cc,/opt/csw/bin/gcc,' \ + -e 's,/opt/SUNWspro/bin/CC,/opt/csw/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 maciej at opencsw.org Sun Feb 26 14:23:48 2012 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Sun, 26 Feb 2012 13:23:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[16320] csw/mgar/pkg/setoolkit/trunk/Makefile In-Reply-To: References: Message-ID: <20120226132347.GA4166@quince.home.blizinski.pl> dmichelsen at users.sourceforge.net wrote: > Revision: 16320 > http://gar.svn.sourceforge.net/gar/?rev=16320&view=rev > Author: dmichelsen > Date: 2011-11-28 12:53:08 +0000 (Mon, 28 Nov 2011) > Log Message: > ----------- > setoolkit/trunk: Update overrides to match latest checkpkg > > Modified Paths: > -------------- > csw/mgar/pkg/setoolkit/trunk/Makefile > > Modified: csw/mgar/pkg/setoolkit/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/setoolkit/trunk/Makefile 2011-11-28 12:02:52 UTC (rev 16319) > +++ csw/mgar/pkg/setoolkit/trunk/Makefile 2011-11-28 12:53:08 UTC (rev 16320) > @@ -17,11 +17,6 @@ > MASTER_SITES = $(SF_MIRRORS) > DISTFILES = $(DISTNAME).tar.gz > > -# We define upstream file regex so we can be notifed of new upstream software release > -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=189279 > -UPSTREAM_USE_SF = 1 > -UFILES_REGEX = SE.Toolkit.(\d+(?:\.\d+)*) > - > BUILD_DEP_PKGS = CSWpydocutils > > BUILD64 = 1 > @@ -40,13 +35,19 @@ > SKIPTEST = 1 > > CHECKPKG_OVERRIDES_CSWsetoolkit += missing-dependency|CSWemacscommon > -CHECKPKG_OVERRIDES_CSWsetoolkit += linked-against-discouraged-library|libsegui.so|libX11.so.4 > -CHECKPKG_OVERRIDES_CSWsetoolkit += linked-against-discouraged-library|libsegui.so|libX11.so.4 > CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/mon_cm|class=none > CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/monlog|class=none > CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/percol|class=none > CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/va_monitor|class=none > CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/vader|class=none > -CHECKPKG_OVERRIDES_CSWsetoolkit += soname-not-found|libm.so.2 > +CHECKPKG_OVERRIDES_CSWsetoolkit += soname-equals-filename|file=/opt/csw/lib/libsegui.so > +CHECKPKG_OVERRIDES_CSWsetoolkit += soname-equals-filename|file=/opt/csw/lib/libsenet.so > +CHECKPKG_OVERRIDES_CSWsetoolkit += soname-equals-filename|file=/opt/csw/lib/amd64/libsegui.so > +CHECKPKG_OVERRIDES_CSWsetoolkit += soname-equals-filename|file=/opt/csw/lib/amd64/libsenet.so > +CHECKPKG_OVERRIDES_CSWsetoolkit += soname-equals-filename|file=/opt/csw/lib/sparcv9/libsegui.so > +CHECKPKG_OVERRIDES_CSWsetoolkit += soname-equals-filename|file=/opt/csw/lib/sparcv9/libsenet.so I guess these aren't publicly linkable shared librares. In such case, it's best to move them out of /opt/csw/lib. > +CHECKPKG_OVERRIDES_CSWsetoolkit += file-with-bad-content|/usr/local|root/opt/csw/share/doc/setoolkit/INSTALL > +CHECKPKG_OVERRIDES_CSWsetoolkit += file-with-bad-content|/usr/local|root/opt/csw/share/setoolkit/examples/limits.se > +CHECKPKG_OVERRIDES_CSWsetoolkit += shared-lib-pkgname-mismatch|sonames=libsegui.so,libsenet.so|pkgname=CSWsetoolkit|expected=CSWlibse| ...and then this error goes away too. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From maciej at opencsw.org Sun Feb 26 14:25:23 2012 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Sun, 26 Feb 2012 13:25:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[16326] csw/mgar/pkg/ganglia/tags/3.1.7-2011.11.27/ In-Reply-To: References: Message-ID: <20120226132523.GB4166@quince.home.blizinski.pl> d_pocock at users.sourceforge.net wrote: > Revision: 16326 > http://gar.svn.sourceforge.net/gar/?rev=16326&view=rev > Author: d_pocock > Date: 2011-11-29 04:25:33 +0000 (Tue, 29 Nov 2011) > Log Message: > ----------- > Tag 3.1.7-2011.11.27 > > Added Paths: > ----------- > csw/mgar/pkg/ganglia/tags/3.1.7-2011.11.27/ All packages now know which sources and revision they've been built from, so there's no need to create additional directories in the subversion tree. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From maciej at opencsw.org Sun Feb 26 14:26:57 2012 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Sun, 26 Feb 2012 13:26:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[16344] csw/mgar/pkg/ganglia/trunk/Makefile In-Reply-To: References: Message-ID: <20120226132657.GC4166@quince.home.blizinski.pl> d_pocock at users.sourceforge.net wrote: > Revision: 16344 > http://gar.svn.sourceforge.net/gar/?rev=16344&view=rev > Author: d_pocock > Date: 2011-12-01 08:47:20 +0000 (Thu, 01 Dec 2011) > Log Message: > ----------- > ganglia: clean up the Makefile a little bit more > > Modified Paths: > -------------- > csw/mgar/pkg/ganglia/trunk/Makefile > > Modified: csw/mgar/pkg/ganglia/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/ganglia/trunk/Makefile 2011-12-01 06:06:58 UTC (rev 16343) > +++ csw/mgar/pkg/ganglia/trunk/Makefile 2011-12-01 08:47:20 UTC (rev 16344) > @@ -170,10 +170,26 @@ > CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-3.2.0.0.so.0.0.0|soname=libganglia-3.2.0.0.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia3-2-0-0-0 > > PKGFILES_CSWgangliamodpython = .*python.* > -PKGFILES_CSWganglia-dev = .*/include/.*.h .*/bin/ganglia-config $(libdir)/libganglia.so > -PKGFILES_CSWgangliagmetad = .*/sbin/gmetad .*/gmetad.conf.CSW /var/opt/csw/ganglia/rrds /etc/opt/csw/init.d/cswgmetad .*/gmetad.1 > -PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW > > +PKGFILES_CSWganglia-dev = /opt/csw/include/ganglia.h $(PKGFILES_DEVEL) expands to regexes that match header files and *.so files, and *-config binaries. > +PKGFILES_CSWganglia-dev += /opt/csw/include/ganglia_gexec.h > +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_metric.h > +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_mmn.h > +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_msg.h > +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_protocol.h > +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_value.h > +PKGFILES_CSWganglia-dev += /opt/csw/bin/ganglia-config > +PKGFILES_CSWganglia-dev += $(libdir)/libganglia.so > + > +PKGFILES_CSWgangliagmetad = /opt/csw/sbin/gmetad > +PKGFILES_CSWgangliagmetad += /etc/opt/csw/ganglia/gmetad.conf.CSW > +PKGFILES_CSWgangliagmetad += /etc/opt/csw/init.d/cswgmetad > +PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/rrds > +PKGFILES_CSWgangliagmetad += /opt/csw/share/man/man1/gmetad.1 > + > +PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* > +PKGFILES_CSWgangliaweb += /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW > + > PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf > PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf > PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From maciej at opencsw.org Sun Feb 26 14:30:16 2012 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Sun, 26 Feb 2012 13:30:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[16358] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: Message-ID: <20120226133016.GD4166@quince.home.blizinski.pl> rthurner at users.sourceforge.net wrote: > Revision: 16358 > http://gar.svn.sourceforge.net/gar/?rev=16358&view=rev > Author: rthurner > Date: 2011-12-04 06:54:37 +0000 (Sun, 04 Dec 2011) > Log Message: > ----------- > subversion, move overrides to the package it belongs to > > Modified Paths: > -------------- > csw/mgar/pkg/subversion/trunk/Makefile > > Modified: csw/mgar/pkg/subversion/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/subversion/trunk/Makefile 2011-12-03 23:07:51 UTC (rev 16357) > +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-12-04 06:54:37 UTC (rev 16358) > @@ -48,6 +48,24 @@ > CATALOGNAME_CSWsvn = subversion > CHECKPKG_OVERRIDES_CSWsvn += catalogname-does-not-match-pkgname|pkgname=CSWsvn|catalogname=subversion|expected-catalogname=svn > CHECKPKG_OVERRIDES_CSWsvn += license-missing|/opt/csw/share/doc/subversion/license > +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/repos.pyc You can see here that the path is wrong: /opt/csw/lib/svn/python/site-packages. Also, maybe it's a better idea to nuke the *.pyc files instead of shipping them. Checkpkg is telling you the right thing, don't override everything! :-) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From bdwalton at users.sourceforge.net Sun Feb 26 20:13:17 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 26 Feb 2012 19:13:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17209] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17209 http://gar.svn.sourceforge.net/gar/?rev=17209&view=rev Author: bdwalton Date: 2012-02-26 19:13:17 +0000 (Sun, 26 Feb 2012) Log Message: ----------- ruby19/trunk: add alternatives info (use lowest priority) to be provided directly by the ruby191 package; add friendly symlinks for use by the ruby19 package Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-26 12:29:43 UTC (rev 17208) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-26 19:13:17 UTC (rev 17209) @@ -39,6 +39,7 @@ PACKAGES = CSWruby191 CSWruby191-samples CSWruby191-ri PACKAGES += CSWruby191-dev CSWlibruby1-9-1-1 +PACKAGES += CSWruby19 SPKG_DESC_CSWruby191 = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWruby191 += CSWlibruby1-9-1-1 @@ -68,6 +69,8 @@ # comments CHECKPKG_OVERRIDES_CSWlibruby1-9-1-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/pathname.rb +SPKG_DESC_CSWruby19 = A meta package for ruby 1.9 to pull Ruby $(VERSION) (api: $(API_VERSION) + ARCHALL_CSWruby191-samples = 1 SPKG_DESC_CSWruby191-samples = Example programs for Ruby $(VERSION) PKGFILES_CSWruby191-samples = $(docdir)/$(NAME)/sample.* @@ -93,6 +96,9 @@ RUNTIME_DEP_PKGS_CSWruby191-dev = CSWlibruby1-9-1-1 CHECKPKG_OVERRIDES_CSWruby191-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby1.9.1-static.a +ALTERNATIVES_CSWruby191 = ruby +ALTERNATIVE_ruby = $(bindir)/ruby ruby $(bindir)/ruby$(API_SHORT) 1 $(bindir)/irb irb $(bindir)/irb$(API_SHORT) $(bindir)/erb erb $(bindir)/erb$(API_SORT) $(bindir)/rdoc rdoc $(bindir)/rdoc$(API_SHORT) $(bindir)/ri ri $(bindir)/ri$(API_SHORT) $(bindir)/testrb testrb $(bindir)/testrb$(API_SHORT) $(mandir)/man1/ruby.1 ruby.1 $(mandir)/man1/ruby$(API_SHORT).1 + MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ DISTFILES = $(DISTNAME).tar.gz @@ -146,7 +152,7 @@ COMPILE_ELISP = 1 PI_TARGETS = samples rbconfig -PM_TARGETS = pathfixes +PM_TARGETS = pathfixes ruby19links post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) @@ -189,3 +195,16 @@ @echo " ==> Fixing paths in manpages" @( cd $(PKGROOT)$(mandir)/man1; perl -pi -e 's!usr/local/bin/ruby!opt/csw/bin/ruby191!g' ruby191.1 ) @$(MAKECOOKIE) + +# Provide a few symlinks for the ruby19 metapackage +ruby19links: + @echo " ==> Installing symlinks from foo19 -> foo191" + @( cd $(PKGROOT)/$(bindir); \ + ln -s erb191 erb19; \ + ln -s gem191 gem19; \ + ln -s irb191 irb19; \ + ln -s rake191 rake19; \ + ln -s rdoc191 rdoc19; \ + ln -s ruby191 ruby19; \ + ln -s testrb191 testrb19 ) + @$(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 Sun Feb 26 21:19:59 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 26 Feb 2012 20:19:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17210] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17210 http://gar.svn.sourceforge.net/gar/?rev=17210&view=rev Author: bdwalton Date: 2012-02-26 20:19:59 +0000 (Sun, 26 Feb 2012) Log Message: ----------- ruby19/trunk: move all separated post-merge targets back under the main post-merge target Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-26 19:13:17 UTC (rev 17209) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-26 20:19:59 UTC (rev 17210) @@ -152,13 +152,11 @@ COMPILE_ELISP = 1 PI_TARGETS = samples rbconfig -PM_TARGETS = pathfixes ruby19links + post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) -post-merge: $(PM_TARGETS) - @$(MAKECOOKIE) multiconfig: RBCONFIG=/opt/csw/lib/ruby/$(API_VERSION)/$(GARCH)-solaris2.10/rbconfig.rb multiconfig: @@ -188,23 +186,20 @@ @$(MAKECOOKIE) # Some scripts come with /usr/local/bin/ruby hard coded. -pathfixes: +# Provide a few symlinks for the ruby19 metapackage +post-merge: @echo " ==> Fixing shebang path in distributed ruby scripts" @find $(PKGROOT)$(prefix) -type f -name '*.rb' -exec \ perl -i -plne "s{^#!/usr/local/bin/ruby}{#!$(bindir)/$(NAME)}g" {} \; @echo " ==> Fixing paths in manpages" @( cd $(PKGROOT)$(mandir)/man1; perl -pi -e 's!usr/local/bin/ruby!opt/csw/bin/ruby191!g' ruby191.1 ) - @$(MAKECOOKIE) - -# Provide a few symlinks for the ruby19 metapackage -ruby19links: @echo " ==> Installing symlinks from foo19 -> foo191" - @( cd $(PKGROOT)/$(bindir); \ - ln -s erb191 erb19; \ - ln -s gem191 gem19; \ - ln -s irb191 irb19; \ - ln -s rake191 rake19; \ - ln -s rdoc191 rdoc19; \ - ln -s ruby191 ruby19; \ - ln -s testrb191 testrb19 ) + ( cd $(PKGROOT)/$(bindir); \ + for bin in ri erb gem irb rake rdoc ruby testrb; do \ + ln -s $${bin}$(API_SHORT) $${bin}19; \ + done; \ + cd $(PKGROOT)/$(mandir)/man1; \ + for man in erb irb rake ri ruby; do \ + ln -s $${man}$(API_SHORT).1 $${man}19.1; \ + 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 Sun Feb 26 21:26:42 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 26 Feb 2012 20:26:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17211] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17211 http://gar.svn.sourceforge.net/gar/?rev=17211&view=rev Author: bdwalton Date: 2012-02-26 20:26:41 +0000 (Sun, 26 Feb 2012) Log Message: ----------- ruby19/trunk: streamline the post-install targets too Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-26 20:19:59 UTC (rev 17210) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-26 20:26:41 UTC (rev 17211) @@ -151,13 +151,21 @@ COMPILE_ELISP = 1 -PI_TARGETS = samples rbconfig +post-install-modulated: + @echo " ==> Fixing the paths in rbconfig." + @gsed -i -e s,$(DESTDIR),, \ + $(DESTDIR)$(libdir)/ruby/$(API_VERSION)/$(GARCH)-solaris2.10/rbconfig.rb - -post-install-modulated: $(PI_TARGETS) + @echo " ==> Installing sample code files." + @mkdir -p $(DESTDIR)$(docdir)/$(NAME)/ + @cp -R $(WORKSRC_FIRSTMOD)/sample $(DESTDIR)$(docdir)/$(NAME)/ + @for ext in bigdecimal tk win32ole ; do \ + cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample $(DESTDIR)$(docdir)/$(NAME)/sample/$$ext ; \ + done @$(MAKECOOKIE) - +# leave this out of post-install for now...we're not modulating on compiler +# just yet. multiconfig: RBCONFIG=/opt/csw/lib/ruby/$(API_VERSION)/$(GARCH)-solaris2.10/rbconfig.rb multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @@ -170,23 +178,7 @@ @ginstall -c -m 0644 $(FILEDIR)/README.csw $(DESTDIR)$(docdir)/$(NAME)/ @$(MAKECONFIG) -# Fix up rbconfig -rbconfig: - @gsed -i -e s,$(DESTDIR),, \ - $(DESTDIR)$(libdir)/ruby/$(API_VERSION)/$(GARCH)-solaris2.10/rbconfig.rb - @$(MAKECOOKIE) -# Copy samples -samples: - @mkdir -p $(DESTDIR)$(docdir)/$(NAME)/ - @cp -R $(WORKSRC_FIRSTMOD)/sample $(DESTDIR)$(docdir)/$(NAME)/ - @for ext in bigdecimal tk win32ole ; do \ - cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample $(DESTDIR)$(docdir)/$(NAME)/sample/$$ext ; \ - done - @$(MAKECOOKIE) - -# Some scripts come with /usr/local/bin/ruby hard coded. -# Provide a few symlinks for the ruby19 metapackage post-merge: @echo " ==> Fixing shebang path in distributed ruby scripts" @find $(PKGROOT)$(prefix) -type f -name '*.rb' -exec \ @@ -194,7 +186,7 @@ @echo " ==> Fixing paths in manpages" @( cd $(PKGROOT)$(mandir)/man1; perl -pi -e 's!usr/local/bin/ruby!opt/csw/bin/ruby191!g' ruby191.1 ) @echo " ==> Installing symlinks from foo19 -> foo191" - ( cd $(PKGROOT)/$(bindir); \ + @( cd $(PKGROOT)/$(bindir); \ for bin in ri erb gem irb rake rdoc ruby testrb; do \ ln -s $${bin}$(API_SHORT) $${bin}19; \ done; \ 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 Feb 26 22:10:47 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 26 Feb 2012 21:10:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17212] csw/mgar/pkg/samba/trunk/Makefile Message-ID: Revision: 17212 http://gar.svn.sourceforge.net/gar/?rev=17212&view=rev Author: dmichelsen Date: 2012-02-26 21:10:47 +0000 (Sun, 26 Feb 2012) Log Message: ----------- samba/trunk: Fix catalog names for obsoleted packages Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2012-02-26 20:26:41 UTC (rev 17211) +++ csw/mgar/pkg/samba/trunk/Makefile 2012-02-26 21:10:47 UTC (rev 17212) @@ -64,7 +64,9 @@ # Make one unified package for now OBSOLETED_BY_CSWsamba += CSWsambacommon +CATALOGNME_CSWsambacommon = samba_common_stub OBSOLETED_BY_CSWsamba += CSWsambadoc +CATALOGNAME_CSWsambadoc = samba_doc_stub PACKAGES += CSWsamba-client SPKG_DESC_CSWsamba-client = Client binaries for samba 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 Feb 26 22:15:29 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 26 Feb 2012 21:15:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[17213] csw/mgar/pkg/cpan/IRC-Utils/trunk/Makefile Message-ID: Revision: 17213 http://gar.svn.sourceforge.net/gar/?rev=17213&view=rev Author: dmichelsen Date: 2012-02-26 21:15:29 +0000 (Sun, 26 Feb 2012) Log Message: ----------- cpan/IRC-Utils/trunk: Add description Modified Paths: -------------- csw/mgar/pkg/cpan/IRC-Utils/trunk/Makefile Modified: csw/mgar/pkg/cpan/IRC-Utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IRC-Utils/trunk/Makefile 2012-02-26 21:10:47 UTC (rev 17212) +++ csw/mgar/pkg/cpan/IRC-Utils/trunk/Makefile 2012-02-26 21:15:29 UTC (rev 17213) @@ -1,6 +1,7 @@ NAME = IRC-Utils VERSION = 0.12 CATEGORIES = cpan +GARTYPE = v2 AUTHOR = HINRIK DESCRIPTION = Common utilities for IRC-related tasks @@ -13,7 +14,7 @@ PACKAGES += CSWpm-irc-utils CATALOGNAME_CSWpm-irc-utils = pm_irc_utils - +SPKG_DESC_CSWpm-irc-utils = Common utilities for IRC-related tasks ARCHALL_CSWpm-irc-utils = 1 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 Sun Feb 26 22:29:47 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 26 Feb 2012 21:29:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17214] csw/mgar/pkg/libpcap/trunk Message-ID: Revision: 17214 http://gar.svn.sourceforge.net/gar/?rev=17214&view=rev Author: dmichelsen Date: 2012-02-26 21:29:47 +0000 (Sun, 26 Feb 2012) Log Message: ----------- libpcap/trunk: Update to 1.2.1 Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpcap/trunk/checksums Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2012-02-26 21:15:29 UTC (rev 17213) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2012-02-26 21:29:47 UTC (rev 17214) @@ -1,5 +1,5 @@ NAME = libpcap -VERSION = 1.2.0 +VERSION = 1.2.1 CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/libpcap/trunk/checksums =================================================================== --- csw/mgar/pkg/libpcap/trunk/checksums 2012-02-26 21:15:29 UTC (rev 17213) +++ csw/mgar/pkg/libpcap/trunk/checksums 2012-02-26 21:29:47 UTC (rev 17214) @@ -1 +1 @@ -dfb8aa690b7a29821bfa183025436569 libpcap-1.2.0.tar.gz +06046e0e81efc60566daf1cc96c77d46 libpcap-1.2.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 Sun Feb 26 22:36:24 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 26 Feb 2012 21:36:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17215] csw/mgar/pkg/samba/trunk/Makefile Message-ID: Revision: 17215 http://gar.svn.sourceforge.net/gar/?rev=17215&view=rev Author: dmichelsen Date: 2012-02-26 21:36:24 +0000 (Sun, 26 Feb 2012) Log Message: ----------- samba/trunk: Fix typo Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2012-02-26 21:29:47 UTC (rev 17214) +++ csw/mgar/pkg/samba/trunk/Makefile 2012-02-26 21:36:24 UTC (rev 17215) @@ -64,7 +64,7 @@ # Make one unified package for now OBSOLETED_BY_CSWsamba += CSWsambacommon -CATALOGNME_CSWsambacommon = samba_common_stub +CATALOGNAME_CSWsambacommon = samba_common_stub OBSOLETED_BY_CSWsamba += CSWsambadoc CATALOGNAME_CSWsambadoc = samba_doc_stub 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 Feb 26 22:39:04 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 26 Feb 2012 21:39:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17216] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17216 http://gar.svn.sourceforge.net/gar/?rev=17216&view=rev Author: bdwalton Date: 2012-02-26 21:39:04 +0000 (Sun, 26 Feb 2012) Log Message: ----------- ruby19/trunk: set CSWruby19 as arch=all; set runtime deps and assign the split definition Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-26 21:36:24 UTC (rev 17215) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-26 21:39:04 UTC (rev 17216) @@ -69,7 +69,10 @@ # comments CHECKPKG_OVERRIDES_CSWlibruby1-9-1-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.9.1/pathname.rb -SPKG_DESC_CSWruby19 = A meta package for ruby 1.9 to pull Ruby $(VERSION) (api: $(API_VERSION) +ARCHALL_CSWruby19 = 1 +SPKG_DESC_CSWruby19 = A meta package for ruby 1.9 (v$(VERSION)/api$(API_VERSION)) +RUNTIME_DEP_PKGS_CSWruby19 = CSWruby$(API_SHORT) +PKGFILES_CSWruby19 = $(bindir)/.*19 $(mandir).*19.1 ARCHALL_CSWruby191-samples = 1 SPKG_DESC_CSWruby191-samples = Example programs for Ruby $(VERSION) 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 Feb 26 22:51:53 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 26 Feb 2012 21:51:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17217] csw/mgar/pkg/tcpdump/trunk Message-ID: Revision: 17217 http://gar.svn.sourceforge.net/gar/?rev=17217&view=rev Author: dmichelsen Date: 2012-02-26 21:51:52 +0000 (Sun, 26 Feb 2012) Log Message: ----------- tcpdump/trunk: Update to 4.2.1 Modified Paths: -------------- csw/mgar/pkg/tcpdump/trunk/Makefile csw/mgar/pkg/tcpdump/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tcpdump/trunk/files/0001-Use-expr-instead-of-bashism.patch Removed Paths: ------------- csw/mgar/pkg/tcpdump/trunk/files/0001-Do-not-use-unnamed-unions.patch csw/mgar/pkg/tcpdump/trunk/files/0002-Add-missing-ppi.h-from-upstream-GIT.patch csw/mgar/pkg/tcpdump/trunk/files/0003-Add-missing-testsuite-files-from-upstream-GIT.patch Modified: csw/mgar/pkg/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile 2012-02-26 21:39:04 UTC (rev 17216) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2012-02-26 21:51:52 UTC (rev 17217) @@ -1,5 +1,5 @@ NAME = tcpdump -VERSION = 4.2.0 +VERSION = 4.2.1 CATEGORIES = utils GARTYPE = v2 @@ -10,11 +10,9 @@ MASTER_SITES = http://www.tcpdump.org/release/ DISTFILES = $(DISTNAME).tar.gz -# Use patches until this is fixed: -# http://sourceforge.net/tracker/?func=detail&aid=3444149&group_id=53066&atid=469573 -PATCHFILES += 0001-Do-not-use-unnamed-unions.patch -PATCHFILES += 0002-Add-missing-ppi.h-from-upstream-GIT.patch -PATCHFILES += 0003-Add-missing-testsuite-files-from-upstream-GIT.patch +# Use patch until this is fixed: +# https://sourceforge.net/tracker/?func=detail&aid=3494835&group_id=53066&atid=469573 +PATCHFILES += Use-expr-instead-of-bashism.patch VENDOR_URL = http://www.tcpdump.org/ @@ -23,12 +21,11 @@ PACKAGES += CSWtcpdump SPKG_DESC_CSWtcpdump = Dump network traffic RUNTIME_DEP_PKGS_CSWtcpdump += CSWlibpcap1 -RUNTIME_DEP_PKGS_CSWtcpdump += CSWosslrt +RUNTIME_DEP_PKGS_CSWtcpdump += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWtcpdump += CSWlibsmi2 BUILD_DEP_PKGS += CSWlibpcap-dev -BUILD_DEP_PKGS += CSWosslrt -BUILD_DEP_PKGS += CSWossldevel +BUILD_DEP_PKGS += CSWlibssl-dev BUILD_DEP_PKGS += CSWlibsmi-dev CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/tcpdump/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpdump/trunk/checksums 2012-02-26 21:39:04 UTC (rev 17216) +++ csw/mgar/pkg/tcpdump/trunk/checksums 2012-02-26 21:51:52 UTC (rev 17217) @@ -1 +1 @@ -0296d4c487c3a156879783643704bd39 tcpdump-4.2.0.tar.gz +c202878c6db054767b52651041b9e60e tcpdump-4.2.1.tar.gz Deleted: csw/mgar/pkg/tcpdump/trunk/files/0001-Do-not-use-unnamed-unions.patch =================================================================== --- csw/mgar/pkg/tcpdump/trunk/files/0001-Do-not-use-unnamed-unions.patch 2012-02-26 21:39:04 UTC (rev 17216) +++ csw/mgar/pkg/tcpdump/trunk/files/0001-Do-not-use-unnamed-unions.patch 2012-02-26 21:51:52 UTC (rev 17217) @@ -1,52 +0,0 @@ -From 08494b5743cb3266ff69d1e26e83f5e142a0ac65 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 29 Nov 2011 13:51:05 +0100 -Subject: [PATCH] Do not use unnamed unions - ---- - print-rpki-rtr.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/print-rpki-rtr.c b/print-rpki-rtr.c -index 6b0ac52..99be576 100644 ---- a/print-rpki-rtr.c -+++ b/print-rpki-rtr.c -@@ -48,7 +48,7 @@ typedef struct rpki_rtr_pdu_ { - union { - u_char cache_nonce[2]; /* Cache Nonce */ - u_char error_code[2]; /* Error code */ -- }; -+ } ui; - u_char length[4]; - u_char msg[0]; /* message body */ - } __attribute__((packed)) rpki_rtr_pdu; -@@ -203,7 +203,7 @@ rpki_rtr_pdu_print (const u_char *tptr, u_int indent) - case RPKI_RTR_END_OF_DATA_PDU: - printf("%sCache-Nonce: 0x%04x, Serial: %u", - indent_string(indent+2), -- EXTRACT_16BITS(pdu_header->cache_nonce), -+ EXTRACT_16BITS(pdu_header->ui.cache_nonce), - EXTRACT_32BITS(pdu_header->msg)); - break; - -@@ -221,7 +221,7 @@ rpki_rtr_pdu_print (const u_char *tptr, u_int indent) - case RPKI_RTR_CACHE_RESPONSE_PDU: - printf("%sCache-Nonce: 0x%04x", - indent_string(indent+2), -- EXTRACT_16BITS(pdu_header->cache_nonce)); -+ EXTRACT_16BITS(pdu_header->ui.cache_nonce)); - break; - - case RPKI_RTR_IPV4_PREFIX_PDU: -@@ -262,7 +262,7 @@ rpki_rtr_pdu_print (const u_char *tptr, u_int indent) - encapsulated_pdu_length = EXTRACT_32BITS(pdu->encapsulated_pdu_length); - tlen = pdu_len; - -- error_code = EXTRACT_16BITS(pdu->pdu_header.error_code); -+ error_code = EXTRACT_16BITS(pdu->pdu_header.ui.error_code); - printf("%sError code: %s (%u), Encapsulated PDU length: %u", - indent_string(indent+2), - tok2str(rpki_rtr_error_codes, "Unknown", error_code), --- -1.7.6.1 - Added: csw/mgar/pkg/tcpdump/trunk/files/0001-Use-expr-instead-of-bashism.patch =================================================================== --- csw/mgar/pkg/tcpdump/trunk/files/0001-Use-expr-instead-of-bashism.patch (rev 0) +++ csw/mgar/pkg/tcpdump/trunk/files/0001-Use-expr-instead-of-bashism.patch 2012-02-26 21:51:52 UTC (rev 17217) @@ -0,0 +1,43 @@ +From bb471680f4e946d252f480d0ca9ce485048cac7f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 26 Feb 2012 22:42:53 +0100 +Subject: [PATCH] Use expr instead of bashism + +--- + tests/TESTrun.sh | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/TESTrun.sh b/tests/TESTrun.sh +index 656974d..1f5fee0 100755 +--- a/tests/TESTrun.sh ++++ b/tests/TESTrun.sh +@@ -14,10 +14,10 @@ do + then + echo $i: passed. + rm -f DIFF/$i.result +- passed=$(($passed + 1)) ++ passed=`expr $passed + 1` + else + echo $i: failed. +- failed=$(($failed + 1)) ++ failed=`expr $failed + 1` + fi + done + +@@ -36,11 +36,11 @@ do + then + echo $name: passed. + rm -f DIFF/$output.diff +- passed=$(($passed + 1)) ++ passed=`expr passed + 1` + echo $passed >.passed + else + echo $name: failed. +- failed=$(($failed + 1)) ++ failed=`expr $failed + 1` + echo $failed >.failed + fi + done +-- +1.7.9 + Deleted: csw/mgar/pkg/tcpdump/trunk/files/0002-Add-missing-ppi.h-from-upstream-GIT.patch =================================================================== --- csw/mgar/pkg/tcpdump/trunk/files/0002-Add-missing-ppi.h-from-upstream-GIT.patch 2012-02-26 21:39:04 UTC (rev 17216) +++ csw/mgar/pkg/tcpdump/trunk/files/0002-Add-missing-ppi.h-from-upstream-GIT.patch 2012-02-26 21:51:52 UTC (rev 17217) @@ -1,27 +0,0 @@ -From 3a7f5fb4d0c5e632c439c7ae3e8189a64f77c853 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 29 Nov 2011 13:55:57 +0100 -Subject: [PATCH] Add missing ppi.h from upstream GIT - ---- - ppi.h | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - create mode 100644 ppi.h - -diff --git a/ppi.h b/ppi.h -new file mode 100644 -index 0000000..fa3359e ---- /dev/null -+++ b/ppi.h -@@ -0,0 +1,8 @@ -+typedef struct ppi_header { -+ uint8_t ppi_ver; -+ uint8_t ppi_flags; -+ uint16_t ppi_len; -+ uint32_t ppi_dlt; -+} ppi_header_t; -+ -+#define PPI_HDRLEN 8 --- -1.7.6.1 - Deleted: csw/mgar/pkg/tcpdump/trunk/files/0003-Add-missing-testsuite-files-from-upstream-GIT.patch =================================================================== --- csw/mgar/pkg/tcpdump/trunk/files/0003-Add-missing-testsuite-files-from-upstream-GIT.patch 2012-02-26 21:39:04 UTC (rev 17216) +++ csw/mgar/pkg/tcpdump/trunk/files/0003-Add-missing-testsuite-files-from-upstream-GIT.patch 2012-02-26 21:51:52 UTC (rev 17217) @@ -1,5255 +0,0 @@ -From 74373a2c5790139f241ea13f2d03b0b4b1063981 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 29 Nov 2011 14:19:03 +0100 -Subject: [PATCH] Add missing testsuite files from upstream GIT - ---- - tests/02-sunrise-sunset-esp.pcap | Bin 0 -> 1352 bytes - tests/08-sunrise-sunset-aes.pcap | Bin 0 -> 1480 bytes - tests/08-sunrise-sunset-esp2.pcap | Bin 0 -> 1800 bytes - tests/QinQpacket.out | 249 ++++ - tests/QinQpacket.pcap | Bin 0 -> 78264 bytes - tests/QinQpacketv.out | 1977 +++++++++++++++++++++++++++++ - tests/TESTrun.sh | 2 +- - tests/babel.pcap | Bin 0 -> 3320 bytes - tests/babel1.out | 25 + - tests/babel1v.out | 51 + - tests/eapon1.pcap | Bin 0 -> 16412 bytes - tests/espudp1.pcap | Bin 0 -> 1416 bytes - tests/forces2.pcap | Bin 0 -> 9878 bytes - tests/forces3.pcap | Bin 0 -> 18176 bytes - tests/ikev2four.pcap | Bin 0 -> 5856 bytes - tests/ikev2pI2.pcap | Bin 0 -> 912 bytes - tests/isakmp-delete-segfault.pcap | Bin 0 -> 721 bytes - tests/isakmp-identification-segfault.pcap | Bin 0 -> 356 bytes - tests/isakmp-pointer-loop.pcap | Bin 0 -> 112 bytes - tests/isakmp4500.pcap | Bin 0 -> 6830 bytes - tests/lmp.pcap | Bin 0 -> 1732 bytes - tests/mpls-ldp-hello.pcap | Bin 0 -> 114 bytes - tests/ospf-gmpls.pcap | Bin 0 -> 640 bytes - tests/print-flags.pcap | Bin 0 -> 6621 bytes - tests/sflow_multiple_counter_30_pdus.out | 1828 ++++++++++++++++++++++++++ - tests/sflow_multiple_counter_30_pdus.pcap | Bin 0 -> 29308 bytes - 26 files changed, 4131 insertions(+), 1 deletions(-) - create mode 100644 tests/02-sunrise-sunset-esp.pcap - create mode 100644 tests/08-sunrise-sunset-aes.pcap - create mode 100644 tests/08-sunrise-sunset-esp2.pcap - create mode 100644 tests/QinQpacket.out - create mode 100644 tests/QinQpacket.pcap - create mode 100644 tests/QinQpacketv.out - create mode 100644 tests/babel.pcap - create mode 100644 tests/babel1.out - create mode 100644 tests/babel1v.out - create mode 100644 tests/eapon1.pcap - create mode 100644 tests/espudp1.pcap - create mode 100644 tests/forces2.pcap - create mode 100644 tests/forces3.pcap - create mode 100644 tests/ikev2four.pcap - create mode 100644 tests/ikev2pI2.pcap - create mode 100644 tests/isakmp-delete-segfault.pcap - create mode 100644 tests/isakmp-identification-segfault.pcap - create mode 100644 tests/isakmp-pointer-loop.pcap - create mode 100644 tests/isakmp4500.pcap - create mode 100644 tests/lmp.pcap - create mode 100644 tests/mpls-ldp-hello.pcap - create mode 100644 tests/ospf-gmpls.pcap - create mode 100644 tests/print-flags.pcap - create mode 100644 tests/sflow_multiple_counter_30_pdus.out - create mode 100644 tests/sflow_multiple_counter_30_pdus.pcap - -diff --git a/tests/02-sunrise-sunset-esp.pcap b/tests/02-sunrise-sunset-esp.pcap -new file mode 100644 -index 0000000000000000000000000000000000000000..e52af9888c73487889c94e88d550c8674de70c8e -GIT binary patch -literal 1352 -zcmca|c+)~A1{MZ5U}IolgmV}erUBU?EWp5!lHv*`l{pw(85lbLr!z1(7=4?1fRRZY -zh;@Zb!YY6Y8GRI7^=&px61=?JW?He(dg-Jl>-jSJ%U2$cns9|d -z=k2}~B at 5R~ZhtKQh)YfCO+>xkzH94E+8^tE-N9_crM02{z2B<~=ifLvyVf^OP_uuh -zH*bEZm4 at p}u7{?YucpNQI2*Vtj)yT!$AtBp>(yt5f3?>W;mS;~D<`A5k{M=N!ksY5 -zdZ}h%ub!ZKwLMw-Wl3iYLQ<74ML(Kfa4`#R>n4iGB=7FK{o~b=;IhEnqP*3$ -zleVSG$FRHowf=r5wk=w#Vx8($-Yr}1y=H1%oyIo9K3sqA#ge4lf-BxmX_p~I&R{CX!G!!wl#SLT9U*^lN* -zc9>~ZdQ}z7Pg-x!ZdLBHG!CD=`gQHn?D-w*7=FeJpF8U+>@vqPTJd$0?m_&IV$Jx*bLxwkxSa(312>6^mx -z$-!>!5|h5w>R*G*T6V12%wcw>bIYv5k4`pK?F*C> -Xf2=91c;)*0pI(cVm(FF_J*O4`-3kV% - -literal 0 -HcmV?d00001 - -diff --git a/tests/08-sunrise-sunset-aes.pcap b/tests/08-sunrise-sunset-aes.pcap -new file mode 100644 -index 0000000000000000000000000000000000000000..1ebe3deac5a7d44910e5ec73b0b5b651e088b3ec -GIT binary patch -literal 1480 -zcmca|c+)~A1{MZ5U}IolgmV}emI2uyEWp5!lHv*`l{pw(85m~#dBwosVDyve03(w) -z5bIu4c1;H=WPG+;=Ea2-jRm(7?%3lSi?YF+s9UZgh;**;bw&%5OggG3Kt6zg%&4}h|CUjF> -zGA4()Z#cT>*5-Yk{;AP&Zkb>1UzmBHTjy(jL)Q1JpH&a=XdNhi_J7m$n)z%|S=(!4 -z!&C*LXY(%M&soDi+tkowSDf<+o-gI40;P*~Z*iKzd+LX(Sb_!fl)rH)KiAHl$8wLU -z+GI^@RlmWaJ|bNG2JC7EG*>gDn_8M2eI at Z4=ld%QTU55s-<1~fYop!!U60lj=q-rp -zUH`q;&Q at zfLG!<)xB903{GAb5(@gbp&NIba?8u#w`&aX7tHil?Csz9u71T*a3(Y&p -z+TC`_{QV`@J2z%zUUlZ0`t<4Mm}QSO`BynfHER|T;p(>_SO55r=4uvnQ?tc*W~&LQ -z7RIH>v57U+GMOZ{Mf^o?qK0# -z_DrwQx~TSg>92DqO?YJ!-}p)2IC*WYzoGi_6E}a#$yqP<(vN+(vna-Y_n#@$di=aho++%NIZ!yKNR7c77HtSLRMVu?t=naLMY -zC&?#i{!Oh83)4}pS$m<$=C!{3|9?5&bEYx)d8GVn4%_hmo4uU>&K^<0DF+f*)3u3k -z^#`!4|Dd^=9o^Jls{_Ng{uc6m<*>ohwjuNW%Zf>REML~W)SkWd)uG1{w@=B56`hpX -z=soLD+sCFC-mjkBORYS*P~?WNU|reW{WGOmj{KZZ+i`!NgD?VpEk0;78Bg9D=leV7_s?gb^(h$y5Cr at hFaQAjbpQap -zKl{HC2LL=h(foZ-7=Q)V|05cs%R1**+{WBU8dQMS4AA#29TJ4x at yvSk$b%6Ev -zg_0oW_P3U|SMMbkU?Szv;4;DBXu7p38((ZmZ7*R3m8DH;BBF4CfuRVyG~UH4y}nmKC!(icLqY_y>n4YNyD>Bb>uE#^W3xZb -z3{gz+TZmy)RacQaLw|p2@@@Q+8_D}#mCORK;!+nhfu)JJZAPrQAQIiGuS?~y_bPYi -zv6iFd4oj1rns%VG$}EA%Vrwsp=+MZFMJ$c$md-p1{OlC6EuZ%4oYBZMvz3fBAIkH)R9^I6n88dj!__CRinNmQ{Vy*9E`XIS?pfQ7 -zi48gV`<^rezR at aDp}}X~A at ns+^kvftyPL|Fm`&-|`uB$*(Hv>U^A8m9!Zoq=LN9^o -zhhr(r)1OCkXzCt+beDvsyd#xJ_Jmiw=-z?Ofv*eQrW3paTO0jYnKzRkp%E7;KX2^{ -z64t90 at 0`gHU$swzOcy)^CG?OsUyr`&S!(L*aLmq1Lc=@JXtxJpc^gv&s=V)Q2OI{ba09p!}7((6CID_xF17ErNv3EW*4d -zR5qrG8uszkX7YpDo;B06tt-9z4L@`mwZgCrlC8W|U5xF at wig}FMW<-T%Ho};E@~3l83!ITzl}bq-Po7) -zLZLNx<%F%M6vXU1{kNm{-=|GnD-Vo3u-UGiRO!C=WJXK`&Q at -crnnpS{O-6{025?j -z6MZHx(Sw+p`u&jlapg*l4Fr9QW4Z$!j;{;Yrh_Qfw8gUbC49O1se9F!eW!3T-SA2p -zlTur2OAOgy~;+KSUc($1x7k`@yR^e?=bO@;Mr% -z{Hl3X-#!TMEF@^uhVfA96&+H%h*FQT?z+AMoeN**w at oKZW~@q* -zbtQHu(a*yI!K`u=H!tJ416=tA$>oNBE%1J5K-sdPpLBW;&thQSixu?6xsWYca|o$4 -zr=IsCb=?T23nReevLU{dsgQNf+qK8%i%%hkv?~;FMOBQDhOd*-V=cMiwOm!pw6o ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 (03:6f:72:67:00:00) tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 (6f:6e:02:63:61:00) tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 (03:6f:72:67:00:00) tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 (03:6f:72:67:00:00) tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 (03:6f:72:67:00:00) tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 (6f:6e:02:63:61:00) tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 (03:6f:72:67:00:00) tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 (03:6f:72:67:00:00) tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 (03:6f:72:67:00:00) tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 (03:6f:72:67:00:00) tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548 -diff --git a/tests/QinQpacket.pcap b/tests/QinQpacket.pcap -new file mode 100644 -index 0000000000000000000000000000000000000000..eeabfe4ebab5dc2a3aa11b1423da8c83c6dc058f -GIT binary patch -literal 78264 -zcmeI5dw7)9wZ>-#2zM>lauF0E2?@ayL%DenK`2N~DWX)WA_f#H3P_~32<=fpn}h_Y -z7P&(Z&_oiIfCvE*0hLQaf>=3PD)zCW;-R3T9OVFg_nI$zb~ZD!&OFcl=bTydJcRjX -z$RhKu-&%X`_uJo>_jZ at 94*2T&Y91Fa`h0#I+;_4x^Z4F|z5#fy{#>MoufdqkO>W33 -z^6hPq;PW@|CDg?~rq at cE`C8(i;els?;4|~LqEZ?JEWKO?D=-=E-n_SwP(W<>p*{(pV+fBwn%CvF|z)9>#asCTq?Lw}uw -z)NX+rR~0sC)~k1qYwu4_Pw&%na7K^xK|O}_Yd$dR;py2~!$yqw_0%c%(fb#tLFab7 -z&YzIZdz4s)&K;_ at mwz8vSPa^Dh7GcdbVeK_np(jF^5C$45Kv-UD -zck7f&#B1H;GH2_aD#Xh_+{9VDLx@*zSz~AM4kKRixJJ(6oj|;tE!_HJ-)*Ym7u;%A -zJbaMlUd6WxmAUauD&DC0lhFBnUgxo-^G%k{OSH~)41H^!iq3}4r=atRYY)t?oZdGqZV}A0eHuwRC<$>)g)Jx8|wnZ0Ot>I^PYQ -z86RY!(s_OxQ)jGFi?q%)+M0ih&W6sWF!A*~34|r`ge at k*Xy#z}AnPT57e at 1ef -zV8yRm5;oZ~FE-}I_e1Bt=&aHA-R%1->0Dvy+*0c-XUUk(Ite=eXqvnJG7a%I^Yuad -zc;@f1^43J>P4KhNv at 4b{h{+BzrwkJefCgD^U;hR$iwIl2$BzXi?kmYO;T -z(h|F9oz)xmL;AhZ?`?77=Xfm$>&z3 at nh0B@bP26e6TKa#m{Eui!c=nn5M_VT5)js& -zCyaI+&9inKCAQT)OneX_%tp&Q-Uh-dUS&tg?$pB`Q{QCtutu6NIV&TCc|_TN?EqoD -zzIW#{>_WVpcCoE{>P*d^80k8Z-H2EJth=A at EyP=0dsJ1jc7YxSr{A#QPhcw>v0rKezI> -zK<7<-6{b_4g3dd5owG>iA(qa$T4$MaF*;v>&NFzOA0nN5TRK0gb(Wb2qjQH-rJ1Xs -zGvkBIS31w at XzC0fq)_Xu-mo9i?~Q(MixWS`oj_PRPuMd=7}cw>hVXWnuIgZ15*(6F -z2ou6ULkbA%&l9$c2y3qJF$fFIS>@aWGggEOFW#Q at 1z~S(WJk&ML|DKgY>pl!<*bYl -z7NK;m2Vuv46x(_*7%KezE&3x~W`eu at AOjF@f2BL$;zq>lxX|5xkim#oewVxbAY&2l -zhcea&IY1SE)U0 at aM%Na>ieI at hY_et6V$53ZfzDS>cE|mA#H)i&9esbv{=ZP(-nH^} -zxz3yTAWWy81f93@^>LJRK49tGKlfTzGix0x+yaYPm -z1f8S%AO{*No(rBcbq=H at U8!|eZ`cp%_eQ_B#fhKe6(Fn!PuS%|7|k3)tJI|SnlKre -zm`aWxqU=w)_J7yIXva~3wc{ws+gpn{tBlD)n2nZqya|LI+rW;JNz}vssJ_YQVRdy6 -zlj~xHun2^01z{^LbGIHWN4$#@n>xE+#&*P;@o(;YkR6Ek#dq#}i=Bu!dxyLIAb&-? -z;#au!^nst!I&Yj=@$f;sE8$jl37c%07aQ~9qtN-?gMMe6euQ{m^LZOVdAr at pTb|dc -zyU6Zi?*6vNp>qHuVsyXhz-ZF>7naW6eJfBOGUsAO#P6VU7hdOIlg>9-I%jL1W#+-? -z-1>BBW(hyT%TYQPB$_(I2l4JxB>kShFSb%HJ|AsCSRqf?Tq5jhrIE3Qcve at kTo=Ps -za(vRIK6NJ$wgYn?#>=H0M+Mf7qojG7Fd37Dun0wz4#NJx6ZRbSFyhGQVgI2Cle02H -zSOmg)g0PR9y7NJLsd$^*`5=7|Z{#d at KFD>5_m at HL_Ja&lpLdEoALJIqoBT4n&f7&5 -z|EWr9O~v~&QoJkSR=f~4+2Vs3KFBEO{5h}lJEZf+md**m&I+C7EE&^TM?>c|?cMd4 -zF^E^j=dFtJ_Mf%$*7btUo9w}5 at -`VdKgR2PjC9^>>HJTvv+P7=bS{9-Eub^AhPbG7 -z&VR|&IgpmzTI;OdupiRzjec*76F; -zgRl=?;(Ay`BO+{#MOb6q!^8(+#)`-p`2YS+5eTc~32R4$S-({+>6|7^&dLa35lTf7 -z_GKG)zC|hG`F|W+ylD3a*?@Rk8pgJciWaX7@!H1t^97{~e;v?Uhhw -zd$^SIK`Q#HiZ7U=ezKZb3w)5ry^2o{n{1gE8}s5S=)9iSc_8UL!P5EnT4(V=n9lkh -zbS|G5Tm44656cn6o5$yE80GD5D{sHic at rOm$=h-0Je=2=_T3a%`)*PuXq{!|!RTD? -zE8IsII!E_GDt=2dyj~{HSfzUV|5ix9XMaz6*by-XwE8QvJe)QFYGu1Vegi(qa^J(%C~kLB~R0{5jiU( -zghe2%I|wVOAKN-57%IFka1G);KQ1;OBwD<5#7j?gw;v<}@ru84cU{a+5O3(#*nE&^ -zpLZzYO#;I?L>k -z>8vB5^UQtju0I-yc+c{A+e3N##LC-goi{o6#N;gtI{%8-`7r7Ho~85Owa&5=mC^Ze -z=sX8HGd{>SO6R%drp|%1uJyIf>J9rL{od&Jwm9)~JO_kb#}oD)5%!wWrDjF}!n|wi -zG1AF(F-#@L4^j3f%?DwhyvX*j3q;ti;xB8SjA7ne?z1_~853&>S -zJ}BmVkjgYw@%b~&iuY%vPWLMQ`mo8Cd9g7s-UFRK<#p~wI#087en{&qJ_yrU4?yQx -z at 3`|pRJ`SU-ma&-O|tTKzs{S?xtP3t2%X3CI at 9m1%D>an`3|kK%sd#Ke}K-(&^fvf -zQu!dw at CKSXW0m@t)>*w_KcwFq{oWQQevZ$Buns(7Q;D$tN*BWi at pe8gzg~P0?#@;5 -zLzMkV>waCDdA^A4VUG}Dy)D8X(LJn at 9T&&a!=#4+gBBoc7f;xeL|9jgu!)+mwnA8+ -zo`W-bqz~#bq+j!aSr1Ro&KfpC2m=;fK-gP#-1#7hhTwipmd|6$PKca~7BF2~$tfvujmUZ|HoE*SVNF*9A-G6T!{}o#iYPvySQmoqw3% -z&WG!dcr7sEM86MdDu&@(e5)&29D1gb -z!>b<;ug(BrYk0!wcY)>YvIz6;{e&JS=Msdl2<4Is!am>$J4ZdN%p&X~-NWRnS|Ka~ -zVT(Z6*L~gj49gKOqgQP4qTS!35b>Uh(N~EUZ?*coJ!AX%g3^V*Zf6bR&D`nES9uxn -zHmu{;jR)xtK64AqiuY%98|PI#U0;7m!o>?WoXRrje3I9>3$62JTRM-`I*YHubk#W|eA2NOzOCQN)4A`J3*pXBvoj+xfh0RC&ugqk4^zw>Nd(#8+YRmIa*) -zp)=#F99BB#erW0pU*)*g`I2Uj7o^`C{XU#P@$uTdAZ!s&*!x5n%^Yef8H9N|1~H?M -zk&db4_ at F7=r+ff}-OLmAHzKTBMKB0Es(YA>@j_TQyztsg5O(1?c9c9xgzZ#848kfj -zVdAR at VG52gk3}GC<3)G#=f#Nk6kD=%Dl7Ibv8=pEuXpbuL==wEIMKI>p!ZRQ{EO at c^lz%!ZC86RPL(jBIw+d -z*O~T99qL$G0`j-eQ -z^G;*lsdPTtqp`DnGVKsA`<%OV;}wXP#&a-_IH3M%_+f8r4rKQ+(^)%1=M-M&g`{(H -ztKQzwI?EnhM&}IZT)B$vYqaks&)RpB_KMb7&X_Pd_kzy58oS$%d5f1f#s}H0>Lcfb -zSs(C0-q(4%WH7=DG9DS at Q8@jo(hOl>tu;WUTnvo8Ky{ie6k&fvM at j+9# -zPk9#zyN at UAAQ5)VBJ6-BOvZR2EF4~V?LiRsC{Nf&L|BzY*fvd=+`mK!i$K^@Agsmh -z?tF{6hh(%3WvWZII5JoP}aKm(qE7jP(|*hVa*AJ&kxJTip4Mix96D&p|`t -zV5P-DKh1%hD`GfU1D%uCyYmTOK)eepxV~H6mhv{w%3GSwoA at eB-pZhJlhN*cmA4V^ -zE95Qus<*li%@}`U<}HxcZKTdyutn7VD&wUwUe=Z-o{si`urGMR{+$TRR?38Ym2SV# -zgvrRxbcT3hs`h8C24VAg!fqtOXl`#1=Iu#c at _h#k-x)+bqgkH!E+i>b%M9hUpBAp>vy4vH672^41jb@;AHlEt(>pd)n7D0b&tbV9rz^LcxQ@_O*|b924UxU!Zs6OXO%KFodJaH -z)P%`?5T-N46H~Q6>&+nSNuIFRiLlcaVOup}jcZ4xBk5t%!vMmaAZ#d4SS1nmu_DLl -zVa1v-*$*N;Ou-T6 at dpsreJSf(&>d)U%2j|G!u%Q6^z;au6(+Fk%dK_4j3=P;WM1bp -zs*-ayS~_2=b(Yx(Q^`+4=d<6s^M{^7ysJ*S^DS}^Z~Z2BzC|wL74lr2Bd$s;u2MBu -zG6!L}%7f0GXSuu1D1Mxu^4vL`jf8XlP2YC(g -zjxXVSkV7dn!<%E~Es&NrQ0Gm(VLxOIA!`UQQ4YeYc*4?%u*VfdH8VUA)?X7QXE>P7 -zV3%L~9KQ*|UgZhvL4-YO5!PE1Cg)Csun0wS2!!qA2^&O&O|l3})`ZFIMhJ^Q*uMbI -CiISfH - -literal 0 -HcmV?d00001 - -diff --git a/tests/QinQpacketv.out b/tests/QinQpacketv.out -new file mode 100644 -index 0000000..03ed7cf ---- /dev/null -+++ b/tests/QinQpacketv.out -@@ -0,0 +1,1977 @@ -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51417, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x9696a090, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51427, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x9696a090, secs 4, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51435, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x9696a090, secs 12, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51451, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x9696a090, secs 28, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51482, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x9696a090, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51486, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x9696a090, secs 4, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51493, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x9696a090, secs 11, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51509, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x9696a090, secs 27, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51540, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x9696a015, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51551, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x9696a015, secs 3, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51558, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x9696a015, secs 10, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51574, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x9696a015, secs 26, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51605, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x9696a015, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51608, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x9696a015, secs 3, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51616, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x9696a015, secs 11, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51632, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x9696a015, secs 27, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51664, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x96969f99, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51675, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x96969f99, secs 4, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51683, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x96969f99, secs 12, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51699, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x96969f99, secs 28, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51731, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x96969f99, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51734, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x96969f99, secs 3, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51742, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x96969f99, secs 11, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51757, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x96969f99, secs 26, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 (03:6f:72:67:00:00) tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51788, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x96969f1d, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 (6f:6e:02:63:61:00) tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51802, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x96969f1d, secs 4, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51809, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x96969f1d, secs 11, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 344: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51824, offset 0, flags [DF], proto UDP (17), length 326) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 298, xid 0x96969f1d, secs 26, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51855, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x96969f1d, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51859, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x96969f1d, secs 4, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51867, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x96969f1d, secs 12, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 594: vlan 200, p 0, ethertype IPv4, (tos 0x0, ttl 32, id 51883, offset 0, flags [DF], proto UDP (17), length 576) -+ 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from 00:08:5d:23:0c:3f, length 548, xid 0x96969f1d, secs 28, Flags [none] -+ Client-Ethernet-Address 00:08:5d:23:0c:3f -+ Vendor-rfc1048 Extensions -+ Magic Cookie 0x63825363 -+ DHCP-Message Option 53, length 1: Discover -+ MSZ Option 57, length 2: 1500 -+ Parameter-Request Option 55, length 9: -+ Subnet-Mask, Default-Gateway, Domain-Name-Server, NTP -+ Vendor-Option, Time-Zone, TFTP, Option 159 -+ Option 160 -+ Hostname Option 12, length 17: "6731i00085D230C3F" -+ Vendor-Class Option 60, length 18: "AastraIPPhone6731i" -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 -+00:08:5d:23:0c:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 172.17.0.2 tell 172.17.0.20, length 46 @@ 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 Sun Feb 26 23:02:29 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 26 Feb 2012 22:02:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[17218] csw/mgar/pkg/tcpdump/trunk/Makefile Message-ID: Revision: 17218 http://gar.svn.sourceforge.net/gar/?rev=17218&view=rev Author: dmichelsen Date: 2012-02-26 22:02:28 +0000 (Sun, 26 Feb 2012) Log Message: ----------- tcpdump/trunk: Fix patch name Modified Paths: -------------- csw/mgar/pkg/tcpdump/trunk/Makefile Modified: csw/mgar/pkg/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile 2012-02-26 21:51:52 UTC (rev 17217) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2012-02-26 22:02:28 UTC (rev 17218) @@ -12,7 +12,7 @@ # Use patch until this is fixed: # https://sourceforge.net/tracker/?func=detail&aid=3494835&group_id=53066&atid=469573 -PATCHFILES += Use-expr-instead-of-bashism.patch +PATCHFILES += 0001-Use-expr-instead-of-bashism.patch VENDOR_URL = http://www.tcpdump.org/ 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 Feb 27 00:04:37 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 26 Feb 2012 23:04:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17219] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17219 http://gar.svn.sourceforge.net/gar/?rev=17219&view=rev Author: bdwalton Date: 2012-02-26 23:04:37 +0000 (Sun, 26 Feb 2012) Log Message: ----------- ruby19/trunk: add ri and dev meta packages Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-26 22:02:28 UTC (rev 17218) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-26 23:04:37 UTC (rev 17219) @@ -39,7 +39,7 @@ PACKAGES = CSWruby191 CSWruby191-samples CSWruby191-ri PACKAGES += CSWruby191-dev CSWlibruby1-9-1-1 -PACKAGES += CSWruby19 +PACKAGES += CSWruby19 CSWruby19-ri CSWruby19-dev SPKG_DESC_CSWruby191 = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWruby191 += CSWlibruby1-9-1-1 @@ -72,8 +72,18 @@ ARCHALL_CSWruby19 = 1 SPKG_DESC_CSWruby19 = A meta package for ruby 1.9 (v$(VERSION)/api$(API_VERSION)) RUNTIME_DEP_PKGS_CSWruby19 = CSWruby$(API_SHORT) -PKGFILES_CSWruby19 = $(bindir)/.*19 $(mandir).*19.1 +PKGFILES_CSWruby19 = $(foreach RB,erb gem irb rake rdoc ruby testrb,$(bindir)/$(RB)19 $(mandir).*19.1) +ARCHALL_CSWruby19-dev = 1 +SPKG_DESC_CSWruby19-dev = A meta devel package ruby 1.9 (v$(VERSION)/api$(API_VERSION)) +RUNTIME_DEP_PKGS_CSWruby19-dev = CSWruby$(API_SHORT)-dev +PKGFILES_CSWruby19-dev = NOFILES + +ARCHALL_CSWruby19-ri = 1 +SPKG_DESC_CSWruby19-ri = A meta package ruby ri 1.9 (v$(VERSION)/api$(API_VERSION)) +RUNTIME_DEP_PKGS_CSWruby19-dev = CSWruby$(API_SHORT)-ri +PKGFILES_CSWruby19-ri = $(bindir)/ri19 + ARCHALL_CSWruby191-samples = 1 SPKG_DESC_CSWruby191-samples = Example programs for Ruby $(VERSION) PKGFILES_CSWruby191-samples = $(docdir)/$(NAME)/sample.* 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 Feb 27 01:00:56 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 27 Feb 2012 00:00:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[17220] csw/mgar/pkg/boost/branches/boost-gcc Message-ID: Revision: 17220 http://gar.svn.sourceforge.net/gar/?rev=17220&view=rev Author: wahwah Date: 2012-02-27 00:00:56 +0000 (Mon, 27 Feb 2012) Log Message: ----------- boost/branches/boost-gcc: work in progress Modified Paths: -------------- csw/mgar/pkg/boost/branches/boost-gcc/Makefile csw/mgar/pkg/boost/branches/boost-gcc/checksums Added Paths: ----------- csw/mgar/pkg/boost/branches/boost-gcc/files/0001-Don-t-try-to-use-fchmodat.patch Property Changed: ---------------- csw/mgar/pkg/boost/branches/boost-gcc/Makefile Modified: csw/mgar/pkg/boost/branches/boost-gcc/Makefile =================================================================== --- csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-02-26 23:04:37 UTC (rev 17219) +++ csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-02-27 00:00:56 UTC (rev 17220) @@ -1,9 +1,9 @@ # $Id$ NAME = boost -VERSION = 1.45.0 -GARTYPE = v1 +VERSION = 1.49.0 CATEGORIES = lib +GARTYPE = v2 define BLURB Boost was begun by members of the C++ standards committee Library Working @@ -22,12 +22,16 @@ DISTNAME = $(NAME)_$(DISTVERSION) DISTFILES = $(DISTNAME).tar.bz2 -prefix = /opt/csw/boost-gcc +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +# ISA_DEFAULT_sparc-5.10 = sparcv8plus +PATCHFILES += 0001-Don-t-try-to-use-fchmodat.patch + +prefix = /opt/csw/gcc + # 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+)*) GARCOMPILER = GNU TOOLSET = gcc @@ -35,13 +39,13 @@ COMPILER_SUFFIX_CAT = _gcc PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG) -CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG) += boost +CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG) += boost$(COMPILER_SUFFIX_CAT) SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG) = Boost libraries # The boost build system is hard to harness. CHECKPKG_OVERRIDES_CSWboost$(COMPILER_SUFFIX_PKG) += bad-rpath-entry PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG)devel -CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG)devel = boost_devel +CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG)devel = boost$(COMPILER_SUFFIX_CAT)_devel SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG)devel = Boost libraries, development files PKGFILES_CSWboost$(COMPILER_SUFFIX_PKG)devel = $(PKGFILES_DEVEL) @@ -50,19 +54,23 @@ BUILD_DEP_PKGS += CSWstar -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = bjam +CONFIGURE_SCRIPTS = boost +BUILD_SCRIPTS = boost INSTALL_SCRIPTS = bjam BUILD_ARGS += toolset=$(TOOLSET) BUILD_ARGS += --prefix=$(DESTDIR)$(prefix) +BUILD_ARGS += --libdir=$(DESTDIR)$(libdir) BUILD_ARGS += link=shared BUILD_ARGS += cflags="$(CFLAGS)" BUILD_ARGS += cxxflags="$(CXXFLAGS)" BUILD_ARGS += linkflags="$(LDFLAGS) $(LD_OPTIONS)" # Stop on the first error BUILD_ARGS += -q -BUILD_ARGS += include="/opt/csw/boost-gcc/include" +# Display commands as you run them, I want to know what you are doing there +BUILD_ARGS += -d+2 +BUILD_ARGS += include="/opt/csw/gcc/include" +BUILD_ARGS += --debug-building TEST_SCRIPTS = @@ -89,16 +97,17 @@ /opt/csw/bin/star -bz -x -C $(EXTRACTDIR) -f $(DOWNLOADDIR)/$* @$(MAKECOOKIE) -pre-configure-modulated: - ( cd $(WORKSRC)/tools/jam/src && \ - ./build.sh $(TOOLSET) && \ - mkdir -p $(DESTDIR)$(bindir) && \ - cp bin.$(JAMDIR)/bjam $(DESTDIR)$(bindir) ) +configure-boost: + ( cd $(WORKSRC) && \ + ./bootstrap.sh $(TOOLSET)) + # && \ + # mkdir -p $(DESTDIR)$(bindir) && \ + # cp bin.$(JAMDIR)/bjam $(DESTDIR)$(bindir) ) @$(MAKECOOKIE) -build-bjam: +build-boost: cd $(WORKSRC) && \ - $(DESTDIR)$(bindir)/bjam \ + ./b2 \ -d+2 \ $(BJAM_PARALLELMFLAGS) \ $(BUILD_ARGS) @@ -106,8 +115,7 @@ install-bjam: cd $(WORKSRC) && \ - $(DESTDIR)$(bindir)/bjam \ - -d+2 \ + ./b2 \ $(BJAM_PARALLELMFLAGS) \ $(BUILD_ARGS) \ install Property changes on: csw/mgar/pkg/boost/branches/boost-gcc/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/boost/branches/boost-gcc/checksums =================================================================== --- csw/mgar/pkg/boost/branches/boost-gcc/checksums 2012-02-26 23:04:37 UTC (rev 17219) +++ csw/mgar/pkg/boost/branches/boost-gcc/checksums 2012-02-27 00:00:56 UTC (rev 17220) @@ -1 +1 @@ -f02578f5218f217a9f20e9c30e119c6a boost_1_44_0.tar.bz2 +0d202cb811f934282dea64856a175698 boost_1_49_0.tar.bz2 Added: csw/mgar/pkg/boost/branches/boost-gcc/files/0001-Don-t-try-to-use-fchmodat.patch =================================================================== --- csw/mgar/pkg/boost/branches/boost-gcc/files/0001-Don-t-try-to-use-fchmodat.patch (rev 0) +++ csw/mgar/pkg/boost/branches/boost-gcc/files/0001-Don-t-try-to-use-fchmodat.patch 2012-02-27 00:00:56 UTC (rev 17220) @@ -0,0 +1,25 @@ +From 41a096b2d285342872396ab98594a0cadba310e5 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 27 Feb 2012 00:49:24 +0100 +Subject: [PATCH] Don't try to use fchmodat + +--- + libs/filesystem/v3/src/operations.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libs/filesystem/v3/src/operations.cpp b/libs/filesystem/v3/src/operations.cpp +index 226f107..116029b 100644 +--- a/libs/filesystem/v3/src/operations.cpp ++++ b/libs/filesystem/v3/src/operations.cpp +@@ -1387,7 +1387,7 @@ namespace detail + + // Mac OS X Lion and some other platforms don't support fchmodat() + # if defined(AT_FDCWD) && defined(AT_SYMLINK_NOFOLLOW) \ +- && (!defined(__SUNPRO_CC) || __SUNPRO_CC > 0x5100) ++ && (!defined(__SUNPRO_CC) || __SUNPRO_CC > 0x5100) && 0 + if (::fchmodat(AT_FDCWD, p.c_str(), mode_cast(prms), + !(prms & symlink_perms) ? 0 : AT_SYMLINK_NOFOLLOW)) + # else // fallback if fchmodat() not supported +-- +1.7.9 + 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 Feb 27 02:16:21 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 27 Feb 2012 01:16:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17221] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17221 http://gar.svn.sourceforge.net/gar/?rev=17221&view=rev Author: bdwalton Date: 2012-02-27 01:16:20 +0000 (Mon, 27 Feb 2012) Log Message: ----------- ruby19/trunk: override archall dev pkg for meta-dev split; fix runtime dep on meta-ri Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-27 00:00:56 UTC (rev 17220) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-27 01:16:20 UTC (rev 17221) @@ -78,10 +78,11 @@ SPKG_DESC_CSWruby19-dev = A meta devel package ruby 1.9 (v$(VERSION)/api$(API_VERSION)) RUNTIME_DEP_PKGS_CSWruby19-dev = CSWruby$(API_SHORT)-dev PKGFILES_CSWruby19-dev = NOFILES +CHECKPKG_OVERRIDES_CSWruby19-dev += archall-devel-package ARCHALL_CSWruby19-ri = 1 SPKG_DESC_CSWruby19-ri = A meta package ruby ri 1.9 (v$(VERSION)/api$(API_VERSION)) -RUNTIME_DEP_PKGS_CSWruby19-dev = CSWruby$(API_SHORT)-ri +RUNTIME_DEP_PKGS_CSWruby19-ri = CSWruby$(API_SHORT)-ri PKGFILES_CSWruby19-ri = $(bindir)/ri19 ARCHALL_CSWruby191-samples = 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 Feb 27 02:43:05 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 27 Feb 2012 01:43:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[17222] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17222 http://gar.svn.sourceforge.net/gar/?rev=17222&view=rev Author: bdwalton Date: 2012-02-27 01:43:04 +0000 (Mon, 27 Feb 2012) Log Message: ----------- ruby19/trunk: clean out a few unused checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-27 01:16:20 UTC (rev 17221) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-27 01:43:04 UTC (rev 17222) @@ -43,7 +43,6 @@ SPKG_DESC_CSWruby191 = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWruby191 += CSWlibruby1-9-1-1 -CHECKPKG_OVERRIDES_CSWruby191 += missing-dependency|CSWruby SPKG_DESC_CSWlibruby1-9-1-1 = The libruby shared object files (Ruby $(VERSION), API $(API_VERSION)) RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 @@ -92,7 +91,6 @@ CHECKPKG_OVERRIDES_CSWruby191-samples += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWruby191-samples += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWruby191-samples += file-with-bad-content -CHECKPKG_OVERRIDES_CSWruby191-samples += surplus-dependency|CSWruby191 ARCHALL_CSWruby191-ri = 1 SPKG_DESC_CSWruby191-ri = Ruby $(VERSION) Interactive Reference 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 Feb 27 02:44:05 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 27 Feb 2012 01:44:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[17223] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 17223 http://gar.svn.sourceforge.net/gar/?rev=17223&view=rev Author: bdwalton Date: 2012-02-27 01:44:04 +0000 (Mon, 27 Feb 2012) Log Message: ----------- ruby19/trunk: override surplus dep of meta-dev on dev Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-27 01:43:04 UTC (rev 17222) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-02-27 01:44:04 UTC (rev 17223) @@ -78,6 +78,7 @@ RUNTIME_DEP_PKGS_CSWruby19-dev = CSWruby$(API_SHORT)-dev PKGFILES_CSWruby19-dev = NOFILES CHECKPKG_OVERRIDES_CSWruby19-dev += archall-devel-package +CHECKPKG_OVERRIDES_CSWruby19-dev += surplus-dependency|CSWruby191-dev ARCHALL_CSWruby19-ri = 1 SPKG_DESC_CSWruby19-ri = A meta package ruby ri 1.9 (v$(VERSION)/api$(API_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 Mon Feb 27 04:33:50 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 27 Feb 2012 03:33:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[17224] csw/mgar/pkg/git/trunk Message-ID: Revision: 17224 http://gar.svn.sourceforge.net/gar/?rev=17224&view=rev Author: bdwalton Date: 2012-02-27 03:33:50 +0000 (Mon, 27 Feb 2012) Log Message: ----------- git/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-02-27 01:44:04 UTC (rev 17223) +++ csw/mgar/pkg/git/trunk/Makefile 2012-02-27 03:33:50 UTC (rev 17224) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.9 +VERSION = 1.7.9.2 #PATCHLEVEL = rc1 CATEGORIES = devel GARTYPE = v2 Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2012-02-27 01:44:04 UTC (rev 17223) +++ csw/mgar/pkg/git/trunk/checksums 2012-02-27 03:33:50 UTC (rev 17224) @@ -1 +1 @@ -d94314eb49622a945b22595b36b7fc47 git-1.7.9.tar.gz +f2f0fc821ab074862c4a96de3f4cefbe git-1.7.9.2.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 Feb 27 10:49:27 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 Feb 2012 09:49:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[17225] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 17225 http://gar.svn.sourceforge.net/gar/?rev=17225&view=rev Author: dmichelsen Date: 2012-02-27 09:49:26 +0000 (Mon, 27 Feb 2012) Log Message: ----------- doxygen/trunk: Update to 1.8.0 Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/doxygen/trunk/checksums Added Paths: ----------- csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2012-02-27 03:33:50 UTC (rev 17224) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2012-02-27 09:49:26 UTC (rev 17225) @@ -1,5 +1,5 @@ NAME = doxygen -VERSION = 1.7.6.1 +VERSION = 1.8.0 CATEGORIES = utils GARTYPE = v2 @@ -12,15 +12,15 @@ MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/ DISTFILES = $(DISTNAME).src.tar.gz +# Use patch until this is fixed: +# https://bugzilla.gnome.org/show_bug.cgi?id=670853 +PATCHFILES += 0001-Cannot-cast-0-to-QCString.patch + PACKAGES += CSWdoxygen CATALOGNAME_CSWdoxygen = doxygen SPKG_DESC_CSWdoxygen = A documentation system for programming languages # PKGFILES is catchall -# That is from the BibTeX-style: -# %%% Modification of BibTeX style file /usr/local/texlive/2008/texmf-dist/bibtex/bst/base/plain.bst -CHECKPKG_OVERRIDES_CSWdoxygen += file-with-bad-content|/usr/local|root/opt/csw/bin/doxygen - PACKAGES += CSWdoxygen-doc CATALOGNAME_CSWdoxygen-doc = doxygen_doc SPKG_DESC_CSWdoxygen-doc = Documentation for doxygen Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2012-02-27 03:33:50 UTC (rev 17224) +++ csw/mgar/pkg/doxygen/trunk/checksums 2012-02-27 09:49:26 UTC (rev 17225) @@ -1 +1 @@ -084f1db244b77b3abff335550ef8eec5 doxygen-1.7.6.1.src.tar.gz +5ff66c50ca9288d9a3d695a031f6950c doxygen-1.8.0.src.tar.gz Added: csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch =================================================================== --- csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch (rev 0) +++ csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch 2012-02-27 09:49:26 UTC (rev 17225) @@ -0,0 +1,26 @@ +From 8de9063649a747a8d0570043970ca1736b7e5007 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 26 Feb 2012 23:04:01 +0100 +Subject: [PATCH] Cannot cast 0 to QCString + +--- + src/htmldocvisitor.cpp | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp +index 14be9d7..7d604f3 100644 +--- a/src/htmldocvisitor.cpp ++++ b/src/htmldocvisitor.cpp +@@ -1376,7 +1376,8 @@ void HtmlDocVisitor::visitPre(DocRef *ref) + { + // when ref->isSubPage()==TRUE we use ref->file() for HTML and + // ref->anchor() for LaTeX/RTF +- startLink(ref->ref(),ref->file(),ref->relPath(),ref->isSubPage() ? 0 : ref->anchor()); ++ QCString empty = ""; ++ startLink(ref->ref(),ref->file(),ref->relPath(),ref->isSubPage() ? empty : ref->anchor()); + } + if (!ref->hasLinkText()) filter(ref->targetTitle()); + } +-- +1.7.9 + 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 Feb 27 11:38:41 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 Feb 2012 10:38:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17226] csw/mgar/pkg/doxygen/trunk/Makefile Message-ID: Revision: 17226 http://gar.svn.sourceforge.net/gar/?rev=17226&view=rev Author: dmichelsen Date: 2012-02-27 10:38:40 +0000 (Mon, 27 Feb 2012) Log Message: ----------- doxygen/trunk: Fix obsoleted catalog name Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2012-02-27 09:49:26 UTC (rev 17225) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2012-02-27 10:38:40 UTC (rev 17226) @@ -30,6 +30,7 @@ # for these tiny examples seems overkill. CHECKPKG_OVERRIDES_CSWdoxygen-doc = missing-dependency|CSWpython OBSOLETED_BY_CSWdoxygen-doc = CSWdoxygendoc +CATALOGNAME_CSWdoxygendoc = doxygen_doc_stub # These are pure examples CHECKPKG_OVERRIDES_CSWdoxygen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/doxygen/html/config.html CHECKPKG_OVERRIDES_CSWdoxygen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/doxygen/html/install.html 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 Feb 27 14:21:06 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 Feb 2012 13:21:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17227] csw/mgar/gar/v2/bin/pcopy Message-ID: Revision: 17227 http://gar.svn.sourceforge.net/gar/?rev=17227&view=rev Author: dmichelsen Date: 2012-02-27 13:21:05 +0000 (Mon, 27 Feb 2012) Log Message: ----------- mGAR v2: Keep symlinks to directories during merge Modified Paths: -------------- csw/mgar/gar/v2/bin/pcopy Modified: csw/mgar/gar/v2/bin/pcopy =================================================================== --- csw/mgar/gar/v2/bin/pcopy 2012-02-27 10:38:40 UTC (rev 17226) +++ csw/mgar/gar/v2/bin/pcopy 2012-02-27 13:21:05 UTC (rev 17227) @@ -130,7 +130,7 @@ } } } - if( -d $whole ) { + if( -d $whole && ! -l $whole ) { make_path( $todir . '/' . $target ); return; } @@ -147,6 +147,7 @@ } elsif( -e $linktarget ) { print "Could not link to $linktarget as there is some file already there\n"; } else { +print "symlink\n"; symlink( $link, $todir . '/' . $target ) or print "Could not link to $todir/$target\n"; } } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Feb 27 15:03:57 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 27 Feb 2012 14:03:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17228] csw/mgar/pkg/tomcat6/trunk Message-ID: Revision: 17228 http://gar.svn.sourceforge.net/gar/?rev=17228&view=rev Author: janholzh Date: 2012-02-27 14:03:57 +0000 (Mon, 27 Feb 2012) Log Message: ----------- tomcat6: Update to 6.0.35, fix some problems Modified Paths: -------------- csw/mgar/pkg/tomcat6/trunk/Makefile csw/mgar/pkg/tomcat6/trunk/checksums Modified: csw/mgar/pkg/tomcat6/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat6/trunk/Makefile 2012-02-27 13:21:05 UTC (rev 17227) +++ csw/mgar/pkg/tomcat6/trunk/Makefile 2012-02-27 14:03:57 UTC (rev 17228) @@ -1,5 +1,5 @@ NAME = tomcat6 -VERSION = 6.0.32 +VERSION = 6.0.35 CATEGORIES = server GARTYPE = v2 @@ -35,6 +35,8 @@ USERGROUP = /etc/opt/csw/pkg/$(NAME)/cswusergroup PRESERVECONF = /etc/opt/csw/$(NAME)/conf/.* +CLASSES=none cswusergroup cswpreserveconf + PROTOTYPE_MODIFIERS = varuser etcperm PROTOTYPE_FILES_varuser = /var/opt/csw/$(NAME)/.* PROTOTYPE_USER_varuser = tomcat @@ -94,10 +96,10 @@ ( mv $(DESTDIR)/opt/csw/share/$(NAME)/work $(DESTDIR)/var/opt/csw/$(NAME) ) ( mv $(DESTDIR)/opt/csw/share/$(NAME)/temp $(DESTDIR)/var/opt/csw/$(NAME) ) ( rm $(DESTDIR)/var/opt/csw/tomcat6/temp/safeToDelete.tmp ) - ( ln -s /etc/opt/csw/$(NAME)/conf $(DESTDIR)/opt/csw/share/$(NAME)/conf ) - ( ln -s /var/opt/csw/$(NAME)/logs $(DESTDIR)/opt/csw/share/$(NAME)/logs ) - ( ln -s /var/opt/csw/$(NAME)/work $(DESTDIR)/opt/csw/share/$(NAME)/work ) - ( ln -s /var/opt/csw/$(NAME)/temp $(DESTDIR)/opt/csw/share/$(NAME)/temp ) + ( ln -s ../../../../etc/opt/csw/$(NAME)/conf $(DESTDIR)/opt/csw/share/$(NAME)/conf ) + ( ln -s ../../../../var/opt/csw/$(NAME)/logs $(DESTDIR)/opt/csw/share/$(NAME)/logs ) + ( ln -s ../../../../var/opt/csw/$(NAME)/work $(DESTDIR)/opt/csw/share/$(NAME)/work ) + ( ln -s ../../../../var/opt/csw/$(NAME)/temp $(DESTDIR)/opt/csw/share/$(NAME)/temp ) ( ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(NAME) ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/tomcat6/trunk/checksums =================================================================== --- csw/mgar/pkg/tomcat6/trunk/checksums 2012-02-27 13:21:05 UTC (rev 17227) +++ csw/mgar/pkg/tomcat6/trunk/checksums 2012-02-27 14:03:57 UTC (rev 17228) @@ -1 +1 @@ -928a960268adf610a7d6fe5c4fcd0b20 apache-tomcat-6.0.32.tar.gz +171d255cd60894b29a41684ce0ff93a8 apache-tomcat-6.0.35.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 Mon Feb 27 15:41:51 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 27 Feb 2012 14:41:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17229] csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/ trunk/Makefile Message-ID: Revision: 17229 http://gar.svn.sourceforge.net/gar/?rev=17229&view=rev Author: idogan23 Date: 2012-02-27 14:41:51 +0000 (Mon, 27 Feb 2012) Log Message: ----------- Email-MIME-Attachment-Stripper: fixed package name Modified Paths: -------------- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile 2012-02-27 14:03:57 UTC (rev 17228) +++ csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile 2012-02-27 14:41:51 UTC (rev 17229) @@ -4,12 +4,12 @@ CATEGORIES = cpan AUTHOR = RJBS -DESCRIPTION = strip the attachments from an email +DESCRIPTION = Strip the attachments from an email. define BLURB - strip the attachments from an email + Strip the attachments from an email endef -PACKAGES = CSWpm-email-mime-attachment-stripper +PACKAGES = CSWpmemailmimeattachmentstripper CATALOGNAME = pm_email_mime-attachment_stripper ARCHALL = 1 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 Feb 27 16:05:29 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 27 Feb 2012 15:05:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[17230] csw/mgar/pkg/cpan Message-ID: Revision: 17230 http://gar.svn.sourceforge.net/gar/?rev=17230&view=rev Author: bonivart Date: 2012-02-27 15:05:29 +0000 (Mon, 27 Feb 2012) Log Message: ----------- cpan/Proc-PID-File/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Proc-PID-File/ csw/mgar/pkg/cpan/Proc-PID-File/Makefile csw/mgar/pkg/cpan/Proc-PID-File/branches/ csw/mgar/pkg/cpan/Proc-PID-File/tags/ csw/mgar/pkg/cpan/Proc-PID-File/trunk/ csw/mgar/pkg/cpan/Proc-PID-File/trunk/Makefile csw/mgar/pkg/cpan/Proc-PID-File/trunk/checksums csw/mgar/pkg/cpan/Proc-PID-File/trunk/files/ Added: csw/mgar/pkg/cpan/Proc-PID-File/Makefile =================================================================== --- csw/mgar/pkg/cpan/Proc-PID-File/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Proc-PID-File/Makefile 2012-02-27 15:05:29 UTC (rev 17230) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/cpan/Proc-PID-File/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Proc-PID-File/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Proc-PID-File/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Proc-PID-File/trunk/Makefile 2012-02-27 15:05:29 UTC (rev 17230) @@ -0,0 +1,17 @@ +NAME = Proc-PID-File +VERSION = 1.27 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = ECALDER + +DESCRIPTION = Module to manage process id files +define BLURB + Module to manage process id files +endef + +PACKAGES = CSWpm-proc-pid-files +CATALOGNAME = pm_proc_pid_files +ARCHALL = 1 +LICENSE = LICENSE + +include gar/category.mk Property changes on: csw/mgar/pkg/cpan/Proc-PID-File/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cpan/Proc-PID-File/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Proc-PID-File/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Proc-PID-File/trunk/checksums 2012-02-27 15:05:29 UTC (rev 17230) @@ -0,0 +1 @@ +3fcb07f914f863f9a0967b35af562f9f Proc-PID-File-1.27.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Feb 27 16:17:14 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 27 Feb 2012 15:17:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17231] csw/mgar/pkg/389-ds-base/trunk Message-ID: Revision: 17231 http://gar.svn.sourceforge.net/gar/?rev=17231&view=rev Author: cgrzemba Date: 2012-02-27 15:17:14 +0000 (Mon, 27 Feb 2012) Log Message: ----------- 389-ds-base/trunk: bump version 1.2.10.2 Modified Paths: -------------- csw/mgar/pkg/389-ds-base/trunk/Makefile csw/mgar/pkg/389-ds-base/trunk/checksums Added Paths: ----------- csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-initconfig.in.patch csw/mgar/pkg/389-ds-base/trunk/files/0006-add-i386-platform-in-configure.ac.patch csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-plugin_syntax.c.patch Removed Paths: ------------- csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-02-27 15:05:29 UTC (rev 17230) +++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-02-27 15:17:14 UTC (rev 17231) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = 389-ds-base -VERSION = 1.2.9.9 +VERSION = 1.2.10.2 GARTYPE = v2 CATEGORIES = server @@ -23,10 +23,12 @@ PATCHFILES += 0005-add-standard-path.patch PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch -PATCHFILES += 0003-add-user-and-var-run-dirsrv.patch +PATCHFILES += 0005-smf-autoenable-no.patch +PATCHFILES += 0005-add-var-run-create-initconfig.in.patch # until Red Hat Bugzilla Bug 773617 is open do it yourself -PATCHFILES += 0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch -PATCHFILES += 0005-smf-autoenable-no.patch +PATCHFILES += 0006-add-i386-platform-in-configure.ac.patch +PATCHFILES += 0007-fixup-Makefile.am.patch +PATCHFILES += 0007-fixup-plugin_syntax.c.patch INITSMF = /etc/opt/csw/init.d/dirsrv RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssldap60 @@ -39,7 +41,6 @@ RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap60 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWnetsnmp RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplds4 -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibpcre0 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnss3 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplc4 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicudata48 @@ -54,6 +55,7 @@ RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibfreebl3 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnssdbm3 +RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibpcre1 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm Modified: csw/mgar/pkg/389-ds-base/trunk/checksums =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/checksums 2012-02-27 15:05:29 UTC (rev 17230) +++ csw/mgar/pkg/389-ds-base/trunk/checksums 2012-02-27 15:17:14 UTC (rev 17231) @@ -1 +1 @@ -85ca908b219b6b7689bcf411b800e2e2 389-ds-base-1.2.9.9.tar.bz2 +35b326f94ea122eba0b4d52d515ee628 389-ds-base-1.2.10.2.tar.bz2 Deleted: csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch 2012-02-27 15:05:29 UTC (rev 17230) +++ csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch 2012-02-27 15:17:14 UTC (rev 17231) @@ -1,64 +0,0 @@ -From 2a0b4df7c481f2f072d432e02389893516ed6007 Mon Sep 17 00:00:00 2001 -From: Carsten Grzemba -Date: Tue, 10 Jan 2012 15:52:22 +0100 -Subject: [PATCH] add user and var run dirsrv - ---- - ldap/admin/src/initconfig.in | 20 ++++++++++++++++---- - 1 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/ldap/admin/src/initconfig.in b/ldap/admin/src/initconfig.in -index 7f9dd8f..f024586 100644 ---- a/ldap/admin/src/initconfig.in -+++ b/ldap/admin/src/initconfig.in -@@ -1,9 +1,9 @@ --# This file is sourced by @package_name@ upon startup to set -+# This file is sourced by dirsrv upon startup to set - # the default environment for all directory server instances. - # To set instance specific defaults, use the file in the same --# directory called @package_name at -instance where "instance" -+# directory called dirsrv-instance where "instance" - # is the name of your directory server instance e.g. --# @package_name at -localhost for the slapd-localhost instance. -+# dirsrv-localhost for the slapd-localhost instance. - - # In order to make more file descriptors available - # to the directory server, first make sure the system -@@ -26,13 +26,15 @@ - # server needs to know where to find its keytab - # file - uncomment the following line and set - # the path and filename appropriately --# KRB5_KTNAME=@instconfigdir@/myname.keytab ; export KRB5_KTNAME -+# KRB5_KTNAME=/etc/opt/csw/dirsrv/myname.keytab ; export KRB5_KTNAME - - # other environment settings can be added here too - OS=`uname -s` - # use the new mt slab memory allocator on Solaris - # this requires Solaris 9 update 3 or later - if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then -+# UMEM_DEBUG=default -+# UMEM_LOGGING=transaction - LD_PRELOAD=/usr/lib/libumem.so - export LD_PRELOAD - fi -@@ -41,6 +43,17 @@ if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then - export LD_PRELOAD_64 - fi - -+USER=`/usr/xpg4/bin/id -u -n` -+export USER -+[ ! -d /var/opt/csw/run/dirsrv ] && mkdir -p /var/opt/csw/run/dirsrv -+if [ -f /etc/opt/csw/dirsrv/admin-serv/adm.conf ]; then -+ slapd-user=`grep SuiteSpotUserID /etc/opt/csw/dirsrv/admin-serv/adm.conf | cut -d: -f2 | tr -d [:space:]` -+ slapd-group=`grep SuiteSpotGroup /etc/opt/csw/dirsrv/admin-serv/adm.conf | cut -d: -f2 | tr -d [:space:]` -+ chown $slapd-user:$slapd-group /var/opt/csw/run/dirsrv -+fi -+chmod g+w /var/opt/csw/run/dirsrv -+chmod +rx /var/opt/csw/run -+ - # how many seconds to wait for the startpid file to show - # up before we assume there is a problem and fail to start - #STARTPID_TIME=10 ; export STARTPID_TIME --- -1.7.8.2 - Deleted: csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch 2012-02-27 15:05:29 UTC (rev 17230) +++ csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch 2012-02-27 15:17:14 UTC (rev 17231) @@ -1,90 +0,0 @@ -From f4315b6b8516a8bfd9b09d2723b78c90e4581652 Mon Sep 17 00:00:00 2001 -From: Carsten Grzemba -Date: Thu, 12 Jan 2012 12:09:34 +0100 -Subject: [PATCH] add i386 platform to Makefile.am and configure.ac - ---- - Makefile.am | 4 ++-- - configure.ac | 18 ++++++++++++++---- - 2 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 4bf1966..6b01783 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -682,7 +682,7 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \ - $(libavl_a_SOURCES) - - libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @sasl_inc@ @db_inc@ @svrcore_inc@ @kerberos_inc@ @pcre_inc@ --if SOLARIS -+if SPARC - libslapd_la_SOURCES += ldap/servers/slapd/slapi_counter_sunos_sparcv9.S - endif - -@@ -863,7 +863,7 @@ libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \ - ldap/servers/plugins/collation/config.c \ - ldap/servers/plugins/collation/orfilter.c - --libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS) -+libcollation_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@ - libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN) - libcollation_plugin_la_LDFLAGS = -avoid-version - libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version -diff --git a/configure.ac b/configure.ac -index 6d8e277..ad94787 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -460,20 +460,18 @@ case $host in - # HPUX doesn't use /etc for this - initdir=/init.d - ;; -- sparc-sun-solaris*) -+ *-*-solaris*) - AC_DEFINE([XP_UNIX], [1], [UNIX]) - AC_DEFINE([SVR4], [1], [SVR4]) - AC_DEFINE([__svr4], [1], [SVR4]) - AC_DEFINE([__svr4__], [1], [SVR4]) - AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD]) - AC_DEFINE([SOLARIS], [1], [SOLARIS]) -- AC_DEFINE([CPU_sparc], [], [cpu type sparc]) - AC_DEFINE([OS_solaris], [1], [OS SOLARIS]) - AC_DEFINE([sunos5], [1], [SunOS5]) - AC_DEFINE([OSVERSION], [509], [OS version]) - AC_DEFINE([_REENTRANT], [1], [_REENTRANT]) - AC_DEFINE([NO_DOMAINNAME], [1], [no getdomainname]) -- AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter]) - dnl socket nsl and dl are required to link several programs and libdb - LIBSOCKET=-lsocket - AC_SUBST([LIBSOCKET], [$LIBSOCKET]) -@@ -488,8 +486,19 @@ dnl Cstd and Crun are required to link any C++ related code - AC_SUBST([LIBCRUN], [$LIBCRUN]) - platform="solaris" - # assume 64 bit -- perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl' - initdir='$(sysconfdir)/init.d' -+ case $host in -+ i?86-*-solaris2.1[[0-9]]*) -+dnl I dont know why i386 need this explicit -+ AC_DEFINE([HAVE_GETPEERUCRED], [1], [have getpeerucred]) -+ ;; -+ sparc-*-solaris*) -+dnl includes some assembler stuff in counter.o -+ AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter]) -+ AC_DEFINE([CPU_sparc], [], [cpu type sparc]) -+ TARGET='SPARC' -+ ;; -+ esac - ;; - *) - platform="" -@@ -519,6 +528,7 @@ AC_SUBST(initconfigdir) - - AM_CONDITIONAL(HPUX,test "$platform" = "hpux") - AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris") -+AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC) - - # Check for library dependencies - m4_include(m4/nspr.m4) --- -1.7.8.2 - Added: csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-initconfig.in.patch =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-initconfig.in.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-initconfig.in.patch 2012-02-27 15:17:14 UTC (rev 17231) @@ -0,0 +1,40 @@ +From 02d3fc96b22f79ca5562949790b53ce7ae63f019 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Mon, 27 Feb 2012 10:16:15 +0100 +Subject: [PATCH] add var run create initconfig.in + +--- + ldap/admin/src/initconfig.in | 15 ++++++++++++++- + 1 files changed, 14 insertions(+), 1 deletions(-) + +diff --git a/ldap/admin/src/initconfig.in b/ldap/admin/src/initconfig.in +index 134e82c..8a73573 100644 +--- a/ldap/admin/src/initconfig.in ++++ b/ldap/admin/src/initconfig.in +@@ -4,9 +4,22 @@ OS=`uname -s` + # this requires Solaris 9 update 3 or later + if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then + LD_PRELOAD=/usr/lib/libumem.so +- export LD_PRELOAD ++# UMEM_DEBUG=default ++# UMEM_LOGGING=transaction ++ export LD_PRELOAD # UMEM_DEBUG UMEM_LOGGING + fi + if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then + LD_PRELOAD_64=/usr/lib/64/libumem.so + export LD_PRELOAD_64 + fi ++ ++USER=`/usr/xpg4/bin/id -u -n` ++export USER ++[ ! -d @localstatedir@/opt/csw/run/dirsrv ] && mkdir -p @localstatedir@/opt/csw/run/dirsrv ++if [ -f @instconfigdir@/admin-serv/adm.conf ]; then ++ slapduser=`grep SuiteSpotUserID @instconfigdir@/admin-serv/adm.conf | cut -d: -f2 | tr -d ' '` ++ slapdgroup=`grep SuiteSpotGroup @instconfigdir@/admin-serv/adm.conf | cut -d: -f2 | tr -d ' '` ++ chown $slapduser:$slapdgroup @localstatedir@/opt/csw/run/dirsrv ++fi ++chmod g+w @localstatedir@/opt/csw/run/dirsrv ++chmod +rx @localstatedir@/opt/csw/run +-- +1.7.9 + Added: csw/mgar/pkg/389-ds-base/trunk/files/0006-add-i386-platform-in-configure.ac.patch =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0006-add-i386-platform-in-configure.ac.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0006-add-i386-platform-in-configure.ac.patch 2012-02-27 15:17:14 UTC (rev 17231) @@ -0,0 +1,67 @@ +From 84b9164a4de6e6a31fe9b1fb239f09debd71b001 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Mon, 27 Feb 2012 10:26:02 +0100 +Subject: [PATCH] add i386 platform in configure.ac + +--- + configure.ac | 18 ++++++++++++++---- + 1 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f993e37..a773763 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -524,20 +524,18 @@ case $host in + # HPUX doesn't use /etc for this + initdir=/init.d + ;; +- sparc-sun-solaris*) ++ *-*-solaris*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([SVR4], [1], [SVR4]) + AC_DEFINE([__svr4], [1], [SVR4]) + AC_DEFINE([__svr4__], [1], [SVR4]) + AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD]) + AC_DEFINE([SOLARIS], [1], [SOLARIS]) +- AC_DEFINE([CPU_sparc], [], [cpu type sparc]) + AC_DEFINE([OS_solaris], [1], [OS SOLARIS]) + AC_DEFINE([sunos5], [1], [SunOS5]) + AC_DEFINE([OSVERSION], [509], [OS version]) + AC_DEFINE([_REENTRANT], [1], [_REENTRANT]) + AC_DEFINE([NO_DOMAINNAME], [1], [no getdomainname]) +- AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter]) + dnl socket nsl and dl are required to link several programs and libdb + LIBSOCKET=-lsocket + AC_SUBST([LIBSOCKET], [$LIBSOCKET]) +@@ -552,8 +550,19 @@ dnl Cstd and Crun are required to link any C++ related code + AC_SUBST([LIBCRUN], [$LIBCRUN]) + platform="solaris" + # assume 64 bit +- perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl' + initdir='$(sysconfdir)/init.d' ++ case $host in ++ i?86-*-solaris2.1[[0-9]]*) ++dnl I dont know why i386 need this explicit ++ AC_DEFINE([HAVE_GETPEERUCRED], [1], [have getpeerucred]) ++ ;; ++ sparc-*-solaris*) ++dnl includes some assembler stuff in counter.o ++ AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter]) ++ AC_DEFINE([CPU_sparc], [], [cpu type sparc]) ++ TARGET='SPARC' ++ ;; ++ esac + ;; + *) + platform="" +@@ -584,6 +593,7 @@ AC_SUBST(initconfigdir) + + AM_CONDITIONAL([HPUX],[test "$platform" = "hpux"]) + AM_CONDITIONAL([SOLARIS],[test "$platform" = "solaris"]) ++AM_CONDITIONAL(SPARC, [test "$TARGET" = "SPARC"]) + AM_CONDITIONAL([SYSTEMD],[test -n "$with_systemdsystemunitdir" -o -n "$with_systemdsystemconfdir"]) + + # Check for library dependencies +-- +1.7.9 + Added: csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch 2012-02-27 15:17:14 UTC (rev 17231) @@ -0,0 +1,61 @@ +From db06cf05345797aabaaa727e4b8c613c3f6e067e Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Mon, 27 Feb 2012 15:36:21 +0100 +Subject: [PATCH] fixup Makefile.am + +--- + Makefile.am | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index bb761e3..0bd9fb3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -696,7 +696,7 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \ + $(libavl_a_SOURCES) + + libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @sasl_inc@ @db_inc@ @svrcore_inc@ @kerberos_inc@ @pcre_inc@ +-if SOLARIS ++if SPARC + libslapd_la_SOURCES += ldap/servers/slapd/slapi_counter_sunos_sparcv9.S + endif + +@@ -886,7 +886,7 @@ libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \ + ldap/servers/plugins/collation/config.c \ + ldap/servers/plugins/collation/orfilter.c + +-libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS) ++libcollation_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@ + libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN) + libcollation_plugin_la_LDFLAGS = -avoid-version + libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version +@@ -1439,7 +1439,7 @@ fixupcmd = sed \ + -e 's, at systemdsystemconfdir\@,$(systemdsystemconfdir),g' \ + -e 's, at systemdgroupname\@,$(systemdgroupname),g' + else +-fixupcmd = sed \ ++fixupcmd = $(SED) \ + -e 's, at bindir\@,$(bindir),g' \ + -e 's, at sbindir\@,$(sbindir),g' \ + -e 's, at libdir\@,$(libdir),g' \ +@@ -1519,7 +1519,7 @@ endif + if SYSTEMD + $(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile format - see man systemd.exec/' > $@ + else +- $(fixupcmd) $^ | sed -n -e 's/@preamble@//' -e '/^#/{p;d}' -e '/^$$/{p;d}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@ ++ $(fixupcmd) $^ | $(SED) -n -e 's/@preamble@//' -e '/^#/{p;d}' -e '/^$$/{p;d}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@ + $(fixupcmd) $(srcdir)/ldap/admin/src/initconfig.in >> $@ + endif + +@@ -1528,7 +1528,7 @@ endif + if SYSTEMD + $(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile format - see man systemd.exec/' > $@ + else +- $(fixupcmd) $^ | sed -n -e 's/@preamble@//' -e '/^#/{p;d}' -e '/^$$/{p;d}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@ ++ $(fixupcmd) $^ | $(SED) -n -e 's/@preamble@//' -e '/^#/{p;d}' -e '/^$$/{p;d}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@ + endif + + %/$(PACKAGE_NAME).pc: %/dirsrv.pc.in +-- +1.7.9 + Added: csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-plugin_syntax.c.patch =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-plugin_syntax.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-plugin_syntax.c.patch 2012-02-27 15:17:14 UTC (rev 17231) @@ -0,0 +1,23 @@ +From 3686fdb384225d622c118c8302fc20b6f8d0824f Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Mon, 27 Feb 2012 13:01:13 +0100 +Subject: [PATCH] fixup plugin_syntax.c + +--- + ldap/servers/slapd/plugin_syntax.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ldap/servers/slapd/plugin_syntax.c b/ldap/servers/slapd/plugin_syntax.c +index 0438ceb..840fa7a 100644 +--- a/ldap/servers/slapd/plugin_syntax.c ++++ b/ldap/servers/slapd/plugin_syntax.c +@@ -991,5 +991,5 @@ slapi_attr_value_normalize( + char **retval + ) + { +- return slapi_attr_value_normalize_ext(pb, sattr, type, val, trim_spaces, retval, 0); ++ slapi_attr_value_normalize_ext(pb, sattr, type, val, trim_spaces, retval, 0); + } +-- +1.7.9 + 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 Feb 27 16:22:16 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 27 Feb 2012 15:22:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17232] csw/mgar/pkg/cpan Message-ID: Revision: 17232 http://gar.svn.sourceforge.net/gar/?rev=17232&view=rev Author: bonivart Date: 2012-02-27 15:22:16 +0000 (Mon, 27 Feb 2012) Log Message: ----------- cpan/Proc-Daemon/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Proc-Daemon/ csw/mgar/pkg/cpan/Proc-Daemon/Makefile csw/mgar/pkg/cpan/Proc-Daemon/branches/ csw/mgar/pkg/cpan/Proc-Daemon/tags/ csw/mgar/pkg/cpan/Proc-Daemon/trunk/ csw/mgar/pkg/cpan/Proc-Daemon/trunk/Makefile csw/mgar/pkg/cpan/Proc-Daemon/trunk/checksums csw/mgar/pkg/cpan/Proc-Daemon/trunk/files/ csw/mgar/pkg/cpan/Proc-Daemon/trunk/files/COPYING Added: csw/mgar/pkg/cpan/Proc-Daemon/Makefile =================================================================== --- csw/mgar/pkg/cpan/Proc-Daemon/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Proc-Daemon/Makefile 2012-02-27 15:22:16 UTC (rev 17232) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/cpan/Proc-Daemon/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Proc-Daemon/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Proc-Daemon/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Proc-Daemon/trunk/Makefile 2012-02-27 15:22:16 UTC (rev 17232) @@ -0,0 +1,25 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = Proc-Daemon +VERSION = 0.14 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = DETI + +DESCRIPTION = Run Perl program(s) as a daemon process +define BLURB + Run Perl program(s) as a daemon process +endef + +# Weird subdir (proc) makes auto-fetch not work +MASTER_SITES = http://mirrors.kernel.org/cpan/authors/id/D/DE/DETI/Proc/ +DISTFILES = $(NAME)-$(VERSION).tar.gz + +DISTFILES += COPYING + +PACKAGES = CSWpm-proc-daemon +CATALOGNAME = pm_proc_daemon +ARCHALL = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/cpan/Proc-Daemon/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cpan/Proc-Daemon/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Proc-Daemon/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Proc-Daemon/trunk/checksums 2012-02-27 15:22:16 UTC (rev 17232) @@ -0,0 +1 @@ +43eeb25f58b03b472942c06bdb34b7d2 Proc-Daemon-0.14.tar.gz Added: csw/mgar/pkg/cpan/Proc-Daemon/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Proc-Daemon/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Proc-Daemon/trunk/files/COPYING 2012-02-27 15:22:16 UTC (rev 17232) @@ -0,0 +1,16 @@ +COPYRIGHT (C) 1997-2011 + +Earl Hood +earl at earlhood.com +http://www.earlhood.com/ + +and + +Detlef Pilzecker +deti at cpan.org +http://www.secure-sip-server.net/ + +All rights reserved. + +This module is free software. It may be used, redistributed and/or modified +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 janholzh at users.sourceforge.net Mon Feb 27 16:27:13 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 27 Feb 2012 15:27:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17233] csw/mgar/pkg/tomcat5/trunk Message-ID: Revision: 17233 http://gar.svn.sourceforge.net/gar/?rev=17233&view=rev Author: janholzh Date: 2012-02-27 15:27:13 +0000 (Mon, 27 Feb 2012) Log Message: ----------- tomcat5/trunk: update to 5.5.35 fix some problems Modified Paths: -------------- csw/mgar/pkg/tomcat5/trunk/Makefile csw/mgar/pkg/tomcat5/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tomcat5/trunk/files/LICENSE csw/mgar/pkg/tomcat5/trunk/files/cswusergroup Removed Paths: ------------- csw/mgar/pkg/tomcat5/trunk/files/CSWtomcat5.depend csw/mgar/pkg/tomcat5/trunk/files/CSWtomcat5.gspec csw/mgar/pkg/tomcat5/trunk/files/CSWtomcat5.prototype csw/mgar/pkg/tomcat5/trunk/files/checkinstall csw/mgar/pkg/tomcat5/trunk/files/i.smfno csw/mgar/pkg/tomcat5/trunk/files/i.smfyes csw/mgar/pkg/tomcat5/trunk/files/postinstall csw/mgar/pkg/tomcat5/trunk/files/preinstall csw/mgar/pkg/tomcat5/trunk/files/preremove csw/mgar/pkg/tomcat5/trunk/files/prototype csw/mgar/pkg/tomcat5/trunk/files/space csw/mgar/pkg/tomcat5/trunk/files/svc-tomcat5 csw/mgar/pkg/tomcat5/trunk/files/tomcat5 csw/mgar/pkg/tomcat5/trunk/files/tomcat5.xml Modified: csw/mgar/pkg/tomcat5/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat5/trunk/Makefile 2012-02-27 15:22:16 UTC (rev 17232) +++ csw/mgar/pkg/tomcat5/trunk/Makefile 2012-02-27 15:27:13 UTC (rev 17233) @@ -1,29 +1,90 @@ NAME = tomcat5 -VERSION = 5.5.27 -GARTYPE = v1 +VERSION = 5.5.35 CATEGORIES = server +GARTYPE = v2 DESCRIPTION = Apache Jakarta Tomcat 5.5 Servlet/JSP Container define BLURB 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-5/ +VENDOR_URL = http://tomcat.apache.org/ MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-5/v$(VERSION)/bin/ +UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-5/v$(VERSION)/bin/ DISTFILES = apache-tomcat-$(VERSION).tar.gz PKGDIST = apache-tomcat-$(VERSION).tar.gz -DISTFILES += CSWtomcat5.gspec CSWtomcat5.prototype CSWtomcat5.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-tomcat5 tomcat5.xml tomcat5 cswtomcat5 -# DISTFILES += $(call admfiles, CSWtomcat5, depend ) +DISTFILES += cswusergroup +DISTFILES += cswtomcat5 +DISTFILES += LICENSE # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = v(\d+(?:\.\d+)*) +PACKAGES = CSWtomcat5 +CATALOGNAME = tomcat5 +LICENSE = LICENSE +ARCHALL = 1 + CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none TEST_SCRIPTS = none INSTALL_SCRIPTS = tomcat prefix = / +INITSMF = /etc/opt/csw/init.d/csw$(NAME) +USERGROUP = /etc/opt/csw/pkg/$(NAME)/cswusergroup + +#PRESERVECONF = /etc/opt/csw/$(NAME)/conf/.* +PRESERVECONF = /etc/opt/csw/$(NAME)/conf/catalina.policy +PRESERVECONF += /etc/opt/csw/$(NAME)/conf/catalina.properties +PRESERVECONF += /etc/opt/csw/$(NAME)/conf/Catalina/localhost/host-manager.xml +PRESERVECONF += /etc/opt/csw/$(NAME)/conf/Catalina/localhost/manager.xml +PRESERVECONF += /etc/opt/csw/$(NAME)/conf/context.xml +PRESERVECONF += /etc/opt/csw/$(NAME)/conf/logging.properties +PRESERVECONF += /etc/opt/csw/$(NAME)/conf/server-minimal.xml +PRESERVECONF += /etc/opt/csw/$(NAME)/conf/server.xml +PRESERVECONF += /etc/opt/csw/$(NAME)/conf/tomcat-users.xml +PRESERVECONF += /etc/opt/csw/$(NAME)/conf/web.xml + +CLASSES=none cswusergroup cswpreserveconf + +PROTOTYPE_MODIFIERS = varuser etcperm +PROTOTYPE_FILES_varuser = /var/opt/csw/$(NAME)/.* +PROTOTYPE_USER_varuser = tomcat +PROTOTYPE_GROUP_varuser = tomcat +PROTOTYPE_FILES_etcperm = /etc/opt/csw/$(NAME)/conf/.*\.CSW +PROTOTYPE_PERMS_etcperm = 0640 +PROTOTYPE_USER_etcperm = tomcat +PROTOTYPE_GROUP_etcperm = tomcat + +MIGRATE_SOURCE_DIR = /opt/csw/etc/$(NAME)/conf +MIGRATE_DEST_DIR = /etc/opt/csw/$(NAME)/conf +MIGRATE_FILES = catalina.policy +MIGRATE_FILES += catalina.properties +MIGRATE_FILES += context.xml +MIGRATE_FILES += logging.properties +MIGRATE_FILES += server.xml +MIGRATE_FILES += server-minimal.xml +MIGRATE_FILES += tomcat-users.xml +MIGRATE_FILES += web.xml +MIGRATE_FILES += Catalina/localhost/host-manager.xml +MIGRATE_FILES += Catalina/localhost/manager.xml + +# Reviewed and fine to override +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/RUNNING.txt +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/server/webapps/manager/manager-howto.html +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/webapps/tomcat-docs/virtual-hosting-howto.html +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/webapps/tomcat-docs/manager-howto.html +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/webapps/tomcat-docs/ssl-howto.html +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/webapps/tomcat-docs/printer/ssl-howto.html +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/webapps/tomcat-docs/printer/manager-howto.html +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/webapps/tomcat-docs/printer/virtual-hosting-howto.html +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/processes.html +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/printer/processes.html +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/share|root/opt/csw/share/tomcat5/webapps/tomcat-docs/building.html +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/share|root/opt/csw/share/tomcat5/webapps/tomcat-docs/printer/building.html + + include gar/category.mk configure-none: @@ -37,39 +98,27 @@ post-extract: ( mv $(WORKDIR)/apache-tomcat-$(VERSION) $(WORKDIR)/$(DISTNAME) ) - ( OLDDIR=`pwd` && cd $(WORKDIR)/$(DISTNAME)/conf && for i in `gfind . -type f` ; do mv $$i $$i.CSW ; done && cd $$OLDDIR ) - ( for i in temp work logs conf ; do gfind $(WORKDIR)/$(DISTNAME)/$$i -type d -exec chmod 0750 {} \; ; gfind $(WORKDIR)/$(DISTNAME)/$$i -type f -exec chmod 0640 {} \; ; done ) + ( 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/$(NAME) ) + ( mkdir -p $(DESTDIR)/etc/opt/csw/$(NAME) ) ( mkdir -p $(DESTDIR)/opt/csw/etc/$(NAME) ) ( mkdir -p $(DESTDIR)/var/opt/csw/$(NAME) ) ( mkdir -p $(DESTDIR)/opt/csw/share ) - ( mkdir -p $(DESTDIR)/etc/opt/csw ) - ( cp -fr $(WORKDIR)/$(DISTNAME) $(DESTDIR)/opt/csw/share/$(NAME) ) - ( cp -fr $(FILEDIR)/$(NAME) $(DESTDIR)/etc/opt/csw/$(NAME) ) - ( cp -fr $(FILEDIR)/csw$(NAME) $(DESTDIR)/etc/init.d ) - ( mv $(DESTDIR)/opt/csw/share/$(NAME)/conf $(DESTDIR)/opt/csw/etc/$(NAME)/conf ) + ( cp -fr $(WORKDIR)/apache-tomcat-$(VERSION) $(DESTDIR)/opt/csw/share/$(NAME) ) + ( cp -fr $(FILEDIR)/csw$(NAME) $(DESTDIR)/etc/opt/csw/init.d ) + ( mv $(DESTDIR)/opt/csw/share/$(NAME)/conf $(DESTDIR)/etc/opt/csw/$(NAME)/conf ) ( mv $(DESTDIR)/opt/csw/share/$(NAME)/logs $(DESTDIR)/var/opt/csw/$(NAME) ) ( mv $(DESTDIR)/opt/csw/share/$(NAME)/work $(DESTDIR)/var/opt/csw/$(NAME) ) ( mv $(DESTDIR)/opt/csw/share/$(NAME)/temp $(DESTDIR)/var/opt/csw/$(NAME) ) - ( ln -s /opt/csw/etc/$(NAME)/conf $(DESTDIR)/opt/csw/share/$(NAME)/conf ) - ( ln -s /var/opt/csw/$(NAME)/logs $(DESTDIR)/opt/csw/share/$(NAME)/logs ) - ( ln -s /var/opt/csw/$(NAME)/work $(DESTDIR)/opt/csw/share/$(NAME)/work ) - ( ln -s /var/opt/csw/$(NAME)/temp $(DESTDIR)/opt/csw/share/$(NAME)/temp ) - ( ln -s /etc/init.d/cswtomcat5 $(DESTDIR)/etc/rc0.d/K17$(NAME) ) - ( ln -s /etc/init.d/cswtomcat5 $(DESTDIR)/etc/rc1.d/K17$(NAME) ) - ( ln -s /etc/init.d/cswtomcat5 $(DESTDIR)/etc/rc2.d/K17$(NAME) ) - ( ln -s /etc/init.d/cswtomcat5 $(DESTDIR)/etc/rc3.d/S51$(NAME) ) - ( ln -s /etc/init.d/cswtomcat5 $(DESTDIR)/etc/rcS.d/K17$(NAME) ) + ( rm $(DESTDIR)/var/opt/csw/tomcat5/temp/bugzilla37035-safeToDelete.tmp ) + ( ln -s ../../../../etc/opt/csw/$(NAME)/conf $(DESTDIR)/opt/csw/share/$(NAME)/conf ) + ( ln -s ../../../../var/opt/csw/$(NAME)/logs $(DESTDIR)/opt/csw/share/$(NAME)/logs ) + ( ln -s ../../../../var/opt/csw/$(NAME)/work $(DESTDIR)/opt/csw/share/$(NAME)/work ) + ( ln -s ../../../../var/opt/csw/$(NAME)/temp $(DESTDIR)/opt/csw/share/$(NAME)/temp ) + ( ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(NAME) ) @$(MAKECOOKIE) - - Modified: csw/mgar/pkg/tomcat5/trunk/checksums =================================================================== --- csw/mgar/pkg/tomcat5/trunk/checksums 2012-02-27 15:22:16 UTC (rev 17232) +++ csw/mgar/pkg/tomcat5/trunk/checksums 2012-02-27 15:27:13 UTC (rev 17233) @@ -1,15 +1 @@ -e576fed8ce66c32ee5295d5f7727b138 download/apache-tomcat-5.5.27.tar.gz -667668ee36cd4ab82088f41a665fb1f8 download/CSWtomcat5.gspec -664162fb61a1ab62833ffe1d864e1e76 download/CSWtomcat5.prototype -d41d8cd98f00b204e9800998ecf8427e download/CSWtomcat5.depend -4d3609552db45727f5aa154abf557062 download/preremove -b49a483a4363081fb971ced893bef6f4 download/postinstall -c051aef03d0b2f6815d743b0a5992619 download/preinstall -55fa93cd473f0b6870e3ea0be02e86b6 download/checkinstall -f49c3339aa897df97abf1baf54582fb8 download/space -ac049cbace6046e38bed18d106110b4f download/i.smfno -eb170cecb32d74f8db84a7b2b13862e8 download/i.smfyes -4d15302b2d9c21036c0905bba39d9c34 download/svc-tomcat5 -62b2ee7bf9927e870d1801696832f312 download/tomcat5.xml -36aca64104055dc1797c8f0f25350d5c download/tomcat5 -cf659ddddcd7c12b1e6c759a7fba3282 download/cswtomcat5 +1791951e1f2e03be9911e28c6145e177 apache-tomcat-5.5.35.tar.gz Deleted: csw/mgar/pkg/tomcat5/trunk/files/CSWtomcat5.depend =================================================================== Deleted: csw/mgar/pkg/tomcat5/trunk/files/CSWtomcat5.gspec =================================================================== --- csw/mgar/pkg/tomcat5/trunk/files/CSWtomcat5.gspec 2012-02-27 15:22:16 UTC (rev 17232) +++ csw/mgar/pkg/tomcat5/trunk/files/CSWtomcat5.gspec 2012-02-27 15:27:13 UTC (rev 17233) @@ -1,5 +0,0 @@ -%var bitname tomcat5 -%var pkgname CSWtomcat5 -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/tomcat5/trunk/files/CSWtomcat5.prototype =================================================================== --- csw/mgar/pkg/tomcat5/trunk/files/CSWtomcat5.prototype 2012-02-27 15:22:16 UTC (rev 17232) +++ csw/mgar/pkg/tomcat5/trunk/files/CSWtomcat5.prototype 2012-02-27 15:27:13 UTC (rev 17233) @@ -1,1043 +0,0 @@ -d none /etc/opt/csw 0755 root bin -f none /etc/opt/csw/tomcat5 0644 root bin -f smfno /etc/init.d/cswtomcat5 0755 root bin -l smfno /etc/rc0.d/K17cswtomcat5=/etc/init.d/cswtomcat5 -l smfno /etc/rc1.d/K17cswtomcat5=/etc/init.d/cswtomcat5 -l smfno /etc/rc2.d/K17cswtomcat5=/etc/init.d/cswtomcat5 -l smfno /etc/rc3.d/S51cswtomcat5=/etc/init.d/cswtomcat5 -l smfno /etc/rcS.d/K17cswtomcat5=/etc/init.d/cswtomcat5 -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/tomcat5.xml=tomcat5.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-tomcat5=svc-tomcat5 0755 root bin -d none /opt/csw/etc/tomcat5 0755 root tomcat -d none /opt/csw/etc/tomcat5/conf 0750 tomcat tomcat -d none /opt/csw/etc/tomcat5/conf/Catalina 0750 tomcat tomcat -d none /opt/csw/etc/tomcat5/conf/Catalina/localhost 0750 tomcat tomcat -f none /opt/csw/etc/tomcat5/conf/Catalina/localhost/host-manager.xml.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat5/conf/Catalina/localhost/manager.xml.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat5/conf/catalina.policy.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat5/conf/catalina.properties.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat5/conf/context.xml.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat5/conf/logging.properties.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat5/conf/server-minimal.xml.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat5/conf/server.xml.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat5/conf/tomcat-users.xml.CSW 0640 tomcat tomcat -f none /opt/csw/etc/tomcat5/conf/web.xml.CSW 0640 tomcat tomcat -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/tomcat5 0755 root bin -f none /opt/csw/share/tomcat5/LICENSE 0644 root bin -f none /opt/csw/share/tomcat5/NOTICE 0644 root bin -f none /opt/csw/share/tomcat5/RELEASE-NOTES 0644 root bin -f none /opt/csw/share/tomcat5/RUNNING.txt 0644 root bin -d none /opt/csw/share/tomcat5/bin 0755 root bin -f none /opt/csw/share/tomcat5/bin/bootstrap.jar 0644 root bin -f none /opt/csw/share/tomcat5/bin/catalina-tasks.xml 0644 root bin -f none /opt/csw/share/tomcat5/bin/catalina.bat 0644 root bin -f none /opt/csw/share/tomcat5/bin/catalina.sh 0755 root bin -f none /opt/csw/share/tomcat5/bin/commons-daemon.jar 0644 root bin -f none /opt/csw/share/tomcat5/bin/commons-logging-api-1.1.1.jar 0644 root bin -f none /opt/csw/share/tomcat5/bin/cpappend.bat 0644 root bin -f none /opt/csw/share/tomcat5/bin/digest.bat 0644 root bin -f none /opt/csw/share/tomcat5/bin/digest.sh 0755 root bin -f none /opt/csw/share/tomcat5/bin/jkstatus-tasks.xml 0644 root bin -f none /opt/csw/share/tomcat5/bin/jmxaccessor-tasks.xml 0644 root bin -f none /opt/csw/share/tomcat5/bin/jsvc.tar.gz 0644 root bin -f none /opt/csw/share/tomcat5/bin/service.bat 0644 root bin -f none /opt/csw/share/tomcat5/bin/setclasspath.bat 0644 root bin -f none /opt/csw/share/tomcat5/bin/setclasspath.sh 0755 root bin -f none /opt/csw/share/tomcat5/bin/shutdown.bat 0644 root bin -f none /opt/csw/share/tomcat5/bin/shutdown.sh 0755 root bin -f none /opt/csw/share/tomcat5/bin/startup.bat 0644 root bin -f none /opt/csw/share/tomcat5/bin/startup.sh 0755 root bin -f none /opt/csw/share/tomcat5/bin/tomcat-juli.jar 0644 root bin -f none /opt/csw/share/tomcat5/bin/tomcat-native.tar.gz 0644 root bin -f none /opt/csw/share/tomcat5/bin/tomcat5.exe 0644 root bin -f none /opt/csw/share/tomcat5/bin/tomcat5w.exe 0644 root bin -f none /opt/csw/share/tomcat5/bin/tool-wrapper.bat 0644 root bin -f none /opt/csw/share/tomcat5/bin/tool-wrapper.sh 0755 root bin -f none /opt/csw/share/tomcat5/bin/version.bat 0644 root bin -f none /opt/csw/share/tomcat5/bin/version.sh 0644 root bin -d none /opt/csw/share/tomcat5/common 0755 root bin -d none /opt/csw/share/tomcat5/common/classes 0755 root bin -d none /opt/csw/share/tomcat5/common/endorsed 0755 root bin -d none /opt/csw/share/tomcat5/common/i18n 0755 root bin -f none /opt/csw/share/tomcat5/common/i18n/tomcat-i18n-en.jar 0644 root bin -f none /opt/csw/share/tomcat5/common/i18n/tomcat-i18n-es.jar 0644 root bin -f none /opt/csw/share/tomcat5/common/i18n/tomcat-i18n-fr.jar 0644 root bin -f none /opt/csw/share/tomcat5/common/i18n/tomcat-i18n-ja.jar 0644 root bin -d none /opt/csw/share/tomcat5/common/lib 0755 root bin -f none /opt/csw/share/tomcat5/common/lib/commons-el.jar 0644 root bin -f none /opt/csw/share/tomcat5/common/lib/jasper-compiler-jdt.jar 0644 root bin -f none /opt/csw/share/tomcat5/common/lib/jasper-compiler.jar 0644 root bin -f none /opt/csw/share/tomcat5/common/lib/jasper-runtime.jar 0644 root bin -f none /opt/csw/share/tomcat5/common/lib/jsp-api.jar 0644 root bin -f none /opt/csw/share/tomcat5/common/lib/naming-factory-dbcp.jar 0644 root bin -f none /opt/csw/share/tomcat5/common/lib/naming-factory.jar 0644 root bin -f none /opt/csw/share/tomcat5/common/lib/naming-resources.jar 0644 root bin -f none /opt/csw/share/tomcat5/common/lib/servlet-api.jar 0644 root bin -s none /opt/csw/share/tomcat5/conf=/opt/csw/etc/tomcat5/conf -s none /opt/csw/share/tomcat5/logs=/var/opt/csw/tomcat5/logs -d none /opt/csw/share/tomcat5/server 0755 root bin -d none /opt/csw/share/tomcat5/server/classes 0755 root bin -d none /opt/csw/share/tomcat5/server/lib 0755 root bin -f none /opt/csw/share/tomcat5/server/lib/catalina-ant-jmx.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/catalina-ant.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/catalina-cluster.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/catalina-optional.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/catalina-storeconfig.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/catalina.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/commons-modeler-2.0.1.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/servlets-cgi.renametojar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/servlets-default.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/servlets-invoker.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/servlets-ssi.renametojar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/servlets-webdav.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/tomcat-ajp.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/tomcat-apr.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/tomcat-coyote.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/tomcat-http.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/tomcat-jkstatus-ant.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/lib/tomcat-util.jar 0644 root bin -d none /opt/csw/share/tomcat5/server/webapps 0755 root bin -d none /opt/csw/share/tomcat5/server/webapps/host-manager 0755 root bin -d none /opt/csw/share/tomcat5/server/webapps/host-manager/WEB-INF 0755 root bin -d none /opt/csw/share/tomcat5/server/webapps/host-manager/WEB-INF/lib 0755 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/WEB-INF/web.xml 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/host-manager.xml 0644 root bin -d none /opt/csw/share/tomcat5/server/webapps/host-manager/images 0755 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/images/add.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/images/asf-logo.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/images/code.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/images/design.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/images/docs.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/images/fix.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/images/tomcat.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/images/update.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/images/void.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/host-manager/manager.xml 0644 root bin -d none /opt/csw/share/tomcat5/server/webapps/manager 0755 root bin -d none /opt/csw/share/tomcat5/server/webapps/manager/WEB-INF 0755 root bin -d none /opt/csw/share/tomcat5/server/webapps/manager/WEB-INF/lib 0755 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/WEB-INF/lib/catalina-manager.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/WEB-INF/lib/commons-fileupload-1.2.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/WEB-INF/lib/commons-io-1.4.jar 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/WEB-INF/web.xml 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/html-manager-howto.html 0644 root bin -d none /opt/csw/share/tomcat5/server/webapps/manager/images 0755 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/images/add.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/images/asf-logo.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/images/code.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/images/design.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/images/docs.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/images/fix.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/images/tomcat.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/images/update.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/images/void.gif 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/manager-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/manager.xml 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/status.xsd 0644 root bin -f none /opt/csw/share/tomcat5/server/webapps/manager/xform.xsl 0644 root bin -d none /opt/csw/share/tomcat5/shared 0755 root bin -d none /opt/csw/share/tomcat5/shared/classes 0755 root bin -d none /opt/csw/share/tomcat5/shared/lib 0755 root bin -s none /opt/csw/share/tomcat5/temp=/var/opt/csw/tomcat5/temp -d none /opt/csw/share/tomcat5/webapps 0755 root bin -d none /opt/csw/share/tomcat5/webapps/ROOT 0755 root bin -f none /opt/csw/share/tomcat5/webapps/ROOT/RELEASE-NOTES.txt 0644 root bin -d none /opt/csw/share/tomcat5/webapps/ROOT/WEB-INF 0755 root bin -d none /opt/csw/share/tomcat5/webapps/ROOT/WEB-INF/lib 0755 root bin -f none /opt/csw/share/tomcat5/webapps/ROOT/WEB-INF/lib/catalina-root.jar 0644 root bin -f none /opt/csw/share/tomcat5/webapps/ROOT/WEB-INF/web.xml 0644 root bin -d none /opt/csw/share/tomcat5/webapps/ROOT/admin 0755 root bin -f none /opt/csw/share/tomcat5/webapps/ROOT/admin/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/ROOT/asf-logo-wide.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/ROOT/favicon.ico 0644 root bin -f none /opt/csw/share/tomcat5/webapps/ROOT/index.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/ROOT/tomcat-power.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/ROOT/tomcat.gif 0644 root bin -d none /opt/csw/share/tomcat5/webapps/balancer 0755 root bin -d none /opt/csw/share/tomcat5/webapps/balancer/META-INF 0755 root bin -f none /opt/csw/share/tomcat5/webapps/balancer/META-INF/context.xml 0644 root bin -d none /opt/csw/share/tomcat5/webapps/balancer/WEB-INF 0755 root bin -d none /opt/csw/share/tomcat5/webapps/balancer/WEB-INF/config 0755 root bin -f none /opt/csw/share/tomcat5/webapps/balancer/WEB-INF/config/rules.xml 0644 root bin -d none /opt/csw/share/tomcat5/webapps/balancer/WEB-INF/lib 0755 root bin -f none /opt/csw/share/tomcat5/webapps/balancer/WEB-INF/lib/catalina-balancer.jar 0644 root bin -f none /opt/csw/share/tomcat5/webapps/balancer/WEB-INF/web.xml 0644 root bin -d none /opt/csw/share/tomcat5/webapps/balancer/images 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/cal 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/Entries.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/Entries.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/Entry.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/Entry.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/JspCalendar.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/JspCalendar.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/TableBean.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/TableBean.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/checkbox 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/checkbox/CheckTest.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/checkbox/CheckTest.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/colors 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/colors/ColorGameBean.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/colors/ColorGameBean.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionFilter.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionFilter.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/dates 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/dates/JspCalendar.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/dates/JspCalendar.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/error 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/error/Smart.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/error/Smart.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/examples 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/ExampleTagBase.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/ExampleTagBase.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/FooTag.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/FooTag.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/FooTagExtraInfo.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/FooTagExtraInfo.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/LogTag.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/LogTag.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/ShowSource.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/ShowSource.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/filters 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/filters/ExampleFilter.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/filters/ExampleFilter.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/filters/RequestDumperFilter.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/filters/RequestDumperFilter.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/BookBean.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/BookBean.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/FooBean.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/FooBean.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/el 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/el/Functions.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/el/Functions.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/listeners 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/listeners/ContextListener.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/listeners/ContextListener.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/listeners/SessionListener.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/listeners/SessionListener.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/num 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/num/NumberGuessBean.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/num/NumberGuessBean.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/cal 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/cal/cal1_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/cal/cal2_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/checkbox 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/checkbox/checkresult_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/colors 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/colors/colrs_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/dates 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/dates/date_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/error 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/error/err_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/error/errorpge_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/forward 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/forward/forward_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/forward/one_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/include 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/include/foo_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/include/include_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/basic_002darithmetic_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/basic_002dcomparisons_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/functions_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/implicit_002dobjects_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/jspattribute_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/shuffle_jsp$Helper.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/shuffle_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/basic_jspx$Helper.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/basic_jspx.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/textRotate_jspx.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/misc 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/misc/config_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/misc/dynamicattrs_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/book_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/hello_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/repeat_jsp$Helper.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/repeat_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/hello_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/panel_jsp$Helper.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/panel_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/products_jsp$Helper.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/products_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsptoserv 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsptoserv/hello_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsptoserv/jsptoservlet_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/num 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/num/numguess_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/plugin 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/plugin/plugin_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security/protected_ 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security/protected_/error_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security/protected_/index_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security/protected_/login_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/sessions 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/sessions/carts_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/simpletag 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/simpletag/foo_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/snp 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/snp/snoop_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/source_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/displayProducts_tag.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/helloWorld_tag.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/panel_tag.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/xhtmlbasic_tag.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/choose_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/if_jsp.class 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/xml 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/xml/xml_jsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/servletToJsp.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/servletToJsp.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/sessions 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/sessions/DummyCart.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/sessions/DummyCart.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/util 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/util/HTMLFilter.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/util/HTMLFilter.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/validators 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/validators/DebugValidator.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/classes/validators/DebugValidator.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/jsp 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/jsp/applet 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/jsp/applet/Clock2.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/jsp/debug-taglib.tld 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/jsp/example-taglib.tld 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/jsp2 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/jsp2/jsp2-example-taglib.tld 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/lib 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/lib/jstl.jar 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/lib/standard.jar 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/tags 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/tags/displayProducts.tag 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/tags/helloWorld.tag 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/tags/panel.tag 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/tags/xhtmlbasic.tag 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/WEB-INF/web.xml 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/cal 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/cal/Entries.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/cal/Entry.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/cal/JspCalendar.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/cal/TableBean.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/cal/cal1.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/cal/cal1.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/cal/cal2.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/cal/cal2.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/cal/calendar.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/cal/login.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/checkbox 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/checkbox/CheckTest.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/checkbox/check.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/checkbox/checkresult.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/checkbox/checkresult.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/checkbox/cresult.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/colors 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/colors/ColorGameBean.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/colors/clr.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/colors/colors.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/colors/colrs.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/colors/colrs.jsp.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/dates 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/dates/date.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/dates/date.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/dates/date.jsp.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/error 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/error/er.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/error/err.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/error/err.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/error/error.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/error/errorpge.jsp 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/forward 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/forward/forward.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/forward/forward.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/forward/fwd.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/forward/one.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/forward/two.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/images 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/images/code.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/images/execute.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/images/read.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/images/return.gif 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/include 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/include/foo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/include/foo.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/include/inc.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/include/include.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/include/include.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/index.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/Functions.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/basic-arithmetic.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/basic-arithmetic.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/basic-arithmetic.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/basic-comparisons.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/basic-comparisons.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/basic-comparisons.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/functions.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/functions.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/functions.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/implicit-objects.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/implicit-objects.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/el/implicit-objects.jsp.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspattribute 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspattribute/FooBean.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspattribute/HelloWorldSimpleTag.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspattribute/ShuffleSimpleTag.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspattribute/TileSimpleTag.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspattribute/jspattribute.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspattribute/jspattribute.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspattribute/jspattribute.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspattribute/shuffle.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspattribute/shuffle.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspattribute/shuffle.jsp.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspx 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspx/basic.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspx/basic.jspx 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspx/basic.jspx.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspx/svgexample.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspx/textRotate.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspx/textRotate.jpg 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspx/textRotate.jspx 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/jspx/textRotate.jspx.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/misc 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/misc/EchoAttributesTag.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/misc/coda.jspf 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/misc/coda.jspf.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/misc/config.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/misc/config.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/misc/config.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/misc/dynamicattrs.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/misc/dynamicattrs.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/misc/dynamicattrs.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/misc/prelude.jspf 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/misc/prelude.jspf.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/BookBean.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/FindBookSimpleTag.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/Functions.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/HelloWorldSimpleTag.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/RepeatSimpleTag.java.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/book.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/book.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/book.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/hello.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/hello.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/hello.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/repeat.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/repeat.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/simpletag/repeat.jsp.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/displayProducts.tag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/hello.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/hello.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/hello.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/helloWorld.tag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/panel.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/panel.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/panel.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/panel.tag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/products.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/products.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/products.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsp2/tagfiles/xhtmlbasic.tag.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/jsptoserv 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsptoserv/hello.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsptoserv/jsptoservlet.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsptoserv/jsptoservlet.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsptoserv/jts.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/jsptoserv/servletToJsp.java.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/num 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/num/numguess.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/num/numguess.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/num/numguess.jsp.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/plugin 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/plugin/applet 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/plugin/applet/Clock2.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/plugin/applet/Clock2.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/plugin/plugin.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/plugin/plugin.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/plugin/plugin.jsp.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/security 0755 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/security/protected 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/security/protected/error.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/security/protected/index.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/security/protected/login.jsp 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/sessions 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/sessions/DummyCart.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/sessions/carts.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/sessions/carts.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/sessions/carts.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/sessions/crt.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/simpletag 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/simpletag/foo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/simpletag/foo.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/simpletag/foo.jsp.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/snp 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/snp/snoop.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/snp/snoop.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/snp/snoop.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/source.jsp 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/tagplugin 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/tagplugin/choose.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/tagplugin/choose.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/tagplugin/choose.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/tagplugin/foreach.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/tagplugin/foreach.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/tagplugin/foreach.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/tagplugin/howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/tagplugin/if.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/tagplugin/if.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/tagplugin/if.jsp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/tagplugin/notes.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/jsp-examples/xml 0755 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/xml/xml.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/xml/xml.jsp 0644 root bin -f none /opt/csw/share/tomcat5/webapps/jsp-examples/xml/xml.jsp.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/servlets-examples 0755 root bin -d none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF 0755 root bin -d none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes 0755 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/CookieExample.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/CookieExample.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/HelloWorldExample.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/HelloWorldExample.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/LocalStrings.properties 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/LocalStrings_en.properties 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/LocalStrings_es.properties 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/LocalStrings_fr.properties 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/LocalStrings_pt.properties 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/RequestHeaderExample.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/RequestHeaderExample.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/RequestInfoExample.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/RequestInfoExample.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/RequestParamExample.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/RequestParamExample.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/SessionExample.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/SessionExample.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters 0755 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionFilter.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionFilter.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/filters 0755 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/filters/ExampleFilter.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/filters/ExampleFilter.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/filters/RequestDumperFilter.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/filters/RequestDumperFilter.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/listeners 0755 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/listeners/ContextListener.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/listeners/ContextListener.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/listeners/SessionListener.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/listeners/SessionListener.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/util 0755 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/util/HTMLFilter.class 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/classes/util/HTMLFilter.java 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/WEB-INF/web.xml 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/cookies.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/helloworld.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/servlets-examples/images 0755 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/images/code.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/images/execute.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/images/return.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/reqheaders.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/reqinfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/reqparams.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/servlets-examples/sessions.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/RELEASE-NOTES.txt 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/WEB-INF 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/WEB-INF/web.xml 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/build.xml.txt 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/deployment.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/installation.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/introduction.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/printer 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/printer/build.xml.txt 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/printer/deployment.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/printer/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/printer/installation.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/printer/introduction.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/printer/processes.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/printer/source.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/printer/web.xml.txt 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/processes.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/build.xml 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/docs 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/docs/README.txt 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/sample.war 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/src 0755 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/src/mypackage 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/src/mypackage/Hello.java 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/web 0755 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/web/WEB-INF 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/web/WEB-INF/web.xml 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/web/hello.jsp 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/web/images 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/web/images/tomcat.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/sample/web/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/source.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/web.xml.txt 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/apr.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/overview.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/printer 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/printer/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/printer/overview.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/printer/requestProcess.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/printer/startup.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/requestProcess 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/requestProcess.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/requestProcess/requestProcess.pdf 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/requestProcess/roseModel.mdl 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/startup 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/startup.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/startup/serverStartup.pdf 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/architecture/startup/serverStartup.txt 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/balancer-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/build.xml 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/building.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina 0755 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/docs 0755 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/docs/api 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/docs/api/index.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-admin-apps.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-admin-objects.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-admin-opers.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-default.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-invoker.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-jdbc-realm.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-jndi-realm.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-memory-realm.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/mbean-names.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-admin-apps.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-admin-objects.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-admin-opers.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-default.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-invoker.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-jdbc-realm.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-jndi-realm.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-memory-realm.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/mbean-names.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/cgi-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/changelog.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/class-loader-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/cluster-howto.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/config 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/ajp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/context.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/engine.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/globalresources.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/host.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/http.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/loader.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/manager.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/ajp.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/context.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/engine.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/globalresources.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/host.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/http.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/loader.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/manager.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/realm.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/resources.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/server.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/service.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/systemprops.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/printer/valve.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/realm.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/resources.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/server.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/service.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/systemprops.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/config/valve.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/connectors.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/default-servlet.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/deployer-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/developers.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/html-manager-howto.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/images 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/images/add.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/images/asf-logo.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/images/code.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/images/design.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/images/docs.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/images/fix.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/images/printer.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/images/tomcat.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/images/update.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/images/void.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/introduction.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jasper 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jasper-howto.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jasper/docs 0755 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jasper/docs/api 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jasper/docs/api/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jndi-datasource-examples-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jndi-resources-howto.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/allclasses-frame.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/allclasses-noframe.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/constant-values.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/deprecated-list.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/help-doc.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/index-all.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/index.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax 0755 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet 0755 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/ErrorData.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/HttpJspPage.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspContext.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspEngineInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspException.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspFactory.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspPage.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspTagException.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspWriter.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/PageContext.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/SkipPageException.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/ErrorData.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/HttpJspPage.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspContext.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspEngineInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspException.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspFactory.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspPage.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspTagException.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspWriter.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/PageContext.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/SkipPageException.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/ELException.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/ELParseException.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/Expression.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/ExpressionEvaluator.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/FunctionMapper.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/VariableResolver.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/ELException.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/ELParseException.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/Expression.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/ExpressionEvaluator.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/FunctionMapper.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/VariableResolver.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/package-frame.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/package-summary.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/package-tree.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/package-use.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/package-frame.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/package-summary.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/package-tree.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/package-use.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/BodyContent.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/BodyTag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/BodyTagSupport.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/DynamicAttributes.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/FunctionInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/IterationTag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/JspFragment.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/JspTag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/PageData.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/SimpleTag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/SimpleTagSupport.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/Tag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagAdapter.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagAttributeInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagData.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagExtraInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagFileInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagLibraryInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagLibraryValidator.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagSupport.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagVariableInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TryCatchFinally.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/ValidationMessage.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/VariableInfo.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/BodyContent.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/BodyTag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/BodyTagSupport.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/DynamicAttributes.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/FunctionInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/IterationTag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/JspFragment.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/JspTag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/PageData.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/SimpleTag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/SimpleTagSupport.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/Tag.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagAdapter.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagAttributeInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagData.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagExtraInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagFileInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagLibraryInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagLibraryValidator.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagSupport.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagVariableInfo.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TryCatchFinally.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/ValidationMessage.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/VariableInfo.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files/BodyTagProtocol.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files/IterationTagProtocol.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files/TagProtocol.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files/VariableInfo-1.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/package-frame.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/package-summary.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/package-tree.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/package-use.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/overview-frame.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/overview-summary.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/overview-tree.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/package-list 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/packages.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/resources 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/resources/inherit.gif 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/serialized-form.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/jspapi/stylesheet.css 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/logging.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/manager-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/mbeans-descriptor-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/monitoring.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/apr.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/balancer-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/building.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/cgi-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/changelog.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/class-loader-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/cluster-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/connectors.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/default-servlet.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/deployer-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/developers.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/html-manager-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/index.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/introduction.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/jasper-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/jndi-datasource-examples-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/jndi-resources-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/logging.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/manager-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/mbeans-descriptor-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/monitoring.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/proxy-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/realm-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/security-manager-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/setup.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/ssi-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/ssl-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/status.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/virtual-hosting-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/printer/windows-service-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/proxy-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/realm-howto.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/security-manager-howto.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/allclasses-frame.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/allclasses-noframe.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/constant-values.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/deprecated-list.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/help-doc.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/index-all.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/index.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax 0755 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/Filter.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/FilterChain.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/FilterConfig.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/GenericServlet.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/RequestDispatcher.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/Servlet.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletConfig.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletContext.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextAttributeEvent.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextAttributeListener.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextEvent.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextListener.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletException.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletInputStream.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletOutputStream.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequest.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestAttributeEvent.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestAttributeListener.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestEvent.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestListener.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestWrapper.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletResponse.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletResponseWrapper.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/SingleThreadModel.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/UnavailableException.html 0644 root bin -d none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use 0755 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/Filter.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/FilterChain.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/FilterConfig.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/GenericServlet.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/RequestDispatcher.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/Servlet.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletConfig.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContext.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextAttributeEvent.html 0644 root bin -f none /opt/csw/share/tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextAttributeListener.html 0644 root bin @@ 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 bdwalton at users.sourceforge.net Mon Feb 27 17:54:38 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 27 Feb 2012 16:54:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17234] csw/mgar/pkg/tomcat6/trunk/Makefile Message-ID: Revision: 17234 http://gar.svn.sourceforge.net/gar/?rev=17234&view=rev Author: bdwalton Date: 2012-02-27 16:54:37 +0000 (Mon, 27 Feb 2012) Log Message: ----------- tomcat6/trunk: no need to set CLASSES explicitly Modified Paths: -------------- csw/mgar/pkg/tomcat6/trunk/Makefile Modified: csw/mgar/pkg/tomcat6/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat6/trunk/Makefile 2012-02-27 15:27:13 UTC (rev 17233) +++ csw/mgar/pkg/tomcat6/trunk/Makefile 2012-02-27 16:54:37 UTC (rev 17234) @@ -35,8 +35,6 @@ USERGROUP = /etc/opt/csw/pkg/$(NAME)/cswusergroup PRESERVECONF = /etc/opt/csw/$(NAME)/conf/.* -CLASSES=none cswusergroup cswpreserveconf - PROTOTYPE_MODIFIERS = varuser etcperm PROTOTYPE_FILES_varuser = /var/opt/csw/$(NAME)/.* PROTOTYPE_USER_varuser = tomcat 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 Feb 27 18:18:13 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 27 Feb 2012 17:18:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17235] csw/mgar/pkg/tomcat6/trunk/Makefile Message-ID: Revision: 17235 http://gar.svn.sourceforge.net/gar/?rev=17235&view=rev Author: bdwalton Date: 2012-02-27 17:18:12 +0000 (Mon, 27 Feb 2012) Log Message: ----------- tomcat6/trunk: set class ugfiles on varuser modifier so these files are not class none (possibly delivered before tomcat users exists) Modified Paths: -------------- csw/mgar/pkg/tomcat6/trunk/Makefile Modified: csw/mgar/pkg/tomcat6/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat6/trunk/Makefile 2012-02-27 16:54:37 UTC (rev 17234) +++ csw/mgar/pkg/tomcat6/trunk/Makefile 2012-02-27 17:18:12 UTC (rev 17235) @@ -39,6 +39,7 @@ PROTOTYPE_FILES_varuser = /var/opt/csw/$(NAME)/.* PROTOTYPE_USER_varuser = tomcat PROTOTYPE_GROUP_varuser = tomcat +PROTOTYPE_CLASS_varuser = ugfiles PROTOTYPE_FILES_etcperm = /etc/opt/csw/$(NAME)/conf/.*\.CSW PROTOTYPE_PERMS_etcperm = 0640 PROTOTYPE_USER_etcperm = tomcat This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Feb 27 23:12:35 2012 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 27 Feb 2012 22:12:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[17236] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 17236 http://gar.svn.sourceforge.net/gar/?rev=17236&view=rev Author: phipsy Date: 2012-02-27 22:12:35 +0000 (Mon, 27 Feb 2012) Log Message: ----------- puppet: 2.7.11 build Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/pkgutil.rb Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2012-02-27 17:18:12 UTC (rev 17235) +++ csw/mgar/pkg/puppet/trunk/Makefile 2012-02-27 22:12:35 UTC (rev 17236) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.7.9 +VERSION = 2.7.11 CATEGORIES = apps GARTYPE = v2 @@ -27,9 +27,9 @@ DISTFILES += cswpuppetmasterd DISTFILES += cswusergroup DISTFILES += CSWpuppet.postinstall -# pkgutil.rb is from https://raw.github.com/domcleal/puppet/tickets/master/8011/lib/puppet/provider/package/pkgutil.rb +# pkgutil.rb https://raw.github.com/domcleal/puppet/tickets/master/8011c/lib/puppet/provider/package/pkgutil.rb # Should be headed into 2.7 code - supports -t REPO -# Still not in 2.7.6 as of 29/11/11 +# Still not in 2.7.10 as of 19-Feb-12 DISTFILES += pkgutil.rb DISTFILES += README.CSW DISTFILES += puppet.conf.example-CSW @@ -72,8 +72,6 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = puppet -# PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch - CHECKPKG_OVERRIDES_CSWpuppetmaster = surplus-dependency|CSWruby18 CHECKPKG_OVERRIDES_CSWpuppet = surplus-dependency|CSWfacter CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWrubyaugeas Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2012-02-27 17:18:12 UTC (rev 17235) +++ csw/mgar/pkg/puppet/trunk/checksums 2012-02-27 22:12:35 UTC (rev 17236) @@ -9,3 +9,5 @@ 3851b1a33cde9d697d5c5c21ef795438 puppet-2.6.12.tar.gz 6dfbeb7810524c97747f45aa194b506f puppet-2.7.6.tar.gz 474c11eeb3c6fc6dabe83b2f4510d038 puppet-2.7.9.tar.gz +64cca5cd88b8df10eb0d3829470890cc puppet-2.7.10.tar.gz +ca1141b3c7d077a128d20458db3b4102 puppet-2.7.11.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/pkgutil.rb =================================================================== --- csw/mgar/pkg/puppet/trunk/files/pkgutil.rb 2012-02-27 17:18:12 UTC (rev 17235) +++ csw/mgar/pkg/puppet/trunk/files/pkgutil.rb 2012-02-27 22:12:35 UTC (rev 17236) @@ -20,7 +20,7 @@ correct_wgetopts = false [ "/opt/csw/etc/pkgutil.conf", "/etc/opt/csw/pkgutil.conf" ].each do |confpath| File.open(confpath) do |conf| - conf.each {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ } + conf.each_line {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ } end end if ! correct_wgetopts @@ -149,10 +149,7 @@ # Allow source to be one or more URLs pointing to a repository that all # get passed to pkgutil via one or more -t options if resource[:source] - sources = resource[:source] - sources = sources.split($/) if sources.is_a?(String) - sources = sources.flatten - + sources = [resource[:source]].flatten pkguti *[sources.map{|src| [ "-t", src ]}, *args].flatten else pkguti *args.flatten @@ -185,4 +182,3 @@ run_pkgutil @resource, "-y", "-r", @resource[:name] end end - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Feb 28 00:19:18 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 27 Feb 2012 23:19:18 +0000 Subject: [csw-devel] [vlc-devel] [PATCH 1/2] Bootstrap on Solaris In-Reply-To: <201202271624.59429.remi@remlab.net> References: <1329725205-4425-1-git-send-email-maciej@opencsw.org> <1329725205-4425-2-git-send-email-maciej@opencsw.org> <201202271624.59429.remi@remlab.net> Message-ID: 2012/2/27 R?mi Denis-Courmont > So 'if ! test COND' fails. Shouldn't 'if test ! COND' work in any POSIX shell? That seems to work. > cat test.sh #!/bin/sh if test ! -z "foo"; then echo True else echo False fi > ./test.sh True From maciej at opencsw.org Tue Feb 28 00:54:29 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 27 Feb 2012 23:54:29 +0000 Subject: [csw-devel] [vlc-devel] [PATCH 2/2] Work around the lack of dirfd() In-Reply-To: <201202271626.21662.remi@remlab.net> References: <1329725205-4425-1-git-send-email-maciej@opencsw.org> <1329725205-4425-3-git-send-email-maciej@opencsw.org> <201202271626.21662.remi@remlab.net> Message-ID: 2012/2/27 R?mi Denis-Courmont : > IIRC this problem was already fixed earlier. Are you using up-to-date vlc.git? Apparently not. I was building from the Solaris branch[1] which seems to be behind master. Maybe I should build from master, so I can actually get any fixes I make back into the source tree? But on the other hand, there's already work that has been put into the Solaris tree, so I'd be probably duplicating it. I'm not sure what's the best way to go about it. My current build error is this: http://buildfarm.opencsw.org/~maciej/vlc-2012-02-28-00-51.log Maciej [1] git://repo.or.cz/vlc/solaris.git From idogan23 at users.sourceforge.net Tue Feb 28 08:27:00 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 28 Feb 2012 07:27:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[17237] csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/ trunk/Makefile Message-ID: Revision: 17237 http://gar.svn.sourceforge.net/gar/?rev=17237&view=rev Author: idogan23 Date: 2012-02-28 07:27:00 +0000 (Tue, 28 Feb 2012) Log Message: ----------- Email-MIME-Attachment-Stripper: Changed package name accordingt to Dago's recommandation Modified Paths: -------------- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile 2012-02-27 22:12:35 UTC (rev 17236) +++ csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile 2012-02-28 07:27:00 UTC (rev 17237) @@ -9,7 +9,7 @@ Strip the attachments from an email endef -PACKAGES = CSWpmemailmimeattachmentstripper +PACKAGES = CSWpm-email-mime-attachment-stri CATALOGNAME = pm_email_mime-attachment_stripper ARCHALL = 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 Tue Feb 28 09:44:31 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 28 Feb 2012 08:44:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17238] csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/ trunk/Makefile Message-ID: Revision: 17238 http://gar.svn.sourceforge.net/gar/?rev=17238&view=rev Author: idogan23 Date: 2012-02-28 08:44:31 +0000 (Tue, 28 Feb 2012) Log Message: ----------- Email-MIME-Attachment-Stripper: fixed catalog name typo Modified Paths: -------------- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile 2012-02-28 07:27:00 UTC (rev 17237) +++ csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile 2012-02-28 08:44:31 UTC (rev 17238) @@ -10,7 +10,7 @@ endef PACKAGES = CSWpm-email-mime-attachment-stri -CATALOGNAME = pm_email_mime-attachment_stripper +CATALOGNAME = pm_email_mime_attachment_stripper ARCHALL = 1 LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Feb 28 09:47:23 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 28 Feb 2012 08:47:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17239] csw/mgar/pkg/tomcat5/trunk/Makefile Message-ID: Revision: 17239 http://gar.svn.sourceforge.net/gar/?rev=17239&view=rev Author: janholzh Date: 2012-02-28 08:47:22 +0000 (Tue, 28 Feb 2012) Log Message: ----------- tomcat5/trunk: fix to have cswusergoup run early Modified Paths: -------------- csw/mgar/pkg/tomcat5/trunk/Makefile Modified: csw/mgar/pkg/tomcat5/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat5/trunk/Makefile 2012-02-28 08:44:31 UTC (rev 17238) +++ csw/mgar/pkg/tomcat5/trunk/Makefile 2012-02-28 08:47:22 UTC (rev 17239) @@ -46,12 +46,12 @@ PRESERVECONF += /etc/opt/csw/$(NAME)/conf/tomcat-users.xml PRESERVECONF += /etc/opt/csw/$(NAME)/conf/web.xml -CLASSES=none cswusergroup cswpreserveconf PROTOTYPE_MODIFIERS = varuser etcperm PROTOTYPE_FILES_varuser = /var/opt/csw/$(NAME)/.* PROTOTYPE_USER_varuser = tomcat PROTOTYPE_GROUP_varuser = tomcat +PROTOTYPE_CLASS_varuser = ugfile PROTOTYPE_FILES_etcperm = /etc/opt/csw/$(NAME)/conf/.*\.CSW PROTOTYPE_PERMS_etcperm = 0640 PROTOTYPE_USER_etcperm = tomcat This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Feb 28 09:53:39 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 28 Feb 2012 08:53:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17240] csw/mgar/pkg/tomcat5/trunk/Makefile Message-ID: Revision: 17240 http://gar.svn.sourceforge.net/gar/?rev=17240&view=rev Author: janholzh Date: 2012-02-28 08:53:39 +0000 (Tue, 28 Feb 2012) Log Message: ----------- tomcat5/trunk: it is ugfiles not file Modified Paths: -------------- csw/mgar/pkg/tomcat5/trunk/Makefile Modified: csw/mgar/pkg/tomcat5/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat5/trunk/Makefile 2012-02-28 08:47:22 UTC (rev 17239) +++ csw/mgar/pkg/tomcat5/trunk/Makefile 2012-02-28 08:53:39 UTC (rev 17240) @@ -51,7 +51,7 @@ PROTOTYPE_FILES_varuser = /var/opt/csw/$(NAME)/.* PROTOTYPE_USER_varuser = tomcat PROTOTYPE_GROUP_varuser = tomcat -PROTOTYPE_CLASS_varuser = ugfile +PROTOTYPE_CLASS_varuser = ugfiles PROTOTYPE_FILES_etcperm = /etc/opt/csw/$(NAME)/conf/.*\.CSW PROTOTYPE_PERMS_etcperm = 0640 PROTOTYPE_USER_etcperm = tomcat This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Feb 28 10:48:25 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 28 Feb 2012 09:48:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17241] csw/mgar/pkg/tomcat7/trunk Message-ID: Revision: 17241 http://gar.svn.sourceforge.net/gar/?rev=17241&view=rev Author: janholzh Date: 2012-02-28 09:48:25 +0000 (Tue, 28 Feb 2012) Log Message: ----------- tomcat7/trunk: update to 7.0.26 ,make it build Modified Paths: -------------- csw/mgar/pkg/tomcat7/trunk/Makefile csw/mgar/pkg/tomcat7/trunk/checksums csw/mgar/pkg/tomcat7/trunk/files/cswtomcat7 Added Paths: ----------- csw/mgar/pkg/tomcat7/trunk/files/LICENSE csw/mgar/pkg/tomcat7/trunk/files/cswusergroup Removed Paths: ------------- csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.depend csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.gspec csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.prototype csw/mgar/pkg/tomcat7/trunk/files/checkinstall csw/mgar/pkg/tomcat7/trunk/files/i.smfno csw/mgar/pkg/tomcat7/trunk/files/i.smfyes csw/mgar/pkg/tomcat7/trunk/files/postinstall csw/mgar/pkg/tomcat7/trunk/files/preinstall csw/mgar/pkg/tomcat7/trunk/files/preremove csw/mgar/pkg/tomcat7/trunk/files/space csw/mgar/pkg/tomcat7/trunk/files/svc-tomcat7 csw/mgar/pkg/tomcat7/trunk/files/tomcat7 csw/mgar/pkg/tomcat7/trunk/files/tomcat7.xml Modified: csw/mgar/pkg/tomcat7/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat7/trunk/Makefile 2012-02-28 08:53:39 UTC (rev 17240) +++ csw/mgar/pkg/tomcat7/trunk/Makefile 2012-02-28 09:48:25 UTC (rev 17241) @@ -1,5 +1,5 @@ -NAME = apache-tomcat7 -VERSION = 7.0.4 +NAME = tomcat7 +VERSION = 7.0.26 CATEGORIES = server GARTYPE = v2 @@ -8,16 +8,22 @@ 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 -MASTER_SITES = http://mirror.switch.ch/mirror/apache/dist//tomcat/tomcat-7/v7.0.4-beta/bin/ +VENDOR_URL = http://tomcat.apache.org/ +MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-7/v$(VERSION)/bin/ +UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-7/v$(VERSION)/bin/ DISTFILES = apache-tomcat-$(VERSION).tar.gz PKGDIST = apache-tomcat-$(VERSION).tar.gz -DISTFILES += CSWtomcat7.gspec CSWtomcat7.prototype CSWtomcat7.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-tomcat7 tomcat7.xml tomcat7 cswtomcat7 -LICENSE = LICENSE +DISTFILES += cswusergroup +DISTFILES += cswtomcat7 +DISTFILES += LICENSE # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = v(\d+(?:\.\d+)*) -#ARCHALL_CSWapache-tomcat7 = 1 +PACKAGES = CSWtomcat7 +CATALOGNAME = tomcat7 +LICENSE = LICENSE +ARCHALL = 1 CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none @@ -25,6 +31,28 @@ INSTALL_SCRIPTS = tomcat prefix = / +INITSMF = /etc/opt/csw/init.d/csw$(NAME) +USERGROUP = /etc/opt/csw/pkg/$(NAME)/cswusergroup +PRESERVECONF = /etc/opt/csw/$(NAME)/conf/.* + +PROTOTYPE_MODIFIERS = varuser etcperm +PROTOTYPE_FILES_varuser = /var/opt/csw/$(NAME)/.* +PROTOTYPE_USER_varuser = tomcat +PROTOTYPE_GROUP_varuser = tomcat +PROTOTYPE_CLASS_varuser = ugfiles +PROTOTYPE_FILES_etcperm = /etc/opt/csw/$(NAME)/conf/.*\.CSW +PROTOTYPE_PERMS_etcperm = 0640 +PROTOTYPE_USER_etcperm = tomcat +PROTOTYPE_GROUP_etcperm = tomcat + +# Reviewed and fine to override +CHECKPKG_OVERRIDES_CSWtomcat7 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat7/webapps/docs/virtual-hosting-howto.html +CHECKPKG_OVERRIDES_CSWtomcat7 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat7/webapps/docs/manager-howto.html +CHECKPKG_OVERRIDES_CSWtomcat7 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat7/webapps/docs/ssl-howto.html +CHECKPKG_OVERRIDES_CSWtomcat7 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat7/webapps/docs/appdev/processes.html +CHECKPKG_OVERRIDES_CSWtomcat7 += file-with-bad-content|/usr/share|root/opt/csw/share/tomcat7/webapps/docs/building.html +CHECKPKG_OVERRIDES_CSWtomcat7 += file-with-bad-content|/usr/share|root/opt/csw/share/tomcat7/webapps/docs/BUILDING.txt + include gar/category.mk configure-none: @@ -38,39 +66,27 @@ post-extract: ( mv $(WORKDIR)/apache-tomcat-$(VERSION) $(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/$(NAME) ) + ( mkdir -p $(DESTDIR)/etc/opt/csw/$(NAME) ) ( mkdir -p $(DESTDIR)/opt/csw/etc/$(NAME) ) ( mkdir -p $(DESTDIR)/var/opt/csw/$(NAME) ) ( mkdir -p $(DESTDIR)/opt/csw/share ) - ( mkdir -p $(DESTDIR)/etc/opt/csw ) - ( cp -fr $(WORKDIR)/$(DISTNAME) $(DESTDIR)/opt/csw/share/$(NAME) ) - ( cp -fr $(FILEDIR)/$(NAME) $(DESTDIR)/etc/opt/csw/$(NAME) ) - ( cp -fr $(FILEDIR)/csw$(NAME) $(DESTDIR)/etc/init.d ) - ( mv $(DESTDIR)/opt/csw/share/$(NAME)/conf $(DESTDIR)/opt/csw/etc/$(NAME)/conf ) + ( cp -fr $(WORKDIR)/apache-tomcat-$(VERSION) $(DESTDIR)/opt/csw/share/$(NAME) ) + ( cp -fr $(FILEDIR)/csw$(NAME) $(DESTDIR)/etc/opt/csw/init.d ) + ( mv $(DESTDIR)/opt/csw/share/$(NAME)/conf $(DESTDIR)/etc/opt/csw/$(NAME)/conf ) ( mv $(DESTDIR)/opt/csw/share/$(NAME)/logs $(DESTDIR)/var/opt/csw/$(NAME) ) ( mv $(DESTDIR)/opt/csw/share/$(NAME)/work $(DESTDIR)/var/opt/csw/$(NAME) ) ( mv $(DESTDIR)/opt/csw/share/$(NAME)/temp $(DESTDIR)/var/opt/csw/$(NAME) ) - ( ln -s /opt/csw/etc/$(NAME)/conf $(DESTDIR)/opt/csw/share/$(NAME)/conf ) - ( ln -s /var/opt/csw/$(NAME)/logs $(DESTDIR)/opt/csw/share/$(NAME)/logs ) - ( ln -s /var/opt/csw/$(NAME)/work $(DESTDIR)/opt/csw/share/$(NAME)/work ) - ( ln -s /var/opt/csw/$(NAME)/temp $(DESTDIR)/opt/csw/share/$(NAME)/temp ) - ( ln -s /etc/init.d/cswtomcat7 $(DESTDIR)/etc/rc0.d/K17$(NAME) ) - ( ln -s /etc/init.d/cswtomcat7 $(DESTDIR)/etc/rc1.d/K17$(NAME) ) - ( ln -s /etc/init.d/cswtomcat7 $(DESTDIR)/etc/rc2.d/K17$(NAME) ) - ( ln -s /etc/init.d/cswtomcat7 $(DESTDIR)/etc/rc3.d/S51$(NAME) ) - ( ln -s /etc/init.d/cswtomcat7 $(DESTDIR)/etc/rcS.d/K17$(NAME) ) + ( rm $(DESTDIR)/var/opt/csw/tomcat7/temp/safeToDelete.tmp ) + ( ln -s ../../../../etc/opt/csw/$(NAME)/conf $(DESTDIR)/opt/csw/share/$(NAME)/conf ) + ( ln -s ../../../../var/opt/csw/$(NAME)/logs $(DESTDIR)/opt/csw/share/$(NAME)/logs ) + ( ln -s ../../../../var/opt/csw/$(NAME)/work $(DESTDIR)/opt/csw/share/$(NAME)/work ) + ( ln -s ../../../../var/opt/csw/$(NAME)/temp $(DESTDIR)/opt/csw/share/$(NAME)/temp ) + ( ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(NAME) ) @$(MAKECOOKIE) - - Modified: csw/mgar/pkg/tomcat7/trunk/checksums =================================================================== --- csw/mgar/pkg/tomcat7/trunk/checksums 2012-02-28 08:53:39 UTC (rev 17240) +++ csw/mgar/pkg/tomcat7/trunk/checksums 2012-02-28 09:48:25 UTC (rev 17241) @@ -1 +1 @@ -340d45b6fb906f6c9a585c2a15167daf apache-tomcat-7.0.4.tar.gz +00d310f2f4e15821951e9d206af45c6b apache-tomcat-7.0.26.tar.gz Deleted: csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.depend =================================================================== Deleted: csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.gspec =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.gspec 2012-02-28 08:53:39 UTC (rev 17240) +++ csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.gspec 2012-02-28 09:48:25 UTC (rev 17241) @@ -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/tomcat7/trunk/files/CSWtomcat7.prototype =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.prototype 2012-02-28 08:53:39 UTC (rev 17240) +++ csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.prototype 2012-02-28 09:48:25 UTC (rev 17241) @@ -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/tomcat7/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/files/LICENSE 2012-02-28 09:48:25 UTC (rev 17241) @@ -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 +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 @@ 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 cgrzemba at users.sourceforge.net Tue Feb 28 14:04:22 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 28 Feb 2012 13:04:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[17242] csw/mgar/pkg Message-ID: Revision: 17242 http://gar.svn.sourceforge.net/gar/?rev=17242&view=rev Author: cgrzemba Date: 2012-02-28 13:04:21 +0000 (Tue, 28 Feb 2012) Log Message: ----------- hplip/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/hplip/ csw/mgar/pkg/hplip/branches/ csw/mgar/pkg/hplip/tags/ csw/mgar/pkg/hplip/trunk/ csw/mgar/pkg/hplip/trunk/Makefile csw/mgar/pkg/hplip/trunk/files/ csw/mgar/pkg/hplip/trunk/files/0001-replace-strnlen.patch csw/mgar/pkg/hplip/trunk/files/0002-add-strnlen-def.patch Property changes on: csw/mgar/pkg/hplip/trunk ___________________________________________________________________ Added: svn:ignore + work checksums Added: csw/mgar/pkg/hplip/trunk/Makefile =================================================================== --- csw/mgar/pkg/hplip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/hplip/trunk/Makefile 2012-02-28 13:04:21 UTC (rev 17242) @@ -0,0 +1,42 @@ +NAME = hplip +VERSION = 3.12.2 +GARTYPE = v2 +CATEGORIES = utils + +MASTER_SITES = http://prdownloads.sourceforge.net/hplip +DISTFILES = $(NAME)-$(VERSION).tar.gz + + +DESCRIPTION = HP Cups Printing and Imaging +define BLURB + Cups printer drivers for HP non postsript printers +endef + +# GARCOMPILER = GNU +GARCOMPILER = SOS12U3 + +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc + +PACKAGES = CSWhplip +OBSOLETED_BY_CSWhplip = CSWhpijs +SPKG_DESC_CSWhplip = $(DESCRIPTION) foomatic + +PATCHFILES += 0001-replace-strnlen.patch +PATCHFILES += 0002-add-strnlen-def.patch + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-hpijs-only-build +# CONFIGURE_ARGS += --enable-hpcups-only-build + +CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/hplip-3.12.2/upgrading.html +CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/hplip-3.12.2/uninstalling.html + + +include gar/category.mk + +pre-configure-modulated: + cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force + cd $(WORKSRC) && aclocal + cd $(WORKSRC) && autoconf --force +# cd $(WORKSRC) && automake -a -c -f + @$(MAKECOOKIE) Added: csw/mgar/pkg/hplip/trunk/files/0001-replace-strnlen.patch =================================================================== --- csw/mgar/pkg/hplip/trunk/files/0001-replace-strnlen.patch (rev 0) +++ csw/mgar/pkg/hplip/trunk/files/0001-replace-strnlen.patch 2012-02-28 13:04:21 UTC (rev 17242) @@ -0,0 +1,26 @@ +From 36215256640bc2c5381b436e7c03aae6d37f4f5a Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Tue, 28 Feb 2012 12:36:47 +0100 +Subject: [PATCH] replace strnlen + +--- + configure.in | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/configure.in b/configure.in +index d3e46cc..d5318f2 100755 +--- a/configure.in ++++ b/configure.in +@@ -526,6 +526,9 @@ if test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups + AC_MSG_ERROR([fax requires dbus support], 15) + fi + ++AC_CHECK_DECLS(strnlen) ++AC_REPLACE_FUNCS(strnlen) ++ + # AC_DEFINE_DIR([DATADIR], [datadir]) + # Copyright ? 2006 Stepan Kasal + # Copyright ? 2006 Andreas Schwab +-- +1.7.9 + Added: csw/mgar/pkg/hplip/trunk/files/0002-add-strnlen-def.patch =================================================================== --- csw/mgar/pkg/hplip/trunk/files/0002-add-strnlen-def.patch (rev 0) +++ csw/mgar/pkg/hplip/trunk/files/0002-add-strnlen-def.patch 2012-02-28 13:04:21 UTC (rev 17242) @@ -0,0 +1,26 @@ +From 747c3b88a9b64a507e9af6c5b00f8bbc78de9795 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Tue, 28 Feb 2012 13:35:49 +0100 +Subject: [PATCH] add strnlen def + +--- + prnt/hpijs/config.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/prnt/hpijs/config.h b/prnt/hpijs/config.h +index 7fe03be..4be5cd5 100644 +--- a/prnt/hpijs/config.h ++++ b/prnt/hpijs/config.h +@@ -394,4 +394,9 @@ in "auto-include.h"). + */ + //#define APDK_AUTO_INCLUDE + ++#if HAVE_DECL_STRNLEN == 0 ++#include ++ size_t strnlen(const char *s,size_t maxlen); ++#endif ++ + #endif //APDK_CONFIG_H +-- +1.7.9 + 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 Feb 28 14:28:09 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 28 Feb 2012 13:28:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17243] csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/ trunk/Makefile Message-ID: Revision: 17243 http://gar.svn.sourceforge.net/gar/?rev=17243&view=rev Author: idogan23 Date: 2012-02-28 13:28:08 +0000 (Tue, 28 Feb 2012) Log Message: ----------- Email-MIME-Attachment-Stripper: Temporary checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile Modified: csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile 2012-02-28 13:04:21 UTC (rev 17242) +++ csw/mgar/pkg/cpan/Email-MIME-Attachment-Stripper/trunk/Makefile 2012-02-28 13:28:08 UTC (rev 17243) @@ -12,6 +12,9 @@ PACKAGES = CSWpm-email-mime-attachment-stri CATALOGNAME = pm_email_mime_attachment_stripper +CHECKPKG_OVERRIDES_CSWpm-email-mime-attachment-stri += catalogname-does-not-match-pkgname|pkgname=CSWpm-email-mime-attachment-stri|catalogname=pm_email_mime_attachment_stripper|expected-catalogname=pm_email_mime_attachment_stri +CHECKPKG_OVERRIDES_CSWpm-email-mime-attachment-stri += catalogname-too-long + ARCHALL = 1 LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Feb 29 10:17:52 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 29 Feb 2012 09:17:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17244] csw/mgar/pkg/hplip/trunk Message-ID: Revision: 17244 http://gar.svn.sourceforge.net/gar/?rev=17244&view=rev Author: cgrzemba Date: 2012-02-29 09:17:52 +0000 (Wed, 29 Feb 2012) Log Message: ----------- hplip/trunk: set csw paths Modified Paths: -------------- csw/mgar/pkg/hplip/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/hplip/trunk/files/0001-add-strnlen.patch csw/mgar/pkg/hplip/trunk/files/0002-set-csw-path-hpijs.cpp.patch csw/mgar/pkg/hplip/trunk/files/0004-set-csw-path-foomatic-rip-hplip.patch Removed Paths: ------------- csw/mgar/pkg/hplip/trunk/files/0002-add-strnlen-def.patch Modified: csw/mgar/pkg/hplip/trunk/Makefile =================================================================== --- csw/mgar/pkg/hplip/trunk/Makefile 2012-02-28 13:28:08 UTC (rev 17243) +++ csw/mgar/pkg/hplip/trunk/Makefile 2012-02-29 09:17:52 UTC (rev 17244) @@ -20,23 +20,21 @@ PACKAGES = CSWhplip OBSOLETED_BY_CSWhplip = CSWhpijs SPKG_DESC_CSWhplip = $(DESCRIPTION) foomatic +RUNTIME_DEP_PKGS_CSWhplip += CSWlibjpeg7 -PATCHFILES += 0001-replace-strnlen.patch -PATCHFILES += 0002-add-strnlen-def.patch +PATCHFILES += 0001-add-strnlen.patch +PATCHFILES += 0002-set-csw-path-hpijs.cpp.patch +PATCHFILES += 0004-set-csw-path-foomatic-rip-hplip.patch +EXTRA_LINKER_FLAGS += -norunpath -xnorunpath + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-hpijs-only-build +CONFIGURE_ARGS += --enable-hpijs-install # CONFIGURE_ARGS += --enable-hpcups-only-build CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/hplip-3.12.2/upgrading.html CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/hplip-3.12.2/uninstalling.html - include gar/category.mk -pre-configure-modulated: - cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force - cd $(WORKSRC) && aclocal - cd $(WORKSRC) && autoconf --force -# cd $(WORKSRC) && automake -a -c -f - @$(MAKECOOKIE) Added: csw/mgar/pkg/hplip/trunk/files/0001-add-strnlen.patch =================================================================== --- csw/mgar/pkg/hplip/trunk/files/0001-add-strnlen.patch (rev 0) +++ csw/mgar/pkg/hplip/trunk/files/0001-add-strnlen.patch 2012-02-29 09:17:52 UTC (rev 17244) @@ -0,0 +1,49 @@ +From 143b48c61ae48dc35002a46fe0ec1e0c07e0abd7 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Tue, 28 Feb 2012 17:09:23 +0100 +Subject: [PATCH] add strnlen + +--- + prnt/hpijs/context2.cpp | 7 +++++++ + prnt/hpijs/ljzjscolor.cpp | 7 +++++++ + 2 files changed, 14 insertions(+), 0 deletions(-) + +diff --git a/prnt/hpijs/context2.cpp b/prnt/hpijs/context2.cpp +index 92a0089..3240d7b 100644 +--- a/prnt/hpijs/context2.cpp ++++ b/prnt/hpijs/context2.cpp +@@ -38,6 +38,13 @@ + #include "colormatch.h" + //#include "bug.h" + ++static size_t ++strnlen (const char *string, size_t maxlen) ++{ ++ const char *end = (const char *)memchr (string, '\0', maxlen); ++ return end ? (size_t) (end - string) : maxlen; ++} ++ + APDK_BEGIN_NAMESPACE + extern ColorMatcher* Create_ColorMatcher + ( +diff --git a/prnt/hpijs/ljzjscolor.cpp b/prnt/hpijs/ljzjscolor.cpp +index ebb45e3..302da42 100644 +--- a/prnt/hpijs/ljzjscolor.cpp ++++ b/prnt/hpijs/ljzjscolor.cpp +@@ -38,6 +38,13 @@ + #include "ljzjs.h" + #include "ljzjscolor.h" + ++static size_t ++strnlen (const char *string, size_t maxlen) ++{ ++ const char *end = (const char *)memchr (string, '\0', maxlen); ++ return end ? (size_t) (end - string) : maxlen; ++} ++ + APDK_BEGIN_NAMESPACE + + #define LJZJSCOLOR2DEVICESCOUNT 8 +-- +1.7.9 + Deleted: csw/mgar/pkg/hplip/trunk/files/0002-add-strnlen-def.patch =================================================================== --- csw/mgar/pkg/hplip/trunk/files/0002-add-strnlen-def.patch 2012-02-28 13:28:08 UTC (rev 17243) +++ csw/mgar/pkg/hplip/trunk/files/0002-add-strnlen-def.patch 2012-02-29 09:17:52 UTC (rev 17244) @@ -1,26 +0,0 @@ -From 747c3b88a9b64a507e9af6c5b00f8bbc78de9795 Mon Sep 17 00:00:00 2001 -From: Carsten Grzemba -Date: Tue, 28 Feb 2012 13:35:49 +0100 -Subject: [PATCH] add strnlen def - ---- - prnt/hpijs/config.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/prnt/hpijs/config.h b/prnt/hpijs/config.h -index 7fe03be..4be5cd5 100644 ---- a/prnt/hpijs/config.h -+++ b/prnt/hpijs/config.h -@@ -394,4 +394,9 @@ in "auto-include.h"). - */ - //#define APDK_AUTO_INCLUDE - -+#if HAVE_DECL_STRNLEN == 0 -+#include -+ size_t strnlen(const char *s,size_t maxlen); -+#endif -+ - #endif //APDK_CONFIG_H --- -1.7.9 - Added: csw/mgar/pkg/hplip/trunk/files/0002-set-csw-path-hpijs.cpp.patch =================================================================== --- csw/mgar/pkg/hplip/trunk/files/0002-set-csw-path-hpijs.cpp.patch (rev 0) +++ csw/mgar/pkg/hplip/trunk/files/0002-set-csw-path-hpijs.cpp.patch 2012-02-29 09:17:52 UTC (rev 17244) @@ -0,0 +1,25 @@ +From 9f614a8c7b35954fdf61b3f794fe3e81e8eb54b7 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Wed, 29 Feb 2012 09:50:31 +0100 +Subject: [PATCH] set csw path hpijs.cpp + +--- + prnt/hpijs/hpijs.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/prnt/hpijs/hpijs.cpp b/prnt/hpijs/hpijs.cpp +index e3af856..77da6dc 100644 +--- a/prnt/hpijs/hpijs.cpp ++++ b/prnt/hpijs/hpijs.cpp +@@ -76,7 +76,7 @@ void setLogLevel(UXServices *pSS) + FILE *fp; + char str[258]; + char *p; +- fp = fopen ("/etc/cups/cupsd.conf", "r"); ++ fp = fopen ("/etc/opt/csw/cups/cupsd.conf", "r"); + if (fp == NULL) + return; + while (!feof (fp)) +-- +1.7.9 + Added: csw/mgar/pkg/hplip/trunk/files/0004-set-csw-path-foomatic-rip-hplip.patch =================================================================== --- csw/mgar/pkg/hplip/trunk/files/0004-set-csw-path-foomatic-rip-hplip.patch (rev 0) +++ csw/mgar/pkg/hplip/trunk/files/0004-set-csw-path-foomatic-rip-hplip.patch 2012-02-29 09:17:52 UTC (rev 17244) @@ -0,0 +1,38 @@ +From 66df2cbc1dd9ee5c4edd6e4212cb8a9e03e56eda Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Wed, 29 Feb 2012 09:55:30 +0100 +Subject: [PATCH 4/4] set csw path foomatic-rip-hplip + +--- + prnt/hpijs/foomatic-rip-hplip | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/prnt/hpijs/foomatic-rip-hplip b/prnt/hpijs/foomatic-rip-hplip +index dc23519..53a585e 100644 +--- a/prnt/hpijs/foomatic-rip-hplip ++++ b/prnt/hpijs/foomatic-rip-hplip +@@ -44,10 +44,10 @@ my $ripversion='$Revision=3.0.2.131$'; + # possibly other stuff. The default path is often fine on Linux, but + # may not be on other systems. + # +-my $execpath = "/usr/bin:/usr/local/bin:/usr/bin:/bin"; ++my $execpath = "/opt/csw/bin:/usr/bin:/usr/local/bin:/usr/bin:/bin"; + + # CUPS raster drivers are searched here +-my $cupsfilterpath = "/usr/lib/cups/filter:/usr/local/lib/cups/filter:/usr/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter"; ++my $cupsfilterpath = "/usr/lib/cups/filter:/opt/csw/lib/cups/filter"; + + # Location of the configuration file "filter.conf", this file can be + # used to change the settings of foomatic-rip without editing +@@ -56,7 +56,7 @@ my $cupsfilterpath = "/usr/lib/cups/filter:/usr/local/lib/cups/filter:/usr/local + # "/etc/foomatic". + # Some versions of configure do not fully expand $sysconfdir + my $prefix = "/usr"; +-my $configpath = "/etc/foomatic"; ++my $configpath = "/etc/opt/csw/foomatic"; + + # For the stuff below, the settings in the configuration file have priority. + +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Feb 29 10:41:09 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 29 Feb 2012 09:41:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17245] csw/mgar/pkg/hplip/trunk/Makefile Message-ID: Revision: 17245 http://gar.svn.sourceforge.net/gar/?rev=17245&view=rev Author: cgrzemba Date: 2012-02-29 09:41:08 +0000 (Wed, 29 Feb 2012) Log Message: ----------- hplip/trunk: sanitize description Modified Paths: -------------- csw/mgar/pkg/hplip/trunk/Makefile Modified: csw/mgar/pkg/hplip/trunk/Makefile =================================================================== --- csw/mgar/pkg/hplip/trunk/Makefile 2012-02-29 09:17:52 UTC (rev 17244) +++ csw/mgar/pkg/hplip/trunk/Makefile 2012-02-29 09:41:08 UTC (rev 17245) @@ -19,7 +19,7 @@ PACKAGES = CSWhplip OBSOLETED_BY_CSWhplip = CSWhpijs -SPKG_DESC_CSWhplip = $(DESCRIPTION) foomatic +SPKG_DESC_CSWhplip = $(DESCRIPTION) Inkjet driver RUNTIME_DEP_PKGS_CSWhplip += CSWlibjpeg7 PATCHFILES += 0001-add-strnlen.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Feb 29 10:58:34 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 29 Feb 2012 09:58:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17246] csw/mgar/pkg/hplip/trunk/files/0001-replace-strnlen .patch Message-ID: Revision: 17246 http://gar.svn.sourceforge.net/gar/?rev=17246&view=rev Author: cgrzemba Date: 2012-02-29 09:58:33 +0000 (Wed, 29 Feb 2012) Log Message: ----------- hplip/trunk: cleaning env Removed Paths: ------------- csw/mgar/pkg/hplip/trunk/files/0001-replace-strnlen.patch Deleted: csw/mgar/pkg/hplip/trunk/files/0001-replace-strnlen.patch =================================================================== --- csw/mgar/pkg/hplip/trunk/files/0001-replace-strnlen.patch 2012-02-29 09:41:08 UTC (rev 17245) +++ csw/mgar/pkg/hplip/trunk/files/0001-replace-strnlen.patch 2012-02-29 09:58:33 UTC (rev 17246) @@ -1,26 +0,0 @@ -From 36215256640bc2c5381b436e7c03aae6d37f4f5a Mon Sep 17 00:00:00 2001 -From: Carsten Grzemba -Date: Tue, 28 Feb 2012 12:36:47 +0100 -Subject: [PATCH] replace strnlen - ---- - configure.in | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/configure.in b/configure.in -index d3e46cc..d5318f2 100755 ---- a/configure.in -+++ b/configure.in -@@ -526,6 +526,9 @@ if test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups - AC_MSG_ERROR([fax requires dbus support], 15) - fi - -+AC_CHECK_DECLS(strnlen) -+AC_REPLACE_FUNCS(strnlen) -+ - # AC_DEFINE_DIR([DATADIR], [datadir]) - # Copyright ? 2006 Stepan Kasal - # Copyright ? 2006 Andreas Schwab --- -1.7.9 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Feb 28 10:45:07 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Tue, 28 Feb 2012 10:45:07 +0100 Subject: [csw-devel] [PATCH] Test for posix_memalign in ./configure In-Reply-To: References: Message-ID: <1330422307-9344-1-git-send-email-maciej@opencsw.org> --- configure.ac | 5 +++++ include/vlc_common.h | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 6d2562c..b5e8473 100644 --- a/configure.ac +++ b/configure.ac @@ -1056,6 +1056,11 @@ dnl Check for backtrace() support AC_CHECK_HEADERS(execinfo.h) AC_CHECK_FUNCS(backtrace) +dnl Check for posix_memalign() support +AC_CHECK_FUNCS(posix_memalign, [ + AC_DEFINE(HAVE_POSIX_MEMALIGN, 1, + [Define to 1 if you have the posix_memalign() function.])]) + dnl dnl default modules dnl diff --git a/include/vlc_common.h b/include/vlc_common.h index 545b1cd..707ecc7 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -904,7 +904,7 @@ static void vlc_free(void *ptr) if (ptr) free((char*)ptr - ((char*)ptr)[-1]); } -#elif defined(__ANDROID__) +#elif !defined(HAVE_POSIX_MEMALIGN) || defined(__ANDROID__) # define vlc_memalign(align, size) memalign(align, size) # define vlc_free(base) free(base) #else -- 1.7.9 From cgrzemba at users.sourceforge.net Wed Feb 29 11:31:45 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 29 Feb 2012 10:31:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17247] csw/mgar/pkg Message-ID: Revision: 17247 http://gar.svn.sourceforge.net/gar/?rev=17247&view=rev Author: cgrzemba Date: 2012-02-29 10:31:45 +0000 (Wed, 29 Feb 2012) Log Message: ----------- foomatic-filters/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/foomatic-filters/ csw/mgar/pkg/foomatic-filters/branches/ csw/mgar/pkg/foomatic-filters/tags/ csw/mgar/pkg/foomatic-filters/trunk/ csw/mgar/pkg/foomatic-filters/trunk/Makefile csw/mgar/pkg/foomatic-filters/trunk/files/ csw/mgar/pkg/foomatic-filters/trunk/files/0001-sanitize-data-type-process.c.patch Property changes on: csw/mgar/pkg/foomatic-filters/trunk ___________________________________________________________________ Added: svn:ignore + work checksums Added: csw/mgar/pkg/foomatic-filters/trunk/Makefile =================================================================== --- csw/mgar/pkg/foomatic-filters/trunk/Makefile (rev 0) +++ csw/mgar/pkg/foomatic-filters/trunk/Makefile 2012-02-29 10:31:45 UTC (rev 17247) @@ -0,0 +1,36 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = foomatic-filters +VERSION = 4.0.12 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Cups printer driver for non postscript printers +define BLURB + Foomatic is a database-driven system for integrating free software printer drivers with common spoolers under Unix. It supports CUPS, LPRng, LPD, GNUlpr, Solaris LP, PPR, PDQ, CPS, and direct printing with every free software printer driver known to us and every printer known to work with these drivers. +endef + +MASTER_SITES = http://www.openprinting.org/download/foomatic/ +DISTFILES = $(DISTNAME).tar.gz +# GARCOMPILER = GNU +GARCOMPILER = SOS12U3 + +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc +PATCHFILES += 0001-sanitize-data-type-process.c.patch + +PACKAGES = CSWfoomatic-filters +OBSOLETED_BY_CSWfoomatic-filters = CSWfoomaticfilters CSWhpijs +SPKG_DESC_CSWfoomatic-filters = $(DESCRIPTION) foomatic +RUNTIME_DEP_PKGS_CSWfoomatic-filters += CSWlibdbus1-3 + +CHECKPKG_OVERRIDES_CSWfoomatic-filters += file-with-bad-content|/usr/local|root/opt/csw/bin/foomatic-rip +CHECKPKG_OVERRIDES_CSWfoomatic-filters += file-with-bad-content|/usr/local|root/opt/csw/lib/cups/backend/beh +CHECKPKG_OVERRIDES_CSWfoomatic-filters += file-with-bad-content|/usr/local|root/etc/opt/csw/foomatic/filter.conf +CHECKPKG_OVERRIDES_CSWfoomatic-filters += file-with-bad-content|/usr/local|root/etc/opt/csw/foomatic/filter.conf.sample +CHECKPKG_OVERRIDES_CSWfoomatic-filters += file-with-bad-content|/usr/share|root/opt/csw/bin/foomatic-rip + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/foomatic-filters/trunk/files/0001-sanitize-data-type-process.c.patch =================================================================== --- csw/mgar/pkg/foomatic-filters/trunk/files/0001-sanitize-data-type-process.c.patch (rev 0) +++ csw/mgar/pkg/foomatic-filters/trunk/files/0001-sanitize-data-type-process.c.patch 2012-02-29 10:31:45 UTC (rev 17247) @@ -0,0 +1,40 @@ +From 10a38e3a17a28a05eba93883690cc76f68aa1817 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Tue, 28 Feb 2012 08:28:32 +0100 +Subject: [PATCH] sanitize data type process.c + +--- + process.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/process.c b/process.c +index f5763bd..d5a7709 100644 +--- a/process.c ++++ b/process.c +@@ -90,7 +90,7 @@ void kill_all_processes() + clear_proc_list(); + } + +-static int _start_process(const char *name, ++static pid_t _start_process(const char *name, + int (*proc_func)(FILE *, FILE *, void *), + void *user_arg, FILE **pipe_in, FILE **pipe_out, + int createprocessgroup) +@@ -182,12 +182,12 @@ int exec_command(FILE *in, FILE *out, void *cmd) + return EXIT_PRNERR_NORETRY_BAD_SETTINGS; + } + +-int start_system_process(const char *name, const char *command, FILE **fdin, FILE **fdout) ++pid_t start_system_process(const char *name, const char *command, FILE **fdin, FILE **fdout) + { + return _start_process(name, exec_command, (void*)command, fdin, fdout, 1); + } + +-int start_process(const char *name, int (*proc_func)(FILE *, FILE *, void *), void *user_arg, FILE **fdin, FILE **fdout) ++pid_t start_process(const char *name, int (*proc_func)(FILE *, FILE *, void *), void *user_arg, FILE **fdin, FILE **fdout) + { + return _start_process(name, proc_func, user_arg, fdin, fdout, 0); + } +-- +1.7.9 + 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 Feb 29 11:38:38 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Feb 2012 10:38:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17248] csw/mgar/pkg/cpan/Path-Class/trunk Message-ID: Revision: 17248 http://gar.svn.sourceforge.net/gar/?rev=17248&view=rev Author: dmichelsen Date: 2012-02-29 10:38:38 +0000 (Wed, 29 Feb 2012) Log Message: ----------- cpan/Path-Class/trunk: Update to 0.25 Modified Paths: -------------- csw/mgar/pkg/cpan/Path-Class/trunk/Makefile csw/mgar/pkg/cpan/Path-Class/trunk/checksums Modified: csw/mgar/pkg/cpan/Path-Class/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Path-Class/trunk/Makefile 2012-02-29 10:31:45 UTC (rev 17247) +++ csw/mgar/pkg/cpan/Path-Class/trunk/Makefile 2012-02-29 10:38:38 UTC (rev 17248) @@ -1,33 +1,28 @@ NAME = Path-Class -VERSION = 0.24 +VERSION = 0.25 CATEGORIES = cpan GARTYPE = v2 AUTHOR = KWILLIAMS DESCRIPTION = Cross-platform path specification manipulation define BLURB - Path::Class is a module for manipulation of file and directory - specifications (strings describing their locations, like '/home/ken/foo.txt' - or 'C:\Windows\Foo.txt') in a cross-platform manner. It supports pretty much - every platform Perl runs on, including Unix, Windows, Mac, VMS, Epoc, - Cygwin, OS/2, and NetWare. endef -BUILD_DEP_PKGS = CSWpmextutilsdepends CSWpmextutpkgconf -RUNTIME_DEP_PKGS_CSWpmpathclass = CSWpmextutilsdepends CSWpmextutpkgconf +CATALOG_RELEASE = unstable -CATALOGNAME = pm_pathclass -PACKAGES = CSWpmpathclass +LICENSE = LICENSE -ARCHALL_CSWpmpathclass = 1 +PACKAGES += CSWpm-path-class +CATALOGNAME_CSWpm-path-class = pm_path_class +SPKG_DESC_CSWpm-path-class = Cross-platform path specification manipulation +ARCHALL_CSWpm-path-class = 1 +OBSOLETED_BY_CSWpm-path-class += CSWpmpathclass +CATALOGNAME_CSWpmpathclass = pm_pathclass_stub -LICENSE = README +# These are just docs +CHECKPKG_OVERRIDES_CSWpm-path-class += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/Path/Class/Dir.pm +CHECKPKG_OVERRIDES_CSWpm-path-class += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/Path/Class/File.pm +CHECKPKG_OVERRIDES_CSWpm-path-class += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/Path::Class::File.3perl +CHECKPKG_OVERRIDES_CSWpm-path-class += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/Path::Class::Dir.3perl -CHECKPKG_OVERRIDES_CSWpmpathclass += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/Path::Class::File.3perl -CHECKPKG_OVERRIDES_CSWpmpathclass += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/Path::Class::Dir.3perl -CHECKPKG_OVERRIDES_CSWpmpathclass += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/Path/Class/File.pm -CHECKPKG_OVERRIDES_CSWpmpathclass += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/Path/Class/Dir.pm -CHECKPKG_OVERRIDES_CSWpmpathclass += catalogname-does-not-match-pkgname|pkgname=CSWpmpathclass|catalogname=pm_pathclass|expected-catalogname=pmpathclass - include gar/category.mk - Modified: csw/mgar/pkg/cpan/Path-Class/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Path-Class/trunk/checksums 2012-02-29 10:31:45 UTC (rev 17247) +++ csw/mgar/pkg/cpan/Path-Class/trunk/checksums 2012-02-29 10:38:38 UTC (rev 17248) @@ -1 +1 @@ -ea0fcec77c63d833a4296ce5b27a5bf2 Path-Class-0.24.tar.gz +91517fdac5262e8665ae2ba9f507824b Path-Class-0.25.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 Wed Feb 29 11:45:25 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Feb 2012 10:45:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17249] csw/mgar/pkg/cpan/Module-Starter/trunk Message-ID: Revision: 17249 http://gar.svn.sourceforge.net/gar/?rev=17249&view=rev Author: dmichelsen Date: 2012-02-29 10:45:25 +0000 (Wed, 29 Feb 2012) Log Message: ----------- cpan/Module-Starter/trunk: Update to 1.58 and sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Starter/trunk/Makefile csw/mgar/pkg/cpan/Module-Starter/trunk/checksums Modified: csw/mgar/pkg/cpan/Module-Starter/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Starter/trunk/Makefile 2012-02-29 10:38:38 UTC (rev 17248) +++ csw/mgar/pkg/cpan/Module-Starter/trunk/Makefile 2012-02-29 10:45:25 UTC (rev 17249) @@ -1,18 +1,23 @@ NAME = Module-Starter -VERSION = 1.54 +VERSION = 1.58 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = PETDANCE +AUTHOR = XSAWYERX DESCRIPTION = A simple starter kit for any module define BLURB endef -DISTFILES = COPYING +DISTFILES += COPYING -PACKAGES = CSWpmmodulestarter -CATALOGNAME = pm_modulestarter +CATALOG_RELEASE = unstable -ARCHALL = 1 +PACKAGES += CSWpm-module-starter +CATALOGNAME_CSWpm-module-starter = pm_module_starter +SPKG_DESC_CSWpm-module-starter = A simple starter kit for any module +ARCHALL_CSWpm-module-starter = 1 +RUNTIME_DEP_PKGS_CSWpm-module-starter += CSWpm-path-class +OBSOLETED_BY_CSWpm-module-starter += CSWpmmodulestarter +CATALOGNAME_CSWpmmodulestarter = pm_modulestarter_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Starter/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Starter/trunk/checksums 2012-02-29 10:38:38 UTC (rev 17248) +++ csw/mgar/pkg/cpan/Module-Starter/trunk/checksums 2012-02-29 10:45:25 UTC (rev 17249) @@ -1 +1 @@ -abf086bf058c2c80ea283d6b4049275b Module-Starter-1.54.tar.gz +eae7a53d77ee765e5a765b8caf92e3f6 Module-Starter-1.58.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Feb 29 14:27:12 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 29 Feb 2012 13:27:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17250] csw/mgar/pkg/hplip/trunk/Makefile Message-ID: Revision: 17250 http://gar.svn.sourceforge.net/gar/?rev=17250&view=rev Author: cgrzemba Date: 2012-02-29 13:27:11 +0000 (Wed, 29 Feb 2012) Log Message: ----------- hplip/trunk: adjust ppd file location Modified Paths: -------------- csw/mgar/pkg/hplip/trunk/Makefile Modified: csw/mgar/pkg/hplip/trunk/Makefile =================================================================== --- csw/mgar/pkg/hplip/trunk/Makefile 2012-02-29 10:45:25 UTC (rev 17249) +++ csw/mgar/pkg/hplip/trunk/Makefile 2012-02-29 13:27:11 UTC (rev 17250) @@ -31,6 +31,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-hpijs-only-build CONFIGURE_ARGS += --enable-hpijs-install +CONFIGURE_ARGS += --with-hpppddir=/opt/csw/share/cups/model/HP # CONFIGURE_ARGS += --enable-hpcups-only-build CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/hplip-3.12.2/upgrading.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Feb 29 10:48:26 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Wed, 29 Feb 2012 10:48:26 +0100 Subject: [csw-devel] [PATCH 1/4] Test for O_DIRECTORY In-Reply-To: <1330508909-16469-1-git-send-email-maciej@opencsw.org> References: <1330508909-16469-1-git-send-email-maciej@opencsw.org> Message-ID: <1330508909-16469-2-git-send-email-maciej@opencsw.org> O_DIRECTORY is not declared on Solaris 10. Test for it and only use it when available. --- configure.ac | 1 + modules/misc/gnutls.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index efb2e99..6ce41f5 100644 --- a/configure.ac +++ b/configure.ac @@ -492,6 +492,7 @@ dnl Check for usual libc functions AC_CHECK_DECLS([nanosleep],,,[#include ]) AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale]) AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 poll rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp]) +AC_CHECK_DECLS([O_DIRECTORY]) AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index d52d3ec..44ce55d 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -467,7 +467,11 @@ static void gnutls_Addx509Directory (vlc_object_t *obj, const char *path, bool priv) { msg_Dbg (obj, "browsing x509 credentials in %s...", path); - int fd = vlc_open (path, O_RDONLY|O_DIRECTORY); + int fd = vlc_open (path, O_RDONLY +#if HAVE_DECL_O_DIRECTORY + |O_DIRECTORY +#endif + ); if (fd == -1) { msg_Warn (obj, "cannot access x509 in %s: %m", path); -- 1.7.9 From maciej at opencsw.org Wed Feb 29 10:48:25 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Wed, 29 Feb 2012 10:48:25 +0100 Subject: [csw-devel] [PATCH 0/4] Solaris 10 patches, take 2 Message-ID: <1330508909-16469-1-git-send-email-maciej@opencsw.org> A second take on the Solaris 10 patches. This patchset makes the Solaris 10 build pass, with two notes: * LDFLAGS must be set to "-lnsl", because inet_pton and inet_ntop functions are in the libnsl shared library. If LDFLAGS is not set, the configure script will fail at link time and conclude that inet_pton is not available, and the build will fail later, complaining about the redefinition of inet_ntop. * The vlc.desktop file generation will fail if the "Encoding" key is absent. For now, I have an additional patch which adds it, but I know that this is an obsolete key and I will look for a better way to work around it. Maciej Blizinski (4): Test for O_DIRECTORY Test for if_nameindex in a specific header. On Solaris, use memalign(), not posix_memalign() A simpler way to sort a list of words configure.ac | 6 ++++-- include/vlc_common.h | 2 +- include/vlc_fixups.h | 2 +- modules/misc/gnutls.c | 6 +++++- 4 files changed, 11 insertions(+), 5 deletions(-) -- 1.7.9 From maciej at opencsw.org Wed Feb 29 10:48:28 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Wed, 29 Feb 2012 10:48:28 +0100 Subject: [csw-devel] [PATCH 3/4] On Solaris, use memalign(), not posix_memalign() In-Reply-To: <1330508909-16469-1-git-send-email-maciej@opencsw.org> References: <1330508909-16469-1-git-send-email-maciej@opencsw.org> Message-ID: <1330508909-16469-4-git-send-email-maciej@opencsw.org> --- include/vlc_common.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index 545b1cd..f2e7118 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -904,7 +904,7 @@ static void vlc_free(void *ptr) if (ptr) free((char*)ptr - ((char*)ptr)[-1]); } -#elif defined(__ANDROID__) +#elif defined(__ANDROID__) || defined(__sun__) # define vlc_memalign(align, size) memalign(align, size) # define vlc_free(base) free(base) #else -- 1.7.9 From maciej at opencsw.org Wed Feb 29 10:48:27 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Wed, 29 Feb 2012 10:48:27 +0100 Subject: [csw-devel] [PATCH 2/4] Test for if_nameindex in a specific header. In-Reply-To: <1330508909-16469-1-git-send-email-maciej@opencsw.org> References: <1330508909-16469-1-git-send-email-maciej@opencsw.org> Message-ID: <1330508909-16469-3-git-send-email-maciej@opencsw.org> On Solaris 10, if_nameindex is defined in a specific header file which needs to be included. When testing for if_nameindex, the header is now used and the false negative is removed. --- configure.ac | 3 ++- include/vlc_fixups.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6ce41f5..0eb47d5 100644 --- a/configure.ac +++ b/configure.ac @@ -490,8 +490,9 @@ need_libc=false dnl Check for usual libc functions AC_CHECK_DECLS([nanosleep],,,[#include ]) -AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale]) +AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale]) AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 poll rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp]) +AC_CHECK_DECLS([if_nameindex],,,[#include ]) AC_CHECK_DECLS([O_DIRECTORY]) AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index 9b6ac21..98d77ac 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -283,7 +283,7 @@ struct pollfd; int poll (struct pollfd *, unsigned, int); #endif -#ifndef HAVE_IF_NAMEINDEX +#ifndef HAVE_DECL_IF_NAMEINDEX #include struct if_nameindex { -- 1.7.9 From maciej at opencsw.org Wed Feb 29 10:48:29 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Wed, 29 Feb 2012 10:48:29 +0100 Subject: [csw-devel] [PATCH 4/4] A simpler way to sort a list of words In-Reply-To: <1330508909-16469-1-git-send-email-maciej@opencsw.org> References: <1330508909-16469-1-git-send-email-maciej@opencsw.org> Message-ID: <1330508909-16469-5-git-send-email-maciej@opencsw.org> There is no reason to `echo $var` if $var is a list of words. Also, there's no need to iterate and echo, translating spaces into newlines works just as well. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 0eb47d5..af6a901 100644 --- a/configure.ac +++ b/configure.ac @@ -4116,7 +4116,7 @@ CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS}" dnl dnl Sort the modules list dnl -PLUGINS=$( (for i in `echo $PLUGINS`; do echo $i; done)|sort|xargs ) +PLUGINS=`echo $PLUGINS | tr ' ' '\n' |sort|xargs` dnl dnl Configuration is finished -- 1.7.9 From maciej at opencsw.org Wed Feb 29 15:41:32 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Wed, 29 Feb 2012 15:41:32 +0100 Subject: [csw-devel] [PATCH] O_DIRECTORY workaround in vlc_fixups.h In-Reply-To: <20120229131758.GB19455@videolan.org> References: <20120229131758.GB19455@videolan.org> Message-ID: <1330526492-3306-1-git-send-email-maciej@opencsw.org> When not defined, set the value to 0. Fixes a gnutls.c build issue on Solaris 10, which doesn't have O_DIRECTORY. Ref: http://mailman.videolan.org/pipermail/vlc-devel/2012-February/086933.html --- include/vlc_fixups.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index 98d77ac..dd56fef 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -337,4 +337,10 @@ long nrand48 (unsigned short subi[3]); # undef HAVE_FORK /* Implementation of fork() is imperfect on OS/2 */ #endif +/* O_DIRECTORY is a Linux-specific constant, not present in Solaris and BSD + * systems. */ +#ifndef O_DIRECTORY +#define O_DIRECTORY 0 +#endif + #endif /* !LIBVLC_FIXUPS_H */ -- 1.7.5.4 From Joerg.Schilling at fokus.fraunhofer.de Wed Feb 29 15:50:42 2012 From: Joerg.Schilling at fokus.fraunhofer.de (Joerg Schilling) Date: Wed, 29 Feb 2012 15:50:42 +0100 Subject: [csw-devel] [PATCH 1/4] Test for O_DIRECTORY In-Reply-To: <1330508909-16469-2-git-send-email-maciej@opencsw.org> References: <1330508909-16469-1-git-send-email-maciej@opencsw.org> <1330508909-16469-2-git-send-email-maciej@opencsw.org> Message-ID: <4f4e3b42.W+3ZA3bVj8qPyOYv%Joerg.Schilling@fokus.fraunhofer.de> Maciej Blizinski wrote: > O_DIRECTORY is not declared on Solaris 10. Test for it and only use it when > available. > --- > configure.ac | 1 + > modules/misc/gnutls.c | 6 +++++- > 2 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/configure.ac b/configure.ac > index efb2e99..6ce41f5 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -492,6 +492,7 @@ dnl Check for usual libc functions > AC_CHECK_DECLS([nanosleep],,,[#include ]) > AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale]) > AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 poll rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp]) > +AC_CHECK_DECLS([O_DIRECTORY]) > AC_CHECK_FUNCS(fdatasync,, > [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) > ]) Why? POSIX grants this to be a #define, so you may safely use: #ifdef O_DIRECTORY J?rg -- EMail:joerg at schily.isdn.cs.tu-berlin.de (home) J?rg Schilling D-13353 Berlin js at cs.tu-berlin.de (uni) joerg.schilling at fokus.fraunhofer.de (work) Blog: http://schily.blogspot.com/ URL: http://cdrecord.berlios.de/private/ ftp://ftp.berlios.de/pub/schily From Joerg.Schilling at fokus.fraunhofer.de Wed Feb 29 15:52:16 2012 From: Joerg.Schilling at fokus.fraunhofer.de (Joerg Schilling) Date: Wed, 29 Feb 2012 15:52:16 +0100 Subject: [csw-devel] [PATCH] O_DIRECTORY workaround in vlc_fixups.h In-Reply-To: <1330526492-3306-1-git-send-email-maciej@opencsw.org> References: <20120229131758.GB19455@videolan.org> <1330526492-3306-1-git-send-email-maciej@opencsw.org> Message-ID: <4f4e3ba0.MRCVE0EDbONQHUeq%Joerg.Schilling@fokus.fraunhofer.de> Maciej Blizinski wrote: > > +/* O_DIRECTORY is a Linux-specific constant, not present in Solaris and BSD > + * systems. */ > +#ifndef O_DIRECTORY > +#define O_DIRECTORY 0 > +#endif > + > #endif /* !LIBVLC_FIXUPS_H */ O_DIRECTORY is a proposal from me for POSIX. It should be present on POSIX.1-2008 compliant platforms. J?rg -- EMail:joerg at schily.isdn.cs.tu-berlin.de (home) J?rg Schilling D-13353 Berlin js at cs.tu-berlin.de (uni) joerg.schilling at fokus.fraunhofer.de (work) Blog: http://schily.blogspot.com/ URL: http://cdrecord.berlios.de/private/ ftp://ftp.berlios.de/pub/schily From maciej at opencsw.org Wed Feb 29 15:59:46 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Wed, 29 Feb 2012 15:59:46 +0100 Subject: [csw-devel] [PATCH] Escape double quotes when creating 'compile' In-Reply-To: <4F4E2414.1040909@videolan.org> References: <4F4E2414.1040909@videolan.org> Message-ID: <1330527586-1400-1-git-send-email-maciej@opencsw.org> --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 2cb86dd..a064df3 100644 --- a/configure.ac +++ b/configure.ac @@ -4256,7 +4256,7 @@ echo "#! $SHELL rm -f .error\$\$ ERROR=0 export PATH=\"$PATH\" LANG=C -($MAKE V=1 \$@ 2>&1 || touch .error\$\$)| `sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl +($MAKE V=1 \$@ 2>&1 || touch .error\$\$)| `sed -ne \"s/^top_srcdir *= *//p\" < Makefile`/extras/buildsystem/make.pl test -f .error\$\$ && ERROR=1 rm -f .error\$\$ exit \$ERROR" >compile -- 1.7.5.4 From maciej at opencsw.org Wed Feb 29 17:09:59 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Wed, 29 Feb 2012 17:09:59 +0100 Subject: [csw-devel] [PATCH] O_DIRECTORY workaround in vlc_fixups.h In-Reply-To: <68b3703e665bc41232172e9cb1e9029c@chewa.net> References: <68b3703e665bc41232172e9cb1e9029c@chewa.net> Message-ID: <1330531799-17889-1-git-send-email-maciej@opencsw.org> When not defined, set the value to 0. Fixes a gnutls.c build issue on Solaris 10, which doesn't have O_DIRECTORY. Ref: http://mailman.videolan.org/pipermail/vlc-devel/2012-February/086933.html --- modules/misc/gnutls.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index d52d3ec..6299a31 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -58,6 +58,21 @@ #include /***************************************************************************** + * Portability issues + *****************************************************************************/ + +/* O_DIRECTORY is a constant introduced in POSIX.1-2008, not present on some + * platforms. + * + * Ref: + * http://lists.opencsw.org/pipermail/devel/2012-February/022302.html + * http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/fcntl.h.html + */ +#ifndef O_DIRECTORY +#define O_DIRECTORY 0 +#endif + +/***************************************************************************** * Module descriptor *****************************************************************************/ static int OpenClient (vlc_tls_t *, int, const char *); -- 1.7.5.4 From janholzh at users.sourceforge.net Wed Feb 29 17:42:17 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 29 Feb 2012 16:42:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17251] csw/mgar/pkg/freerdp/trunk Message-ID: Revision: 17251 http://gar.svn.sourceforge.net/gar/?rev=17251&view=rev Author: janholzh Date: 2012-02-29 16:42:17 +0000 (Wed, 29 Feb 2012) Log Message: ----------- freerdp/trunk: update to 1.0.1, make progress it builds without rpath Modified Paths: -------------- csw/mgar/pkg/freerdp/trunk/Makefile csw/mgar/pkg/freerdp/trunk/checksums Modified: csw/mgar/pkg/freerdp/trunk/Makefile =================================================================== --- csw/mgar/pkg/freerdp/trunk/Makefile 2012-02-29 13:27:11 UTC (rev 17250) +++ csw/mgar/pkg/freerdp/trunk/Makefile 2012-02-29 16:42:17 UTC (rev 17251) @@ -1,10 +1,9 @@ # TODO (release-critical prefixed with !, non release-critical with *) # -# ! libxcursor packages missing (currently only available in the CSW -# X11 stack which should be obsoleted) +# ! cmake kills RPATH in linker flags somehow needs to be fixed. # -NAME = freerdp -VERSION = 0.8.2 +NAME = FreeRDP +VERSION = 1.0.1 CATEGORIES = utils GARTYPE = v2 @@ -13,10 +12,59 @@ Long description endef -MASTER_SITES = $(SF_MIRROR) +MASTER_SITES = http://github.com/downloads/FreeRDP/FreeRDP/ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +GARCOMPILER = GCC4 + +PACKAGES += CSWfreerdp-dev +CATALOGNAME_CSWfreerdp-dev = FreeRDP_dev +SPKG_DESC_CSWfreerdp-dev += $(DESCRIPTION), development files +RUNTIME_DEP_PKGS_CSWfreerdp-dev += CSWfreerdp +PKGFILES_CSWfreerdp-dev += /opt/csw/lib/libfreerdp-cache.so +PKGFILES_CSWfreerdp-dev += /opt/csw/lib/libfreerdp-channels.so +PKGFILES_CSWfreerdp-dev += /opt/csw/lib/libfreerdp-codec.so +PKGFILES_CSWfreerdp-dev += /opt/csw/lib/libfreerdp-core.so +PKGFILES_CSWfreerdp-dev += /opt/csw/lib/libfreerdp-gdi.so +PKGFILES_CSWfreerdp-dev += /opt/csw/lib/libfreerdp-kbd.so +PKGFILES_CSWfreerdp-dev += /opt/csw/lib/libfreerdp-rail.so +PKGFILES_CSWfreerdp-dev += /opt/csw/lib/libfreerdp-utils.so +PKGFILES_CSWfeerdp-dev += $(PKGFILES_DEVEL) + +PACKAGES += CSWfreerdp +SPKG_DESC_CSWfreerdp = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWfreerdp += CSWlibgcc-s1 + + CONFIGURE_ARGS = $(DIRPATHS) +# http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide +CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix) +CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" +CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" +CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" +CMAKE_ARGS += -DWITH_SSE2=OFF +CMAKE_ARGS += -DWITH_ALSA=OFF +CMAKE_ARGS += -DCMAKE_SKIP_RPATH=NO + +CONFIGURE_SCRIPTS = custom + +SKIPTEST = 1 + include gar/category.mk + +post-extract-isa-$(ISA_DEFAULT_$(GARCH)): + @( cd $(WORKDIR) ; mv Free* $(NAME)-$(VERSION$) ) + @$(MAKECOOKIE) + +configure-custom: + (cd $(WORKSRC) && \ + /usr/bin/env -i \ + $(CONFIGURE_ENV) \ + cmake \ + . \ + $(CMAKE_ARGS)) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/freerdp/trunk/checksums =================================================================== --- csw/mgar/pkg/freerdp/trunk/checksums 2012-02-29 13:27:11 UTC (rev 17250) +++ csw/mgar/pkg/freerdp/trunk/checksums 2012-02-29 16:42:17 UTC (rev 17251) @@ -1 +1 @@ -cde590336292c977dfc1b4b7badf24d2 freerdp-0.8.2.tar.gz +1282189a87893bf196da20382e45f6c1 FreeRDP-1.0.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 Feb 29 23:58:31 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 29 Feb 2012 22:58:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17252] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 17252 http://gar.svn.sourceforge.net/gar/?rev=17252&view=rev Author: wahwah Date: 2012-02-29 22:58:30 +0000 (Wed, 29 Feb 2012) Log Message: ----------- mysql5/branches/mysql-5.0.x: replace multiple instances of keywords Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-02-29 16:42:17 UTC (rev 17251) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-02-29 22:58:30 UTC (rev 17252) @@ -46,7 +46,7 @@ PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1) PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)) PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* +PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config\.1 PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel @@ -255,11 +255,11 @@ post-configure-modulated: gsed \ - -e 's+ at prefix@+$(prefix)+' \ - -e 's+ at localstatedir@+$(localstatedir)+' \ - -e 's+ at sysconfdir@+$(sysconfdir)+' \ - -e 's+ at bindir@+$(bindir)+' \ - -e 's+ at BASE_VERSION@+$(BASE_VERSION)+' \ + -e 's+ at prefix@+$(prefix)+g' \ + -e 's+ at localstatedir@+$(localstatedir)+g' \ + -e 's+ at sysconfdir@+$(sysconfdir)+g' \ + -e 's+ at bindir@+$(bindir)+g' \ + -e 's+ at BASE_VERSION@+$(BASE_VERSION)+g' \ < $(WORKDIR)/csw$(NAME).tpl \ > $(WORKDIR)/csw$(NAME) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.