From bonivart at users.sourceforge.net Tue Dec 1 00:14:49 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 30 Nov 2009 23:14:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7512] csw/mgar/pkg/bind/trunk/files/CSWbindchroot. postinstall Message-ID: Revision: 7512 http://gar.svn.sourceforge.net/gar/?rev=7512&view=rev Author: bonivart Date: 2009-11-30 23:14:49 +0000 (Mon, 30 Nov 2009) Log Message: ----------- bind: fix for device files on sparcs Modified Paths: -------------- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall Modified: csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 20:05:20 UTC (rev 7511) +++ csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 23:14:49 UTC (rev 7512) @@ -7,8 +7,13 @@ for i in $DEVICELIST do - DEV=`ls -l /dev/$i | awk '{print $11}'` - DEVICE=`ls -l /dev/$DEV` + DEV=`ls -l /dev/$i | cut -c1` + if [ "$DEV" = "c" ]; then + DEVICE=`ls -l /dev/$i` + else + DEV=`ls -l /dev/$i | awk '{print $11}'` + DEVICE=`ls -l /dev/$DEV` + fi MAJOR=`echo $DEVICE | awk '{print $5}' | awk -F',' '{print $1}'` MINOR=`echo $DEVICE | awk '{print $6}'` echo "Creating device $i ($MAJOR,$MINOR)" 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 Dec 1 10:24:10 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 01 Dec 2009 09:24:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7513] csw/mgar/pkg/bind/trunk/checksums Message-ID: Revision: 7513 http://gar.svn.sourceforge.net/gar/?rev=7513&view=rev Author: bonivart Date: 2009-12-01 09:24:09 +0000 (Tue, 01 Dec 2009) Log Message: ----------- bind: fix checksums Modified Paths: -------------- csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2009-11-30 23:14:49 UTC (rev 7512) +++ csw/mgar/pkg/bind/trunk/checksums 2009-12-01 09:24:09 UTC (rev 7513) @@ -1,2 +1,2 @@ -4e64ed13da0d0e18aa770d6279df834a CSWbindchroot.postinstall +77345b27d2d3f23101e62bd4facb8ad8 CSWbindchroot.postinstall 435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 1 11:03:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:03:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7514] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 7514 http://gar.svn.sourceforge.net/gar/?rev=7514&view=rev Author: dmichelsen Date: 2009-12-01 10:03:50 +0000 (Tue, 01 Dec 2009) Log Message: ----------- mGAR v2: Do not pass include flags to the C/C++ compiler, but only to the preprocessor Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-12-01 09:24:09 UTC (rev 7513) +++ csw/mgar/gar/v2/gar.conf.mk 2009-12-01 10:03:50 UTC (rev 7514) @@ -499,8 +499,8 @@ CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) CXX = $($(GARCOMPILER)_CXX) -CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE_FLAGS)) -CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS) $(INCLUDE_FLAGS)) +CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS) +CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS) CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(_CATEGORY_CPPFLAGS) $(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS)) LDFLAGS ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(_CATEGORY_LDFLAGS) $(EXTRA_LDFLAGS) $(LINKER_FLAGS)) ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(_CATEGORY_ASFLAGS) $(EXTRA_ASFLAGS)) 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 Dec 1 11:05:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:05:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7515] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 7515 http://gar.svn.sourceforge.net/gar/?rev=7515&view=rev Author: dmichelsen Date: 2009-12-01 10:05:48 +0000 (Tue, 01 Dec 2009) Log Message: ----------- mGAR v2: Fix typo Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-12-01 10:03:50 UTC (rev 7514) +++ csw/mgar/gar/v2/gar.conf.mk 2009-12-01 10:05:48 UTC (rev 7515) @@ -499,8 +499,8 @@ CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) CXX = $($(GARCOMPILER)_CXX) -CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS) -CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS) +CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS)) +CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS)) CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(_CATEGORY_CPPFLAGS) $(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS)) LDFLAGS ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(_CATEGORY_LDFLAGS) $(EXTRA_LDFLAGS) $(LINKER_FLAGS)) ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(_CATEGORY_ASFLAGS) $(EXTRA_ASFLAGS)) 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 Dec 1 11:35:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:35:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7516] csw/mgar/pkg/sqlite3/tags/sqlite3-3.6.19, REV=2009.10 .29/ Message-ID: Revision: 7516 http://gar.svn.sourceforge.net/gar/?rev=7516&view=rev Author: dmichelsen Date: 2009-12-01 10:35:11 +0000 (Tue, 01 Dec 2009) Log Message: ----------- Tag release to current Added Paths: ----------- csw/mgar/pkg/sqlite3/tags/sqlite3-3.6.19,REV=2009.10.29/ 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 Dec 1 11:35:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:35:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7517] csw/mgar/pkg/hdf5/tags/hdf5-1.8.3, REV=2009.11.03/ Message-ID: Revision: 7517 http://gar.svn.sourceforge.net/gar/?rev=7517&view=rev Author: dmichelsen Date: 2009-12-01 10:35:51 +0000 (Tue, 01 Dec 2009) Log Message: ----------- hdf5: Tag release to current Added Paths: ----------- csw/mgar/pkg/hdf5/tags/hdf5-1.8.3,REV=2009.11.03/ 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 Dec 1 11:36:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:36:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7518] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 7518 http://gar.svn.sourceforge.net/gar/?rev=7518&view=rev Author: dmichelsen Date: 2009-12-01 10:36:23 +0000 (Tue, 01 Dec 2009) Log Message: ----------- sqlite3: Update to 3.6.20 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-12-01 10:35:51 UTC (rev 7517) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-12-01 10:36:23 UTC (rev 7518) @@ -1,5 +1,5 @@ GARNAME = sqlite3 -GARVERSION = 3.6.19 +GARVERSION = 3.6.20 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2009-12-01 10:35:51 UTC (rev 7517) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2009-12-01 10:36:23 UTC (rev 7518) @@ -1,4 +1,4 @@ 22bb7b924e2ecb13997abcf15966f674 COPYING 80d638505872be7ffa238d43f0e268b2 gar-base.diff 1a2be927ceacfa534501b9f4675bce83 shell.c.diff -aa03cc24a52851bb204fc1e489e195e8 sqlite-3.6.19.tar.gz +0faf8fc8ccff5297513c6532b2b4ce23 sqlite-3.6.20.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 Dec 1 11:36:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:36:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7519] csw/mgar/pkg/hdf5/trunk Message-ID: Revision: 7519 http://gar.svn.sourceforge.net/gar/?rev=7519&view=rev Author: dmichelsen Date: 2009-12-01 10:36:38 +0000 (Tue, 01 Dec 2009) Log Message: ----------- hdf5: Update to 1.6.10 and 1.8.4 Modified Paths: -------------- csw/mgar/pkg/hdf5/trunk/Makefile csw/mgar/pkg/hdf5/trunk/checksums Modified: csw/mgar/pkg/hdf5/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5/trunk/Makefile 2009-12-01 10:36:23 UTC (rev 7518) +++ csw/mgar/pkg/hdf5/trunk/Makefile 2009-12-01 10:36:38 UTC (rev 7519) @@ -1,12 +1,12 @@ GARNAME = hdf5 -GARVERSION = 1.8.3 +GARVERSION = 1.8.4 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 1.6.9 1.8.3 +MODULATIONS_GARVERSION = 1.6.10 1.8.4 -SKIP_MODULATIONS = isa-sparcv9-garversion-1.6.9 -SKIP_MODULATIONS += isa-amd64-garversion-1.6.9 +SKIP_MODULATIONS = isa-sparcv9-garversion-1.6.10 +SKIP_MODULATIONS += isa-amd64-garversion-1.6.10 DESCRIPTION = Event notification library define BLURB @@ -44,14 +44,14 @@ TEST_TARGET = check -MERGE_SCRIPTS_isa-default-garversion-1.6.9 = copy-only -MERGE_DIRS_isa-default-garversion-1.6.9 = $(libdir) -MERGE_SCRIPTS_isa-extra-garversion-1.6.9 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.6.9 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-1.6.10 = copy-only +MERGE_DIRS_isa-default-garversion-1.6.10 = $(libdir) +MERGE_SCRIPTS_isa-extra-garversion-1.6.10 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.6.10 = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-1.8.3 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-1.8.3 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.8.3 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-1.8.4 = copy-all +MERGE_SCRIPTS_isa-extra-garversion-1.8.4 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.8.4 = $(libdir) PKGFILES_CSWhdf5rt = $(PKGFILES_RT) Modified: csw/mgar/pkg/hdf5/trunk/checksums =================================================================== --- csw/mgar/pkg/hdf5/trunk/checksums 2009-12-01 10:36:23 UTC (rev 7518) +++ csw/mgar/pkg/hdf5/trunk/checksums 2009-12-01 10:36:38 UTC (rev 7519) @@ -1,2 +1,2 @@ -751eb3317a47e7c58978e1c3a13a93fc hdf5-1.6.9.tar.gz -5ce228d860bf9e797ca40ab1a823c380 hdf5-1.8.3.tar.gz +6e207a95d22e9e9ffdfaecdd580cd1b3 hdf5-1.6.10.tar.gz +971cc81ef10f50d2bb63cd6879fca7bc hdf5-1.8.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 Tue Dec 1 11:51:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:51:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7520] csw/mgar/pkg/cpan Message-ID: Revision: 7520 http://gar.svn.sourceforge.net/gar/?rev=7520&view=rev Author: dmichelsen Date: 2009-12-01 10:51:37 +0000 (Tue, 01 Dec 2009) Log Message: ----------- Mail-SPF: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Mail-SPF/ csw/mgar/pkg/cpan/Mail-SPF/branches/ csw/mgar/pkg/cpan/Mail-SPF/tags/ csw/mgar/pkg/cpan/Mail-SPF/trunk/ csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile csw/mgar/pkg/cpan/Mail-SPF/trunk/checksums csw/mgar/pkg/cpan/Mail-SPF/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Mail-SPF/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2009-12-01 10:51:37 UTC (rev 7520) @@ -0,0 +1,20 @@ +GARNAME = Mail-SPF +GARVERSION = 2.007 +CATEGORIES = cpan +AUTHOR = JMEHNLE + +DISTNAME = $(GARNAME)-v$(GARVERSION) +MODDIST = $(DISTNAME).tar.gz + +DESCRIPTION = Perl extension for Sender Policy Framework +define BLURB +endef + +PACKAGES = CSWpmmailspf +CATALOGNAME = pm_mailspf + +ARCHALL = 1 + +EXTRA_PAX_ARGS = '-s,spfquery,spfquery-cpan,p' + +include gar/category.mk Added: csw/mgar/pkg/cpan/Mail-SPF/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Mail-SPF/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Mail-SPF/trunk/checksums 2009-12-01 10:51:37 UTC (rev 7520) @@ -0,0 +1 @@ +67dccdc91e3264679a0e17d493d3cc30 Mail-SPF-v2.007.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 Dec 1 11:54:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:54:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7521] csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile Message-ID: Revision: 7521 http://gar.svn.sourceforge.net/gar/?rev=7521&view=rev Author: dmichelsen Date: 2009-12-01 10:54:13 +0000 (Tue, 01 Dec 2009) Log Message: ----------- cpan/Mail-SPF: Rename spfd Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile Modified: csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2009-12-01 10:51:37 UTC (rev 7520) +++ csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2009-12-01 10:54:13 UTC (rev 7521) @@ -16,5 +16,6 @@ ARCHALL = 1 EXTRA_PAX_ARGS = '-s,spfquery,spfquery-cpan,p' +EXTRA_PAX_ARGS += '-s,spfd,spfd-cpan,p' 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 Dec 1 14:26:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 13:26:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7522] csw/mgar/pkg/libmpeg2/trunk/Makefile Message-ID: Revision: 7522 http://gar.svn.sourceforge.net/gar/?rev=7522&view=rev Author: dmichelsen Date: 2009-12-01 13:26:58 +0000 (Tue, 01 Dec 2009) Log Message: ----------- libmpeg2: Add missing dependency Modified Paths: -------------- csw/mgar/pkg/libmpeg2/trunk/Makefile Modified: csw/mgar/pkg/libmpeg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-12-01 10:54:13 UTC (rev 7521) +++ csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-12-01 13:26:58 UTC (rev 7522) @@ -22,7 +22,7 @@ SPKG_DESC_CSWlibmpeg2 = A free MPEG-2 video stream library SPKG_DESC_CSWmpeg2dec = A free MPEG-2 video stream decoder -REQUIRED_PKGS_CSWmpeg2dec = CSWlibmpeg2 +REQUIRED_PKGS_CSWmpeg2dec = CSWlibmpeg2 CSWlibsdl SPKG_SOURCEURL = http://libmpeg2.sourceforge.net 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 Dec 1 14:53:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 13:53:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7523] csw/mgar/pkg/libmpeg2/trunk/Makefile Message-ID: Revision: 7523 http://gar.svn.sourceforge.net/gar/?rev=7523&view=rev Author: dmichelsen Date: 2009-12-01 13:53:33 +0000 (Tue, 01 Dec 2009) Log Message: ----------- libmpeg2: Make separate packages for Solaris 10 to make use of newer X11 builtin features Modified Paths: -------------- csw/mgar/pkg/libmpeg2/trunk/Makefile Modified: csw/mgar/pkg/libmpeg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-12-01 13:26:58 UTC (rev 7522) +++ csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-12-01 13:53:33 UTC (rev 7523) @@ -26,16 +26,27 @@ SPKG_SOURCEURL = http://libmpeg2.sourceforge.net -# This stupid configure script adds '-fast' overwriting -xarch and -# especially activating 64 bit. +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + +# This stupid configure script adds '-fast' overwriting -xarch ande especially activating 64 bit. BUILD_ARGS = MPEG2DEC_CFLAGS= OPT_CFLAGS= -BUILD64 = 1 +BUILD64_platform-solaris8-sparc = 1 +BUILD64_platform-solaris10-sparc = 1 +BUILD64_platform-solaris10-i386 = 1 +BUILD64 = $(BUILD64_platform-$(PLATFORM)) + NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -# Do this only for sparcv8 and i386, otherwise make sure to compile on vis/mmx-enable ISA -CONFIGURE_ARGS += --disable-accel-detect +CONFIGURE_ARGS_garosrel-5.8 = --x-includes=/usr/openwin/include +CONFIGURE_ARGS_garosrel-5.8 += --x-libraries=/usr/openwin/lib +CONFIGURE_ARGS_garosrel-5.10 = --x-includes=/usr/X11/include +CONFIGURE_ARGS_garosrel-5.10 += --x-libraries=/usr/X11/lib + +CONFIGURE_ARGS += $(CONFIGURE_ARGS_garosrel-$(GAROSREL)) + MERGE_DIRS_isa-extra = $(libdir) PKGFILES_CSWmpeg2dec = $(bindir)/.* 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 Dec 1 15:06:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 14:06:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7524] csw/mgar/pkg/hdf5/trunk/Makefile Message-ID: Revision: 7524 http://gar.svn.sourceforge.net/gar/?rev=7524&view=rev Author: dmichelsen Date: 2009-12-01 14:06:12 +0000 (Tue, 01 Dec 2009) Log Message: ----------- hdf5: Add dependency to CSWzlib Modified Paths: -------------- csw/mgar/pkg/hdf5/trunk/Makefile Modified: csw/mgar/pkg/hdf5/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5/trunk/Makefile 2009-12-01 13:53:33 UTC (rev 7523) +++ csw/mgar/pkg/hdf5/trunk/Makefile 2009-12-01 14:06:12 UTC (rev 7524) @@ -25,7 +25,8 @@ PACKAGES = CSWhdf5rt CSWhdf5 -REQUIRED_PKGS_CSWhdf5 = CSWhdf5rt +REQUIRED_PKGS_CSWhdf5 = CSWhdf5rt CSWzlib +REQUIRED_PKGS_CSWhdf5rt = CSWzlib CATALOGNAME_CSWhdf5 = hdf5 CATALOGNAME_CSWhdf5rt = hdf5_rt 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 Dec 1 16:45:42 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 01 Dec 2009 15:45:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7525] csw/mgar/pkg/bind/trunk/files/CSWbindchroot. postinstall Message-ID: Revision: 7525 http://gar.svn.sourceforge.net/gar/?rev=7525&view=rev Author: bonivart Date: 2009-12-01 15:45:42 +0000 (Tue, 01 Dec 2009) Log Message: ----------- bind: fix chroot postinstall Modified Paths: -------------- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall Modified: csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-12-01 14:06:12 UTC (rev 7524) +++ csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-12-01 15:45:42 UTC (rev 7525) @@ -17,7 +17,7 @@ MAJOR=`echo $DEVICE | awk '{print $5}' | awk -F',' '{print $1}'` MINOR=`echo $DEVICE | awk '{print $6}'` echo "Creating device $i ($MAJOR,$MINOR)" - mknod $ROOTDIR/dev/$i c $MAJOR $MINOR + [ ! -c $ROOTDIR/dev/$i ] && mknod $ROOTDIR/dev/$i c $MAJOR $MINOR done # Copy config from /etc/opt/csw 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 Dec 1 17:00:20 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 01 Dec 2009 16:00:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7526] csw/mgar/pkg/bind/trunk/checksums Message-ID: Revision: 7526 http://gar.svn.sourceforge.net/gar/?rev=7526&view=rev Author: bonivart Date: 2009-12-01 16:00:20 +0000 (Tue, 01 Dec 2009) Log Message: ----------- bind: forgot checksums again! Modified Paths: -------------- csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2009-12-01 15:45:42 UTC (rev 7525) +++ csw/mgar/pkg/bind/trunk/checksums 2009-12-01 16:00:20 UTC (rev 7526) @@ -1,2 +1,2 @@ -77345b27d2d3f23101e62bd4facb8ad8 CSWbindchroot.postinstall +dbbc839888d11d22aad3ccb65942d2e5 CSWbindchroot.postinstall 435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.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 Dec 1 19:29:07 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 01 Dec 2009 18:29:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7527] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 7527 http://gar.svn.sourceforge.net/gar/?rev=7527&view=rev Author: bonivart Date: 2009-12-01 18:29:07 +0000 (Tue, 01 Dec 2009) Log Message: ----------- dhcp: update to 4.1.1 beta 3, update GAR stuff (found a bug?) Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-01 16:00:20 UTC (rev 7526) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-01 18:29:07 UTC (rev 7527) @@ -1,5 +1,5 @@ GARNAME = dhcp -GARVERSION = 4.1.1b2 +GARVERSION = 4.1.1b3 CATEGORIES = net DESCRIPTION = ISC DHCP reference implementation @@ -13,21 +13,24 @@ MASTER_SITES = http://ftp.isc.org/isc/dhcp/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +LICENSE = LICENSE + PACKAGES = CSWdhcp CSWdhcpdevel -CATALOGNAME_CSWdhcpdevel = dhcp_devel + +REQUIRED_PKGS_CSWdhcp = CSWosslrt SPKG_DESC_CSWdhcp = ISC DHCP reference implementation -LICENSE = LICENSE -REQUIRED_PKGS_CSWdhcp = CSWcswclassutils CSWosslrt REQUIRED_PKGS_CSWdhcpdevel = CSWdhcp +CATALOGNAME_CSWdhcpdevel = dhcp_devel +ARCHALL_CSWdhcpdevel = 1 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) +UFILES_REGEX = ($(GARNAME)-\d+(?:\.\d+)*).tar.gz GARCOMPILER = GNU TEST_TARGET = check -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw CONFIGURE_ARGS += --localstatedir=/var/opt/csw/dhcp @@ -39,15 +42,18 @@ INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /\/dhcpd.leases.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' +#PROTOTYPE_FILTER = awk ' \ +# $$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } \ +# $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ +# $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ +# $$$$3 ~ /\/dhcpd.leases.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ +# { print }' +INITSMF_CSWdhcp = /etc/opt/csw/init.d/cswdhcpd +SAMPLECONF_CSWdhcp = /etc/opt/csw/dhcpd.conf /etc/opt/csw/dhclient.conf /var/opt/csw/dhcp/db/dhcpd.leases + SPKG_SOURCEURL = https://www.isc.org/software/dhcp -SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf +#SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf include gar/category.mk @@ -58,11 +64,12 @@ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @cp $(FILEDIR)/CSWdhcp.cswdhcpd $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd @chmod 755 $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd - @( cd $(DESTDIR)/etc/opt/csw ; \ - mv dhcpd.conf dhcpd.conf.CSW ; \ - mv dhclient.conf dhclient.conf.CSW ) +# @( cd $(DESTDIR)/etc/opt/csw ; \ +# mv dhcpd.conf dhcpd.conf.CSW ; \ +# mv dhclient.conf dhclient.conf.CSW ) @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(FILEDIR)/CSWdhcp.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/db - @touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases.CSW +# @touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases.CSW + @touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases @$(MAKECOOKIE) Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2009-12-01 16:00:20 UTC (rev 7526) +++ csw/mgar/pkg/dhcp/trunk/checksums 2009-12-01 18:29:07 UTC (rev 7527) @@ -1 +1 @@ -b85b23edc74514712139b860f74bc650 download/dhcp-4.1.1b2.tar.gz +085da9c98f3d4ec285b319fcdda6d552 dhcp-4.1.1b3.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 Dec 1 21:24:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 20:24:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7528] csw/mgar/pkg/libschroedinger/trunk/Makefile Message-ID: Revision: 7528 http://gar.svn.sourceforge.net/gar/?rev=7528&view=rev Author: dmichelsen Date: 2009-12-01 20:24:04 +0000 (Tue, 01 Dec 2009) Log Message: ----------- libschroedinger: Split off devel package Modified Paths: -------------- csw/mgar/pkg/libschroedinger/trunk/Makefile Modified: csw/mgar/pkg/libschroedinger/trunk/Makefile =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/Makefile 2009-12-01 18:29:07 UTC (rev 7527) +++ csw/mgar/pkg/libschroedinger/trunk/Makefile 2009-12-01 20:24:04 UTC (rev 7528) @@ -19,12 +19,23 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWliboil +SPKG_SOURCEURL = http://diracvideo.org/ +PACKAGES = CSWlibschro CSWlibschrodevel + +SPKG_DESC_CSWlibschro = $(DESCRIPTION) +SPKG_DESC_CSWlibschrodevel = libschroedinger developer files + +REQUIRED_PKGS_CSWlibschro = CSWliboil +REQUIRED_PKGS_CSWlibschrodevel = CSWlibschro + BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +PKGFILES_CSWlibschrodevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibschrodevel += $(sharedstatedir)/gtk-doc/.* + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 1 22:56:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 01 Dec 2009 21:56:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7529] csw/mgar/pkg/x11 Message-ID: Revision: 7529 http://gar.svn.sourceforge.net/gar/?rev=7529&view=rev Author: wbonnet Date: 2009-12-01 21:56:44 +0000 (Tue, 01 Dec 2009) Log Message: ----------- Upgrade to 7.5RC Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxi/trunk/Makefile csw/mgar/pkg/x11/lib/libxi/trunk/checksums csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums csw/mgar/pkg/x11/libwindowswm/trunk/Makefile csw/mgar/pkg/x11/libwindowswm/trunk/checksums csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/lib/libxi/trunk/files/XExtInt.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XGetCPtr.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIAllowEvents.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIDefineCursor.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGetDevFocus.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGrabDevice.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIHierarchy.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIPassiveGrab.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIProperties.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryDevice.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryPointer.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryVersion.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XISelEv.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XISelectEvent.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XISetDevFocus.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIWarpPointer.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XSetCPtr.c.diff Modified: csw/mgar/pkg/x11/lib/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-12-01 21:56:44 UTC (rev 7529) @@ -32,4 +32,23 @@ PKGFILES_CSWlibxidevel = $(PKGFILES_DEVEL) +PATCHFILES = XGetCPtr.c.diff +PATCHFILES += XSetCPtr.c.diff +PATCHFILES += XExtInt.c.diff +PATCHFILES += XIAllowEvents.c.diff +PATCHFILES += XIGrabDevice.c.diff +PATCHFILES += XIQueryDevice.c.diff +PATCHFILES += XIQueryVersion.c.diff +PATCHFILES += XISetDevFocus.c.diff +PATCHFILES += XIGetDevFocus.c.diff +PATCHFILES += XIPassiveGrab.c.diff +PATCHFILES += XIProperties.c.diff +PATCHFILES += XISelEv.c.diff +PATCHFILES += XIWarpPointer.c.diff +PATCHFILES += XIHierarchy.c.diff +PATCHFILES += XIDefineCursor.c.diff +PATCHFILES += XIQueryPointer.c.diff + +EXTRA_CFLAGS = -D__solaris__ + include gar/category.mk Modified: csw/mgar/pkg/x11/lib/libxi/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-12-01 21:56:44 UTC (rev 7529) @@ -1 +1,17 @@ +d95bdf63f185d137a6c8f2e05d293298 XExtInt.c.diff +27309cebc8303847fab98a8e420da406 XGetCPtr.c.diff +6a5891b82318eb5e0d15d9102a44b4bc XIAllowEvents.c.diff +da48611d1f64a9072cab0afeb8267b1d XIDefineCursor.c.diff +619aa946e0795ee3f29c0478a84dd620 XIGetDevFocus.c.diff +fcb606dd69e87c852b84332634182d17 XIGrabDevice.c.diff +9bc00af97e2ce1fdce5835fd6a0d958f XIHierarchy.c.diff +8ad06ba31a36b0f4f296a940acc4d9e0 XIPassiveGrab.c.diff +f7eca3ea1289267b7e5b949c266045c6 XIProperties.c.diff +7fe2b8efb13fef03d68d52dd06dcc3d1 XIQueryDevice.c.diff +f425a7ebe13aff5382b64cafbc11bcad XIQueryPointer.c.diff +336cb168b33dca2bf3bf0fe49f51ef55 XIQueryVersion.c.diff +4a032e1634db5afbaafd49372930bb18 XISelEv.c.diff +59275ffc08d5c8d8aa0c838929f1c7ba XISetDevFocus.c.diff +90a67e6b1ca050cd9c7e47d9d486cf6d XIWarpPointer.c.diff +f3dfe2f596b169a7c8f6a13265633cc1 XSetCPtr.c.diff 8df4ece9bd1efb02c28acb2b6f485e09 libXi-1.3.tar.bz2 Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XExtInt.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XExtInt.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XExtInt.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XExtInt.c 2009-11-29 19:00:14.775150130 +0100 ++++ libXi-1.3/src/XExtInt.c 2009-11-29 19:00:50.822247645 +0100 +@@ -53,7 +53,11 @@ + #define NEED_EVENTS + #define NEED_REPLIES + #include ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XGetCPtr.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XGetCPtr.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XGetCPtr.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XGetCPtr.c.orig 2009-11-29 18:30:33.259326221 +0100 ++++ libXi-1.3/src/XGetCPtr.c 2009-11-29 18:33:08.647183904 +0100 +@@ -30,7 +30,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIAllowEvents.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIAllowEvents.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIAllowEvents.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIAllowEvents.c 2009-11-29 19:05:36.738683637 +0100 ++++ libXi-1.3/src/XIAllowEvents.c 2009-11-29 19:06:23.727032463 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIDefineCursor.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIDefineCursor.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIDefineCursor.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIDefineCursor.c 2009-11-29 20:03:33.432148265 +0100 ++++ libXi-1.3/src/XIDefineCursor.c 2009-11-29 20:04:31.660299927 +0100 +@@ -29,7 +29,11 @@ + * XIDefineCursor - Change the cursor of an extension input device. + * + */ ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGetDevFocus.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGetDevFocus.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGetDevFocus.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIGetDevFocus.c 2009-11-29 19:17:55.985236561 +0100 ++++ libXi-1.3/src/XIGetDevFocus.c 2009-11-29 19:19:03.913035021 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGrabDevice.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGrabDevice.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGrabDevice.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIGrabDevice.c 2009-11-29 19:07:57.401317320 +0100 ++++ libXi-1.3/src/XIGrabDevice.c 2009-11-29 19:09:24.260835640 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIHierarchy.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIHierarchy.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIHierarchy.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIHierarchy.c 2009-11-29 19:56:17.122299253 +0100 ++++ libXi-1.3/src/XIHierarchy.c 2009-11-29 19:57:12.933049711 +0100 +@@ -30,7 +30,11 @@ + * device is attached to which master, etc. + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIPassiveGrab.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIPassiveGrab.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIPassiveGrab.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIPassiveGrab.c 2009-11-29 19:17:55.985236561 +0100 ++++ libXi-1.3/src/XIPassiveGrab.c 2009-11-29 19:19:03.913035021 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIProperties.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIProperties.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIProperties.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIProperties.c 2009-11-29 19:17:55.985236561 +0100 ++++ libXi-1.3/src/XIProperties.c 2009-11-29 19:19:03.913035021 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryDevice.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryDevice.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryDevice.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIQueryDevice.c 2009-11-29 19:14:41.717573509 +0100 ++++ libXi-1.3/src/XIQueryDevice.c 2009-11-29 19:17:04.390432318 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryPointer.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryPointer.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryPointer.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3/src/XIQueryPointer.c 2009-11-29 22:21:21.244165842 +0100 ++++ libXi-1.3/src/XIQueryPointer.c 2009-11-29 22:21:45.583635373 +0100 +@@ -30,7 +30,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryVersion.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryVersion.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryVersion.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIQueryVersion.c 2009-11-29 19:11:37.322670833 +0100 ++++ libXi-1.3/src/XIQueryVersion.c 2009-11-29 19:12:13.171546047 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XISelEv.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XISelEv.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XISelEv.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XISelEv.c 2009-11-29 19:38:26.221076187 +0100 ++++ libXi-1.3/src/XISelEv.c 2009-11-29 19:38:50.845264126 +0100 +@@ -31,7 +31,11 @@ + */ + + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XISetDevFocus.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XISetDevFocus.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XISetDevFocus.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XISetDevFocus.c 2009-11-29 19:17:55.985236561 +0100 ++++ libXi-1.3/src/XISetDevFocus.c 2009-11-29 19:19:03.913035021 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIWarpPointer.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIWarpPointer.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIWarpPointer.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIWarpPointer.c 2009-11-29 19:48:25.658001547 +0100 ++++ libXi-1.3/src/XIWarpPointer.c 2009-11-29 19:48:49.798058492 +0100 +@@ -30,7 +30,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XSetCPtr.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XSetCPtr.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XSetCPtr.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XSetCPtr.c.orig 2009-11-29 18:30:33.259326221 +0100 ++++ libXi-1.3/src/XSetCPtr.c 2009-11-29 18:33:08.647183904 +0100 +@@ -30,7 +30,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Modified: csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile 2009-12-01 21:56:44 UTC (rev 7529) @@ -1,5 +1,5 @@ GARNAME = libXScrnSaver -GARVERSION = 1.1.3 +GARVERSION = 1.2.0 CATEGORIES = x11 DESCRIPTION = The XScrnSaver Library @@ -15,19 +15,19 @@ CONFIGURE_ARGS = $(DIRPATHS) -PACKAGES = CSWlibxscrnsaver CSWlibxscrnsaverdevel +PACKAGES = CSWlibxscrnsaver CSWlibxscrnsaverdev CATALOGNAME_CSWlibxscrnsaver = libxscrnsaver -CATALOGNAME_CSWlibxscrnsaverdevel = libxscrnsaver_devel +CATALOGNAME_CSWlibxscrnsaverdev = libxscrnsaver_devel SPKG_DESC_CSWlibxscrnsaver = $(DESCRIPTION) -SPKG_DESC_CSWlibxscrnsaverdevel = $(DESCRIPTION) development files +SPKG_DESC_CSWlibxscrnsaverdev = $(DESCRIPTION) development files # PREREQUISITE_PKGS = CSWscrnsaverproto REQUIRED_PKGS_CSWlibxscrnsaver = CSWlibx11 CSWlibxext -REQUIRED_PKGS_CSWlibxscrnsaverdevel = CSWlibxscrnsaver +REQUIRED_PKGS_CSWlibxscrnsaverdev = CSWlibxscrnsaver -PKGFILES_CSWlibxscrnsaverdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxscrnsaverdev = $(PKGFILES_DEVEL) BUILD64 = 1 NOISALIST = 1 Modified: csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums 2009-12-01 21:56:44 UTC (rev 7529) @@ -1 +1 @@ -93f84b6797f2f29cae1ce23b0355d00d download/libXScrnSaver-1.1.3.tar.bz2 +33e54f64b55f22d8bbe822a5b62568cb libXScrnSaver-1.2.0.tar.bz2 Modified: csw/mgar/pkg/x11/libwindowswm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libwindowswm/trunk/Makefile 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/libwindowswm/trunk/Makefile 2009-12-01 21:56:44 UTC (rev 7529) @@ -1,5 +1,5 @@ GARNAME = libWindowsWM -GARVERSION = 1.0.0 +GARVERSION = 1.0.1 CATEGORIES = x11 DESCRIPTION = Cygwin/X rootless window management extension @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibwindowswm = $(DESCRIPTION) SPKG_DESC_CSWlibwindowswmdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWwindowswmproto +PREREQUISITE_PKGS = CSWx11windowswmproto REQUIRED_PKGS_CSWlibwindowswm = CSWlibx11 CSWlibxext REQUIRED_PKGS_CSWlibwindowswmdevel = CSWlibwindowswm Modified: csw/mgar/pkg/x11/libwindowswm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libwindowswm/trunk/checksums 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/libwindowswm/trunk/checksums 2009-12-01 21:56:44 UTC (rev 7529) @@ -1 +1 @@ -337b379fd00a67345b083100c4e6ba95 download/libWindowsWM-1.0.0.tar.bz2 +274b2b5620a524fd7bb739edb97317f5 libWindowsWM-1.0.1.tar.bz2 Modified: csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile 2009-12-01 21:56:44 UTC (rev 7529) @@ -1,5 +1,5 @@ -GARVERSION = 2.3 -CATEGORIES = x11.0 +GARVERSION = 2.3.0 +CATEGORIES = x11 PROTONAME = videoproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums 2009-12-01 21:56:44 UTC (rev 7529) @@ -1 +1 @@ -ace6f55cd4dcebf4b191c0c31755ed92 download/videoproto-2.2.2.tar.gz +888543493cd69c6c78002ac59c3f077f videoproto-2.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Dec 2 01:25:50 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Dec 2009 00:25:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7530] csw/mgar/pkg/colormake/trunk/Makefile Message-ID: Revision: 7530 http://gar.svn.sourceforge.net/gar/?rev=7530&view=rev Author: bdwalton Date: 2009-12-02 00:25:50 +0000 (Wed, 02 Dec 2009) Log Message: ----------- colormake: update custom install to match old package (and not conflict with cmake) Modified Paths: -------------- csw/mgar/pkg/colormake/trunk/Makefile Modified: csw/mgar/pkg/colormake/trunk/Makefile =================================================================== --- csw/mgar/pkg/colormake/trunk/Makefile 2009-12-01 21:56:44 UTC (rev 7529) +++ csw/mgar/pkg/colormake/trunk/Makefile 2009-12-02 00:25:50 UTC (rev 7530) @@ -39,6 +39,7 @@ install-custom: @(cd $(WORKSRC); \ ginstall -d -m 0755 $(DESTDIR)$(bindir) $(DESTDIR)$(CMDD); \ - ginstall -m 0755 colormake.pl cmake clmake $(DESTDIR)$(bindir); \ + ginstall -m 0755 colormake.pl clmake $(DESTDIR)$(bindir); \ + ginstall -m 0755 cmake $(DESTDIR)$(bindir)/colormake; \ ginstall -m 0644 AUTHORS README $(DESTDIR)$(CMDD) ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 2 01:29:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 00:29:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7531] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7531 http://gar.svn.sourceforge.net/gar/?rev=7531&view=rev Author: wahwah Date: 2009-12-02 00:29:09 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Enabling contrib Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 00:25:50 UTC (rev 7530) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 00:29:09 UTC (rev 7531) @@ -83,7 +83,14 @@ # NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-includes=/opt/csw/include +CONFIGURE_ARGS_isa-sparcv8 += --with-libraries=/opt/csw/lib/32 +CONFIGURE_ARGS_isa-i386 += --with-libraries=/opt/csw/lib/32 +CONFIGURE_ARGS_isa-sparcv9 += --with-libraries=/opt/csw/lib/64 +CONFIGURE_ARGS_isa-amd64 += --with-libraries=/opt/csw/lib/64 +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) + TEST_TARGET = check EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" @@ -93,6 +100,7 @@ PKGFILES_CSWpostgresqldevel += $(prefix)/share/doc/postgresql/html.* PKGFILES_CSWlibpq = $(PKGFILES_RT) PKGFILES_CSWlibpq += $(libdir)/64 +PKGFILES_CSWlibpq += $(libdir)/32 INITSMF = /etc$(prefix)/init\.d/cswpostgres-$(BASE_VERSION) USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) @@ -117,6 +125,14 @@ CFLAGS := $(filter-out -I%,$(CFLAGS)) +post-build-modulated: + $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all + @$(MAKECOOKIE) + +post-install-modulated: + $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install + @$(MAKECOOKIE) + post-merge: ginstall -d $(PKGROOT)/etc$(prefix)/init.d sed -e 's+ at PGDATA@+$(PGDATA)+' \ @@ -146,4 +162,5 @@ done ginstall -d $(PKGROOT)$(PGDATA) gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + gln -s . $(PKGROOT)$(libdir)/32 @$(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 Wed Dec 2 04:43:03 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Dec 2009 03:43:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7532] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 7532 http://gar.svn.sourceforge.net/gar/?rev=7532&view=rev Author: bdwalton Date: 2009-12-02 03:43:03 +0000 (Wed, 02 Dec 2009) Log Message: ----------- libxml2: bump version to 2.7.6 Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-02 00:29:09 UTC (rev 7531) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-02 03:43:03 UTC (rev 7532) @@ -1,5 +1,5 @@ GARNAME = libxml2 -GARVERSION = 2.7.3 +GARVERSION = 2.7.6 CATEGORIES = lib DESCRIPTION = XML Parser Library 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 Dec 2 10:07:33 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 09:07:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7533] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 7533 http://gar.svn.sourceforge.net/gar/?rev=7533&view=rev Author: wahwah Date: 2009-12-02 09:07:27 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Symlinks for contrib, trying to make smf work Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 03:43:03 UTC (rev 7532) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 09:07:27 UTC (rev 7533) @@ -82,7 +82,7 @@ # # NO_ISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-includes=/opt/csw/include CONFIGURE_ARGS_isa-sparcv8 += --with-libraries=/opt/csw/lib/32 CONFIGURE_ARGS_isa-i386 += --with-libraries=/opt/csw/lib/32 @@ -90,10 +90,29 @@ CONFIGURE_ARGS_isa-amd64 += --with-libraries=/opt/csw/lib/64 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) +# # Perl support only in the 32-bit version +# CONFIGURE_ARGS_isa-sparcv8 += --with-perl +# CONFIGURE_ARGS_isa-i386 += --with-perl +# # Python support in 32-bit only +# CONFIGURE_ARGS_isa-sparcv8 += --with-python +# CONFIGURE_ARGS_isa-i386 += --with-python + +CONFIGURE_ARGS += --with-gssapi +# CONFIGURE_ARGS += --with-krb5 +CONFIGURE_ARGS += --with-pam +# CONFIGURE_ARGS += --with-bonjour +CONFIGURE_ARGS += --with-openssl +CONFIGURE_ARGS += --with-libxml +CONFIGURE_ARGS += --with-libxslt +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) + +# Skipping tests to save time during packaging, and to enable x86 builds. +SKIPTEST = 1 TEST_TARGET = check -EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" +# What's that for? +# EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" PKGFILES_CSWpostgresqldoc = $(PKGFILES_DOC) PKGFILES_CSWpostgresqldevel = $(PKGFILES_DEVEL) @@ -102,13 +121,35 @@ PKGFILES_CSWlibpq += $(libdir)/64 PKGFILES_CSWlibpq += $(libdir)/32 -INITSMF = /etc$(prefix)/init\.d/cswpostgres-$(BASE_VERSION) +INITSMF = /etc$(prefix)/init\.d/cswpostgresql_$(BASE_VERSION) USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) PRESERVECONF = $(sysconfdir)/postgresql\.conf -BIN_NAMES = clusterdb createdb createlang createuser dropdb droplang dropuser -BIN_NAMES += ecpg initdb pg_config pg_controldata pg_ctl pg_dump pg_dumpall -BIN_NAMES += pg_resetxlog pg_restore postgres postmaster psql reindexdb +BIN_NAMES = clusterdb +BIN_NAMES += createdb +BIN_NAMES += createlang +BIN_NAMES += createuser +BIN_NAMES += dropdb +BIN_NAMES += droplang +BIN_NAMES += dropuser +BIN_NAMES += ecpg +BIN_NAMES += initdb +BIN_NAMES += oid2name +BIN_NAMES += pg_config +BIN_NAMES += pg_controldata +BIN_NAMES += pg_ctl +BIN_NAMES += pg_dump +BIN_NAMES += pg_dumpall +BIN_NAMES += pg_resetxlog +BIN_NAMES += pg_restore +BIN_NAMES += pg_standby +BIN_NAMES += pgbench +BIN_NAMES += postgres +BIN_NAMES += postmaster +BIN_NAMES += psql +BIN_NAMES += reindexdb +BIN_NAMES += vacuumdb +BIN_NAMES += vacuumlo PGDATA = $(localstatedir)/pgdata @@ -139,10 +180,10 @@ -e 's+ at sysconfdir@+$(sysconfdir)+' \ -e 's+ at bindir@+$(bindir)+' \ < $(FILEDIR)/cswpostgres.tmpl \ - > $(WORKDIR)/cswpostgres + > $(WORKDIR)/cswpostgres_$(BASE_VERSION) ginstall \ - $(WORKDIR)/cswpostgres \ - $(PKGROOT)/etc$(prefix)/init.d/cswpostgres-$(BASE_VERSION) + $(WORKDIR)/cswpostgres_$(BASE_VERSION) \ + $(PKGROOT)/etc$(prefix)/init.d/cswpostgres_$(BASE_VERSION) ginstall -d $(PKGROOT)/etc$(prefix)/pkg/$(GARNAME) sed -e 's+ at PGDATA@+$(PGDATA)+' \ < $(FILEDIR)/cswusergroup.tmpl \ Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2009-12-02 03:43:03 UTC (rev 7532) +++ csw/mgar/pkg/postgresql/trunk/checksums 2009-12-02 09:07:27 UTC (rev 7533) @@ -1,5 +1,5 @@ 6e4e2a7755acf94bc83200a308e21ef3 README-CSW.txt -922febb720931220e272c2872ebf47e4 cswpostgres.tmpl +e6f5d88d673c79e3948bf0fde2ba282f cswpostgres.tmpl 9e1e49d76fee70cb8e2d49304695ec89 cswusergroup.tmpl f2015af17bacbbfe140daf0d1067f9c9 postgresql-8.4.1.tar.bz2 8237c74666058f607f5418e3b57c74a9 postgresql.conf.tmpl Modified: csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl 2009-12-02 03:43:03 UTC (rev 7532) +++ csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl 2009-12-02 09:07:27 UTC (rev 7533) @@ -4,10 +4,14 @@ # PostgreSQL startup script - part of the CSWpostgresql package # mark at blastwave.org # -# 2009-11-29: Parametrized file locations -# Maciej Blizinski (maciej at opencsw.org) +# 2009-11-29 Maciej Blizinski (maciej at opencsw.org) +# - Parametrized file locations +# - Style changes +# # -# Variables to substitute: +# This files is a template. The following variables need to be substituted +# before it can be run: +# # - PGDATA # - bindir # - sysconfdir @@ -27,6 +31,8 @@ # version - it checks if the 64-bit server was last run. If so, # it forces the 64-bit server, otherwise it won't start up! # And vice-versa for the 32-bit server... +# +# This version doesn't check the i386/amd64 architectures. if [ -f "${PGDATA}/postmaster.opts" ]; then if grep 'sparcv9' ${PGDATA}/postmaster.opts > /dev/null; then echo ${PGCTL} | grep "sparcv8" > /dev/null @@ -47,14 +53,14 @@ PGINIT=@bindir@/sparcv8/initdb else echo "Couldn't detect whether the previously run version was 32 or 64-bit." + echo "Running the default." PGCTL=@bindir@/pg_ctl PGINIT=@bindir@/initdb fi fi # Exit if postgres user hasn't been created. -grep '^postgres:' /etc/passwd >/dev/null -if [ $? -ne 0 ] ; then +if ! grep '^postgres:' /etc/passwd >/dev/null; then getent passwd postgres >/dev/null if [ $? -ne 0 ] ; then exit 0 @@ -65,7 +71,7 @@ # a directory that they can read cd /var/tmp -case "${1}" in +case "$1" in start) if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then # PostgreSQL data directory exists and is populated @@ -110,4 +116,4 @@ esac -# vim:set sw=2 ts=2 sts=2 expandtab: +# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci: 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 Dec 2 10:09:56 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 09:09:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7534] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7534 http://gar.svn.sourceforge.net/gar/?rev=7534&view=rev Author: wahwah Date: 2009-12-02 09:09:54 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Adding dependencies on lixml2, libxslt and openssl Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 09:07:27 UTC (rev 7533) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 09:09:54 UTC (rev 7534) @@ -54,7 +54,7 @@ SPKG_DESC_CSWpostgresqldevel = PostgreSQL Developer Files SPKG_DESC_CSWlibpq = PostgreSQL Libraries -REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq +REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq CSWlibxml2 CSWlibxslt CSWosslrt REQUIRED_PKGS_CSWpostgresqldevel = CSWpostgresql ARCHALL_CSWpostgresqldevel = 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 Wed Dec 2 13:37:53 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 02 Dec 2009 12:37:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7535] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7535 http://gar.svn.sourceforge.net/gar/?rev=7535&view=rev Author: bonivart Date: 2009-12-02 12:37:53 +0000 (Wed, 02 Dec 2009) Log Message: ----------- pkgutil: add pkgask dir Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-02 09:09:54 UTC (rev 7534) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-02 12:37:53 UTC (rev 7535) @@ -71,5 +71,6 @@ @pod2man --section=1 $(WORKSRC)/chkcat > $(DESTDIR)$(mandir)/man1/chkcat.1 @chmod 444 $(DESTDIR)$(mandir)/man1/* @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/pkgask @ginstall $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-02 09:09:54 UTC (rev 7534) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-02 12:37:53 UTC (rev 7535) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec -b93ce519cebdc48350eb0e2a22214827 CSWpkgutil.prototype +a751314ee495d7477888522435b769e4 CSWpkgutil.prototype 33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil bdc6afd165a5117c9d0f3a3a54109461 pkgutil-1.9.zip 6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-12-02 09:09:54 UTC (rev 7534) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-12-02 12:37:53 UTC (rev 7535) @@ -24,3 +24,4 @@ d none /var/opt/csw/pkgutil 0755 root bin f cswpkgutil /var/opt/csw/pkgutil/admin.CSW 644 root bin d none /var/opt/csw/pkgutil/packages 0755 root bin +d none /var/opt/csw/pkgutil/pkgask 0755 root bin 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 Dec 2 14:05:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 13:05:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7536] csw/mgar/pkg/chromium/trunk Message-ID: Revision: 7536 http://gar.svn.sourceforge.net/gar/?rev=7536&view=rev Author: wahwah Date: 2009-12-02 13:05:15 +0000 (Wed, 02 Dec 2009) Log Message: ----------- chromium: First few bits. Modified Paths: -------------- csw/mgar/pkg/chromium/trunk/Makefile csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py Added Paths: ----------- csw/mgar/pkg/chromium/trunk/files/IDLParser.pm-gcc.patch.patch csw/mgar/pkg/chromium/trunk/files/make-css-file-arrays.pl-gcc.patch csw/mgar/pkg/chromium/trunk/files/make-shell.patch csw/mgar/pkg/chromium/trunk/files/make_names.pl-gcc.patch Modified: csw/mgar/pkg/chromium/trunk/Makefile =================================================================== --- csw/mgar/pkg/chromium/trunk/Makefile 2009-12-02 12:37:53 UTC (rev 7535) +++ csw/mgar/pkg/chromium/trunk/Makefile 2009-12-02 13:05:15 UTC (rev 7536) @@ -2,182 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## GARNAME = chromium CHROMIUM_REVISION = 32797 GARVERSION = 0.$(CHROMIUM_REVISION) -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. DESCRIPTION = An open-source web browser -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. define BLURB endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = http://build.chromium.org/buildbot/archives/ -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). # DISTFILES = chromium.r$(CHROMIUM_REVISION).tgz DISTFILES = -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. REQUIRED_PKGS = CSWnspr CSWnss CSWffmpeg -## -## A list of packages necessary to build this package -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. +# CSWpyxml must be uninstalled +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg CSWgperf CSWpython CONFIGURE_SCRIPTS = chromium -BUILD_SCRIPTS = chromium -INSTALL_SCRIPTS = chromium -TEST_SCRIPTS = chromium -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -## CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## +BUILD_SCRIPTS = chromium +INSTALL_SCRIPTS = chromium +TEST_SCRIPTS = chromium +GIT_URI = git://git.chromium.org/chromium.git + GYP_GENERATORS = make export GYP_GENERATORS @@ -189,25 +35,29 @@ GARCOMPILER = GNU -# Because of bashisms in Makefiles in Chromium -SHELL = /opt/csw/bin/bash +# # Because of bashisms in Makefiles in Chromium +# SHELL = /opt/csw/bin/bash +# TODO: Make V8 realize it's a known architecture. +# EXTRA_CFLAGS = -DV8_TARGET_ARCH_IA32 +# EXTRA_CXXFLAGS = -DV8_TARGET_ARCH_IA32 + include gar/category.mk $(WORKSRC)/.gclient: - (cd $(WORKSRC) && \ - PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools) \ - GYP_GENERATORS=make \ + (cd $(WORKSRC) \ + && \ + PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools) \ gclient config http://src.chromium.org/svn/trunk/src) post-extract-modulated: mkdir -p $(WORKSRC) (cd $(WORKSRC) \ - && \ + && \ if [ -d src ]; then \ (cd src && git fetch ); \ else \ - git clone git://git.chromium.org/chromium.git src; \ + git clone $(GIT_URI) src; \ fi) @$(MAKECOOKIE) @@ -216,14 +66,18 @@ # I don't think there's anything platform-specific for Solaris in the source # code repository. -configure-chromium: depot-tools gclient-sync +configure-chromium: prerequisite-tests depot-tools gclient-sync +prerequisite-tests: + python files/xml_dom_minidom_test.py + @$(MAKECOOKIE) + gclient-sync: $(WORKSRC)/.gclient (cd $(WORKSRC) \ && \ - PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ - GYP_DEFINES="use_system_ffmpeg=1" \ - GYP_GENERATORS=make \ + PATH=$(PATH):$(abspath $(WORKDIR)/depot_tools) \ + GYP_DEFINES="use_system_ffmpeg=1" \ + GYP_GENERATORS=make \ gclient sync --revision src@$(CHROMIUM_REVISION)) # gclient sync) @$(MAKECOOKIE) @@ -231,15 +85,15 @@ gclient-runhooks: $(WORKSRC)/.gclient (cd $(WORKSRC) \ && \ - PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ - GYP_GENERATORS=make \ - GYP_DEFINES="use_system_ffmpeg=1" \ + PATH=$(PATH):$(abspath $(WORKDIR)/depot_tools) \ + GYP_GENERATORS=make \ + GYP_DEFINES="use_system_ffmpeg=1" \ gclient runhooks --force) @$(MAKECOOKIE) depot-tools: (cd $(WORKDIR) \ - && \ + && \ if [ -d depot_tools ]; then \ (cd depot_tools; svn up); \ else \ @@ -253,3 +107,5 @@ && \ PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ gmake $(PARALLELMFLAGS) chrome) + false + @$(MAKECOOKIE) Added: csw/mgar/pkg/chromium/trunk/files/IDLParser.pm-gcc.patch.patch =================================================================== --- csw/mgar/pkg/chromium/trunk/files/IDLParser.pm-gcc.patch.patch (rev 0) +++ csw/mgar/pkg/chromium/trunk/files/IDLParser.pm-gcc.patch.patch 2009-12-02 13:05:15 UTC (rev 7536) @@ -0,0 +1,11 @@ +--- src/third_party/WebKit/WebCore/bindings/scripts/IDLParser.pm.orig 2009-11-28 10:25:59.122473741 +0000 ++++ src/third_party/WebKit/WebCore/bindings/scripts/IDLParser.pm 2009-11-28 10:26:07.807234188 +0000 +@@ -64,7 +64,7 @@ + $parentsOnly = shift; + + if (!$preprocessor) { +- $preprocessor = "/usr/bin/gcc -E -P -x c++"; ++ $preprocessor = "/opt/csw/gcc4/bin/gcc -E -P -x c++"; + } + + if (!$defines) { Added: csw/mgar/pkg/chromium/trunk/files/make-css-file-arrays.pl-gcc.patch =================================================================== --- csw/mgar/pkg/chromium/trunk/files/make-css-file-arrays.pl-gcc.patch (rev 0) +++ csw/mgar/pkg/chromium/trunk/files/make-css-file-arrays.pl-gcc.patch 2009-12-02 13:05:15 UTC (rev 7536) @@ -0,0 +1,11 @@ +--- src/third_party/WebKit/WebCore/css/make-css-file-arrays.pl.orig 2009-11-28 10:22:54.972192369 +0000 ++++ src/third_party/WebKit/WebCore/css/make-css-file-arrays.pl 2009-11-28 10:23:20.152912664 +0000 +@@ -28,7 +28,7 @@ + GetOptions('preprocessor=s' => \$preprocessor); + + if (!$preprocessor) { +- $preprocessor = "/usr/bin/gcc -E -P -x c++"; ++ $preprocessor = "/opt/csw/gcc4/bin/gcc -E -P -x c++"; + } + + my $header = $ARGV[0]; Added: csw/mgar/pkg/chromium/trunk/files/make-shell.patch =================================================================== --- csw/mgar/pkg/chromium/trunk/files/make-shell.patch (rev 0) +++ csw/mgar/pkg/chromium/trunk/files/make-shell.patch 2009-12-02 13:05:15 UTC (rev 7536) @@ -0,0 +1,8 @@ +--- src/Makefile.orig 2009-11-28 09:56:56.496441208 +0000 ++++ src/Makefile 2009-11-28 09:57:22.425335593 +0000 +@@ -1,3 +1,5 @@ ++SHELL = /opt/csw/bin/bash ++ + # The source directory tree. + srcdir := . + Added: csw/mgar/pkg/chromium/trunk/files/make_names.pl-gcc.patch =================================================================== --- csw/mgar/pkg/chromium/trunk/files/make_names.pl-gcc.patch (rev 0) +++ csw/mgar/pkg/chromium/trunk/files/make_names.pl-gcc.patch 2009-12-02 13:05:15 UTC (rev 7536) @@ -0,0 +1,11 @@ +--- src/third_party/WebKit/WebCore/dom/make_names.pl.orig 2009-11-28 10:24:25.492039333 +0000 ++++ src/third_party/WebKit/WebCore/dom/make_names.pl 2009-11-28 10:24:37.696563843 +0000 +@@ -46,7 +46,7 @@ + my %attrs = (); + my %parameters = (); + my $extraDefines = 0; +-my $preprocessor = "/usr/bin/gcc -E -P -x c++"; ++my $preprocessor = "/opt/csw/gcc4/bin/gcc -E -P -x c++"; + + GetOptions( + 'tags=s' => \$tagsFile, Modified: csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py =================================================================== --- csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py 2009-12-02 12:37:53 UTC (rev 7535) +++ csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py 2009-12-02 13:05:15 UTC (rev 7536) @@ -35,6 +35,8 @@ gmake[1]: *** [gclient-sync] Error 1 gmake[1]: Leaving directory `/export/home/blizinski/opencsw/pkg/chromium/trunk' gmake: *** [build-isa-i386] Error 2 + +It was fixed by removing CSWpyxml. """ __author__ = 'Maciej Blizi?ski (blizinski at google.com)' 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 Dec 2 15:28:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 14:28:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7537] csw/mgar/pkg/postgresql/trunk/files/bench-32-vs-64. sh Message-ID: Revision: 7537 http://gar.svn.sourceforge.net/gar/?rev=7537&view=rev Author: wahwah Date: 2009-12-02 14:28:09 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgres: Benchmarking script Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/files/bench-32-vs-64.sh Added: csw/mgar/pkg/postgresql/trunk/files/bench-32-vs-64.sh =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/bench-32-vs-64.sh (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/bench-32-vs-64.sh 2009-12-02 14:28:09 UTC (rev 7537) @@ -0,0 +1,74 @@ +#!/opt/csw/bin/bash +# vim:set sw=2 ts=2 sts=2: +# +# $Id$ +# +# Usage: run as user postgres +# $ ./bench-32-vs-64.sh sparcv8 +# $ ./bench-32-vs-64.sh sparcv9 + +set -u +set -e + +do_arch() { + local arch="$1" + local bindir=/opt/csw/bin/postgresql/8.4/${arch} + local pgdatadir=/var/opt/csw/postgresql/8.4/pgdata-${arch} + echo "architecture: ${arch}" + echo "bindir: ${bindir}" + echo "pgdatadir: ${pgdatadir}" + read -p "Press ENTER to continue. > " JUNK + echo "Stopping the database." + ${bindir}/pg_ctl -D ${pgdatadir} -l ${pgdatadir}/postgresql.log stop || true + echo "Removing ${pgdatadir}" + rm -rf "${pgdatadir}" + mkdir -p "${pgdatadir}" + echo "Initializing ${pgdatadir}" + ${bindir}/initdb -D ${pgdatadir} -E "utf-8" -U postgres + echo "Starting the database" + ${bindir}/pg_ctl -D ${pgdatadir} -l ${pgdatadir}/postgresql.log start + echo "Waiting for the database to start up." + sleep 3 + echo "Creating the pgbench database" + ${bindir}/createdb -E utf-8 pgbench + echo "Initializing pgbench" + pgbench -i -s 10 pgbench + + echo "Running benchmarks" + # http://www.robsell.com/howto/pgbench.html + # local HOST=localhost + local USER=postgres + local DB=pgbench + local totxacts=1000 + for c in 10 + do + t=`expr $totxacts / $c` + # psql -h $HOST -U $USER -c 'vacuum analyze' $DB + # psql -h $HOST -U $USER -c 'checkpoint' $DB + psql -U $USER -c 'vacuum analyze' $DB + psql -U $USER -c 'checkpoint' $DB + echo "===== sync ======" 1>&2 + sync;sync;sync;sleep 10 + echo $c concurrent users... 1>&2 + pgbench -n -U $USER -t $t -c $c $DB + done + ${bindir}/pg_ctl -D ${pgdatadir} -l ${pgdatadir}/postgresql.log stop || true +} + +all_architectures() { + for arch in sparcv8 sparcv9 + do + do_arch ${arch} + done +} + +main() { + arg1="${1:-}" + if [[ -n "$arg1" ]]; then + do_arch $arg1 + else + all_architectures + fi +} + +main "$@" Property changes on: csw/mgar/pkg/postgresql/trunk/files/bench-32-vs-64.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + 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 Dec 2 16:43:37 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 15:43:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7538] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7538 http://gar.svn.sourceforge.net/gar/?rev=7538&view=rev Author: wahwah Date: 2009-12-02 15:43:37 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Fixing initsmf path, removing references to /opt/csw/lib/32 Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 14:28:09 UTC (rev 7537) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 15:43:37 UTC (rev 7538) @@ -84,11 +84,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-includes=/opt/csw/include -CONFIGURE_ARGS_isa-sparcv8 += --with-libraries=/opt/csw/lib/32 -CONFIGURE_ARGS_isa-i386 += --with-libraries=/opt/csw/lib/32 -CONFIGURE_ARGS_isa-sparcv9 += --with-libraries=/opt/csw/lib/64 -CONFIGURE_ARGS_isa-amd64 += --with-libraries=/opt/csw/lib/64 -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) +CONFIGURE_ARGS += --with-library=$(abspath /opt/csw/lib/$(MM_LIBDIR)) # # Perl support only in the 32-bit version # CONFIGURE_ARGS_isa-sparcv8 += --with-perl @@ -119,9 +115,8 @@ PKGFILES_CSWpostgresqldevel += $(prefix)/share/doc/postgresql/html.* PKGFILES_CSWlibpq = $(PKGFILES_RT) PKGFILES_CSWlibpq += $(libdir)/64 -PKGFILES_CSWlibpq += $(libdir)/32 -INITSMF = /etc$(prefix)/init\.d/cswpostgresql_$(BASE_VERSION) +INITSMF = /etc$(prefix)/init\.d/cswpostgres_$(BASE_VERSION) USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) PRESERVECONF = $(sysconfdir)/postgresql\.conf @@ -203,5 +198,4 @@ done ginstall -d $(PKGROOT)$(PGDATA) gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 - gln -s . $(PKGROOT)$(libdir)/32 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Dec 2 16:55:17 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 02 Dec 2009 15:55:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7539] csw/mgar/pkg/sudosh2/trunk Message-ID: Revision: 7539 http://gar.svn.sourceforge.net/gar/?rev=7539&view=rev Author: skayser Date: 2009-12-02 15:55:09 +0000 (Wed, 02 Dec 2009) Log Message: ----------- sudosh2: modify /etc/shells on installation/removal, included file handle leak patch Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/Makefile csw/mgar/pkg/sudosh2/trunk/checksums csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/sudosh2/trunk/files/004-replay-close-fds.patch csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postinstall csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postremove Modified: csw/mgar/pkg/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile 2009-12-02 15:43:37 UTC (rev 7538) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-12-02 15:55:09 UTC (rev 7539) @@ -1,7 +1,6 @@ # TODO/Issues # - Submit 001- (DESTDIR) and 002- (man page) patches upstream # - clearenvironment is not documented in sudosh.conf(5), others? -# - add /opt/csw/bin/sudosh to /etc/shells in postinstall GARNAME = sudosh2 GARVERSION = 1.0.2 CATEGORIES = apps @@ -21,9 +20,11 @@ Sudosh2 is a fork of sudosh (by Douglas Hanks). endef -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tgz SPKG_SOURCEURL = http://sudosh2.sf.net +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES += CSWsudosh2.postinstall +DISTFILES += CSWsudosh2.postremove sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw @@ -56,6 +57,9 @@ PATCHFILES += 002-strip-man-page-blank.patch # The binary is called sudosh (not sudosh2 - only leave sudosh2 in the title) PATCHFILES += 003-adjust-sudosh-man-binary-name.patch +# sudosh-replay leaks FDs on listing sessions +# http://sourceforge.net/tracker/?func=detail&aid=2040342&group_id=213047&atid=1024149 +PATCHFILES += 004-replay-close-fds.patch include gar/category.mk Modified: csw/mgar/pkg/sudosh2/trunk/checksums =================================================================== --- csw/mgar/pkg/sudosh2/trunk/checksums 2009-12-02 15:43:37 UTC (rev 7538) +++ csw/mgar/pkg/sudosh2/trunk/checksums 2009-12-02 15:55:09 UTC (rev 7539) @@ -1,4 +1,7 @@ -652d339ec04952f3d114b9aea838afc5 download/001-installsudosh.conf-destdir.patch -9752d641a2233caf7789711ecbcd890e download/002-strip-man-page-blank.patch -882f7d2ddb59330350dd2d82184aff50 download/003-adjust-sudosh-man-binary-name.patch -4c837f7739d9db780ad324ed8482e8a7 download/sudosh2-1.0.2.tgz +652d339ec04952f3d114b9aea838afc5 001-installsudosh.conf-destdir.patch +9752d641a2233caf7789711ecbcd890e 002-strip-man-page-blank.patch +882f7d2ddb59330350dd2d82184aff50 003-adjust-sudosh-man-binary-name.patch +41edfc118e6aaf191e647decee641bee 004-replay-close-fds.patch +0b8a0b464681f636262f716d096420f6 CSWsudosh2.postinstall +e324c66237a431004242d274fa2ad1f4 CSWsudosh2.postremove +4c837f7739d9db780ad324ed8482e8a7 sudosh2-1.0.2.tgz Added: csw/mgar/pkg/sudosh2/trunk/files/004-replay-close-fds.patch =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/004-replay-close-fds.patch (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/004-replay-close-fds.patch 2009-12-02 15:55:09 UTC (rev 7539) @@ -0,0 +1,36 @@ +diff -uNr sudosh2-1.0.2/src/replay.c sudosh2-1.0.3/src/replay.c +--- sudosh2-1.0.2/src/replay.c 2008-01-30 16:56:15.000000000 -0600 ++++ sudosh2-1.0.3/src/replay.c 2008-04-02 10:50:38.000000000 -0500 +@@ -345,8 +345,7 @@ + fprintf(stderr, + "[warning]: session %s is missing input information.\n", + scan->id); +- else +- close(scan->input.fd); ++ close(scan->input.fd); + + if ((scan->script.fd = open(scan->script.str, O_RDONLY)) == -1) { + LL(); +@@ -355,6 +354,7 @@ + scan->id); + continue; + } ++ close(scan->script.fd); + + if(!strcmp(scan->type, "interactive")) + fprintf(stdout, "%-19s %-8s %-12s %-12s %s\n", scan->date, +@@ -469,6 +469,8 @@ + fflush(stdout); + memset(read_buffer, '\0', BUFSIZ); + } ++ close(s_script.fd); ++ fclose(s_time.f); + fprintf(stderr, "[info]: EOF\n"); + fflush(stderr); + } +@@ -655,4 +657,5 @@ + } + + s->secs = (long) t_time; ++ fclose(s_time.f); + } Added: csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postinstall =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postinstall (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postinstall 2009-12-02 15:55:09 UTC (rev 7539) @@ -0,0 +1,52 @@ +#!/bin/sh +PATH=/usr/bin +export PATH + +SHELLS=/etc/shells +SUDOSH=/opt/csw/bin/sudosh + +if [ -z "${PKG_INSTALL_ROOT}" -o "${PKG_INSTALL_ROOT}" = "/" ] +then + RSHELLS=${SHELLS} + RSUDOSH=${SUDOSH} +else + RSHELLS=${PKG_INSTALL_ROOT}${SHELLS} + RSUDOSH=${SUDOSH} +fi + +if [ -f "${RSHELLS}" ]; then + echo "${RSHELLS} already exists." +else + cat > ${RSHELLS} < /dev/null 2>&1; then + echo "${RSHELLS} UNCHANGED because entry ${RSUDOSH} already exists." +else + echo "${RSUDOSH} # Added by CSWsudosh2" >> ${RSHELLS} + echo "ADDED ${RSUDOSH} to ${RSHELLS}." +fi Added: csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postremove =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postremove (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postremove 2009-12-02 15:55:09 UTC (rev 7539) @@ -0,0 +1,22 @@ +#!/bin/sh +PATH=/usr/bin +export PATH + +SHELLS=/etc/shells +SUDOSH=/opt/csw/bin/sudosh + +if [ -z "${PKG_INSTALL_ROOT}" -o "${PKG_INSTALL_ROOT}" = "/" ] +then + RSHELLS=${SHELLS} + RSUDOSH=${SUDOSH} +else + RSHELLS=${PKG_INSTALL_ROOT}${SHELLS} + RSUDOSH=${SUDOSH} +fi + +if /usr/bin/grep "^${RSUDOSH}" ${RSHELLS} > /dev/null 2>&1; then + /usr/bin/perl -i -pwe '$_ = "" if m%^'${RSUDOSH}'%' ${RSHELLS} + echo "REMOVED ${RSUDOSH} from ${RSHELLS}." +else + echo "${RSHELLS} UNCHANGED because it did not contain entry ${RSUDOSH}." +fi Modified: csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW 2009-12-02 15:43:37 UTC (rev 7538) +++ csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW 2009-12-02 15:55:09 UTC (rev 7539) @@ -1,3 +1,11 @@ +sudosh2 (1.0.2,REV=2009.12.02) + + * Applied file handle leak patch so that sudosh-replay doesn't run out of + file handles when listing sessions (#2040342 @ SF). + * Added postinstall/postremove scripts to include sudosh in /etc/shells + + -- Sebastian Kayser Wed, 2 Dec 2009 16:35:14 +0100 + sudosh2 (1.0.2,REV=2009.09.17) * Initial release. 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 Dec 2 17:15:10 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 02 Dec 2009 16:15:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7540] csw/mgar/pkg Message-ID: Revision: 7540 http://gar.svn.sourceforge.net/gar/?rev=7540&view=rev Author: bonivart Date: 2009-12-02 16:14:56 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgrey: initial commit Added Paths: ----------- csw/mgar/pkg/postgrey/ csw/mgar/pkg/postgrey/branches/ csw/mgar/pkg/postgrey/tags/ csw/mgar/pkg/postgrey/trunk/ csw/mgar/pkg/postgrey/trunk/Makefile csw/mgar/pkg/postgrey/trunk/checksums csw/mgar/pkg/postgrey/trunk/files/ csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init csw/mgar/pkg/postgrey/trunk/files/cswusergroup Property changes on: csw/mgar/pkg/postgrey/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/postgrey/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgrey/trunk/Makefile (rev 0) +++ csw/mgar/pkg/postgrey/trunk/Makefile 2009-12-02 16:14:56 UTC (rev 7540) @@ -0,0 +1,48 @@ +GARNAME = postgrey +GARVERSION = 1.32 +CATEGORIES = net + +DESCRIPTION = Postfix policy server implementing greylisting +define BLURB + Postfix policy server implementing greylisting +endef + +MASTER_SITES = http://postgrey.schweikert.ch/pub/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +REQUIRED_PKGS = CSWperl CSWpmiomultiplex CSWpmnetserver CSWbdb48 CSWpostfix +ARCHALL = 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +INITSMF = /etc/opt/csw/init.d/cswpostgrey +USERGROUP = /etc/opt/csw/pkg/CSWpostgrey/cswusergroup + +include gar/category.mk + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/CSWpostgrey.init $(DESTDIR)/etc/opt/csw/init.d/cswpostgrey + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/postfix + @ginstall -m 644 $(WORKSRC)/postgrey_whitelist_clients $(DESTDIR)/etc/opt/csw/postfix + @ginstall -m 644 $(WORKSRC)/postgrey_whitelist_recipients $(DESTDIR)/etc/opt/csw/postfix + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWpostgrey + @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWpostgrey/cswusergroup + @ginstall -m 755 -d $(DESTDIR)$(sbindir) + @ginstall -m 755 $(WORKSRC)/postgrey $(DESTDIR)$(sbindir) + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKSRC)/Changes $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 $(WORKSRC)/policy-test $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 $(WORKSRC)/contrib/postgreyreport $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 -d $(DESTDIR)$(mandir)/man1 + @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/$(GARNAME).1 + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/postgrey/trunk/checksums =================================================================== --- csw/mgar/pkg/postgrey/trunk/checksums (rev 0) +++ csw/mgar/pkg/postgrey/trunk/checksums 2009-12-02 16:14:56 UTC (rev 7540) @@ -0,0 +1 @@ +524a4e165bf997996f3bccade394712f postgrey-1.32.tar.gz Added: csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init =================================================================== --- csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init (rev 0) +++ csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init 2009-12-02 16:14:56 UTC (rev 7540) @@ -0,0 +1,40 @@ +#!/sbin/sh + +# 2009-12-02 Peter Bonivart + +if [ -f /lib/svc/share/smf_include.sh ]; then + . /lib/svc/share/smf_include.sh +fi + +SERVICE=postgrey + +OPTIONS="--inet=10023 -d --whitelist-clients=/etc/opt/csw/postfix/postgrey_whitelist_clients --whitelist-recipients=/etc/opt/csw/postfix/postgrey_whitelist_recipients --pidfile=/var/opt/csw/postgrey/postgrey.pid" + +case "$1" in + start) + echo "Starting $SERVICE ..." + /opt/csw/sbin/postgrey $OPTIONS + ;; + stop) + echo "Stopping $SERVICE ..." + pkill $SERVICE + ;; + restart) + echo "Restarting $SERVICE ... " + $0 stop + echo "Waiting for $SERVICE to stop: \c" + while ( pgrep $SERVICE > /dev/null ) + do + echo ".\c" + sleep 1 + done + echo + sleep 1 + $0 start + ;; + *) + echo "Usage: `basename $0` { start | stop | restart}" + exit 1 +esac + +exit 0 Added: csw/mgar/pkg/postgrey/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/postgrey/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/postgrey/trunk/files/cswusergroup 2009-12-02 16:14:56 UTC (rev 7540) @@ -0,0 +1 @@ +postgrey:postgrey:CSW Postgrey:/var/opt/csw/postgrey:/bin/false:::NP 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 Dec 2 17:34:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 16:34:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7541] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7541 http://gar.svn.sourceforge.net/gar/?rev=7541&view=rev Author: wahwah Date: 2009-12-02 16:34:55 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Moving html files to CSWpostgresqldoc Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 16:14:56 UTC (rev 7540) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 16:34:55 UTC (rev 7541) @@ -111,8 +111,8 @@ # EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" PKGFILES_CSWpostgresqldoc = $(PKGFILES_DOC) +PKGFILES_CSWpostgresqldoc += $(prefix)/share/doc/postgresql/html.* PKGFILES_CSWpostgresqldevel = $(PKGFILES_DEVEL) -PKGFILES_CSWpostgresqldevel += $(prefix)/share/doc/postgresql/html.* PKGFILES_CSWlibpq = $(PKGFILES_RT) PKGFILES_CSWlibpq += $(libdir)/64 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 Dec 2 17:56:23 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 02 Dec 2009 16:56:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7542] csw/mgar/pkg/postgrey/trunk/Makefile Message-ID: Revision: 7542 http://gar.svn.sourceforge.net/gar/?rev=7542&view=rev Author: bonivart Date: 2009-12-02 16:56:23 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgrey: use classutils for config files Modified Paths: -------------- csw/mgar/pkg/postgrey/trunk/Makefile Modified: csw/mgar/pkg/postgrey/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgrey/trunk/Makefile 2009-12-02 16:34:55 UTC (rev 7541) +++ csw/mgar/pkg/postgrey/trunk/Makefile 2009-12-02 16:56:23 UTC (rev 7542) @@ -23,6 +23,7 @@ INITSMF = /etc/opt/csw/init.d/cswpostgrey USERGROUP = /etc/opt/csw/pkg/CSWpostgrey/cswusergroup +SAMPLECONF = /etc/opt/csw/postfix/postgrey_whitelist_clients /etc/opt/csw/postfix/postgrey_whitelist_recipients include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 2 18:24:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 17:24:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7543] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7543 http://gar.svn.sourceforge.net/gar/?rev=7543&view=rev Author: wahwah Date: 2009-12-02 17:24:30 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: More dependencies added Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 16:56:23 UTC (rev 7542) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 17:24:30 UTC (rev 7543) @@ -54,8 +54,10 @@ SPKG_DESC_CSWpostgresqldevel = PostgreSQL Developer Files SPKG_DESC_CSWlibpq = PostgreSQL Libraries -REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq CSWlibxml2 CSWlibxslt CSWosslrt +REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq +REQUIRED_PKGS_CSWpostgresql += CSWlibxml2 CSWlibxslt CSWosslrt CSWkrb5lib REQUIRED_PKGS_CSWpostgresqldevel = CSWpostgresql +REQUIRED_PKGS_CSWlibpq = CSWkrb5lib CSWlibxml2 CSWlibxslt CSWosslrt CSWzlib ARCHALL_CSWpostgresqldevel = 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 Dec 2 19:30:53 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 18:30:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7544] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7544 http://gar.svn.sourceforge.net/gar/?rev=7544&view=rev Author: wahwah Date: 2009-12-02 18:30:52 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Make it possible to set GARFLAVOR from the command line Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 17:24:30 UTC (rev 7543) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 18:30:52 UTC (rev 7544) @@ -9,7 +9,7 @@ CATEGORIES = apps # Useful when making a series of builds on the same day -GARFLAVOR = DBG +GARFLAVOR ?= DBG DESCRIPTION = An advanced open source database SPKG_SOURCEURL = http://www.postgresql.org/ 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 Dec 2 20:29:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 19:29:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7545] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7545 http://gar.svn.sourceforge.net/gar/?rev=7545&view=rev Author: wahwah Date: 2009-12-02 19:29:07 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Making the *doc package ARCHALL Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 18:30:52 UTC (rev 7544) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 19:29:07 UTC (rev 7545) @@ -60,6 +60,7 @@ REQUIRED_PKGS_CSWlibpq = CSWkrb5lib CSWlibxml2 CSWlibxslt CSWosslrt CSWzlib ARCHALL_CSWpostgresqldevel = 1 +ARCHALL_CSWpostgresqldoc = 1 LICENSE = COPYRIGHT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 2 22:10:44 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 02 Dec 2009 21:10:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7546] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 7546 http://gar.svn.sourceforge.net/gar/?rev=7546&view=rev Author: chninkel Date: 2009-12-02 21:10:44 +0000 (Wed, 02 Dec 2009) Log Message: ----------- lftp: updated to 4.0.4 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2009-12-02 19:29:07 UTC (rev 7545) +++ csw/mgar/pkg/lftp/trunk/Makefile 2009-12-02 21:10:44 UTC (rev 7546) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = lftp -GARVERSION = 4.0.3 +GARVERSION = 4.0.4 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-12-02 19:29:07 UTC (rev 7545) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-12-02 21:10:44 UTC (rev 7546) @@ -1,3 +1,3 @@ 5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype -db4f98b7f4e325262647231ebba66b74 changelog.CSW -3dcda96e6567c0829055dc7e0f92ff5c lftp-4.0.3.tar.gz +e813870b518281ca71c398a9b05494e6 changelog.CSW +08461f56eb149382dfd120f461f49b5f lftp-4.0.4.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-12-02 19:29:07 UTC (rev 7545) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-12-02 21:10:44 UTC (rev 7546) @@ -1,3 +1,9 @@ +lftp (4.0.4,REV=2009.12.02) unstable + + * New upstream release. + + -- Yann Rouillard Wed, 02 Dec 2009 21:47:50 +0100 + lftp (4.0.3,REV=2009.11.01) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 2 22:44:40 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 02 Dec 2009 21:44:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7547] csw/mgar/pkg/rlwrap/trunk Message-ID: Revision: 7547 http://gar.svn.sourceforge.net/gar/?rev=7547&view=rev Author: chninkel Date: 2009-12-02 21:44:40 +0000 (Wed, 02 Dec 2009) Log Message: ----------- rlwrap: updated to 0.33 Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile csw/mgar/pkg/rlwrap/trunk/checksums csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2009-12-02 21:10:44 UTC (rev 7546) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2009-12-02 21:44:40 UTC (rev 7547) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = rlwrap -GARVERSION = 0.32 +GARVERSION = 0.33 CATEGORIES = utils DESCRIPTION = A readline wrapper Modified: csw/mgar/pkg/rlwrap/trunk/checksums =================================================================== --- csw/mgar/pkg/rlwrap/trunk/checksums 2009-12-02 21:10:44 UTC (rev 7546) +++ csw/mgar/pkg/rlwrap/trunk/checksums 2009-12-02 21:44:40 UTC (rev 7547) @@ -1,5 +1,2 @@ -1c940e58cea90e9fd91c3286d5f2a31e CSWrlwrap.depend -e699f8a2167f07465cfe891bba7a1bc7 CSWrlwrap.gspec -64db02a1daa57c76f7bf1e501d5cee17 CSWrlwrap.prototype -913fd14e3f46b7bc09c56a3325424123 changelog.CSW -441282a9a65c1d516c1c9a6821184539 rlwrap-0.32.tar.gz +ada93921f64eaa8153db0307bc11795f changelog.CSW +831f375ca6c9d7ac77bebff616bd03a6 rlwrap-0.33.tar.gz Modified: csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2009-12-02 21:10:44 UTC (rev 7546) +++ csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2009-12-02 21:44:40 UTC (rev 7547) @@ -1,3 +1,9 @@ +rlwrap (0.33,REV=2009.12.02) unstable + + * New upstream release. + + -- Yann Rouillard Wed, 02 Dec 2009 21:47:50 +0100 + rlwrap (0.32,REV=2009.10.09) unstable * New upstream release. 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 Dec 4 09:28:54 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Dec 2009 08:28:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7548] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Makefile Message-ID: Revision: 7548 http://gar.svn.sourceforge.net/gar/?rev=7548&view=rev Author: wahwah Date: 2009-12-04 08:28:54 +0000 (Fri, 04 Dec 2009) Log Message: ----------- mysql5: first try to do a /opt/csw prefix Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2009-12-02 21:44:40 UTC (rev 7547) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2009-12-04 08:28:54 UTC (rev 7548) @@ -8,7 +8,11 @@ GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server +# Useful when making a series of builds on the same day +GARFLAVOR = DBG + DISTNAME = mysql-$(GARVERSION) +SPKG_SOURCEURL = http://www.mysql.com/ DESCRIPTION = Multithreaded SQL database server define BLURB @@ -16,38 +20,44 @@ (Structured Query Language) database server. endef -GARFLAVOR = DBG +bindir_install = $(prefix)/bin/$(GARNAME)/$(BASE_VERSION) +datadir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) +docdir=$(prefix)/share/doc/$(GARNAME)/$(BASE_VERSION) +includedir=$(prefix)/include/$(GARNAME)/$(BASE_VERSION) +infodir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/info +libdir_install =$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) +libexecdir_install =$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) +lispdir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/emacs/site-lisp +localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION) +mandir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/man +sbindir_install = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) +sharedstatedir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) +sourcedir=$(prefix)/src/$(GARNAME)/$(BASE_VERSION) +sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION) -bindir = $(prefix)/bin/mysql/$(BASE_VERSION) -datadir=$(prefix)/share/mysql/$(BASE_VERSION) -docdir=$(prefix)/share/doc/mysql/$(BASE_VERSION) -includedir=$(prefix)/include/mysql/$(BASE_VERSION) -infodir=$(prefix)/share/mysql/$(BASE_VERSION)/info -libdir=$(prefix)/lib/mysql/$(BASE_VERSION) -libexecdir=$(prefix)/libexec/mysql/$(BASE_VERSION) -lispdir=$(prefix)/share/mysql/$(BASE_VERSION)/emacs/site-lisp -localstatedir = /var/opt/csw/mysql/$(BASE_VERSION) -mandir=$(prefix)/share/mysql/$(BASE_VERSION)/man -sbindir = $(prefix)/sbin/mysql/$(BASE_VERSION) -sharedstatedir=$(prefix)/share/mysql/$(BASE_VERSION) -sourcedir=$(prefix)/src/mysql/$(BASE_VERSION) -sysconfdir = /etc/opt/csw/mysql/$(BASE_VERSION) - # Where to put the init script -global_sysconfdir = /etc/opt/csw +global_sysconfdir = /etc$(prefix) # Where to link the binaries -global_bindir = /opt/csw/bin +global_bindir = /opt$(prefix) INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION) +PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel +PACKAGES += CSWmysql5rt CSWmysql5test + 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 -PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel -PACKAGES += CSWmysql5rt CSWmysql5test +SPKG_DESC_CSWmysql5 = Multithreaded SQL database +SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking +SPKG_DESC_CSWmysql5client = MySQL 5 client binaries +SPKG_DESC_CSWmysql5devel = MySQL 5 header files +SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files +SPKG_DESC_CSWmysql5test = MySQL 5 testing files + CATALOGNAME_CSWmysql5 = $(GARNAME) CATALOGNAME_CSWmysql5bench = $(GARNAME)bench CATALOGNAME_CSWmysql5client = $(GARNAME)client @@ -61,13 +71,6 @@ INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test -SPKG_DESC_CSWmysql5 = Multithreaded SQL database -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking -SPKG_DESC_CSWmysql5client = MySQL 5 client binaries -SPKG_DESC_CSWmysql5devel = MySQL 5 header files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files -SPKG_DESC_CSWmysql5test = MySQL 5 testing files - # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSWmysql5client_programs = myisamlog @@ -87,8 +90,21 @@ CSWmysql5client_programs += perror CSWmysql5client_programs += replace +# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared +# library not found. EXTRA_LIB was tried too, but did not work, as the -R path +# ended up with having two $ISALIST tokens. +# +# Without this setting it looks for: +# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 +# The library is at: +# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql + CSWmysql5devel_programs += mysql_config +# Enable 64 bits build +BUILD64 = 1 + PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5client = $(bindir) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) @@ -130,20 +146,10 @@ EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared -# library not found. EXTRA_LIB was tried too, but did not work, as the -R path -# ended up with having two $ISALIST tokens. -# -# Without this setting it looks for: -# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 -# The library is at: -# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 -EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql - # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler -CONFIGURE_ARGS += --without-docs +# CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile CONFIGURE_ARGS += --with-extra-charsets=all CONFIGURE_ARGS += --with-low-memory @@ -160,42 +166,43 @@ TEST_SCRIPTS = TEST_TARGETS = check -# Enable 64 bits build -BUILD64 = 1 USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup -PROTOTYPE_MODIFIERS = ownmysql -PROTOTYPE_FILES_ownmysql = /var/opt/csw/mysql5 -PROTOTYPE_USER_ownmysql = mysql -PROTOTYPE_GROUP_ownmysql = mysql -PROTOTYPE_PERMS_ownmysql = 0700 -PROTOTYPE_CLASS_ownmysql = ugfiles +PROTOTYPE_MODIFIERS = dbdir +PROTOTYPE_FILES_dbdir = $(localstatedir) +PROTOTYPE_USER_dbdir = mysql +PROTOTYPE_GROUP_dbdir = mysql +PROTOTYPE_PERMS_dbdir = 0700 +PROTOTYPE_CLASS_dbdir = ugfiles SPKG_CLASSES = none ugfiles include gar/category.mk -post-install-modulated: - ginstall -m 755 -d $(DESTDIR)$(localstatedir) - ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc - ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ - $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW - ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql - ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 +CFLAGS := $(filter-out -I%,$(CFLAGS)) + +post-merge: + ginstall -m 755 -d $(PKGROOT)$(localstatedir) + ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc + # ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ + # $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW + ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/cswmysql5 $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql + ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 - # A symlink for mysql5 include files - ginstall -m 755 -d $(DESTDIR)/opt/csw/include - ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql + $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 + ## A symlink for mysql5 include files + ## ginstall -m 755 -d $(PKGROOT)/opt/csw/include + ## ln -s ../mysql5/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries - ginstall -m 755 -d $(DESTDIR)$(global_bindir) - for f in $(DESTDIR)$(bindir)/*; do \ - ln -s mysql/$(BASE_VERSION)/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + ginstall -m 755 -d $(PKGROOT)$(global_bindir) + for f in $(PKGROOT)$(bindir)/*; do \ + ln -s mysql/$(BASE_VERSION)/`basename $$f` $(PKGROOT)$(global_bindir)/`basename $$f`; \ done + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 4 15:25:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Dec 2009 14:25:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7549] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 7549 http://gar.svn.sourceforge.net/gar/?rev=7549&view=rev Author: dmichelsen Date: 2009-12-04 14:25:33 +0000 (Fri, 04 Dec 2009) Log Message: ----------- mysql5: Fix some typos Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-04 08:28:54 UTC (rev 7548) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-04 14:25:33 UTC (rev 7549) @@ -15,11 +15,18 @@ CATALOGNAME_CSWmysql5 = $(GARNAME) CATALOGNAME_CSWmysql5bench = $(GARNAME)bench -CATALOGNAME_CSWmysql5clien = $(GARNAME)client +CATALOGNAME_CSWmysql5client = $(GARNAME)client CATALOGNAME_CSWmysql5devel = $(GARNAME)devel CATALOGNAME_CSWmysql5rt = $(GARNAME)rt CATALOGNAME_CSWmysql5test = $(GARNAME)test +SPKG_DESC_CSWmysql5 = $(DESCRIPTION) +SPKG_DESC_CSWmysql5bench = MySQL 5 benchmark tools +SPKG_DESC_CSWmysql5client = MySQL 5 client +SPKG_DESC_CSWmysql5devel = MySQL 5 development files +SPKG_DESC_CSWmysql5rt = MySQL 5 runtime libraries +SPKG_DESC_CSWmysql5test = MySQL 5 testing environment + MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ DISTFILES = mysql-$(GARVERSION).tar.gz @@ -31,7 +38,7 @@ # because we alter the prefix. this gets us proper linking as well as # LD_OPTIONS (RPATH) -EXTRA_LIB = /opt/csw/lib +# EXTRA_LIB = /opt/csw/lib EXTRA_INC = /opt/csw/include EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ 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 Dec 4 15:47:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Dec 2009 14:47:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7550] csw/mgar/pkg Message-ID: Revision: 7550 http://gar.svn.sourceforge.net/gar/?rev=7550&view=rev Author: dmichelsen Date: 2009-12-04 14:47:19 +0000 (Fri, 04 Dec 2009) Log Message: ----------- lastx: Initial commit Added Paths: ----------- csw/mgar/pkg/lastx/ csw/mgar/pkg/lastx/branches/ csw/mgar/pkg/lastx/tags/ csw/mgar/pkg/lastx/trunk/ csw/mgar/pkg/lastx/trunk/Makefile csw/mgar/pkg/lastx/trunk/checksums csw/mgar/pkg/lastx/trunk/files/ csw/mgar/pkg/lastx/trunk/files/COPYING Property changes on: csw/mgar/pkg/lastx/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/lastx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lastx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lastx/trunk/Makefile 2009-12-04 14:47:19 UTC (rev 7550) @@ -0,0 +1,36 @@ +GARNAME = lastx +GARVERSION = 1.1 +CATEGORIES = utils + +DESCRIPTION = An extension of the last utility shipped with Solaris +define BLURB + lastx is an extension of the last utility shipped with Solaris. It + prints all 32-characters of the users utmpx entry, and provides + facilities to display last data over a period of days. It also + allows the user to print unique logins, and the total # of attempted + logins. +endef + +MASTER_SITES = http://prefetch.net/code/ +DISTFILES = lastx.c +DISTFILES += COPYING + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://prefetch.net/code/lastx.c.html + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +build-custom: + cd $(WORKDIR) && $(CC) -o lastx $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) lastx.c + @$(MAKECOOKIE) + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKDIR)/lastx $(DESTDIR)$(bindir)/lastx Added: csw/mgar/pkg/lastx/trunk/checksums =================================================================== --- csw/mgar/pkg/lastx/trunk/checksums (rev 0) +++ csw/mgar/pkg/lastx/trunk/checksums 2009-12-04 14:47:19 UTC (rev 7550) @@ -0,0 +1,2 @@ +bb18f5d59310199db2915aae5f528fdc COPYING +5e57ffdd9e1ecd4baf5f5ecba766e15c lastx.c Added: csw/mgar/pkg/lastx/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/lastx/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/lastx/trunk/files/COPYING 2009-12-04 14:47:19 UTC (rev 7550) @@ -0,0 +1,13 @@ + 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 2, or (at your option) any + later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 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 Dec 4 17:02:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Dec 2009 16:02:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7551] csw/mgar/pkg Message-ID: Revision: 7551 http://gar.svn.sourceforge.net/gar/?rev=7551&view=rev Author: dmichelsen Date: 2009-12-04 16:02:42 +0000 (Fri, 04 Dec 2009) Log Message: ----------- libcdio: Initial commit Added Paths: ----------- csw/mgar/pkg/libcdio/ csw/mgar/pkg/libcdio/branches/ csw/mgar/pkg/libcdio/tags/ csw/mgar/pkg/libcdio/trunk/ csw/mgar/pkg/libcdio/trunk/Makefile csw/mgar/pkg/libcdio/trunk/checksums csw/mgar/pkg/libcdio/trunk/files/ Property changes on: csw/mgar/pkg/libcdio/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/libcdio/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcdio/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libcdio/trunk/Makefile 2009-12-04 16:02:42 UTC (rev 7551) @@ -0,0 +1,23 @@ +GARNAME = libcdio +GARVERSION = 0.82 +CATEGORIES = lib + +DESCRIPTION = Encapsulate CD-ROM reading and control +define BLURB + The Compact Disc Input and Control library encapsulates CD-ROM reading and control and + can be used in applications wishing to be oblivious of the OS- and device-dependant + properties of a CD-ROM. +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +GARCOMPILER = GNU + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/libcdio/trunk/checksums =================================================================== --- csw/mgar/pkg/libcdio/trunk/checksums (rev 0) +++ csw/mgar/pkg/libcdio/trunk/checksums 2009-12-04 16:02:42 UTC (rev 7551) @@ -0,0 +1 @@ +1c29b18e01ab2b966162bc727bf3c360 libcdio-0.82.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 Fri Dec 4 17:57:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Dec 2009 16:57:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7552] csw/mgar/pkg/gnupg2/trunk Message-ID: Revision: 7552 http://gar.svn.sourceforge.net/gar/?rev=7552&view=rev Author: wahwah Date: 2009-12-04 16:57:30 +0000 (Fri, 04 Dec 2009) Log Message: ----------- gnupg2: Making incompatible with gnupg 1.x, adding a symlink from gpg to gpg2, version bump to 2.0.13 Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile csw/mgar/pkg/gnupg2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch Removed Paths: ------------- csw/mgar/pkg/gnupg2/trunk/files/patch-keyserver_and_sm.diff Property Changed: ---------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-04 16:02:42 UTC (rev 7551) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-04 16:57:30 UTC (rev 7552) @@ -1,5 +1,9 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = gnupg -GARVERSION = 2.0.10 +GARVERSION = 2.0.13 CATEGORIES = apps DESCRIPTION = GnuPG is a complete and free replacement for PGP. @@ -19,10 +23,8 @@ # Bug ID 996 filed up stream along with patch # Supposed to be Fixed in the 01/2009 SVN version but has not # made it into a release at the time of this packaging -PATCHFILES = patch-keyserver_and_sm.diff +PATCHFILES = sm-libraries.patch -# We define upstream file regex so we can be notifed of -# new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) NOISALIST = 1 @@ -35,16 +37,27 @@ CONFIGURE_ARGS += --with-bzip2 CONFIGURE_ARGS += --with-readline CONFIGURE_ARGS += --enable-threads=solaris +CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses +PROTOTYPE_FILTER = awk '$$$$3 ~/\/gpg2$$$$/ { $$$$4 = 4755 } { print }' + # This is somehow not correctly detected from autoconf EXTRA_LINKER_FLAGS = -lgpg-error # Needed for nanosleep() EXTRA_LINKER_FLAGS += -lrt -REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt -REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn +REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt +REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn REQUIRED_PKGS += CSWbzip2 CSWreadline CSWggettextrt CSWiconv CSWosslrt +REQUIRED_PKGS += CSWpinentry CSWlibassuan +PREREQUISITE_PKGS = $(REQUIRED_PKGS) +INCOMPATIBLE_PKGS = CSWgnupg + TEST_TARGET = check include gar/category.mk + +post-merge: + ln -s gnupg2 $(DESTDIR)$(bindir)/gnupg + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/gnupg2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/gnupg2/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg2/trunk/checksums 2009-12-04 16:02:42 UTC (rev 7551) +++ csw/mgar/pkg/gnupg2/trunk/checksums 2009-12-04 16:57:30 UTC (rev 7552) @@ -1,2 +1,2 @@ -1cb778dd555f87685a8fde2f7113725e download/gnupg-2.0.10.tar.bz2 -37677df3905ce0e4b23a2fb3cc4d7207 download/patch-keyserver_and_sm.diff +41bd7629d815b90c15b37bb31c2f07c0 download/gnupg-2.0.13.tar.bz2 +9ee96ed5623d9ff8f3be8c3d70709509 download/sm-libraries.patch Deleted: csw/mgar/pkg/gnupg2/trunk/files/patch-keyserver_and_sm.diff =================================================================== --- csw/mgar/pkg/gnupg2/trunk/files/patch-keyserver_and_sm.diff 2009-12-04 16:02:42 UTC (rev 7551) +++ csw/mgar/pkg/gnupg2/trunk/files/patch-keyserver_and_sm.diff 2009-12-04 16:57:30 UTC (rev 7552) @@ -1,40 +0,0 @@ -diff -Nru gnupg-2.0.10.orig/keyserver/Makefile.in gnupg-2.0.10/keyserver/Makefile.in ---- gnupg-2.0.10.orig/keyserver/Makefile.in 2009-01-12 03:29:44.000000000 -0600 -+++ gnupg-2.0.10/keyserver/Makefile.in 2009-02-03 21:29:41.031225041 -0600 -@@ -395,7 +395,7 @@ - libexec_SCRIPTS = $(GPGKEYS_MAILTO) - noinst_SCRIPTS = gpg2keys_test - common_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a --other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) -+other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) ../jnlib/libjnlib.a - gpg2keys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h no-libgcrypt.c - gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS) - gpg2keys_ldap_LDADD = ../jnlib/libjnlib.a $(LDAPLIBS) $(GPG_ERROR_LIBS) \ -@@ -417,13 +417,13 @@ - $(am__append_8) - @FAKE_CURL_FALSE at gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS) - @FAKE_CURL_TRUE at gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS) -- at FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT) -+ at FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT) $(other_libs) - @FAKE_CURL_TRUE at gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \ - @FAKE_CURL_TRUE@ $(other_libs) - - @FAKE_CURL_FALSE at gpg2keys_hkp_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS) - @FAKE_CURL_TRUE at gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS) -- at FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT) -+ at FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT) $(other_libs) - @FAKE_CURL_TRUE at gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \ - @FAKE_CURL_TRUE@ $(other_libs) - -diff -Nru gnupg-2.0.10.orig/sm/Makefile.in gnupg-2.0.10/sm/Makefile.in ---- gnupg-2.0.10.orig/sm/Makefile.in 2009-01-12 03:29:44.000000000 -0600 -+++ gnupg-2.0.10/sm/Makefile.in 2009-02-03 21:30:03.836999289 -0600 -@@ -375,7 +375,7 @@ - common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \ - ../gl/libgnu.a - --gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \ -+gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a $(NETLIBS) \ - $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ - $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) $(ZLIBS) $(LIBICONV) - Added: csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch =================================================================== --- csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch (rev 0) +++ csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch 2009-12-04 16:57:30 UTC (rev 7552) @@ -0,0 +1,29 @@ +Otherwise: + + /opt/studio/SOS11/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I.. -I../gl -I../common -I../intl -DLOCALEDIR=\"/opt/csw/share/locale\" -DGNUPG_BINDIR="\"/opt/csw/bin\"" -DGNUPG_LIBEXECDIR="\"/opt/csw/libexec\"" -DGNUPG_LIBDIR="\"/opt/csw/lib/gnupg\"" -DGNUPG_DATADIR="\"/opt/csw/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/opt/csw/etc/gnupg\"" -DGNUPG_DEFAULT_PINENTRY="\"/opt/csw/bin/pinentry-curses\"" -I/opt/csw/include -I/opt/csw/include -I/opt/csw/include -I/opt/csw/include -xO3 -xarch=386 -I/opt/csw/include -c qualified.c +/opt/studio/SOS11/SUNWspro/bin/cc -I/opt/csw/include -I/opt/csw/include -I/opt/csw/include -xO3 -xarch=386 -I/opt/csw/include -xarch=386 -L/opt/csw/lib -lgpg-error -lrt -o gpgsm gpgsm.o misc.o keydb.o server.o call-agent.o call-dirmngr.o fingerprint.o base64.o certlist.o certdump.o certcheck.o certchain.o keylist.o verify.o sign.o encrypt.o decrypt.o import.o export.o delete.o certreqgen.o certreqgen-ui.o qualified.o ../common/libcommon.a ../kbx/libkeybox.a ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libgpgrl.a -L/opt/csw/lib -lgcrypt -lgpg-error -L/opt/csw/lib -lksba -lgpg-error -L/opt/csw/lib -lassuan -L/opt/csw/lib -lgpg-error -lreadline /opt/csw/lib/libintl.so -R/opt/csw/lib -lz -lbz2 /opt/csw/lib/libiconv.so -R/opt/csw/lib +Undefined first referenced + symbol in file +__xnet_connect /opt/csw/lib/libassuan.a(assuan-socket.o) (symbol belongs to implicit dependency /lib/libsocket.so.1) +__xnet_socket /opt/csw/lib/libassuan.a(assuan-socket.o) (symbol belongs to implicit dependency /lib/libsocket.so.1) +__xnet_socketpair /opt/csw/lib/libassuan.a(assuan-pipe-connect.o) (symbol belongs to implicit dependency /lib/libsocket.so.1) +__xnet_bind /opt/csw/lib/libassuan.a(assuan-socket.o) (symbol belongs to implicit dependency /lib/libsocket.so.1) +__xnet_recvmsg /opt/csw/lib/libassuan.a(assuan-io.o) (symbol belongs to implicit dependency /lib/libsocket.so.1) +__xnet_sendmsg /opt/csw/lib/libassuan.a(assuan-io.o) (symbol belongs to implicit dependency /lib/libsocket.so.1) +ld: fatal: Symbol referencing errors. No output written to gpgsm +gmake[4]: *** [gpgsm] Error 1 +gmake[4]: Leaving directory `/export/home/blizinski/opencsw/pkg/gnupg2/trunk/work/build-isa-i386/gnupg-2.0.13/sm' + + +diff -Nru gnupg-2.0.10.orig/sm/Makefile.in gnupg-2.0.10/sm/Makefile.in +--- gnupg-2.0.10.orig/sm/Makefile.in 2009-01-12 03:29:44.000000000 -0600 ++++ gnupg-2.0.10/sm/Makefile.in 2009-02-03 21:30:03.836999289 -0600 +@@ -375,7 +375,7 @@ + common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \ + ../gl/libgnu.a + +-gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \ ++gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a $(NETLIBS) \ + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ + $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) $(ZLIBS) $(LIBICONV) + 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 Dec 4 18:30:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Dec 2009 17:30:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7553] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 7553 http://gar.svn.sourceforge.net/gar/?rev=7553&view=rev Author: wahwah Date: 2009-12-04 17:30:14 +0000 (Fri, 04 Dec 2009) Log Message: ----------- pinentry: Setting packaging platforms and the compiler. Fails on build8s. Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-04 16:57:30 UTC (rev 7552) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-04 17:30:14 UTC (rev 7553) @@ -9,9 +9,13 @@ define BLURB endef SPKG_SOURCEURL = http://www.gnupg.org/ -PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ -PATCHFILES = 0001-remove-__extension__-from-util.c.patch +# PATCHFILES = 0001-remove-__extension__-from-util.c.patch +EXTRA_CFLAGS = -D__EXTENSIONS__ +EXTRA_CXXFLAGS = -D__EXTENSIONS__ PATCHFILES += 0002-ncurses-include.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -20,5 +24,32 @@ PREREQUISITE_PKGS += CSWgtk2devel TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) + +# Unfortunately, the compilation fails with SOS11. Because of that, pinentry +# can't be compiled on Solaris 8, and CSWgnupg2 needs to be compiled for +# Solaris 8 with no pinentry support. +# +# gmake[4]: Entering directory +# `(...)/pinentry-0.7.6/secmem' +# source='util.c' object='util.o' libtool=no \ +# DEPDIR=.deps depmode=none /bin/bash ../depcomp \ +# /opt/studio/SOS11/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I.. \ +# -I/opt/csw/X11/include -I/opt/csw/include -xO3 -xarch=v8 \ +# -D__EXTENSIONS__ -c util.c +# "util.c", line 57: warning: implicit function declaration: __extension__ +# "util.c", line 57: syntax error before or at: { +# "util.c", line 57: undefined symbol: __result +# "util.c", line 57: undefined symbol: __result +# "util.c", line 57: undefined symbol: __result +# "util.c", line 57: syntax error before or at: ) +# "util.c", line 58: warning: syntax error: empty declaration +# "util.c", line 59: warning: old-style declaration or incorrect type for: written +# cc: acomp failed for util.c +# gmake[4]: *** [util.o] Error 2 + GARCOMPILER = SOS12 + +PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 + + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Dec 4 18:47:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Dec 2009 17:47:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7554] csw/mgar/gar/v2-git Message-ID: Revision: 7554 http://gar.svn.sourceforge.net/gar/?rev=7554&view=rev Author: wahwah Date: 2009-12-04 17:47:14 +0000 (Fri, 04 Dec 2009) Log Message: ----------- gar-v2-git: Merging v2 up to r7553 Modified Paths: -------------- csw/mgar/gar/v2-git/gar.conf.mk csw/mgar/gar/v2-git/gar.pkg.mk Property Changed: ---------------- csw/mgar/gar/v2-git/ Property changes on: csw/mgar/gar/v2-git ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,6916-7336 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678,6915-7553 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2-git/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-git/gar.conf.mk 2009-12-04 17:30:14 UTC (rev 7553) +++ csw/mgar/gar/v2-git/gar.conf.mk 2009-12-04 17:47:14 UTC (rev 7554) @@ -499,8 +499,8 @@ CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) CXX = $($(GARCOMPILER)_CXX) -CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE_FLAGS)) -CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS) $(INCLUDE_FLAGS)) +CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS)) +CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS)) CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(_CATEGORY_CPPFLAGS) $(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS)) LDFLAGS ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(_CATEGORY_LDFLAGS) $(EXTRA_LDFLAGS) $(LINKER_FLAGS)) ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(_CATEGORY_ASFLAGS) $(EXTRA_ASFLAGS)) Modified: csw/mgar/gar/v2-git/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-git/gar.pkg.mk 2009-12-04 17:30:14 UTC (rev 7553) +++ csw/mgar/gar/v2-git/gar.pkg.mk 2009-12-04 17:47:14 UTC (rev 7554) @@ -185,15 +185,16 @@ SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) +SPKG_CLASSES := $(call _spkg_cond_add,CRONTABS,cswcrontab) SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) + # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE)$(TEXINFO),) _CSWCLASS_FILTER = | perl -ane '\ $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ @@ -202,10 +203,13 @@ $(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(CRONTABS),$$F[1] = "cswcrontab" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' +# The TEXINFO dependency is handled dynamically by looking at the prototype for matching files +ifneq ($(MIGRATECONF)$(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _EXTRA_GAR_PKGS += CSWcswclassutils # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. @@ -596,16 +600,14 @@ merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) @$(MAKECOOKIE) -merge-migrateconf-%: MIGRATE_FILES_$* ?= $(MIGRATE_FILES) -merge-migrateconf-%: MIGRATE_SOURCE_DIR_$* ?= $(MIGRATE_SOURCE_DIR) -merge-migrateconf-%: MIGRATE_DEST_DIR_$* ?= $(MIGRATE_DEST_DIR) merge-migrateconf-%: @echo "[ Generating cswmigrateconf for package $* ]" + @echo "X: $(MIGRATE_FILES_$*) Y: $(MIGRATE_FILES)" $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* - $(_DBG)(echo "MIGRATE_FILES=\"$(MIGRATE_FILES_$*)\"";\ + $(_DBG)(echo "MIGRATE_FILES=\"$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES))\"";\ $(if $(MIGRATE_SOURCE_DIR_$*),echo "SOURCE_DIR___default__=\"$(MIGRATE_SOURCE_DIR_$*)\"";)\ $(if $(MIGRATE_DEST_DIR_$*),echo "DEST_DIR___default__=\"$(MIGRATE_DEST_DIR_$*)\"";)\ - $(foreach F,$(MIGRATE_FILES_$*),\ + $(foreach F,$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES)),\ $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ )\ 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 Dec 4 18:51:22 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Dec 2009 17:51:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7555] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: Revision: 7555 http://gar.svn.sourceforge.net/gar/?rev=7555&view=rev Author: wahwah Date: 2009-12-04 17:51:22 +0000 (Fri, 04 Dec 2009) Log Message: ----------- gnupg2: post-merge target has to use PKGROOT Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-04 17:47:14 UTC (rev 7554) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-04 17:51:22 UTC (rev 7555) @@ -37,8 +37,10 @@ CONFIGURE_ARGS += --with-bzip2 CONFIGURE_ARGS += --with-readline CONFIGURE_ARGS += --enable-threads=solaris -CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses +# Waits for pinentry to be compiled on Solaris 8. +# CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses + PROTOTYPE_FILTER = awk '$$$$3 ~/\/gpg2$$$$/ { $$$$4 = 4755 } { print }' # This is somehow not correctly detected from autoconf @@ -49,7 +51,11 @@ REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn REQUIRED_PKGS += CSWbzip2 CSWreadline CSWggettextrt CSWiconv CSWosslrt -REQUIRED_PKGS += CSWpinentry CSWlibassuan +REQUIRED_PKGS += CSWlibassuan + +# Waits for pinentry to be compiled on Solaris 8. +# REQUIRED_PKGS += CSWpinentry + PREREQUISITE_PKGS = $(REQUIRED_PKGS) INCOMPATIBLE_PKGS = CSWgnupg @@ -59,5 +65,5 @@ include gar/category.mk post-merge: - ln -s gnupg2 $(DESTDIR)$(bindir)/gnupg + ln -s gnupg2 $(PKGROOT)$(bindir)/gnupg @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Dec 4 21:17:08 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 04 Dec 2009 20:17:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7556] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 7556 http://gar.svn.sourceforge.net/gar/?rev=7556&view=rev Author: chninkel Date: 2009-12-04 20:17:08 +0000 (Fri, 04 Dec 2009) Log Message: ----------- vsftpd: updated to 2.2.2 Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-12-04 17:51:22 UTC (rev 7555) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-12-04 20:17:08 UTC (rev 7556) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = vsftpd -GARVERSION = 2.2.1 +GARVERSION = 2.2.2 CATEGORIES = server DESCRIPTION = A very secure and fast FTP server. Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2009-12-04 17:51:22 UTC (rev 7555) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-12-04 20:17:08 UTC (rev 7556) @@ -2,7 +2,7 @@ 8944fcd302add66d5b2b287d390b9c91 CSWvsftpd.prototype eeaf77528b2da0c7730323838f30b7ef README.CSW 281c51282cabd9475cceef363bbc699b build_options.patch -c402d9755c9ea931dec6f256aef16541 changelog.CSW +eb30bdbd51e7226289cf9606c318608b changelog.CSW 54c1c39c6bfa8747a4457f135fd5bca1 csw_build_system.patch a9e994d2b57999b76a0e03503745c01a csw_paths.patch 98e1d831801985daf5ce2ed01fbc0efd cswusergroup @@ -10,7 +10,7 @@ 93173edf9931b8eb835c6d0177a7c6bd cswvsftpd.xml 73e59f9ada47d3d20199f7c97849fb13 destdir.patch a9a65f55cbfd01f9d72d1de25e67148d set_priv_sep_user.patch -a25e53dd86fada8d3897910b8f0efdb7 vsftpd-2.2.1.tar.gz +6d6bc136af14c23f8fef6f1a51f55418 vsftpd-2.2.2.tar.gz f6ce22a6959b93e500a4ae800295c2ee vsftpd.conf 0d4a1cf36560892adb9eb9410a01c522 vsftpd.smf_wrapper 60c736802e2ce00c531953b01e4a26f6 vsftpd.userlist Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-12-04 17:51:22 UTC (rev 7555) +++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-12-04 20:17:08 UTC (rev 7556) @@ -1,3 +1,9 @@ +vsftpd (2.2.2,REV=2009.12.04) unstable + + * New upstream version. + + -- Yann Rouillard Fri, 04 Dec 2009 21:12:20 +0100 + vsftpd (2.2.1,REV=2009.11.01) unstable * New upstream version. 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 Dec 5 16:49:18 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Dec 2009 15:49:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7557] csw/mgar/pkg/mysql5/trunk Message-ID: Revision: 7557 http://gar.svn.sourceforge.net/gar/?rev=7557&view=rev Author: wahwah Date: 2009-12-05 15:49:18 +0000 (Sat, 05 Dec 2009) Log Message: ----------- mysql5: Merged 5.1 into trunk, now triggers the libtool problem. Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile csw/mgar/pkg/mysql5/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/trunk/files/0001-Use-libc-not-libcrypt.patch csw/mgar/pkg/mysql5/trunk/files/0002-cast-user_info-pw_gid-to-gid_t.patch csw/mgar/pkg/mysql5/trunk/files/0003-OpenCSW-perl-for-tests.patch csw/mgar/pkg/mysql5/trunk/files/0004-basedir-and-datadir-in-the-cnf-files.patch csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall csw/mgar/pkg/mysql5/trunk/files/ChangeLog csw/mgar/pkg/mysql5/trunk/files/README.CSW csw/mgar/pkg/mysql5/trunk/files/cswmysql5 csw/mgar/pkg/mysql5/trunk/files/cswusergroup csw/mgar/pkg/mysql5/trunk/files/quick_start-csw Property Changed: ---------------- csw/mgar/pkg/mysql5/trunk/ csw/mgar/pkg/mysql5/trunk/Makefile Property changes on: csw/mgar/pkg/mysql5/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work mysql-5.0.84 old-pkgs CSWmysql5 Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-git Added: svn:mergeinfo + /csw/mgar/pkg/mysql5/branches/mysql-5.0.x:6058-7197 /csw/mgar/pkg/mysql5/branches/mysql-5.1.x:7198-7556 Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-04 20:17:08 UTC (rev 7556) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-05 15:49:18 UTC (rev 7557) @@ -1,53 +1,136 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = mysql5 -GARVERSION = 5.1.33 +GARVERSION = 5.1.40 CATEGORIES = server DISTNAME = mysql-$(GARVERSION) -DESCRIPTION = Multithreaded SQL database +DESCRIPTION = Multithreaded SQL database server define BLURB MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. endef +GARFLAVOR = DBG + +# Change prefix to /opt/csw/mysql5 +prefix = /opt/csw/mysql5 +sysconfdir = /etc/opt/csw/mysql5 +localstatedir = /var/opt/csw/mysql5 +global_sysconfdir = /etc/opt/csw +global_bindir = /opt/csw/bin + +INITSMF = $(global_sysconfdir)/init\.d/cswmysql5 + +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 + PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel PACKAGES += CSWmysql5rt CSWmysql5test -CATALOGNAME_CSWmysql5 = $(GARNAME) -CATALOGNAME_CSWmysql5bench = $(GARNAME)bench +CATALOGNAME_CSWmysql5 = $(GARNAME) +CATALOGNAME_CSWmysql5bench = $(GARNAME)bench CATALOGNAME_CSWmysql5client = $(GARNAME)client -CATALOGNAME_CSWmysql5devel = $(GARNAME)devel -CATALOGNAME_CSWmysql5rt = $(GARNAME)rt -CATALOGNAME_CSWmysql5test = $(GARNAME)test +CATALOGNAME_CSWmysql5devel = $(GARNAME)devel +CATALOGNAME_CSWmysql5rt = $(GARNAME)rt +CATALOGNAME_CSWmysql5test = $(GARNAME)test -SPKG_DESC_CSWmysql5 = $(DESCRIPTION) -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmark tools -SPKG_DESC_CSWmysql5client = MySQL 5 client -SPKG_DESC_CSWmysql5devel = MySQL 5 development files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime libraries -SPKG_DESC_CSWmysql5test = MySQL 5 testing environment +INCOMPATIBLE_PKGS_CSWmysql5bench = CSWmysql4bench +INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client +INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 +INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel +INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test +SPKG_DESC_CSWmysql5 = Multithreaded SQL database +SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking +SPKG_DESC_CSWmysql5client = MySQL 5 client binaries +SPKG_DESC_CSWmysql5devel = MySQL 5 header files +SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files +SPKG_DESC_CSWmysql5test = MySQL 5 testing files + +# Defining the client programs, which are going to pick up the 32- and 64-bit +# binaries, symbolic links, isaexec stuff and man pages. +CSWmysql5client_programs = myisamlog +CSWmysql5client_programs += myisampack +CSWmysql5client_programs += mysql +CSWmysql5client_programs += mysqlaccess +CSWmysql5client_programs += mysqladmin +CSWmysql5client_programs += mysqlbin +CSWmysql5client_programs += mysqlbinlog +CSWmysql5client_programs += mysqlcheck +CSWmysql5client_programs += mysql_client_test +CSWmysql5client_programs += mysqldump +CSWmysql5client_programs += mysqlhotcopy +CSWmysql5client_programs += mysqlimport +CSWmysql5client_programs += mysqlshow +CSWmysql5client_programs += mysql_zap +CSWmysql5client_programs += perror +CSWmysql5client_programs += replace + +CSWmysql5devel_programs += mysql_config + +PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* +PKGFILES_CSWmysql5client = $(bindir) +PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSWmysql5devel += $(prefix)/include.* +PKGFILES_CSWmysql5devel += /opt/csw/include/mysql + +PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* +PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* + +REQUIRED_PKGS_CSWmysql5bench = CSWmysql5 +REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt +REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt +REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 +REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl + MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ DISTFILES = mysql-$(GARVERSION).tar.gz +DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog +DISTFILES += CSWmysql5.preinstall +DISTFILES += CSWmysql5.postinstall +DISTFILES += cswusergroup -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz -# Change prefix to /opt/csw/mysql5 -prefix = /opt/csw/mysql5 +REQUIRED_PKGS = CSWncurses CSWzlib +PREREQUISITE_PKGS = $(REQUIRED_PKGS) -# because we alter the prefix. this gets us proper linking as well as -# LD_OPTIONS (RPATH) -# EXTRA_LIB = /opt/csw/lib +# MySQL-5.1.40 doesn't compile without setting EXTRA_INC. EXTRA_INC = /opt/csw/include -EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +EXTRA_LIB = /opt/csw/lib +EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared +# library not found. EXTRA_LIB was tried too, but did not work, as the -R path +# ended up with having two $ISALIST tokens. +# +# Without this setting it looks for: +# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 +# The library is at: +# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql + # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile +CONFIGURE_ARGS += --with-charset=utf8 CONFIGURE_ARGS += --with-extra-charsets=all CONFIGURE_ARGS += --with-low-memory CONFIGURE_ARGS += --with-pthread @@ -55,10 +138,50 @@ CONFIGURE_ARGS += --with-zlib-dir=/opt/csw CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb +CONFIGURE_ARGS += --with-comment +CONFIGURE_ARGS_DBG = --with-debug +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) -#TEST_ARGS = test-force +# TODO: Make the tests pass. They don't at the moment. +# TEST_SCRIPTS = +TEST_TARGETS = check # Enable 64 bits build BUILD64 = 1 +USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup + +PROTOTYPE_MODIFIERS = ownmysql +PROTOTYPE_FILES_ownmysql = /var/opt/csw/mysql5 +PROTOTYPE_USER_ownmysql = mysql +PROTOTYPE_GROUP_ownmysql = mysql +PROTOTYPE_PERMS_ownmysql = 0700 +PROTOTYPE_CLASS_ownmysql = ugfiles + +SPKG_CLASSES = none ugfiles + include gar/category.mk + +post-install-modulated: + ginstall -m 755 -d $(DESTDIR)$(localstatedir) + ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc + ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc + ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ + $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW + ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql + ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + ginstall -m 644 $(FILEDIR)/cswusergroup \ + $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + # A symlink for mysql5 include files + ginstall -m 755 -d $(DESTDIR)/opt/csw/include + ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql + # Create symlinks to binaries + ginstall -m 755 -d $(DESTDIR)$(global_bindir) + for f in $(DESTDIR)$(bindir)/*; do \ + ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + done + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/mysql5/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/mysql5/trunk/checksums =================================================================== --- csw/mgar/pkg/mysql5/trunk/checksums 2009-12-04 20:17:08 UTC (rev 7556) +++ csw/mgar/pkg/mysql5/trunk/checksums 2009-12-05 15:49:18 UTC (rev 7557) @@ -1 +1,12 @@ -9c5711e9bea4514df6f2659f283f0aa0 download/mysql-5.1.33.tar.gz +a0b98a7320bce2da3e1f90da704d3c85 0001-Use-libc-not-libcrypt.patch +1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch +5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch +8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch +747637bc4be42207974ae845d832ae65 CSWmysql5.postinstall +60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall +e691b0cf00a3925ac55c1844045d6e30 ChangeLog +e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW +aaca748fc044834e71ad544ab293c494 cswmysql5 +67228e1f096fe08a94f4267439a4ec36 cswusergroup +32e7373c16271606007374396e6742ad mysql-5.1.40.tar.gz +90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw Copied: csw/mgar/pkg/mysql5/trunk/files/0001-Use-libc-not-libcrypt.patch (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0001-Use-libc-not-libcrypt.patch) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/0001-Use-libc-not-libcrypt.patch (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/0001-Use-libc-not-libcrypt.patch 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,28 @@ +From a527f284ef5646dbdd731af007aace3daee3e946 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:27:38 +0100 +Subject: [PATCH 1/4] Use libc, not libcrypt + +--- + configure.in | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index ec432e1..577cfe3 100644 +--- a/configure.in ++++ b/configure.in +@@ -891,7 +891,10 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) + # This may get things to compile even if bind-8 is installed + AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) + # Check if crypt() exists in libc or libcrypt, sets LIBS if needed +-AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) ++## AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) ++# For crypt() on Solaris use libc, not libcrypt ++AC_CHECK_LIB(c, crypt) ++AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) + # See if we need a library for address lookup. + AC_SEARCH_LIBS(inet_aton, [socket nsl resolv]) + +-- +1.6.3.2 + Copied: csw/mgar/pkg/mysql5/trunk/files/0002-cast-user_info-pw_gid-to-gid_t.patch (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/0002-cast-user_info-pw_gid-to-gid_t.patch (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/0002-cast-user_info-pw_gid-to-gid_t.patch 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,27 @@ +From 8536f5925a96634950decd8779b2c6a60d183134 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:29:57 +0100 +Subject: [PATCH 2/4] cast user_info->pw_gid to gid_t + +--- + sql/mysqld.cc | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/sql/mysqld.cc b/sql/mysqld.cc +index 592ae3e..695fbb9 100644 +--- a/sql/mysqld.cc ++++ b/sql/mysqld.cc +@@ -1436,7 +1436,9 @@ static void set_user(const char *user, struct passwd *user_info_arg) + output a specific message to help the user resolve this problem. + */ + calling_initgroups= TRUE; +- initgroups((char*) user, user_info_arg->pw_gid); ++/* Solaris patch */ ++/* initgroups((char*) user, user_info->pw_gid); */ ++ initgroups((char*) user,(gid_t) user_info->pw_gid); + calling_initgroups= FALSE; + #endif + if (setgid(user_info_arg->pw_gid) == -1) +-- +1.6.3.2 + Copied: csw/mgar/pkg/mysql5/trunk/files/0003-OpenCSW-perl-for-tests.patch (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0003-OpenCSW-perl-for-tests.patch) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/0003-OpenCSW-perl-for-tests.patch (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/0003-OpenCSW-perl-for-tests.patch 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,22 @@ +From bd9a3ff419f5a614d584aa6156a512e69f470e0f Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:36:09 +0100 +Subject: [PATCH 3/4] OpenCSW perl for tests + +--- + mysql-test/mysql-test-run.pl | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl +index f60701b..cd9f843 100755 +--- a/mysql-test/mysql-test-run.pl ++++ b/mysql-test/mysql-test-run.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/opt/csw/bin/perl + # -*- cperl -*- + + # +-- +1.6.3.2 + Copied: csw/mgar/pkg/mysql5/trunk/files/0004-basedir-and-datadir-in-the-cnf-files.patch (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/0004-basedir-and-datadir-in-the-cnf-files.patch (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,81 @@ +From 194dbf9ff230f747bb093970831fbdf4cb0f0674 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:38:35 +0100 +Subject: [PATCH 4/4] basedir and datadir in the cnf files + +--- + support-files/my-huge.cnf.sh | 2 ++ + support-files/my-innodb-heavy-4G.cnf.sh | 2 ++ + support-files/my-large.cnf.sh | 2 ++ + support-files/my-medium.cnf.sh | 2 ++ + support-files/my-small.cnf.sh | 2 ++ + 5 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh +index e4747ac..907b41d 100644 +--- a/support-files/my-huge.cnf.sh ++++ b/support-files/my-huge.cnf.sh +@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh +index cda11d6..a9d5514 100644 +--- a/support-files/my-innodb-heavy-4G.cnf.sh ++++ b/support-files/my-innodb-heavy-4G.cnf.sh +@@ -39,6 +39,8 @@ socket = @MYSQL_UNIX_ADDR@ + # The MySQL server + # + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + + # generic configuration options + port = @MYSQL_TCP_PORT@ +diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh +index 981b137..8b890fb 100644 +--- a/support-files/my-large.cnf.sh ++++ b/support-files/my-large.cnf.sh +@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh +index c3135ea..ef841db 100644 +--- a/support-files/my-medium.cnf.sh ++++ b/support-files/my-medium.cnf.sh +@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh +index 24c0840..89299dd 100644 +--- a/support-files/my-small.cnf.sh ++++ b/support-files/my-small.cnf.sh +@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +-- +1.6.3.2 + Copied: csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $Id$ +# + +MYSQLDATADIR=/var/opt/csw/mysql5 +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/trunk/files/CSWmysql5.preinstall (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall 2009-12-05 15:49:18 UTC (rev 7557) @@ -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 Copied: csw/mgar/pkg/mysql5/trunk/files/ChangeLog (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/ChangeLog (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/ChangeLog 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,37 @@ +2009-11-05 Maciej Blizi?ski + + * Makefile: Reworked the package from ground up, using GAR. + +2007-06-17 Alex Moore + + * Version 5.1: MySQL 5.1 is still in beta. This package is released + for your testing only. + +2007-06-03 Alex Moore + + * Startup script: This update fixes a startup script problem that + caused the script to not work when --datadir is not the default. This + update also adds amd64 mysqld and client libraries. + +2006-12-29 Alex Moore + + * csw.conf: 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 this package is mysql5. + *** IMPORTANT *** + If you are using mysql5rc; please move your options to my.cnf and + eliminate mysql5rc. A future release will remove mysql5rc. my.cnf is + more flexible and any new or missing options will not be added to + mysql5rc. quick_start-csw is changed with this release to Not write + mysql5rc. Options for --basedir and --datadir are included in the + default my.cnf files. + *** END OF IMPORTANT *** + +2006-04-16 Alex Moore + + * quick_start-csw: This update fixes some problems with + quick_start-csw and svc-mysql5. I have also corrected some issues + when using a database directory that is not /opt/csw/mysql5/var 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. Copied: csw/mgar/pkg/mysql5/trunk/files/README.CSW (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/README.CSW 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,58 @@ +MySQL 5 OpenCSW package +======================= + +* http://www.opencsw.org/packages/mysql5 + +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/mysql5, but all the binaries are now linked from + /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/trunk/files/cswmysql5 (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/cswmysql5 (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/cswmysql5 2009-12-05 15:49:18 UTC (rev 7557) @@ -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/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 +MYSQLHOME=/opt/csw/mysql5 +MYSQL_VAR=/var/opt/csw/mysql5 +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +CONFFILE=$MYSQL_VAR/my.cnf + +# +# Source configuration +[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc +[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc + +# To get started quickly, copy a sample configuration file from +# $MYSQLHOME/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 [ 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/mysql5/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 Copied: csw/mgar/pkg/mysql5/trunk/files/cswusergroup (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/cswusergroup 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1 @@ +mysql:mysql:MySQL database user:/var/opt/csw/mysql5:/bin/false:: Copied: csw/mgar/pkg/mysql5/trunk/files/quick_start-csw (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/quick_start-csw (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/quick_start-csw 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,139 @@ +#!/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 +# +BASEDIR=/opt/csw/mysql5 +MYSQL_VAR=/var/opt/csw/mysql5 +DEFAULTS_FILE=$BASEDIR/my.cnf +SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf +MYSQLD_USER=mysql +# +# Provide a default data directory +MYSQLD_DATADIR=$MYSQL_VAR +# +echo +echo "This is the start script to setup a MySQL-5 database" +echo " directory." +echo +echo " The base directory is $BASEDIR." +echo " The default database directory is $MYSQLD_DATADIR." +echo +echo " If you have not setup a partition for the database and" +echo " you want one; now is a good time to exit this script and" +echo " create and mount the partition." +echo +echo " If you have not setup a my.cnf file and you do not want" +echo " one of the sample files; now is a good time to exit and" +echo " create the file $DEFAULTS_FILE." +echo +echo "Data directory: The default is $MYSQLD_DATADIR." +unset usrin +usrin=`/usr/bin/ckpath -ay -d [default] \ + -p "Accept the default or enter a directory" + ` || exit $? +if [ ! "$usrin" = "[default]" ]; then + MYSQLD_DATADIR=$usrin +fi +echo +echo "my.cnf pathname: The default is either to use the supplied file in" +echo " the base directory or to create one in the base directory from" +echo " the small memory footprint sample. If your enter a pathname," +echo " it will be used to create the options file in the base directory." +unset usrin +usrin=`/usr/bin/ckpath -f -d [default] \ + -p "Accept the default or enter a pathname" + ` || exit $? +if [ $usrin = "[default]" ]; then + 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 +else + IN_DEFAULTS_FILE=$usrin + echo "Using $IN_DEFAULTS_FILE to create the options file." +fi + +echo "data directory is $MYSQLD_DATADIR" +if [ ! -d "$MYSQLD_DATADIR" ]; then + echo "data directory will be created." +fi + +unset usrin +usrin=`/usr/bin/ckyorn -d y \ + -p "Continue with installation or quit" + ` || exit $? +if [ "$usrin" = "n" ] ; then + echo "Leaving script without doing anything." + exit 0 +fi + +if [ -d "$MYSQLD_DATADIR/mysql" ]; then + echo "mysql database already exists. Leaving script without doing anything." + 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 root:bin $MYSQLD_DATADIR + chmod -R 0755 $MYSQLD_DATADIR + chown 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 +chown -R mysql: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 quick_start-csw." +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 "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later" +else + 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 dmichelsen at users.sourceforge.net Sat Dec 5 17:39:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 05 Dec 2009 16:39:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7558] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 7558 http://gar.svn.sourceforge.net/gar/?rev=7558&view=rev Author: dmichelsen Date: 2009-12-05 16:39:30 +0000 (Sat, 05 Dec 2009) Log Message: ----------- pinetry: Add buildhosts Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-05 15:49:18 UTC (rev 7557) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-05 16:39:30 UTC (rev 7558) @@ -50,6 +50,9 @@ GARCOMPILER = SOS12 PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 +BUILDHOST_sparc-32 = build9s +BUILDHOST_sparc-64 = build9s +BUILDHOST_i386-32 = build9x +BUILDHOST_i386-64 = build10x - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Dec 5 20:33:51 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Dec 2009 19:33:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7559] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7559 http://gar.svn.sourceforge.net/gar/?rev=7559&view=rev Author: wahwah Date: 2009-12-05 19:33:51 +0000 (Sat, 05 Dec 2009) Log Message: ----------- postgresql: Layout based on the Debian PostgreSQL package Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-05 16:39:30 UTC (rev 7558) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-05 19:33:51 UTC (rev 7559) @@ -17,23 +17,24 @@ define BLURB endef -bindir_install = $(prefix)/bin/$(GARNAME)/$(BASE_VERSION) -datadir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) -docdir=$(prefix)/share/doc/$(GARNAME)/$(BASE_VERSION) -includedir=$(prefix)/include/$(GARNAME)/$(BASE_VERSION) -infodir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/info -libdir_install =$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) -libexecdir_install =$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) -lispdir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/emacs/site-lisp +version_dependent = /lib/$(GARNAME)/$(BASE_VERSION) +bindir_install = $(prefix)$(version_dependent)/bin +sbindir_install = $(prefix)$(version_dependent)/sbin +libdir_install = $(prefix)$(version_dependent)/lib localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION) -mandir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/man -sbindir_install = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) -sharedstatedir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) -sourcedir=$(prefix)/src/$(GARNAME)/$(BASE_VERSION) sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION) +datadir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION) +docdir = $(prefix)/share/doc/$(GARNAME)-$(BASE_VERSION) +includedir = $(prefix)/include/$(GARNAME)/$(BASE_VERSION) +infodir = $(datadir)/info +libexecdir_install = $(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) +lispdir = $(datadir)/emacs/site-lisp +mandir = $(datadir)/man +sharedstatedir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION) +sourcedir = $(prefix)/src/$(GARNAME)/$(BASE_VERSION) -MIGRATE_FILES = postgresql.conf -MIGRATE_DEST_DIR = $(sysconfdir) +MIGRATE_FILES_CSWpostgresql-8.4 = postgresql.conf +MIGRATE_DEST_DIR_CSWpostgresql-8.4 = $(sysconfdir) MASTER_SITES = http://wwwmaster.postgresql.org/redir/53/h/source/v$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 @@ -42,25 +43,31 @@ DISTFILES += postgresql.conf.tmpl DISTFILES += README-CSW.txt -PACKAGES = CSWpostgresql CSWpostgresqldoc CSWpostgresqldevel CSWlibpq +PACKAGES = CSWpostgresql-84 CSWpostgresql-84-doc CSWpostgresql-84-dev CSWlibpq-84 +PACKAGES += CSWpostgresql -CATALOGNAME_CSWpostgresql = postgresql -CATALOGNAME_CSWpostgresqldoc = postgresql_doc -CATALOGNAME_CSWpostgresqldevel = postgresql_devel -CATALOGNAME_CSWlibpq = libpq +CATALOGNAME_CSWpostgresql-84 = postgresql_84 +CATALOGNAME_CSWpostgresql-84-doc = postgresql_84_doc +CATALOGNAME_CSWpostgresql-84-dev = postgresql_84_devel +CATALOGNAME_CSWlibpq-84 = libpq84 +CATALOGNAME_CSWpostgresql = postgresql -SPKG_DESC_CSWpostgresql = An advanced open source database -SPKG_DESC_CSWpostgresqldoc = PostgreSQL Documentation -SPKG_DESC_CSWpostgresqldevel = PostgreSQL Developer Files -SPKG_DESC_CSWlibpq = PostgreSQL Libraries +SPKG_DEST_CSWpostgresql = An advanced open source database, a metapackage +SPKG_DESC_CSWpostgresql-84 = An advanced open source database, version 8.4.x +SPKG_DESC_CSWpostgresql-84-doc = PostgreSQL Documentation +SPKG_DESC_CSWpostgresql-84-dev = PostgreSQL Developer Files +SPKG_DESC_CSWlibpq-84 = PostgreSQL Libraries -REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq -REQUIRED_PKGS_CSWpostgresql += CSWlibxml2 CSWlibxslt CSWosslrt CSWkrb5lib -REQUIRED_PKGS_CSWpostgresqldevel = CSWpostgresql -REQUIRED_PKGS_CSWlibpq = CSWkrb5lib CSWlibxml2 CSWlibxslt CSWosslrt CSWzlib +REQUIRED_PKGS_CSWpostgresql = CSWpostgresql-84 +REQUIRED_PKGS_CSWpostgresql-84 = CSWreadline CSWzlib CSWlibpq-84 +REQUIRED_PKGS_CSWpostgresql-84 += CSWlibxml2 CSWlibxslt CSWosslrt CSWkrb5lib +REQUIRED_PKGS_CSWpostgresql-84-dev = CSWpostgresql-84 +REQUIRED_PKGS_CSWlibpq-84 = CSWkrb5lib CSWlibxml2 CSWlibxslt CSWosslrt +REQUIRED_PKGS_CSWlibpq-84 += CSWzlib -ARCHALL_CSWpostgresqldevel = 1 -ARCHALL_CSWpostgresqldoc = 1 +ARCHALL_CSWpostgresql = 1 +ARCHALL_CSWpostgresql-84-doc = 1 +ARCHALL_CSWpostgresql-84-doc = 1 LICENSE = COPYRIGHT @@ -107,18 +114,16 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) # Skipping tests to save time during packaging, and to enable x86 builds. -SKIPTEST = 1 +SKIPTEST ?= 1 TEST_TARGET = check -# What's that for? -# EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" +PKGFILES_CSWpostgresql = $(prefix)/bin/.* +PKGFILES_CSWpostgresql-84-doc = $(PKGFILES_DOC) +PKGFILES_CSWpostgresql-84-doc += $(prefix)/share/doc/postgresql/html.* +PKGFILES_CSWpostgresql-84-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibpq-84 = $(PKGFILES_RT) +PKGFILES_CSWlibpq-84 += $(libdir)/64 -PKGFILES_CSWpostgresqldoc = $(PKGFILES_DOC) -PKGFILES_CSWpostgresqldoc += $(prefix)/share/doc/postgresql/html.* -PKGFILES_CSWpostgresqldevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibpq = $(PKGFILES_RT) -PKGFILES_CSWlibpq += $(libdir)/64 - INITSMF = /etc$(prefix)/init\.d/cswpostgres_$(BASE_VERSION) USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) PRESERVECONF = $(sysconfdir)/postgresql\.conf @@ -152,7 +157,7 @@ PGDATA = $(localstatedir)/pgdata PROTOTYPE_MODIFIERS = pgdata -PROTOTYPE_FILES_pgdata = $(PGDATA) +PROTOTYPE_FILES_pgdata = $(localstatedir) $(PGDATA) PROTOTYPE_USER_pgdata = postgres PROTOTYPE_GROUP_pgdata = postgres PROTOTYPE_PERMS_pgdata = 0700 @@ -196,8 +201,9 @@ $(PKGROOT)$(sysconfdir) ginstall -d $(PKGROOT)$(docdir) ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir) + ginstall -m 755 -d $(PKGROOT)$(prefix)/bin for b in $(BIN_NAMES); do \ - gln -s $(GARNAME)/$(BASE_VERSION)/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \ + gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \ done ginstall -d $(PKGROOT)$(PGDATA) gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 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 Dec 6 05:23:51 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Dec 2009 04:23:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7560] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 7560 http://gar.svn.sourceforge.net/gar/?rev=7560&view=rev Author: bdwalton Date: 2009-12-06 04:23:50 +0000 (Sun, 06 Dec 2009) Log Message: ----------- libxml2: patch in casts to fix compile breakage; enable pycompile, striplibtool Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile csw/mgar/pkg/libxml2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-05 19:33:51 UTC (rev 7559) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-06 04:23:50 UTC (rev 7560) @@ -9,6 +9,8 @@ MASTER_SITES = ftp://xmlsoft.org/libxml2/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = ld-symbol-handling-fixup.patch +PATCHFILES += 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -39,6 +41,10 @@ BUILD64 = 1 NO_ISAEXEC = 1 +PYCOMPILE = 1 + +STRIP_LIBTOOL = 1 + # Skip 64 bit binaries - they are just big and gain nothing MERGE_DIRS_isa-sparcv9 = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2009-12-05 19:33:51 UTC (rev 7559) +++ csw/mgar/pkg/libxml2/trunk/checksums 2009-12-06 04:23:50 UTC (rev 7560) @@ -1 +1,3 @@ -8f4fda3969237c2a33bdb1583b5d06b2 download/libxml2-2.7.3.tar.gz +f0a8df3f16e7e44d6252d6f0f1896214 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch +5e371e0f0921fc7b366c34aded6ae993 ld-symbol-handling-fixup.patch +7740a8ec23878a2f50120e1faa2730f2 libxml2-2.7.6.tar.gz Added: csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch (rev 0) +++ csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch 2009-12-06 04:23:50 UTC (rev 7560) @@ -0,0 +1,42 @@ +From 960433c24da65100dcb57ec9ce801d59a86722cb Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 5 Dec 2009 13:32:49 -0500 +Subject: [PATCH] relaxng.c: add cast to allow compilation with sun studio 11 + +Sun Studio 11 was failing to compile relaxng.c due to a type mismatch +when calling xmlRngPErr. The issue was caused by a type mismatch with +in the outcomes of a ternary operation ("nothing" vs node->name). + +Cleanup another warning by casting a string literal to const unsigned +char *. + +Signed-off-by: Ben Walton +--- + relaxng.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/relaxng.c b/relaxng.c +index 075fc4a..9c6019d 100644 +--- a/relaxng.c ++++ b/relaxng.c +@@ -5369,7 +5369,7 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node, + } else { + xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, + "expecting name, anyName, nsName or choice : got %s\n", +- (node == NULL ? "nothing" : node->name), NULL); ++ (node == NULL ? (const unsigned char *) "nothing" : node->name), NULL); + return (NULL); + } + if (ret != def) { +@@ -9459,7 +9459,7 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt, + ctxt->states = NULL; + if (found == 0) { + if (cur == NULL) { +- VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); ++ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const unsigned char *) "noname"); + } else { + VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name); + } +-- +1.6.5.3 + Added: csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch (rev 0) +++ csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch 2009-12-06 04:23:50 UTC (rev 7560) @@ -0,0 +1,21 @@ +--- libxml2-2.7.6/configure.orig 2009-12-06 02:38:02.408924064 +0100 ++++ libxml2-2.7.6/configure 2009-12-06 02:38:28.581172792 +0100 +@@ -12150,15 +12150,10 @@ + $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \ + VERSION_SCRIPT_FLAGS=-Wl,--version-script= + test "`uname`" == "SunOS" && \ +- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," ++ VERSION_SCRIPT_FLAGS="-Wl,-M" + +- if test -n "$VERSION_SCRIPT_FLAGS"; then +- USE_VERSION_SCRIPT_TRUE= +- USE_VERSION_SCRIPT_FALSE='#' +-else +- USE_VERSION_SCRIPT_TRUE='#' +- USE_VERSION_SCRIPT_FALSE= +-fi ++USE_VERSION_SCRIPT_TRUE='#' ++USE_VERSION_SCRIPT_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 Sun Dec 6 08:50:29 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Dec 2009 07:50:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7561] csw/mgar/pkg/pinentry/trunk Message-ID: Revision: 7561 http://gar.svn.sourceforge.net/gar/?rev=7561&view=rev Author: wahwah Date: 2009-12-06 07:50:28 +0000 (Sun, 06 Dec 2009) Log Message: ----------- pinentry: Added gnulib, switched on 64-bit build Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile csw/mgar/pkg/pinentry/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pinentry/trunk/files/0003-TEMP_FAILURE_RETRY-macro-expansion.patch csw/mgar/pkg/pinentry/trunk/files/0004-adding-prereq-2.59-to-configure.ac.patch csw/mgar/pkg/pinentry/trunk/files/0005-Importing-getopt-posix-gnulib-module.patch csw/mgar/pkg/pinentry/trunk/files/0006-enabling-gnulib-getopt-module.patch Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 04:23:50 UTC (rev 7560) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 07:50:28 UTC (rev 7561) @@ -14,45 +14,57 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ # PATCHFILES = 0001-remove-__extension__-from-util.c.patch +PATCHFILES += 0002-ncurses-include.patch +PATCHFILES += 0003-TEMP_FAILURE_RETRY-macro-expansion.patch +PATCHFILES += 0004-adding-prereq-2.59-to-configure.ac.patch +PATCHFILES += 0005-Importing-getopt-posix-gnulib-module.patch +PATCHFILES += 0006-enabling-gnulib-getopt-module.patch EXTRA_CFLAGS = -D__EXTENSIONS__ EXTRA_CXXFLAGS = -D__EXTENSIONS__ -PATCHFILES += 0002-ncurses-include.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWglib CSWgtk CSWiconv CSWncurses +REQUIRED_PKGS = CSWfconfig +REQUIRED_PKGS += CSWftype2 +REQUIRED_PKGS += CSWggettextrt +REQUIRED_PKGS += CSWglib +REQUIRED_PKGS += CSWglib2 +REQUIRED_PKGS += CSWgtk +REQUIRED_PKGS += CSWgtk2 +REQUIRED_PKGS += CSWiconv +REQUIRED_PKGS += CSWlibatk +REQUIRED_PKGS += CSWlibcairo +REQUIRED_PKGS += CSWlibxext +REQUIRED_PKGS += CSWncurses +REQUIRED_PKGS += CSWpango PREREQUISITE_PKGS = $(REQUIRED_PKGS) PREREQUISITE_PKGS += CSWgtk2devel TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_LINKER_FLAGS_isa-i386 = /usr/openwin/lib/libXext.so +EXTRA_LINKER_FLAGS_isa-sparcv8 = /usr/openwin/lib/libXext.so +EXTRA_LINKER_FLAGS_isa-amd64 = /usr/openwin/lib/sparcv9/libXext.so +EXTRA_LINKER_FLAGS_isa-sparcv9 = /usr/openwin/lib/sparcv9/libXext.so +EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(MODULATION)) +BUILD64 = 1 -# Unfortunately, the compilation fails with SOS11. Because of that, pinentry -# can't be compiled on Solaris 8, and CSWgnupg2 needs to be compiled for -# Solaris 8 with no pinentry support. -# -# gmake[4]: Entering directory -# `(...)/pinentry-0.7.6/secmem' -# source='util.c' object='util.o' libtool=no \ -# DEPDIR=.deps depmode=none /bin/bash ../depcomp \ -# /opt/studio/SOS11/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I.. \ -# -I/opt/csw/X11/include -I/opt/csw/include -xO3 -xarch=v8 \ -# -D__EXTENSIONS__ -c util.c -# "util.c", line 57: warning: implicit function declaration: __extension__ -# "util.c", line 57: syntax error before or at: { -# "util.c", line 57: undefined symbol: __result -# "util.c", line 57: undefined symbol: __result -# "util.c", line 57: undefined symbol: __result -# "util.c", line 57: syntax error before or at: ) -# "util.c", line 58: warning: syntax error: empty declaration -# "util.c", line 59: warning: old-style declaration or incorrect type for: written -# cc: acomp failed for util.c -# gmake[4]: *** [util.o] Error 2 +include gar/category.mk -GARCOMPILER = SOS12 +# Switch this target on when working with gnulib. +# pre-configure-modulated: +# # To pick up the gnulib bits. +# ( \ +# cd $(WORKSRC) \ +# && \ +# aclocal -I m4 \ +# && \ +# autoconf -I m4 \ +# && \ +# autoheader \ +# && \ +# automake --add-missing --foreign \ +# ) +# @$(MAKECOOKIE) -PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 -BUILDHOST_sparc-32 = build9s -BUILDHOST_sparc-64 = build9s -BUILDHOST_i386-32 = build9x -BUILDHOST_i386-64 = build10x - -include gar/category.mk +# It works with SOS11 now, thanks to +# 0003-TEMP_FAILURE_RETRY-macro-expansion.patch +# GARCOMPILER = SOS12 Modified: csw/mgar/pkg/pinentry/trunk/checksums =================================================================== --- csw/mgar/pkg/pinentry/trunk/checksums 2009-12-06 04:23:50 UTC (rev 7560) +++ csw/mgar/pkg/pinentry/trunk/checksums 2009-12-06 07:50:28 UTC (rev 7561) @@ -1,3 +1,6 @@ -2964e403781bf656b04b46b3846057e4 download/0001-remove-__extension__-from-util.c.patch -1cfd306236b7fb0bc01a2a408f4f5abb download/0002-ncurses-include.patch -5a4f676375fa882009da02013d77210f download/pinentry-0.7.6.tar.gz +1cfd306236b7fb0bc01a2a408f4f5abb 0002-ncurses-include.patch +acafe7b0e415b707d2ab91dd5c24ac68 0003-TEMP_FAILURE_RETRY-macro-expansion.patch +9ce352e0abab7435d54123ad3bad03ce 0004-adding-prereq-2.59-to-configure.ac.patch +b2817a6ea1682a53e6d89ea96e64d5fc 0005-Importing-getopt-posix-gnulib-module.patch +c4440acb2da95db03342e45eb10bec4d 0006-enabling-gnulib-getopt-module.patch +5a4f676375fa882009da02013d77210f pinentry-0.7.6.tar.gz Added: csw/mgar/pkg/pinentry/trunk/files/0003-TEMP_FAILURE_RETRY-macro-expansion.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0003-TEMP_FAILURE_RETRY-macro-expansion.patch (rev 0) +++ csw/mgar/pkg/pinentry/trunk/files/0003-TEMP_FAILURE_RETRY-macro-expansion.patch 2009-12-06 07:50:28 UTC (rev 7561) @@ -0,0 +1,60 @@ +From e5752fdc0313d3b2ec35d8192bdeb39c25e0795c Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 4 Dec 2009 18:55:28 +0100 +Subject: [PATCH] TEMP_FAILURE_RETRY macro expansion + +--- + secmem/util.c | 22 ++++++++++++++++++++-- + 1 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/secmem/util.c b/secmem/util.c +index 580fd34..0ee1e8d 100644 +--- a/secmem/util.c ++++ b/secmem/util.c +@@ -32,6 +32,11 @@ + + #include "util.h" + ++/* ++ * This macro does not work with Sun Studio 11. ++ */ ++ ++#if 0 + #ifndef TEMP_FAILURE_RETRY + #define TEMP_FAILURE_RETRY(expression) \ + (__extension__ \ +@@ -40,6 +45,7 @@ + while (__result == -1L && errno == EINTR); \ + __result; })) + #endif ++#endif + + #ifndef HAVE_DOSISH_SYSTEM + static int uid_set = 0; +@@ -53,9 +59,21 @@ ssize_t xwrite(int fd, const void *data, size_t bytes) + size_t todo; + ssize_t written = 0; + +- for (ptr = (char *)data, todo = bytes; todo; ptr += written, todo -= written) +- if ((written = TEMP_FAILURE_RETRY(write(fd, ptr, todo))) < 0) ++ for (ptr = (char *)data, todo = bytes; todo; ptr += written, todo -= written) { ++ ++ do { ++ written = (long int) write(fd, ptr, todo); ++ } while (written == -1L && errno == EINTR); ++ ++ if (written < 0) + break; ++ } ++ /* ++ * Original code inside the for loop: ++ * ++ * if ((written = TEMP_FAILURE_RETRY(write(fd, ptr, todo))) < 0) ++ * break; ++ */ + return written; + } + +-- +1.6.5.1 + Added: csw/mgar/pkg/pinentry/trunk/files/0004-adding-prereq-2.59-to-configure.ac.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0004-adding-prereq-2.59-to-configure.ac.patch (rev 0) +++ csw/mgar/pkg/pinentry/trunk/files/0004-adding-prereq-2.59-to-configure.ac.patch 2009-12-06 07:50:28 UTC (rev 7561) @@ -0,0 +1,25 @@ +From 6f95e3011e203a98a1dc7cde43887a155bd2c041 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 4 Dec 2009 19:37:47 +0100 +Subject: [PATCH 4/6] adding-prereq-2.59-to-configure.ac + +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e091dd9..8707ff1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -19,7 +19,7 @@ + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + + # (Process this file with autoconf to produce a configure script.) +-AC_PREREQ(2.57) ++AC_PREREQ(2.59) + min_automake_version="1.7.6" + + # Version number: Remember to change it immediately *after* a release. +-- +1.6.5.1 + Added: csw/mgar/pkg/pinentry/trunk/files/0005-Importing-getopt-posix-gnulib-module.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0005-Importing-getopt-posix-gnulib-module.patch (rev 0) +++ csw/mgar/pkg/pinentry/trunk/files/0005-Importing-getopt-posix-gnulib-module.patch 2009-12-06 07:50:28 UTC (rev 7561) @@ -0,0 +1,5816 @@ +From 5ab452427bdb2f48759090c0acd4b49ab33a0d9e Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 4 Dec 2009 19:39:08 +0100 +Subject: [PATCH 5/6] Importing getopt-posix gnulib module + +--- + lib/Makefile.am | 219 ++++++++++ + lib/Makefile.am~ | 219 ++++++++++ + lib/Makefile.in | 933 ++++++++++++++++++++++++++++++++++++++++ + lib/dummy.c | 42 ++ + lib/getopt.c | 1187 +++++++++++++++++++++++++++++++++++++++++++++++++++ + lib/getopt.in.h | 247 +++++++++++ + lib/getopt1.c | 170 ++++++++ + lib/getopt_int.h | 132 ++++++ + lib/gettext.h | 279 ++++++++++++ + lib/stddef.in.h | 86 ++++ + lib/unistd.in.h | 810 +++++++++++++++++++++++++++++++++++ + link-warning.h | 28 ++ + m4/00gnulib.m4 | 30 ++ + m4/extensions.m4 | 104 +++++ + m4/getopt.m4 | 250 +++++++++++ + m4/gnulib-cache.m4 | 34 ++ + m4/gnulib-common.m4 | 124 ++++++ + m4/gnulib-comp.m4 | 201 +++++++++ + m4/gnulib-tool.m4 | 57 +++ + m4/include_next.m4 | 187 ++++++++ + m4/onceonly.m4 | 90 ++++ + m4/stddef_h.m4 | 45 ++ + m4/unistd_h.m4 | 119 +++++ + m4/wchar_t.m4 | 20 + + 24 files changed, 5613 insertions(+), 0 deletions(-) + create mode 100644 lib/Makefile.am + create mode 100644 lib/Makefile.am~ + create mode 100644 lib/Makefile.in + create mode 100644 lib/dummy.c + create mode 100644 lib/getopt.c + create mode 100644 lib/getopt.in.h + create mode 100644 lib/getopt1.c + create mode 100644 lib/getopt_int.h + create mode 100644 lib/gettext.h + create mode 100644 lib/stddef.in.h + create mode 100644 lib/unistd.in.h + create mode 100644 link-warning.h + create mode 100644 m4/00gnulib.m4 + create mode 100644 m4/extensions.m4 + create mode 100644 m4/getopt.m4 + create mode 100644 m4/gnulib-cache.m4 + create mode 100644 m4/gnulib-common.m4 + create mode 100644 m4/gnulib-comp.m4 + create mode 100644 m4/gnulib-tool.m4 + create mode 100644 m4/include_next.m4 + create mode 100644 m4/onceonly.m4 + create mode 100644 m4/stddef_h.m4 + create mode 100644 m4/unistd_h.m4 + create mode 100644 m4/wchar_t.m4 + +diff --git a/lib/Makefile.am b/lib/Makefile.am +new file mode 100644 +index 0000000..f407c93 +--- /dev/null ++++ b/lib/Makefile.am +@@ -0,0 +1,219 @@ ++## DO NOT EDIT! GENERATED AUTOMATICALLY! ++## Process this file with automake to produce Makefile.in. ++# Copyright (C) 2002-2009 Free Software Foundation, Inc. ++# ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. ++# ++# Generated by gnulib-tool. ++# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-libtool --macro-prefix=gl getopt-posix ++ ++AUTOMAKE_OPTIONS = 1.5 gnits ++ ++SUBDIRS = ++noinst_HEADERS = ++noinst_LIBRARIES = ++noinst_LTLIBRARIES = ++EXTRA_DIST = ++BUILT_SOURCES = ++SUFFIXES = ++MOSTLYCLEANFILES = core *.stackdump ++MOSTLYCLEANDIRS = ++CLEANFILES = ++DISTCLEANFILES = ++MAINTAINERCLEANFILES = ++ ++AM_CPPFLAGS = ++AM_CFLAGS = ++ ++noinst_LIBRARIES += libgnu.a ++ ++libgnu_a_SOURCES = ++libgnu_a_LIBADD = $(gl_LIBOBJS) ++libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) ++EXTRA_libgnu_a_SOURCES = ++ ++## begin gnulib module getopt-posix ++ ++BUILT_SOURCES += $(GETOPT_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++getopt.h: getopt.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/getopt.in.h; \ ++ } > $@-t && \ ++ mv -f $@-t $@ ++MOSTLYCLEANFILES += getopt.h getopt.h-t ++ ++EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h ++ ++EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c ++ ++## end gnulib module getopt-posix ++ ++## begin gnulib module gettext-h ++ ++libgnu_a_SOURCES += gettext.h ++ ++## end gnulib module gettext-h ++ ++## begin gnulib module link-warning ++ ++LINK_WARNING_H=$(top_srcdir)/./link-warning.h ++ ++EXTRA_DIST += $(top_srcdir)/./link-warning.h ++ ++## end gnulib module link-warning ++ ++## begin gnulib module stddef ++ ++BUILT_SOURCES += $(STDDEF_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++stddef.h: stddef.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ ++ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ ++ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ ++ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ ++ < $(srcdir)/stddef.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += stddef.h stddef.h-t ++ ++EXTRA_DIST += stddef.in.h ++ ++## end gnulib module stddef ++ ++## begin gnulib module unistd ++ ++BUILT_SOURCES += unistd.h ++ ++# We need the following in order to create an empty placeholder for ++# when the system doesn't have one. ++unistd.h: unistd.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ ++ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ ++ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ ++ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ ++ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \ ++ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ ++ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ ++ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \ ++ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ ++ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \ ++ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ ++ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ ++ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ ++ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ ++ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ ++ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \ ++ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ ++ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ ++ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ ++ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ ++ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ ++ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ ++ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ ++ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ ++ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ ++ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ ++ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ ++ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \ ++ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ ++ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ ++ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ ++ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \ ++ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \ ++ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ ++ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ ++ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ ++ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ ++ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ ++ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ ++ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ ++ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ ++ -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ ++ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ ++ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ ++ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ ++ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ ++ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ ++ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ ++ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ ++ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ ++ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ ++ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ ++ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ ++ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ ++ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ ++ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ ++ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ ++ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ ++ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ ++ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ ++ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ ++ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ ++ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ ++ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ ++ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ ++ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ ++ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ ++ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ ++ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ ++ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ ++ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ ++ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ ++ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ ++ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ ++ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ ++ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ ++ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ ++ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ ++ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/unistd.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += unistd.h unistd.h-t ++ ++EXTRA_DIST += unistd.in.h ++ ++## end gnulib module unistd ++ ++## begin gnulib module dummy ++ ++libgnu_a_SOURCES += dummy.c ++ ++## end gnulib module dummy ++ ++ ++mostlyclean-local: mostlyclean-generic ++ @for dir in '' $(MOSTLYCLEANDIRS); do \ ++ if test -n "$$dir" && test -d $$dir; then \ ++ echo "rmdir $$dir"; rmdir $$dir; \ ++ fi; \ ++ done; \ ++ : +diff --git a/lib/Makefile.am~ b/lib/Makefile.am~ +new file mode 100644 +index 0000000..c1fb886 +--- /dev/null ++++ b/lib/Makefile.am~ +@@ -0,0 +1,219 @@ ++## DO NOT EDIT! GENERATED AUTOMATICALLY! ++## Process this file with automake to produce Makefile.in. ++# Copyright (C) 2002-2009 Free Software Foundation, Inc. ++# ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. ++# ++# Generated by gnulib-tool. ++# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-libtool --macro-prefix=gl getopt ++ ++AUTOMAKE_OPTIONS = 1.5 gnits ++ ++SUBDIRS = ++noinst_HEADERS = ++noinst_LIBRARIES = ++noinst_LTLIBRARIES = ++EXTRA_DIST = ++BUILT_SOURCES = ++SUFFIXES = ++MOSTLYCLEANFILES = core *.stackdump ++MOSTLYCLEANDIRS = ++CLEANFILES = ++DISTCLEANFILES = ++MAINTAINERCLEANFILES = ++ ++AM_CPPFLAGS = ++AM_CFLAGS = ++ ++noinst_LIBRARIES += libgnu.a ++ ++libgnu_a_SOURCES = ++libgnu_a_LIBADD = $(gl_LIBOBJS) ++libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) ++EXTRA_libgnu_a_SOURCES = ++ ++## begin gnulib module getopt-posix ++ ++BUILT_SOURCES += $(GETOPT_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++getopt.h: getopt.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/getopt.in.h; \ ++ } > $@-t && \ ++ mv -f $@-t $@ ++MOSTLYCLEANFILES += getopt.h getopt.h-t ++ ++EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h ++ ++EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c ++ ++## end gnulib module getopt-posix ++ ++## begin gnulib module gettext-h ++ ++libgnu_a_SOURCES += gettext.h ++ ++## end gnulib module gettext-h ++ ++## begin gnulib module link-warning ++ ++LINK_WARNING_H=$(top_srcdir)/./link-warning.h ++ ++EXTRA_DIST += $(top_srcdir)/./link-warning.h ++ ++## end gnulib module link-warning ++ ++## begin gnulib module stddef ++ ++BUILT_SOURCES += $(STDDEF_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++stddef.h: stddef.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ ++ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ ++ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ ++ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ ++ < $(srcdir)/stddef.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += stddef.h stddef.h-t ++ ++EXTRA_DIST += stddef.in.h ++ ++## end gnulib module stddef ++ ++## begin gnulib module unistd ++ ++BUILT_SOURCES += unistd.h ++ ++# We need the following in order to create an empty placeholder for ++# when the system doesn't have one. ++unistd.h: unistd.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ ++ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ ++ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ ++ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ ++ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \ ++ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ ++ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ ++ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \ ++ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ ++ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \ ++ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ ++ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ ++ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ ++ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ ++ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ ++ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \ ++ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ ++ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ ++ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ ++ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ ++ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ ++ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ ++ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ ++ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ ++ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ ++ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ ++ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ ++ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \ ++ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ ++ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ ++ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ ++ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \ ++ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \ ++ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ ++ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ ++ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ ++ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ ++ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ ++ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ ++ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ ++ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ ++ -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ ++ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ ++ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ ++ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ ++ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ ++ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ ++ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ ++ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ ++ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ ++ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ ++ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ ++ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ ++ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ ++ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ ++ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ ++ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ ++ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ ++ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ ++ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ ++ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ ++ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ ++ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ ++ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ ++ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ ++ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ ++ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ ++ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ ++ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ ++ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ ++ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ ++ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ ++ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ ++ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ ++ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ ++ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ ++ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ ++ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ ++ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/unistd.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += unistd.h unistd.h-t ++ ++EXTRA_DIST += unistd.in.h ++ ++## end gnulib module unistd ++ ++## begin gnulib module dummy ++ ++libgnu_a_SOURCES += dummy.c ++ ++## end gnulib module dummy ++ ++ ++mostlyclean-local: mostlyclean-generic ++ @for dir in '' $(MOSTLYCLEANDIRS); do \ ++ if test -n "$$dir" && test -d $$dir; then \ ++ echo "rmdir $$dir"; rmdir $$dir; \ ++ fi; \ ++ done; \ ++ : +diff --git a/lib/Makefile.in b/lib/Makefile.in +new file mode 100644 +index 0000000..f22746f +--- /dev/null ++++ b/lib/Makefile.in +@@ -0,0 +1,933 @@ ++# Makefile.in generated by automake 1.11 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. ++# 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. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ at SET_MAKE@ ++ ++# Copyright (C) 2002-2009 Free Software Foundation, Inc. ++# ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. ++# ++# Generated by gnulib-tool. ++# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-libtool --macro-prefix=gl getopt getopt-gnu ++ ++ ++ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++subdir = lib ++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ ++ $(top_srcdir)/m4/curses.m4 $(top_srcdir)/m4/extensions.m4 \ ++ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/glib.m4 \ ++ $(top_srcdir)/m4/gnulib-common.m4 \ ++ $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/gtk.m4 \ ++ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \ ++ $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/qt.m4 \ ++ $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ ++ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++LIBRARIES = $(noinst_LIBRARIES) ++AR = ar ++ARFLAGS = cru ++libgnu_a_AR = $(AR) $(ARFLAGS) ++am__DEPENDENCIES_1 = ++am_libgnu_a_OBJECTS = dummy.$(OBJEXT) ++libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++am__mv = mv -f ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) ++DIST_SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++HEADERS = $(noinst_HEADERS) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" ++ACLOCAL = @ACLOCAL@ ++AMTAR = @AMTAR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++GETOPT_H = @GETOPT_H@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ ++GLIB_CONFIG = @GLIB_CONFIG@ ++GLIB_LIBS = @GLIB_LIBS@ ++GNULIB_CHOWN = @GNULIB_CHOWN@ ++GNULIB_CLOSE = @GNULIB_CLOSE@ ++GNULIB_DUP2 = @GNULIB_DUP2@ ++GNULIB_DUP3 = @GNULIB_DUP3@ ++GNULIB_ENVIRON = @GNULIB_ENVIRON@ ++GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ ++GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ ++GNULIB_FCHDIR = @GNULIB_FCHDIR@ ++GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ ++GNULIB_FSYNC = @GNULIB_FSYNC@ ++GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ ++GNULIB_GETCWD = @GNULIB_GETCWD@ ++GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ ++GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ ++GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ ++GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ ++GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ ++GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ ++GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ ++GNULIB_LCHOWN = @GNULIB_LCHOWN@ ++GNULIB_LINK = @GNULIB_LINK@ ++GNULIB_LINKAT = @GNULIB_LINKAT@ ++GNULIB_LSEEK = @GNULIB_LSEEK@ ++GNULIB_PIPE2 = @GNULIB_PIPE2@ ++GNULIB_READLINK = @GNULIB_READLINK@ ++GNULIB_READLINKAT = @GNULIB_READLINKAT@ ++GNULIB_RMDIR = @GNULIB_RMDIR@ ++GNULIB_SLEEP = @GNULIB_SLEEP@ ++GNULIB_SYMLINK = @GNULIB_SYMLINK@ ++GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ ++GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ ++GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ ++GNULIB_UNLINK = @GNULIB_UNLINK@ ++GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ ++GNULIB_WRITE = @GNULIB_WRITE@ ++GREP = @GREP@ ++GTK2CFLAGS = @GTK2CFLAGS@ ++GTK2LIBS = @GTK2LIBS@ ++GTK_CFLAGS = @GTK_CFLAGS@ ++GTK_CONFIG = @GTK_CONFIG@ ++GTK_LIBS = @GTK_LIBS@ ++HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ++HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ ++HAVE_DUP2 = @HAVE_DUP2@ ++HAVE_DUP3 = @HAVE_DUP3@ ++HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ ++HAVE_FACCESSAT = @HAVE_FACCESSAT@ ++HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ ++HAVE_FSYNC = @HAVE_FSYNC@ ++HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ ++HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ ++HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ ++HAVE_GETGROUPS = @HAVE_GETGROUPS@ ++HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ ++HAVE_GETOPT_H = @HAVE_GETOPT_H@ ++HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ++HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ ++HAVE_LINK = @HAVE_LINK@ ++HAVE_LINKAT = @HAVE_LINKAT@ ++HAVE_OS_H = @HAVE_OS_H@ ++HAVE_PIPE2 = @HAVE_PIPE2@ ++HAVE_READLINK = @HAVE_READLINK@ ++HAVE_READLINKAT = @HAVE_READLINKAT@ ++HAVE_SLEEP = @HAVE_SLEEP@ ++HAVE_SYMLINK = @HAVE_SYMLINK@ ++HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ ++HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ ++HAVE_UNISTD_H = @HAVE_UNISTD_H@ ++HAVE_UNLINKAT = @HAVE_UNLINKAT@ ++HAVE_WCHAR_T = @HAVE_WCHAR_T@ ++INCLUDE_NEXT = @INCLUDE_NEXT@ ++INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LDFLAGS = @LDFLAGS@ ++LIBCAP = @LIBCAP@ ++LIBCURSES = @LIBCURSES@ ++LIBICONV = @LIBICONV@ ++LIBINTL = @LIBINTL@ ++LIBNCURSES = @LIBNCURSES@ ++LIBOBJS = @LIBOBJS@ ++LIBPTHREAD = @LIBPTHREAD@ ++LIBS = @LIBS@ ++LIBTERMCAP = @LIBTERMCAP@ ++LIB_QPE = @LIB_QPE@ ++LN_S = @LN_S@ ++LTLIBICONV = @LTLIBICONV@ ++LTLIBINTL = @LTLIBINTL@ ++LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ ++MOC = @MOC@ ++NCURSES_INCLUDE = @NCURSES_INCLUDE@ ++NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ ++NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ ++NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ ++NEXT_GETOPT_H = @NEXT_GETOPT_H@ ++NEXT_STDDEF_H = @NEXT_STDDEF_H@ ++NEXT_UNISTD_H = @NEXT_UNISTD_H@ ++OBJEXT = @OBJEXT@ ++PACKAGE = @PACKAGE@ ++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@ ++PINENTRY_DEFAULT = @PINENTRY_DEFAULT@ ++PKG_CONFIG = @PKG_CONFIG@ ++PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ ++QT4_CORE_CFLAGS = @QT4_CORE_CFLAGS@ ++QT4_CORE_LIBS = @QT4_CORE_LIBS@ ++QT4_GUI_CFLAGS = @QT4_GUI_CFLAGS@ ++QT4_GUI_LIBS = @QT4_GUI_LIBS@ ++QTE_NORTTI = @QTE_NORTTI@ ++QT_CXXFLAGS = @QT_CXXFLAGS@ ++QT_INCLUDES = @QT_INCLUDES@ ++QT_LDFLAGS = @QT_LDFLAGS@ ++QT_LIBS = @QT_LIBS@ ++QT_MT_LDFLAGS = @QT_MT_LDFLAGS@ ++QT_MT_LIBS = @QT_MT_LIBS@ ++QT_RPATH = @QT_RPATH@ ++RANLIB = @RANLIB@ ++REPLACE_CHOWN = @REPLACE_CHOWN@ ++REPLACE_CLOSE = @REPLACE_CLOSE@ ++REPLACE_DUP = @REPLACE_DUP@ ++REPLACE_DUP2 = @REPLACE_DUP2@ ++REPLACE_FCHDIR = @REPLACE_FCHDIR@ ++REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ ++REPLACE_GETCWD = @REPLACE_GETCWD@ ++REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ ++REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ ++REPLACE_LCHOWN = @REPLACE_LCHOWN@ ++REPLACE_LINK = @REPLACE_LINK@ ++REPLACE_LINKAT = @REPLACE_LINKAT@ ++REPLACE_LSEEK = @REPLACE_LSEEK@ ++REPLACE_NULL = @REPLACE_NULL@ ++REPLACE_READLINK = @REPLACE_READLINK@ ++REPLACE_RMDIR = @REPLACE_RMDIR@ ++REPLACE_SYMLINK = @REPLACE_SYMLINK@ ++REPLACE_UNLINK = @REPLACE_UNLINK@ ++REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ ++REPLACE_WRITE = @REPLACE_WRITE@ ++SETCAP = @SETCAP@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++STDDEF_H = @STDDEF_H@ ++STRIP = @STRIP@ ++UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ ++UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ ++USE_THREADS = @USE_THREADS@ ++VERSION = @VERSION@ ++WINDRES = @WINDRES@ ++XMKMF = @XMKMF@ ++X_CFLAGS = @X_CFLAGS@ ++X_EXTRA_LIBS = @X_EXTRA_LIBS@ ++X_LIBS = @X_LIBS@ ++X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++gl_LIBOBJS = @gl_LIBOBJS@ ++gl_LTLIBOBJS = @gl_LTLIBOBJS@ ++gltests_LIBOBJS = @gltests_LIBOBJS@ ++gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++libgnu_LIBDEPS = @libgnu_LIBDEPS@ ++libgnu_LTLIBDEPS = @libgnu_LTLIBDEPS@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++qt_includes = @qt_includes@ ++qt_libraries = @qt_libraries@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++x_libraries = @x_libraries@ ++AUTOMAKE_OPTIONS = 1.5 gnits ++SUBDIRS = ++noinst_HEADERS = ++noinst_LIBRARIES = libgnu.a ++noinst_LTLIBRARIES = ++EXTRA_DIST = getopt.c getopt.in.h getopt1.c getopt_int.h \ ++ $(top_srcdir)/./link-warning.h stddef.in.h unistd.in.h ++BUILT_SOURCES = $(GETOPT_H) $(STDDEF_H) unistd.h ++SUFFIXES = ++MOSTLYCLEANFILES = core *.stackdump getopt.h getopt.h-t stddef.h \ ++ stddef.h-t unistd.h unistd.h-t ++MOSTLYCLEANDIRS = ++CLEANFILES = ++DISTCLEANFILES = ++MAINTAINERCLEANFILES = ++AM_CPPFLAGS = ++AM_CFLAGS = ++libgnu_a_SOURCES = gettext.h dummy.c ++libgnu_a_LIBADD = $(gl_LIBOBJS) ++libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) ++EXTRA_libgnu_a_SOURCES = getopt.c getopt1.c ++LINK_WARNING_H = $(top_srcdir)/./link-warning.h ++all: $(BUILT_SOURCES) ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive ++ ++.SUFFIXES: ++.SUFFIXES: .c .o .obj ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnits lib/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): ++ ++clean-noinstLIBRARIES: ++ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) ++libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) ++ -rm -f libgnu.a ++ $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) ++ $(RANLIB) libgnu.a ++ ++clean-noinstLTLIBRARIES: ++ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) ++ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ ++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ++ test "$$dir" != "$$p" || dir=.; \ ++ echo "rm -f \"$${dir}/so_locations\""; \ ++ rm -f "$${dir}/so_locations"; \ ++ done ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dummy.Po at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getopt.Po at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getopt1.Po at am__quote@ ++ ++.c.o: ++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ at am__fastdepCC_FALSE@ $(COMPILE) -c $< ++ ++.c.obj: ++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` ++ ++# This directory's subdirectories are mostly independent; you can cd ++# into them and run `make' without going through this Makefile. ++# To change the values of `make' variables: instead of editing Makefiles, ++# (1) if the variable is set in `config.status', edit `config.status' ++# (which will cause the Makefiles to be regenerated when you run `make'); ++# (2) otherwise, pass the desired values on the `make' command line. ++$(RECURSIVE_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" ++ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ ++ done; \ ++ rev="$$rev ."; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ for subdir in $$rev; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done && test -z "$$fail" ++tags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ set x; \ ++ here=`pwd`; \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ empty_fix=.; \ ++ else \ ++ include_option=--include; \ ++ empty_fix=; \ ++ fi; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test ! -f $$subdir/TAGS || \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ ++ done; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ else \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ ++ || exit 1; \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ || exit 1; \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ am__skip_mode_fix=: \ ++ distdir) \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: $(BUILT_SOURCES) ++ $(MAKE) $(AM_MAKEFLAGS) check-recursive ++all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) ++installdirs: installdirs-recursive ++installdirs-am: ++install: $(BUILT_SOURCES) ++ $(MAKE) $(AM_MAKEFLAGS) install-recursive ++install-exec: install-exec-recursive ++install-data: install-data-recursive ++uninstall: uninstall-recursive ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-recursive ++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 ++mostlyclean-generic: ++ -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) ++ ++clean-generic: ++ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) ++ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) ++ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) ++clean: clean-recursive ++ ++clean-am: clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ ++ mostlyclean-am ++ ++distclean: distclean-recursive ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-tags ++ ++dvi: dvi-recursive ++ ++dvi-am: ++ ++html: html-recursive ++ ++html-am: ++ ++info: info-recursive ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-recursive ++ ++install-dvi-am: ++ ++install-exec-am: ++ ++install-html: install-html-recursive ++ ++install-html-am: ++ ++install-info: install-info-recursive ++ ++install-info-am: ++ ++install-man: ++ ++install-pdf: install-pdf-recursive ++ ++install-pdf-am: ++ ++install-ps: install-ps-recursive ++ ++install-ps-am: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-recursive ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-recursive ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-local ++ ++pdf: pdf-recursive ++ ++pdf-am: ++ ++ps: ps-recursive ++ ++ps-am: ++ ++uninstall-am: ++ ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ ++ ctags-recursive install install-am install-strip \ ++ tags-recursive ++ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic \ ++ clean-noinstLIBRARIES clean-noinstLTLIBRARIES ctags \ ++ ctags-recursive distclean distclean-compile distclean-generic \ ++ distclean-tags distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-local pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am ++ ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++getopt.h: getopt.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/getopt.in.h; \ ++ } > $@-t && \ ++ mv -f $@-t $@ ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++stddef.h: stddef.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ ++ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ ++ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ ++ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ ++ < $(srcdir)/stddef.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++ ++# We need the following in order to create an empty placeholder for ++# when the system doesn't have one. ++unistd.h: unistd.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ ++ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ ++ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ ++ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ ++ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \ ++ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ ++ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ ++ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \ ++ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ ++ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \ ++ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ ++ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ ++ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ ++ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ ++ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ ++ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \ ++ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ ++ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ ++ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ ++ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ ++ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ ++ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ ++ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ ++ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ ++ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ ++ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ ++ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ ++ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \ ++ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ ++ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ ++ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ ++ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \ ++ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \ ++ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ ++ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ ++ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ ++ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ ++ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ ++ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ ++ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ ++ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ ++ -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ ++ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ ++ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ ++ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ ++ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ ++ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ ++ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ ++ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ ++ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ ++ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ ++ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ ++ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ ++ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ ++ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ ++ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ ++ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ ++ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ ++ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ ++ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ ++ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ ++ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ ++ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ ++ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ ++ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ ++ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ ++ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ ++ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ ++ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ ++ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ ++ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ ++ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ ++ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ ++ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ ++ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ ++ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ ++ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ ++ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ ++ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/unistd.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++ ++mostlyclean-local: mostlyclean-generic ++ @for dir in '' $(MOSTLYCLEANDIRS); do \ ++ if test -n "$$dir" && test -d $$dir; then \ ++ echo "rmdir $$dir"; rmdir $$dir; \ ++ fi; \ ++ done; \ ++ : ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff --git a/lib/dummy.c b/lib/dummy.c +new file mode 100644 +index 0000000..ccb5c26 +--- /dev/null ++++ b/lib/dummy.c +@@ -0,0 +1,42 @@ ++/* A dummy file, to prevent empty libraries from breaking builds. ++ Copyright (C) 2004, 2007 Free Software Foundation, Inc. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create ++ libraries without any object files. You might get an error like: ++ ++ > ar cru .libs/libgl.a ++ > ar: no archive members specified ++ ++ Compiling this file, and adding its object file to the library, will ++ prevent the library from being empty. */ ++ ++/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries ++ that don't export any symbol. You might get an error like: ++ ++ > cc ... libgnu.a ++ > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a ++ ++ Compiling this file, and adding its object file to the library, will ++ prevent the library from exporting no symbols. */ ++ ++#ifdef __sun ++/* This declaration ensures that the library will export at least 1 symbol. */ ++int gl_dummy_symbol; ++#else ++/* This declaration is solely to ensure that after preprocessing ++ this file is never empty. */ ++typedef int dummy; ++#endif +diff --git a/lib/getopt.c b/lib/getopt.c +new file mode 100644 +index 0000000..797d166 +--- /dev/null ++++ b/lib/getopt.c +@@ -0,0 +1,1187 @@ ++/* Getopt for GNU. ++ NOTE: getopt is now part of the C library, so if you don't know what ++ "Keep this file name-space clean" means, talk to drepper at gnu.org ++ before changing it! ++ Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004,2006,2008,2009 ++ Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++#ifndef _LIBC ++# include ++#endif ++ ++#include "getopt.h" ++ ++#include ++#include ++#include ++#include ++ ++#ifdef _LIBC ++# include ++#else ++# include "gettext.h" ++# define _(msgid) gettext (msgid) ++#endif ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++# include ++#endif ++ ++#ifndef attribute_hidden ++# define attribute_hidden ++#endif ++ ++/* Unlike standard Unix `getopt', functions like `getopt_long' ++ let the user intersperse the options with the other arguments. ++ ++ As `getopt_long' works, it permutes the elements of ARGV so that, ++ when it is done, all the options precede everything else. Thus ++ all application programs are extended to handle flexible argument order. ++ ++ Using `getopt' or setting the environment variable POSIXLY_CORRECT ++ disables permutation. ++ Then the application's behavior is completely standard. ++ ++ GNU application programs can use a third alternative mode in which ++ they can distinguish the relative order of options and other arguments. */ ++ ++#include "getopt_int.h" ++ ++/* For communication from `getopt' to the caller. ++ When `getopt' finds an option that takes an argument, ++ the argument value is returned here. ++ Also, when `ordering' is RETURN_IN_ORDER, ++ each non-option ARGV-element is returned here. */ ++ ++char *optarg; ++ ++/* Index in ARGV of the next element to be scanned. ++ This is used for communication to and from the caller ++ and for communication between successive calls to `getopt'. ++ ++ On entry to `getopt', zero means this is the first call; initialize. ++ ++ When `getopt' returns -1, this is the index of the first of the ++ non-option elements that the caller should itself scan. ++ ++ Otherwise, `optind' communicates from one call to the next ++ how much of ARGV has been scanned so far. */ ++ ++/* 1003.2 says this must be 1 before any call. */ ++int optind = 1; ++ ++/* Callers store zero here to inhibit the error message ++ for unrecognized options. */ ++ ++int opterr = 1; ++ ++/* Set to an option character which was unrecognized. ++ This must be initialized on some systems to avoid linking in the ++ system's own getopt implementation. */ ++ ++int optopt = '?'; ++ ++/* Keep a global copy of all internal members of getopt_data. */ ++ ++static struct _getopt_data getopt_data; ++ ++ ++#if defined HAVE_DECL_GETENV && !HAVE_DECL_GETENV ++extern char *getenv (); ++#endif ++ ++#ifdef _LIBC ++/* Stored original parameters. ++ XXX This is no good solution. We should rather copy the args so ++ that we can compare them later. But we must not use malloc(3). */ ++extern int __libc_argc; ++extern char **__libc_argv; ++ ++/* Bash 2.0 gives us an environment variable containing flags ++ indicating ARGV elements that should not be considered arguments. */ ++ ++# ifdef USE_NONOPTION_FLAGS ++/* Defined in getopt_init.c */ ++extern char *__getopt_nonoption_flags; ++# endif ++ ++# ifdef USE_NONOPTION_FLAGS ++# define SWAP_FLAGS(ch1, ch2) \ ++ if (d->__nonoption_flags_len > 0) \ ++ { \ ++ char __tmp = __getopt_nonoption_flags[ch1]; \ ++ __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ ++ __getopt_nonoption_flags[ch2] = __tmp; \ ++ } ++# else ++# define SWAP_FLAGS(ch1, ch2) ++# endif ++#else /* !_LIBC */ ++# define SWAP_FLAGS(ch1, ch2) ++#endif /* _LIBC */ ++ ++/* Exchange two adjacent subsequences of ARGV. ++ One subsequence is elements [first_nonopt,last_nonopt) ++ which contains all the non-options that have been skipped so far. ++ The other is elements [last_nonopt,optind), which contains all ++ the options processed since those non-options were skipped. ++ ++ `first_nonopt' and `last_nonopt' are relocated so that they describe ++ the new indices of the non-options in ARGV after they are moved. */ ++ ++static void ++exchange (char **argv, struct _getopt_data *d) ++{ ++ int bottom = d->__first_nonopt; ++ int middle = d->__last_nonopt; ++ int top = d->optind; ++ char *tem; ++ ++ /* Exchange the shorter segment with the far end of the longer segment. ++ That puts the shorter segment into the right place. ++ It leaves the longer segment in the right place overall, ++ but it consists of two parts that need to be swapped next. */ ++ ++#if defined _LIBC && defined USE_NONOPTION_FLAGS ++ /* First make sure the handling of the `__getopt_nonoption_flags' ++ string can work normally. Our top argument must be in the range ++ of the string. */ ++ if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len) ++ { ++ /* We must extend the array. The user plays games with us and ++ presents new arguments. */ ++ char *new_str = malloc (top + 1); ++ if (new_str == NULL) ++ d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0; ++ else ++ { ++ memset (__mempcpy (new_str, __getopt_nonoption_flags, ++ d->__nonoption_flags_max_len), ++ '\0', top + 1 - d->__nonoption_flags_max_len); ++ d->__nonoption_flags_max_len = top + 1; ++ __getopt_nonoption_flags = new_str; ++ } ++ } ++#endif ++ ++ while (top > middle && middle > bottom) ++ { ++ if (top - middle > middle - bottom) ++ { ++ /* Bottom segment is the short one. */ ++ int len = middle - bottom; ++ register int i; ++ ++ /* Swap it with the top part of the top segment. */ ++ for (i = 0; i < len; i++) ++ { ++ tem = argv[bottom + i]; ++ argv[bottom + i] = argv[top - (middle - bottom) + i]; ++ argv[top - (middle - bottom) + i] = tem; ++ SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); ++ } ++ /* Exclude the moved bottom segment from further swapping. */ ++ top -= len; ++ } ++ else ++ { ++ /* Top segment is the short one. */ ++ int len = top - middle; ++ register int i; ++ ++ /* Swap it with the bottom part of the bottom segment. */ ++ for (i = 0; i < len; i++) ++ { ++ tem = argv[bottom + i]; ++ argv[bottom + i] = argv[middle + i]; ++ argv[middle + i] = tem; ++ SWAP_FLAGS (bottom + i, middle + i); ++ } ++ /* Exclude the moved top segment from further swapping. */ ++ bottom += len; ++ } ++ } ++ ++ /* Update records for the slots the non-options now occupy. */ ++ ++ d->__first_nonopt += (d->optind - d->__last_nonopt); ++ d->__last_nonopt = d->optind; ++} ++ ++/* Initialize the internal data when the first call is made. */ ++ ++static const char * ++_getopt_initialize (int argc _UNUSED_PARAMETER_, ++ char **argv _UNUSED_PARAMETER_, const char *optstring, ++ int posixly_correct, struct _getopt_data *d) ++{ ++ /* Start processing options with ARGV-element 1 (since ARGV-element 0 ++ is the program name); the sequence of previously skipped ++ non-option ARGV-elements is empty. */ ++ ++ d->__first_nonopt = d->__last_nonopt = d->optind; ++ ++ d->__nextchar = NULL; ++ ++ d->__posixly_correct = posixly_correct || !!getenv ("POSIXLY_CORRECT"); ++ ++ /* Determine how to handle the ordering of options and nonoptions. */ ++ ++ if (optstring[0] == '-') ++ { ++ d->__ordering = RETURN_IN_ORDER; ++ ++optstring; ++ } ++ else if (optstring[0] == '+') ++ { ++ d->__ordering = REQUIRE_ORDER; ++ ++optstring; ++ } ++ else if (d->__posixly_correct) ++ d->__ordering = REQUIRE_ORDER; ++ else ++ d->__ordering = PERMUTE; ++ ++#if defined _LIBC && defined USE_NONOPTION_FLAGS ++ if (!d->__posixly_correct ++ && argc == __libc_argc && argv == __libc_argv) ++ { ++ if (d->__nonoption_flags_max_len == 0) ++ { ++ if (__getopt_nonoption_flags == NULL ++ || __getopt_nonoption_flags[0] == '\0') ++ d->__nonoption_flags_max_len = -1; ++ else ++ { ++ const char *orig_str = __getopt_nonoption_flags; ++ int len = d->__nonoption_flags_max_len = strlen (orig_str); ++ if (d->__nonoption_flags_max_len < argc) ++ d->__nonoption_flags_max_len = argc; ++ __getopt_nonoption_flags = ++ (char *) malloc (d->__nonoption_flags_max_len); ++ if (__getopt_nonoption_flags == NULL) ++ d->__nonoption_flags_max_len = -1; ++ else ++ memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), ++ '\0', d->__nonoption_flags_max_len - len); ++ } ++ } ++ d->__nonoption_flags_len = d->__nonoption_flags_max_len; ++ } ++ else ++ d->__nonoption_flags_len = 0; ++#endif ++ ++ return optstring; ++} ++ ++/* Scan elements of ARGV (whose length is ARGC) for option characters ++ given in OPTSTRING. ++ ++ If an element of ARGV starts with '-', and is not exactly "-" or "--", ++ then it is an option element. The characters of this element ++ (aside from the initial '-') are option characters. If `getopt' ++ is called repeatedly, it returns successively each of the option characters ++ from each of the option elements. ++ ++ If `getopt' finds another option character, it returns that character, ++ updating `optind' and `nextchar' so that the next call to `getopt' can ++ resume the scan with the following option character or ARGV-element. ++ ++ If there are no more option characters, `getopt' returns -1. ++ Then `optind' is the index in ARGV of the first ARGV-element ++ that is not an option. (The ARGV-elements have been permuted ++ so that those that are not options now come last.) ++ ++ OPTSTRING is a string containing the legitimate option characters. ++ If an option character is seen that is not listed in OPTSTRING, ++ return '?' after printing an error message. If you set `opterr' to ++ zero, the error message is suppressed but we still return '?'. ++ ++ If a char in OPTSTRING is followed by a colon, that means it wants an arg, ++ so the following text in the same ARGV-element, or the text of the following ++ ARGV-element, is returned in `optarg'. Two colons mean an option that ++ wants an optional arg; if there is text in the current ARGV-element, ++ it is returned in `optarg', otherwise `optarg' is set to zero. ++ ++ If OPTSTRING starts with `-' or `+', it requests different methods of ++ handling the non-option ARGV-elements. ++ See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. ++ ++ Long-named options begin with `--' instead of `-'. ++ Their names may be abbreviated as long as the abbreviation is unique ++ or is an exact match for some defined option. If they have an ++ argument, it follows the option name in the same ARGV-element, separated ++ from the option name by a `=', or else the in next ARGV-element. ++ When `getopt' finds a long-named option, it returns 0 if that option's ++ `flag' field is nonzero, the value of the option's `val' field ++ if the `flag' field is zero. ++ ++ LONGOPTS is a vector of `struct option' terminated by an ++ element containing a name which is zero. ++ ++ LONGIND returns the index in LONGOPT of the long-named option found. ++ It is only valid when a long-named option has been found by the most ++ recent call. ++ ++ If LONG_ONLY is nonzero, '-' as well as '--' can introduce ++ long-named options. ++ ++ If POSIXLY_CORRECT is nonzero, behave as if the POSIXLY_CORRECT ++ environment variable were set. */ ++ ++int ++_getopt_internal_r (int argc, char **argv, const char *optstring, ++ const struct option *longopts, int *longind, ++ int long_only, int posixly_correct, struct _getopt_data *d) ++{ ++ int print_errors = d->opterr; ++ if (optstring[0] == ':') ++ print_errors = 0; ++ ++ if (argc < 1) ++ return -1; ++ ++ d->optarg = NULL; ++ ++ if (d->optind == 0 || !d->__initialized) ++ { ++ if (d->optind == 0) ++ d->optind = 1; /* Don't scan ARGV[0], the program name. */ ++ optstring = _getopt_initialize (argc, argv, optstring, ++ posixly_correct, d); ++ d->__initialized = 1; ++ } ++ ++ /* Test whether ARGV[optind] points to a non-option argument. ++ Either it does not have option syntax, or there is an environment flag ++ from the shell indicating it is not an option. The later information ++ is only used when the used in the GNU libc. */ ++#if defined _LIBC && defined USE_NONOPTION_FLAGS ++# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \ ++ || (d->optind < d->__nonoption_flags_len \ ++ && __getopt_nonoption_flags[d->optind] == '1')) ++#else ++# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') ++#endif ++ ++ if (d->__nextchar == NULL || *d->__nextchar == '\0') ++ { ++ /* Advance to the next ARGV-element. */ ++ ++ /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been ++ moved back by the user (who may also have changed the arguments). */ ++ if (d->__last_nonopt > d->optind) ++ d->__last_nonopt = d->optind; ++ if (d->__first_nonopt > d->optind) ++ d->__first_nonopt = d->optind; ++ ++ if (d->__ordering == PERMUTE) ++ { ++ /* If we have just processed some options following some non-options, ++ exchange them so that the options come first. */ ++ ++ if (d->__first_nonopt != d->__last_nonopt ++ && d->__last_nonopt != d->optind) ++ exchange ((char **) argv, d); ++ else if (d->__last_nonopt != d->optind) ++ d->__first_nonopt = d->optind; ++ ++ /* Skip any additional non-options ++ and extend the range of non-options previously skipped. */ ++ ++ while (d->optind < argc && NONOPTION_P) ++ d->optind++; ++ d->__last_nonopt = d->optind; ++ } ++ ++ /* The special ARGV-element `--' means premature end of options. ++ Skip it like a null option, ++ then exchange with previous non-options as if it were an option, ++ then skip everything else like a non-option. */ ++ ++ if (d->optind != argc && !strcmp (argv[d->optind], "--")) ++ { ++ d->optind++; ++ ++ if (d->__first_nonopt != d->__last_nonopt ++ && d->__last_nonopt != d->optind) ++ exchange ((char **) argv, d); ++ else if (d->__first_nonopt == d->__last_nonopt) ++ d->__first_nonopt = d->optind; ++ d->__last_nonopt = argc; ++ ++ d->optind = argc; ++ } ++ ++ /* If we have done all the ARGV-elements, stop the scan ++ and back over any non-options that we skipped and permuted. */ ++ ++ if (d->optind == argc) ++ { ++ /* Set the next-arg-index to point at the non-options ++ that we previously skipped, so the caller will digest them. */ ++ if (d->__first_nonopt != d->__last_nonopt) ++ d->optind = d->__first_nonopt; ++ return -1; ++ } ++ ++ /* If we have come to a non-option and did not permute it, ++ either stop the scan or describe it to the caller and pass it by. */ ++ ++ if (NONOPTION_P) ++ { ++ if (d->__ordering == REQUIRE_ORDER) ++ return -1; ++ d->optarg = argv[d->optind++]; ++ return 1; ++ } ++ ++ /* We have found another option-ARGV-element. ++ Skip the initial punctuation. */ ++ ++ d->__nextchar = (argv[d->optind] + 1 ++ + (longopts != NULL && argv[d->optind][1] == '-')); ++ } ++ ++ /* Decode the current option-ARGV-element. */ ++ ++ /* Check whether the ARGV-element is a long option. ++ ++ If long_only and the ARGV-element has the form "-f", where f is ++ a valid short option, don't consider it an abbreviated form of ++ a long option that starts with f. Otherwise there would be no ++ way to give the -f short option. ++ ++ On the other hand, if there's a long option "fubar" and ++ the ARGV-element is "-fu", do consider that an abbreviation of ++ the long option, just like "--fu", and not "-f" with arg "u". ++ ++ This distinction seems to be the most useful approach. */ ++ ++ if (longopts != NULL ++ && (argv[d->optind][1] == '-' ++ || (long_only && (argv[d->optind][2] ++ || !strchr (optstring, argv[d->optind][1]))))) ++ { ++ char *nameend; ++ const struct option *p; ++ const struct option *pfound = NULL; ++ int exact = 0; ++ int ambig = 0; ++ int indfound = -1; ++ int option_index; ++ ++ for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++) ++ /* Do nothing. */ ; ++ ++ /* Test all long options for either exact match ++ or abbreviated matches. */ ++ for (p = longopts, option_index = 0; p->name; p++, option_index++) ++ if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) ++ { ++ if ((unsigned int) (nameend - d->__nextchar) ++ == (unsigned int) strlen (p->name)) ++ { ++ /* Exact match found. */ ++ pfound = p; ++ indfound = option_index; ++ exact = 1; ++ break; ++ } ++ else if (pfound == NULL) ++ { ++ /* First nonexact match found. */ ++ pfound = p; ++ indfound = option_index; ++ } ++ else if (long_only ++ || pfound->has_arg != p->has_arg ++ || pfound->flag != p->flag ++ || pfound->val != p->val) ++ /* Second or later nonexact match found. */ ++ ambig = 1; ++ } ++ ++ if (ambig && !exact) ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"), ++ argv[0], argv[d->optind]) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("%s: option `%s' is ambiguous\n"), ++ argv[0], argv[d->optind]); ++#endif ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ d->optind++; ++ d->optopt = 0; ++ return '?'; ++ } ++ ++ if (pfound != NULL) ++ { ++ option_index = indfound; ++ d->optind++; ++ if (*nameend) ++ { ++ /* Don't test has_arg with >, because some C compilers don't ++ allow it to be used on enums. */ ++ if (pfound->has_arg) ++ d->optarg = nameend + 1; ++ else ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ int n; ++#endif ++ ++ if (argv[d->optind - 1][1] == '-') ++ { ++ /* --option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("\ ++%s: option `--%s' doesn't allow an argument\n"), ++ argv[0], pfound->name); ++#else ++ fprintf (stderr, _("\ ++%s: option `--%s' doesn't allow an argument\n"), ++ argv[0], pfound->name); ++#endif ++ } ++ else ++ { ++ /* +option or -option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("\ ++%s: option `%c%s' doesn't allow an argument\n"), ++ argv[0], argv[d->optind - 1][0], ++ pfound->name); ++#else ++ fprintf (stderr, _("\ ++%s: option `%c%s' doesn't allow an argument\n"), ++ argv[0], argv[d->optind - 1][0], ++ pfound->name); ++#endif ++ } ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++ if (n >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 ++ |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#endif ++ } ++ ++ d->__nextchar += strlen (d->__nextchar); ++ ++ d->optopt = pfound->val; ++ return '?'; ++ } ++ } ++ else if (pfound->has_arg == 1) ++ { ++ if (d->optind < argc) ++ d->optarg = argv[d->optind++]; ++ else ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option `%s' requires an argument\n"), ++ argv[0], argv[d->optind - 1]) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 ++ |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, ++ _("%s: option `%s' requires an argument\n"), ++ argv[0], argv[d->optind - 1]); ++#endif ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ d->optopt = pfound->val; ++ return optstring[0] == ':' ? ':' : '?'; ++ } ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ if (longind != NULL) ++ *longind = option_index; ++ if (pfound->flag) ++ { ++ *(pfound->flag) = pfound->val; ++ return 0; ++ } ++ return pfound->val; ++ } ++ ++ /* Can't find it as a long option. If this is not getopt_long_only, ++ or the option starts with '--' or is not a valid short ++ option, then it's an error. ++ Otherwise interpret it as a short option. */ ++ if (!long_only || argv[d->optind][1] == '-' ++ || strchr (optstring, *d->__nextchar) == NULL) ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ int n; ++#endif ++ ++ if (argv[d->optind][1] == '-') ++ { ++ /* --option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"), ++ argv[0], d->__nextchar); ++#else ++ fprintf (stderr, _("%s: unrecognized option `--%s'\n"), ++ argv[0], d->__nextchar); ++#endif ++ } ++ else ++ { ++ /* +option or -option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"), ++ argv[0], argv[d->optind][0], d->__nextchar); ++#else ++ fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), ++ argv[0], argv[d->optind][0], d->__nextchar); ++#endif ++ } ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++ if (n >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#endif ++ } ++ d->__nextchar = (char *) ""; ++ d->optind++; ++ d->optopt = 0; ++ return '?'; ++ } ++ } ++ ++ /* Look at and handle the next short option-character. */ ++ ++ { ++ char c = *d->__nextchar++; ++ char *temp = strchr (optstring, c); ++ ++ /* Increment `optind' when we start to process its last character. */ ++ if (*d->__nextchar == '\0') ++ ++d->optind; ++ ++ if (temp == NULL || c == ':') ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ int n; ++#endif ++ ++ if (d->__posixly_correct) ++ { ++ /* 1003.2 specifies the format of this message. */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: illegal option -- %c\n"), ++ argv[0], c); ++#else ++ fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); ++#endif ++ } ++ else ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: invalid option -- %c\n"), ++ argv[0], c); ++#else ++ fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c); ++#endif ++ } ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++ if (n >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#endif ++ } ++ d->optopt = c; ++ return '?'; ++ } ++ /* Convenience. Treat POSIX -W foo same as long option --foo */ ++ if (temp[0] == 'W' && temp[1] == ';') ++ { ++ char *nameend; ++ const struct option *p; ++ const struct option *pfound = NULL; ++ int exact = 0; ++ int ambig = 0; ++ int indfound = 0; ++ int option_index; ++ ++ /* This is an option that requires an argument. */ ++ if (*d->__nextchar != '\0') ++ { ++ d->optarg = d->__nextchar; ++ /* If we end this ARGV-element by taking the rest as an arg, ++ we must advance to the next element now. */ ++ d->optind++; ++ } ++ else if (d->optind == argc) ++ { ++ if (print_errors) ++ { ++ /* 1003.2 specifies the format of this message. */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, ++ _("%s: option requires an argument -- %c\n"), ++ argv[0], c) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("%s: option requires an argument -- %c\n"), ++ argv[0], c); ++#endif ++ } ++ d->optopt = c; ++ if (optstring[0] == ':') ++ c = ':'; ++ else ++ c = '?'; ++ return c; ++ } ++ else ++ /* We already incremented `d->optind' once; ++ increment it again when taking next ARGV-elt as argument. */ ++ d->optarg = argv[d->optind++]; ++ ++ /* optarg is now the argument, see if it's in the ++ table of longopts. */ ++ ++ for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '='; ++ nameend++) ++ /* Do nothing. */ ; ++ ++ /* Test all long options for either exact match ++ or abbreviated matches. */ ++ for (p = longopts, option_index = 0; p->name; p++, option_index++) ++ if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) ++ { ++ if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name)) ++ { ++ /* Exact match found. */ ++ pfound = p; ++ indfound = option_index; ++ exact = 1; ++ break; ++ } ++ else if (pfound == NULL) ++ { ++ /* First nonexact match found. */ ++ pfound = p; ++ indfound = option_index; ++ } ++ else ++ /* Second or later nonexact match found. */ ++ ambig = 1; ++ } ++ if (ambig && !exact) ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"), ++ argv[0], argv[d->optind]) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), ++ argv[0], argv[d->optind]); ++#endif ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ d->optind++; ++ return '?'; ++ } ++ if (pfound != NULL) ++ { ++ option_index = indfound; ++ if (*nameend) ++ { ++ /* Don't test has_arg with >, because some C compilers don't ++ allow it to be used on enums. */ ++ if (pfound->has_arg) ++ d->optarg = nameend + 1; ++ else ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option `-W %s' doesn't allow an argument\n"), ++ argv[0], pfound->name) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 ++ |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("\ ++%s: option `-W %s' doesn't allow an argument\n"), ++ argv[0], pfound->name); ++#endif ++ } ++ ++ d->__nextchar += strlen (d->__nextchar); ++ return '?'; ++ } ++ } ++ else if (pfound->has_arg == 1) ++ { ++ if (d->optind < argc) ++ d->optarg = argv[d->optind++]; ++ else ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option `%s' requires an argument\n"), ++ argv[0], argv[d->optind - 1]) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 ++ |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, ++ _("%s: option `%s' requires an argument\n"), ++ argv[0], argv[d->optind - 1]); ++#endif ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ return optstring[0] == ':' ? ':' : '?'; ++ } ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ if (longind != NULL) ++ *longind = option_index; ++ if (pfound->flag) ++ { ++ *(pfound->flag) = pfound->val; ++ return 0; ++ } ++ return pfound->val; ++ } ++ d->__nextchar = NULL; ++ return 'W'; /* Let the application handle it. */ ++ } ++ if (temp[1] == ':') ++ { ++ if (temp[2] == ':') ++ { ++ /* This is an option that accepts an argument optionally. */ ++ if (*d->__nextchar != '\0') ++ { ++ d->optarg = d->__nextchar; ++ d->optind++; ++ } ++ else ++ d->optarg = NULL; ++ d->__nextchar = NULL; ++ } ++ else ++ { ++ /* This is an option that requires an argument. */ ++ if (*d->__nextchar != '\0') ++ { ++ d->optarg = d->__nextchar; ++ /* If we end this ARGV-element by taking the rest as an arg, ++ we must advance to the next element now. */ ++ d->optind++; ++ } ++ else if (d->optind == argc) ++ { ++ if (print_errors) ++ { ++ /* 1003.2 specifies the format of this message. */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option requires an argument -- %c\n"), ++ argv[0], c) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, ++ _("%s: option requires an argument -- %c\n"), ++ argv[0], c); ++#endif ++ } ++ d->optopt = c; ++ if (optstring[0] == ':') ++ c = ':'; ++ else ++ c = '?'; ++ } ++ else ++ /* We already incremented `optind' once; ++ increment it again when taking next ARGV-elt as argument. */ ++ d->optarg = argv[d->optind++]; ++ d->__nextchar = NULL; ++ } ++ } ++ return c; ++ } ++} ++ ++int ++_getopt_internal (int argc, char **argv, const char *optstring, ++ const struct option *longopts, int *longind, ++ int long_only, int posixly_correct) ++{ ++ int result; ++ ++ getopt_data.optind = optind; ++ getopt_data.opterr = opterr; ++ ++ result = _getopt_internal_r (argc, argv, optstring, longopts, longind, ++ long_only, posixly_correct, &getopt_data); ++ ++ optind = getopt_data.optind; ++ optarg = getopt_data.optarg; ++ optopt = getopt_data.optopt; ++ ++ return result; ++} ++ ++/* glibc gets a LSB-compliant getopt. ++ Standalone applications get a POSIX-compliant getopt. */ ++#if _LIBC ++enum { POSIXLY_CORRECT = 0 }; ++#else ++enum { POSIXLY_CORRECT = 1 }; ++#endif ++ ++int ++getopt (int argc, char *const *argv, const char *optstring) ++{ ++ return _getopt_internal (argc, (char **) argv, optstring, NULL, NULL, 0, ++ POSIXLY_CORRECT); ++} ++ ++ ++#ifdef TEST ++ ++/* Compile with -DTEST to make an executable for use in testing ++ the above definition of `getopt'. */ ++ ++int ++main (int argc, char **argv) ++{ ++ int c; ++ int digit_optind = 0; ++ ++ while (1) ++ { ++ int this_option_optind = optind ? optind : 1; ++ ++ c = getopt (argc, argv, "abc:d:0123456789"); ++ if (c == -1) ++ break; ++ ++ switch (c) ++ { ++ case '0': ++ case '1': ++ case '2': ++ case '3': ++ case '4': ++ case '5': ++ case '6': ++ case '7': ++ case '8': ++ case '9': ++ if (digit_optind != 0 && digit_optind != this_option_optind) ++ printf ("digits occur in two different argv-elements.\n"); ++ digit_optind = this_option_optind; ++ printf ("option %c\n", c); ++ break; ++ ++ case 'a': ++ printf ("option a\n"); ++ break; ++ ++ case 'b': ++ printf ("option b\n"); ++ break; ++ ++ case 'c': ++ printf ("option c with value `%s'\n", optarg); ++ break; ++ ++ case '?': ++ break; ++ ++ default: ++ printf ("?? getopt returned character code 0%o ??\n", c); ++ } ++ } ++ ++ if (optind < argc) ++ { ++ printf ("non-option ARGV-elements: "); ++ while (optind < argc) ++ printf ("%s ", argv[optind++]); ++ printf ("\n"); ++ } ++ ++ exit (0); ++} ++ ++#endif /* TEST */ +diff --git a/lib/getopt.in.h b/lib/getopt.in.h +new file mode 100644 +index 0000000..7377f3c +--- /dev/null ++++ b/lib/getopt.in.h +@@ -0,0 +1,247 @@ ++/* Declarations for getopt. ++ Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2005,2006,2007,2009 ++ Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++#ifndef _GL_GETOPT_H ++ ++#if __GNUC__ >= 3 ++ at PRAGMA_SYSTEM_HEADER@ ++#endif ++ ++/* The include_next requires a split double-inclusion guard. We must ++ also inform the replacement unistd.h to not recursively use ++ ; our definitions will be present soon enough. */ ++#if @HAVE_GETOPT_H@ ++# define _GL_SYSTEM_GETOPT ++# @INCLUDE_NEXT@ @NEXT_GETOPT_H@ ++# undef _GL_SYSTEM_GETOPT ++#endif ++ ++#ifndef _GL_GETOPT_H ++ ++#ifndef __need_getopt ++# define _GL_GETOPT_H 1 ++#endif ++ ++/* Standalone applications should #define __GETOPT_PREFIX to an ++ identifier that prefixes the external functions and variables ++ defined in this header. When this happens, include the ++ headers that might declare getopt so that they will not cause ++ confusion if included after this file (if the system had , ++ we have already included it). Then systematically rename ++ identifiers so that they do not collide with the system functions ++ and variables. Renaming avoids problems with some compilers and ++ linkers. */ ++#if defined __GETOPT_PREFIX && !defined __need_getopt ++# if !@HAVE_GETOPT_H@ ++# include ++# include ++# include ++# endif ++# undef __need_getopt ++# undef getopt ++# undef getopt_long ++# undef getopt_long_only ++# undef optarg ++# undef opterr ++# undef optind ++# undef optopt ++# undef option ++# define __GETOPT_CONCAT(x, y) x ## y ++# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) ++# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) ++# define getopt __GETOPT_ID (getopt) ++# define getopt_long __GETOPT_ID (getopt_long) ++# define getopt_long_only __GETOPT_ID (getopt_long_only) ++# define optarg __GETOPT_ID (optarg) ++# define opterr __GETOPT_ID (opterr) @@ 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 wahwah at users.sourceforge.net Sun Dec 6 08:57:38 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Dec 2009 07:57:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7562] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 7562 http://gar.svn.sourceforge.net/gar/?rev=7562&view=rev Author: wahwah Date: 2009-12-06 07:57:38 +0000 (Sun, 06 Dec 2009) Log Message: ----------- pinentry: Use /usr/openwin/lib/amd64/libXext.so for isa-amd64 Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 07:50:28 UTC (rev 7561) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 07:57:38 UTC (rev 7562) @@ -42,7 +42,7 @@ CONFIGURE_ARGS = $(DIRPATHS) EXTRA_LINKER_FLAGS_isa-i386 = /usr/openwin/lib/libXext.so EXTRA_LINKER_FLAGS_isa-sparcv8 = /usr/openwin/lib/libXext.so -EXTRA_LINKER_FLAGS_isa-amd64 = /usr/openwin/lib/sparcv9/libXext.so +EXTRA_LINKER_FLAGS_isa-amd64 = /usr/openwin/lib/amd64/libXext.so EXTRA_LINKER_FLAGS_isa-sparcv9 = /usr/openwin/lib/sparcv9/libXext.so EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(MODULATION)) BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Dec 6 09:51:48 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Dec 2009 08:51:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7563] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 7563 http://gar.svn.sourceforge.net/gar/?rev=7563&view=rev Author: wahwah Date: 2009-12-06 08:51:48 +0000 (Sun, 06 Dec 2009) Log Message: ----------- pinentry: switching off the 64-bit build. Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 07:57:38 UTC (rev 7562) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 08:51:48 UTC (rev 7563) @@ -45,8 +45,11 @@ EXTRA_LINKER_FLAGS_isa-amd64 = /usr/openwin/lib/amd64/libXext.so EXTRA_LINKER_FLAGS_isa-sparcv9 = /usr/openwin/lib/sparcv9/libXext.so EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(MODULATION)) -BUILD64 = 1 +# There's a problem with building on Solaris 10 as getopt.h is already present +# in /usr/include and conflicts with the one provided by gnulib. +# BUILD64 = 1 + include gar/category.mk # Switch this target on when working with gnulib. 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 Dec 6 11:00:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Dec 2009 10:00:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7564] csw/mgar/pkg/pinentry/trunk Message-ID: Revision: 7564 http://gar.svn.sourceforge.net/gar/?rev=7564&view=rev Author: wahwah Date: 2009-12-06 10:00:15 +0000 (Sun, 06 Dec 2009) Log Message: ----------- pinentry: Remove an obsolete patch Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 08:51:48 UTC (rev 7563) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 10:00:15 UTC (rev 7564) @@ -13,8 +13,7 @@ EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ -# PATCHFILES = 0001-remove-__extension__-from-util.c.patch -PATCHFILES += 0002-ncurses-include.patch +PATCHFILES = 0002-ncurses-include.patch PATCHFILES += 0003-TEMP_FAILURE_RETRY-macro-expansion.patch PATCHFILES += 0004-adding-prereq-2.59-to-configure.ac.patch PATCHFILES += 0005-Importing-getopt-posix-gnulib-module.patch Deleted: csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch 2009-12-06 08:51:48 UTC (rev 7563) +++ csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch 2009-12-06 10:00:15 UTC (rev 7564) @@ -1,25 +0,0 @@ -From 26f9938de29f65324acaedf376801f2e40f04b27 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Tue, 8 Sep 2009 20:02:35 +0100 -Subject: [PATCH 1/2] remove __extension__ from util.c - ---- - secmem/util.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/secmem/util.c b/secmem/util.c -index 580fd34..c836ad0 100644 ---- a/secmem/util.c -+++ b/secmem/util.c -@@ -34,7 +34,7 @@ - - #ifndef TEMP_FAILURE_RETRY - #define TEMP_FAILURE_RETRY(expression) \ -- (__extension__ \ -+ ( \ - ({ long int __result; \ - do __result = (long int) (expression); \ - while (__result == -1L && errno == EINTR); \ --- -1.6.3.2 - 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 Dec 6 14:52:12 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Dec 2009 13:52:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7565] csw/mgar/pkg Message-ID: Revision: 7565 http://gar.svn.sourceforge.net/gar/?rev=7565&view=rev Author: wahwah Date: 2009-12-06 13:52:12 +0000 (Sun, 06 Dec 2009) Log Message: ----------- dpkg: Initial commit, providing update-alternatives only. Modified Paths: -------------- csw/mgar/pkg/dpkg/trunk/Makefile csw/mgar/pkg/dpkg/trunk/checksums Added Paths: ----------- csw/mgar/pkg/dpkg/ Modified: csw/mgar/pkg/dpkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-06 10:00:15 UTC (rev 7564) +++ csw/mgar/pkg/dpkg/trunk/Makefile 2009-12-06 13:52:12 UTC (rev 7565) @@ -2,184 +2,44 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +# This package might provide the dpkg binary itself, but for the time being, it +# provides only update-alternatives. + +GARNAME = dpkg +GARVERSION = 1.15.5.3 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = Debian package manager +PACKAGES = CSWalternatives +SPKG_DESC_CSWalternative = Alternatives management for CSW define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release +SPKG_SOURCEURL = http://wiki.debian.org/Teams/Dpkg +MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/d/dpkg/ +DISTFILES = $(GARNAME)_$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = alternatives +TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +include gar/category.mk -#include gar/category.mk +install-alternatives: + ginstall -m 755 -d $(DESTDIR)$(bindir) + ginstall -m 755 \ + $(WORKSRC)/scripts/update-alternatives.pl \ + $(DESTDIR)$(bindir)/update-alternatives + ginstall -m 755 -d $(DESTDIR)$(mandir)/man8 + ginstall -m 644 \ + $(WORKSRC)/man/update-alternatives.8 \ + $(DESTDIR)$(mandir)/man8 + ginstall -m 755 -d $(DESTDIR)$(datadir)/perl/csw/Dpkg + ginstall -m 644 \ + $(WORKSRC)/scripts/Dpkg.pm \ + $(DESTDIR)$(datadir)/perl/csw + for f in $(WORKSRC)/scripts/Dpkg/*.pm; do \ + ginstall -m 644 $$f $(DESTDIR)$(datadir)/perl/csw/Dpkg; \ + done + ginstall -m 755 -d $(DESTDIR)/var$(prefix)/lib/dpkg/alternatives + ginstall -m 755 -d $(DESTDIR)/etc$(prefix)/alternatives + @$(MAKECOOKIE) Modified: csw/mgar/pkg/dpkg/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-12-06 10:00:15 UTC (rev 7564) +++ csw/mgar/pkg/dpkg/trunk/checksums 2009-12-06 13:52:12 UTC (rev 7565) @@ -0,0 +1 @@ +2fd20b06c23e7c3bfc39525f0b278804 dpkg_1.15.5.3.tar.bz2 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 Sun Dec 6 18:20:16 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 06 Dec 2009 17:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7566] csw/mgar/pkg/nagvis/trunk Message-ID: Revision: 7566 http://gar.svn.sourceforge.net/gar/?rev=7566&view=rev Author: j_arndt Date: 2009-12-06 17:20:16 +0000 (Sun, 06 Dec 2009) Log Message: ----------- nagvis: update to 1.4.5, switch dynamic gspec Modified Paths: -------------- csw/mgar/pkg/nagvis/trunk/Makefile csw/mgar/pkg/nagvis/trunk/checksums csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.prototype Added Paths: ----------- csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php-sample.diff Removed Paths: ------------- csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.gspec csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php.diff Modified: csw/mgar/pkg/nagvis/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagvis/trunk/Makefile 2009-12-06 13:52:12 UTC (rev 7565) +++ csw/mgar/pkg/nagvis/trunk/Makefile 2009-12-06 17:20:16 UTC (rev 7566) @@ -1,18 +1,20 @@ GARNAME = nagvis -GARVERSION = 1.3.2 +GARVERSION = 1.4.5 CATEGORIES = apps -DESCRIPTION = visualization addon for nagios +SPKG_DESC_CSWnagvis = visualization addon for nagios + define BLURB Long description endef MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnagvis, prototype) -PATCHFILES += nagvis.ini.php.diff +DISTFILES += CSWnagvis.prototype +PATCHFILES += nagvis.ini.php-sample.diff + # We define upstream file regex so we can be notifed of new upstream software release #UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -20,12 +22,17 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -REQUIRED_PKGS = CSWnagios CSWphp5gd CSWphp5mysql CSWphp5mbstring CSWphp5session -REQUIRED_PKGS += CSWphp5xmlreader CSWphp5xmlwriter CSWgraphviz2 -REQUIRED_PKGS += CSWcswclassutils +PACKAGES = CSWnagvis +CATALOGNAME_CSWnagvis = nagvis -SPKG_CLASSES = none cswpreserveconf +REQUIRED_PKGS_CSWnagvis = CSWnagios CSWphp5gd CSWphp5mysql CSWphp5mbstring CSWphp5session +REQUIRED_PKGS_CSWnagvis += CSWphp5xmlreader CSWphp5xmlwriter CSWgraphviz2 CSWphp5gettext +REQUIRED_PKGS_CSWnagvis += CSWap2modphp5 CSWcswclassutils +SPKG_CLASSES_CSWnagvis = none cswpreserveconf + +ARCHALL_CSWnagvis = 1 + #CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = custom @@ -47,12 +54,25 @@ install-custom: @ginstall -d $(DESTDIR)$(NAGVISDIR) + #$(WORKSRC)/install.sh -n $(DESTDIR)/opt/csw/nagios \ + #-B $(DESTDIR)/opt/csw/nagios/bin/nagios \ + #-m $(DESTDIR)/opt/csw/nagios/ndoutils/bin/ndo2db-3x \ + #-b $(DESTDIR)/opt/csw/bin \ + #-p $(DESTDIR)/opt/csw/nagios/share/nagvis \ + #-W /nagios/nagvis \ + #-u nobody \ + #-g nobody \ + #-w /opt/csw/apache2/etc \ + #-i ndo2db + @ @# @# not nice but easy @# @cp $(WORKSRC)/etc/maps/__automap.cfg $(WORKSRC)/etc/maps/__automap.cfg.CSW @cp $(WORKSRC)/etc/maps/demo.cfg $(WORKSRC)/etc/maps/demo.cfg.CSW @cp $(WORKSRC)/etc/maps/demo2.cfg $(WORKSRC)/etc/maps/demo2.cfg.CSW + @cp $(WORKSRC)/etc/maps/demo-map.cfg $(WORKSRC)/etc/maps/demo-map.cfg.CSW + @cp $(WORKSRC)/etc/maps/demo-server.cfg $(WORKSRC)/etc/maps/demo-server.cfg.CSW @cp $(WORKSRC)/etc/nagvis.ini.php-sample $(WORKSRC)/etc/nagvis.ini.php.CSW @# @# Modified: csw/mgar/pkg/nagvis/trunk/checksums =================================================================== --- csw/mgar/pkg/nagvis/trunk/checksums 2009-12-06 13:52:12 UTC (rev 7565) +++ csw/mgar/pkg/nagvis/trunk/checksums 2009-12-06 17:20:16 UTC (rev 7566) @@ -1,4 +1,3 @@ -6a8010fb5cb56c6f5cd1f37879c218ae download/nagvis-1.3.2.tar.gz -9b93c302b8a731eee55e6039f44c4650 download/CSWnagvis.gspec -078719dd13f2036a7eaf8ec5ebd3a128 download/CSWnagvis.prototype -f5c6dac77df57bad25504842a3c73554 download/nagvis.ini.php.diff +f4859977d68f015767037271b1858363 download/nagvis-1.4.5.tar.gz +c88f2d9b3bfb49b25b77c21b1efc9833 download/CSWnagvis.prototype +83a92dc54914abc0cc3c9239ca569d62 download/nagvis.ini.php-sample.diff Deleted: csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.gspec =================================================================== --- csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.gspec 2009-12-06 13:52:12 UTC (rev 7565) +++ csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.gspec 2009-12-06 17:20:16 UTC (rev 7566) @@ -1,3 +0,0 @@ -%var bitname nagvis -%var pkgname CSWnagvis -%include url file://%{PKGLIB}/csw_dyndepend.gspec Modified: csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.prototype =================================================================== --- csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.prototype 2009-12-06 13:52:12 UTC (rev 7565) +++ csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.prototype 2009-12-06 17:20:16 UTC (rev 7566) @@ -1,191 +1,384 @@ d none /opt/csw/nagios 0755 root bin -d none /opt/csw/nagios/share 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/INSTALL 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/LICENCE 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/README 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/config.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/etc 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/etc/.htaccess 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/etc/maps 0755 nagios nagios -f cswpreserveconf /opt/csw/nagios/share/nagvis/etc/maps/__automap.cfg.CSW 0664 nagios nagios -f cswpreserveconf /opt/csw/nagios/share/nagvis/etc/maps/demo.cfg.CSW 0664 nagios nagios -f cswpreserveconf /opt/csw/nagios/share/nagvis/etc/maps/demo2.cfg.CSW 0664 nagios nagios -f cswpreserveconf /opt/csw/nagios/share/nagvis/etc/nagvis.ini.php.CSW 0664 nagios nagios -f none /opt/csw/nagios/share/nagvis/index.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/ajax_handler.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/draw.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/20x20.gif 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/configerror_large.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/configerror_medium.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/configerror_small.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/error.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_ack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_critical.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_down.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_downtime.png 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_error.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_ok.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_pending.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_sack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_sdowntime.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_unknown.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_up.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_warning.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_ack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_critical.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_down.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_downtime.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_error.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_ok.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_pending.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_sack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_sdowntime.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_unknown.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_up.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_warning.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_ack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_critical.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_down.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_downtime.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_error.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_ok.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_pending.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_sack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_sdowntime.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_unknown.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_up.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_warning.png 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/internal 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/10x10.gif 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_ack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_critical.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_down.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_downtime.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_error.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_ok.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_up.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_warning.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/img_error.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/img_permission.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/img_warning.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/logo_119x31.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/pixel.gif 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/wui.gif 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/maps 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/maps/nagvis-demo.png 0664 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/shapes 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/templates 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/templates/header 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/templates/hover 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackend-ndomy.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendMgmt.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackground.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalForm.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalGraphic.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalLanguage.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalMainCfg.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalMap.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalMapCfg.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalPage.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisAutoMap.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisBackground.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisFrontend.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisMap.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisMapCfg.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisHost.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisHostgroup.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisMapObj.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisObject.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisService.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisServicegroup.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisShape.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisStatefulObject.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisStatelessObject.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisTextbox.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosHost.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosHostgroup.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosService.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosServicegroup.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/css 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/css/style.css 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/defines 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/defines/global.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/defines/matches.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/functions 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/debug.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/getuser.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/oldPhpVersionFixes.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/js 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/ajax.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/dynfavicon.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/hover.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/nagvis.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/overlib.js 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/languages 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/languages/english.xml 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/languages/german.xml 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/index.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/templates 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/templates/header 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/templates/header/tmpl.default.css 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/templates/header/tmpl.default.html 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/templates/hover 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/templates/hover/tmpl.default.css 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/templates/hover/tmpl.default.html 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/var 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/ajax_handler.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/form_handler.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/images 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/images/internal 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/images/internal/help_icon.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/images/internal/wuilogo.png 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/includes 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/includes/classes 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiAddModify.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiBackendManagement.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiBackground.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiBackgroundManagement.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiEditMainCfg.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiFrontend.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMainCfg.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMap.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMapCfg.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMapManagement.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiShapeManagement.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/includes/css 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/icon1.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/icon2.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/icon3.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp.css 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_arrow.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_arrow_o.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_divider.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_menu_left.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/wui.css 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/includes/functions 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/functions/form_handler.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/includes/js 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/BackendManagement.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/BackgroundManagement.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/EditMainCfg.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/ShapeManagement.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/addmodify.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/ajax.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/jsdomenu.inc.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/jsdomenu.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/map_management.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/wui.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/wz_dragdrop.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/wz_jsgraphics.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/wz_tooltip.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/index.php 0644 nagios nagios +d none /opt/csw/nagios/share 0755 root bin +d none /opt/csw/nagios/share/nagvis 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/INSTALL 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/LICENCE 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/README 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/config.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/de_DE 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/about.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/automap.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/backends.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/changelog.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/context_templates.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/de_DE/extending 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/extending/custom_context_actions.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/extending/iconsets.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/extending/languages.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/extending/shapes.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/extending/templates.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/gadgets.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/header_templates.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/hover_templates.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/index.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/installation_instructions.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/installer.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/map_config_format_description.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/nagvis_config_format_description.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/system_requirements.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/toc.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/update_instructions.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/user_interface.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/welcome.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/en_US 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/about.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/automap.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/backends.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/changelog.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/context_templates.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/en_US/extending 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/extending/custom_context_actions.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/extending/iconsets.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/extending/languages.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/extending/shapes.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/extending/templates.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/gadgets.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/header_templates.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/hover_templates.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/index.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/installation_instructions.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/installer.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/map_config_format_description.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/nagvis_config_format_description.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/system_requirements.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/toc.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/update_instructions.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/user_interface.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/welcome.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/general 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/general/css 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/css/style.css 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/general/img 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/favicon.ico 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/iconset-std_mini.jpg 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/iconset-std_small.jpg 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/logo-88x23.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/logo.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/medium_nagvis-1.0-wui-preview.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/nagvis-1.3-automap-directed-1-thumb.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/nagvis-1.3-automap_undirected-1-thumb.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/nagvis-1.4-context-ssh-1.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/nagvis-1.4-gadget-label-hover.png 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/etc 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/.htaccess 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/etc/maps 0775 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/__automap.cfg 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/__automap.cfg.CSW 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo-map.cfg 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo-map.cfg.CSW 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo-server.cfg 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo-server.cfg.CSW 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo.cfg 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo.cfg.CSW 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo2.cfg 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo2.cfg.CSW 0664 nobody nobody +f cswpreserveconf /opt/csw/nagios/share/nagvis/etc/nagvis.ini.php.CSW 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/index.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/install.sh 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/ajax_handler.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/gadgets 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/gadgets/gadgets_core.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/gadgets/std_speedometer.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/gadgets 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/gadgets/dummy 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/20x20.gif 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/configerror_large.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/configerror_medium.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/configerror_small.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_ack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_sack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_unknown.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_warning.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_ack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_sack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_unknown.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_warning.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_ack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_downtime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_pending.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_sack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_sdowntime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_unknown.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_warning.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_ack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_downtime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_pending.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_sack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_sdowntime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_unknown.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_warning.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_ack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_downtime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_pending.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_sack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_sdowntime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_unknown.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_warning.png 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/internal 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/10x10.gif 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_ack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_downtime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_warning.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/logo_119x31.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_note.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_permission.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_unknown.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_unreachable.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_warning.png 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/maps 0775 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/maps/demo_background.png 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/maps/nagvis-demo.png 0664 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/shapes 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo-load.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo-server.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo-text_demo.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo-text_hoststate.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo-text_mapstate.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo-text_servicestate.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo_german_landscape.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo_server_bg.png 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/templates 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/templates/header 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/templates/hover 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendInterface.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendMgmt.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendmerlinmy.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendmklivestatus.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendndo2fs.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendndomy.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackground.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalCore.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalFileCache.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalForm.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalHeaderMenu.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalIndexPage.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalLanguage.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalMainCfg.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalMap.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalMapCfg.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalPage.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisAutoMap.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisContextMenu.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisFrontend.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisHoverMenu.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisHoverUrl.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisInfoPage.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisMap.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisMapCfg.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisRotation.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisUrl.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalController.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerAutomap.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerIndex.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerInfo.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerInterface.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerMap.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerRotation.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerUrl.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/frontend 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/frontend/GlobalFrontendMessage.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/frontend/GlobalFrontendMessageBox.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/httpRequest 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/httpRequest/GlobalHttpRequest.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/httpRequest/GlobalHttpRequestInterface.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisHost.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisHostgroup.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisMapObj.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisObject.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisService.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisServicegroup.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisShape.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisStatefulObject.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisStatelessObject.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisTextbox.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosHost.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosHostgroup.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosService.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosServicegroup.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidator.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidatorAbstract.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidatorBoolean.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidatorInteger.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidatorInterface.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidatorString.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidatorUrl.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/css 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/css/frontendEventlog.css 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/css/style.css 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/defines 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/defines/global.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/defines/matches.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/functions 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/ajaxErrorHandler.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/autoload.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/debug.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/getuser.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/oldPhpVersionFixes.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/js 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/ExtBase.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisHost.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisHostgroup.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisMap.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisObject.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisRotation.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisService.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisServicegroup.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisShape.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisStatefulObject.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisStatelessObject.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisTextbox.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/ajax.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/dynfavicon.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/frontend.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/frontendContext.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/frontendEventlog.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/frontendMessage.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/hover.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/lines.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/nagvis.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/overlib.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/wz_jsgraphics.js 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/de_DE 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/de_DE/LC_MESSAGES 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/de_DE/LC_MESSAGES/nagvis.mo 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/de_DE/LC_MESSAGES/nagvis.po 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/en_US 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/en_US/LC_MESSAGES 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/en_US/LC_MESSAGES/nagvis.mo 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/en_US/LC_MESSAGES/nagvis.po 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/fr_FR 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/fr_FR/LC_MESSAGES 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/fr_FR/LC_MESSAGES/nagvis.mo 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/fr_FR/LC_MESSAGES/nagvis.po 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/pt_BR 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/pt_BR/LC_MESSAGES 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/pt_BR/LC_MESSAGES/nagvis.mo 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/pt_BR/LC_MESSAGES/nagvis.po 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/index.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/sounds 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/sounds/std_critical.mp3 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/sounds/std_down.mp3 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/sounds/std_error.mp3 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/sounds/std_unreachable.mp3 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/sounds/std_warning.mp3 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/templates 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/templates/context 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/templates/context/tmpl.default.css 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/templates/context/tmpl.default.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/templates/header 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/templates/header/tmpl.default.css 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/templates/header/tmpl.default.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/templates/hover 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/templates/hover/tmpl.default.css 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/templates/hover/tmpl.default.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/var 0775 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/ajax_handler.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/form_handler.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/images 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/images/internal 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/images/internal/delete.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/images/internal/help_icon.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/images/internal/modify.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/images/internal/move.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/images/internal/wuilogo.png 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/includes 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/includes/classes 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiAddModify.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiBackendManagement.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiBackground.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiBackgroundManagement.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiCore.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiEditMainCfg.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiFrontend.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMainCfg.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMap.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMapCfg.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMapManagement.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiShapeManagement.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/includes/css 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/icon1.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/icon2.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/icon3.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp.css 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_arrow.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_arrow_o.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_divider.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_menu_left.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/wui.css 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/includes/functions 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/functions/form_handler.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/includes/js 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/BackendManagement.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/BackgroundManagement.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/EditMainCfg.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/MapManagement.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/ShapeManagement.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/addmodify.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/ajax.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/jsdomenu.inc.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/jsdomenu.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/popupWindow.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/wui.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/wz_dragdrop.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/wz_jsgraphics.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/wz_tooltip.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/index.php 0644 nobody nobody Added: csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php-sample.diff =================================================================== --- csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php-sample.diff (rev 0) +++ csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php-sample.diff 2009-12-06 17:20:16 UTC (rev 7566) @@ -0,0 +1,24 @@ +diff --speed-large-files --minimal -Nru nagvis-1.4.5.orig/etc/nagvis.ini.php-sample nagvis-1.4.5/etc/nagvis.ini.php-sample +--- nagvis-1.4.5.orig/etc/nagvis.ini.php-sample 2009-11-27 16:41:36.000000000 +0100 ++++ nagvis-1.4.5/etc/nagvis.ini.php-sample 2009-12-05 18:18:53.986605941 +0100 +@@ -25,7 +25,7 @@ + ; Path definitions + [paths] + ; absolute physical NagVis path +-;base="/usr/local/nagios/share/nagvis/" ++base="/opt/csw/nagios/share/nagvis/" + ; absolute html NagVis path + ;htmlbase="/nagios/nagvis" + ; absolute html NagVis cgi path +@@ -173,9 +173,9 @@ + ; database name for NDO-db + ;dbname="nagios" + ; username for NDO-db +-;dbuser="root" ++dbuser="nagios" + ; password for NDO-db +-;dbpass="" ++dbpass="nagios" + ; prefix for tables in NDO-db + ;dbprefix="nagios_" + ; instance name for tables in NDO-db Deleted: csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php.diff =================================================================== --- csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php.diff 2009-12-06 13:52:12 UTC (rev 7565) +++ csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php.diff 2009-12-06 17:20:16 UTC (rev 7566) @@ -1,24 +0,0 @@ -diff --speed-large-files --minimal -Nru nagvis-1.3.2.orig/etc/nagvis.ini.php-sample nagvis-1.3.2/etc/nagvis.ini.php-sample ---- nagvis-1.3.2.orig/etc/nagvis.ini.php-sample 2008-06-04 19:57:06.000000000 +0200 -+++ nagvis-1.3.2/etc/nagvis.ini.php-sample 2009-03-26 11:57:24.335438559 +0100 -@@ -84,7 +84,7 @@ - ; path options - [paths] - ; absolute physical NagVis path --;base="/usr/local/nagios/share/nagvis/" -+base="/opt/csw/nagios/share/share/nagvis/" - ; absolute html NagVis path - ;htmlbase="/nagios/nagvis" - ; absolute html NagVis cgi path -@@ -102,9 +102,9 @@ - ; database-name for NDO-db - ;dbname="nagios" - ; username for NDO-db --;dbuser="root" -+dbuser="nagios" - ; password for NDO-db --;dbpass="" -+dbpass="nagios" - ; prefix for tables in NDO-db - ;dbprefix="nagios_" - ; instace-name for tables in NDO-db 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 Sun Dec 6 18:23:02 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 06 Dec 2009 17:23:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7567] csw/mgar/pkg/ndoutils/trunk Message-ID: Revision: 7567 http://gar.svn.sourceforge.net/gar/?rev=7567&view=rev Author: j_arndt Date: 2009-12-06 17:23:02 +0000 (Sun, 06 Dec 2009) Log Message: ----------- ndoutils: patched config to CSW paths Modified Paths: -------------- csw/mgar/pkg/ndoutils/trunk/Makefile csw/mgar/pkg/ndoutils/trunk/checksums Modified: csw/mgar/pkg/ndoutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/ndoutils/trunk/Makefile 2009-12-06 17:20:16 UTC (rev 7566) +++ csw/mgar/pkg/ndoutils/trunk/Makefile 2009-12-06 17:23:02 UTC (rev 7567) @@ -17,8 +17,8 @@ DISTFILES += $(call admfiles,CSWndoutils3x, prototype postinstall) DISTFILES += cswndoutils -#PATCHFILES += config.diff -#PATCHFILES += installdb.diff +PATCHFILES += config.diff +PATCHFILES += installdb.diff # We define upstream file regex so we can be notifed of new upstream software release #UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -76,7 +76,7 @@ @ginstall -m 755 $(WORKSRC)/src/ndomod-3x.o $(DESTDIR)/$(BINDIR) @ginstall -m 755 $(WORKSRC)/src/file2sock $(DESTDIR)/$(BINDIR) @ginstall -m 755 $(WORKSRC)/src/log2ndo $(DESTDIR)/$(BINDIR) - cp -r $(WORKSRC)/db $(DESTDIR)/$(CONTRIBDIR) + @cp -r $(WORKSRC)/db $(DESTDIR)/$(CONTRIBDIR) #@ginstall -m 744 $(WORKSRC)/db/installdb $(DESTDIR)/$(DOCDIR)/db @ginstall -m 644 $(WORKSRC)/docs/"NDOUTILS_DB_Model.pdf" $(DESTDIR)/$(DOCDIR) @ginstall -m 644 $(WORKSRC)/docs/"NDOUtils_Documentation.pdf" $(DESTDIR)/$(DOCDIR) Modified: csw/mgar/pkg/ndoutils/trunk/checksums =================================================================== --- csw/mgar/pkg/ndoutils/trunk/checksums 2009-12-06 17:20:16 UTC (rev 7566) +++ csw/mgar/pkg/ndoutils/trunk/checksums 2009-12-06 17:23:02 UTC (rev 7567) @@ -4,5 +4,7 @@ 5b1fa6c2971d0f13d1e56ab7bb9939bd download/CSWndoutils3x.gspec 86e430bdcd2e3681fa73b2280b435406 download/CSWndoutils3x.postinstall 70ab91abfc5447c5bf9c0ab74b52a94c download/CSWndoutils3x.prototype +0cadac9fada2aacb909e8b1e4f9c2f9c download/config.diff 842170f59e6f5092554ca7a3b3ce6d95 download/cswndoutils +a1d5f59d751be796f367a1eb8b0db7c3 download/installdb.diff a454f7434f401bd48047cc42b045ff8b download/ndoutils-1.4b7.tar.gz 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 Sun Dec 6 18:38:21 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 06 Dec 2009 17:38:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7568] csw/mgar/pkg/ndoutils/trunk Message-ID: Revision: 7568 http://gar.svn.sourceforge.net/gar/?rev=7568&view=rev Author: j_arndt Date: 2009-12-06 17:38:21 +0000 (Sun, 06 Dec 2009) Log Message: ----------- ndoutils: fixed typo in start / stop script Modified Paths: -------------- csw/mgar/pkg/ndoutils/trunk/checksums csw/mgar/pkg/ndoutils/trunk/files/cswndoutils Modified: csw/mgar/pkg/ndoutils/trunk/checksums =================================================================== --- csw/mgar/pkg/ndoutils/trunk/checksums 2009-12-06 17:23:02 UTC (rev 7567) +++ csw/mgar/pkg/ndoutils/trunk/checksums 2009-12-06 17:38:21 UTC (rev 7568) @@ -5,6 +5,6 @@ 86e430bdcd2e3681fa73b2280b435406 download/CSWndoutils3x.postinstall 70ab91abfc5447c5bf9c0ab74b52a94c download/CSWndoutils3x.prototype 0cadac9fada2aacb909e8b1e4f9c2f9c download/config.diff -842170f59e6f5092554ca7a3b3ce6d95 download/cswndoutils +5cd659c88c8a507428e92dea115ef757 download/cswndoutils a1d5f59d751be796f367a1eb8b0db7c3 download/installdb.diff a454f7434f401bd48047cc42b045ff8b download/ndoutils-1.4b7.tar.gz Modified: csw/mgar/pkg/ndoutils/trunk/files/cswndoutils =================================================================== --- csw/mgar/pkg/ndoutils/trunk/files/cswndoutils 2009-12-06 17:23:02 UTC (rev 7567) +++ csw/mgar/pkg/ndoutils/trunk/files/cswndoutils 2009-12-06 17:38:21 UTC (rev 7568) @@ -19,7 +19,7 @@ exit $SMF_EXIT_ERR_CONFIG fi -NAGIOS_MAJOR_RELEASE=`/opt/csw/nagios/bin/nagios -v | head -2 | tail -1 | awk '{print $2}' | awk -F. '{print $1}'` +NAGIOS_MAJOR_RELEASE=`/opt/csw/nagios/bin/nagios -v | head -2 | tail -1 | awk '{print $3}' | awk -F. '{print $1}'` BIN_DIR="/opt/csw/nagios/ndoutils/bin" if [ $NAGIOS_MAJOR_RELEASE -eq 2 ] 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 Dec 7 04:02:37 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Dec 2009 03:02:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7569] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 7569 http://gar.svn.sourceforge.net/gar/?rev=7569&view=rev Author: bdwalton Date: 2009-12-07 03:02:36 +0000 (Mon, 07 Dec 2009) Log Message: ----------- libxml2: clean up patch for upstream submission Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/checksums csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2009-12-06 17:38:21 UTC (rev 7568) +++ csw/mgar/pkg/libxml2/trunk/checksums 2009-12-07 03:02:36 UTC (rev 7569) @@ -1,3 +1,3 @@ -f0a8df3f16e7e44d6252d6f0f1896214 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch +238e60413c73cb046ac5ee90dac8c848 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch 5e371e0f0921fc7b366c34aded6ae993 ld-symbol-handling-fixup.patch 7740a8ec23878a2f50120e1faa2730f2 libxml2-2.7.6.tar.gz Modified: csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch 2009-12-06 17:38:21 UTC (rev 7568) +++ csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch 2009-12-07 03:02:36 UTC (rev 7569) @@ -1,4 +1,4 @@ -From 960433c24da65100dcb57ec9ce801d59a86722cb Mon Sep 17 00:00:00 2001 +From e7372dda4881e8421b55b80f556f62ec977bfe0f Mon Sep 17 00:00:00 2001 From: Ben Walton Date: Sat, 5 Dec 2009 13:32:49 -0500 Subject: [PATCH] relaxng.c: add cast to allow compilation with sun studio 11 @@ -6,34 +6,37 @@ Sun Studio 11 was failing to compile relaxng.c due to a type mismatch when calling xmlRngPErr. The issue was caused by a type mismatch with in the outcomes of a ternary operation ("nothing" vs node->name). +Cast the string literal to const xmlChar * so that both outcomes are +of the same type and compatible with the xmlRngPErr function prototype. Cleanup another warning by casting a string literal to const unsigned char *. Signed-off-by: Ben Walton --- - relaxng.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + relaxng.c | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/relaxng.c b/relaxng.c -index 075fc4a..9c6019d 100644 +index 075fc4a..e78fa18 100644 --- a/relaxng.c +++ b/relaxng.c -@@ -5369,7 +5369,7 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node, +@@ -5369,7 +5369,8 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node, } else { xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, "expecting name, anyName, nsName or choice : got %s\n", - (node == NULL ? "nothing" : node->name), NULL); -+ (node == NULL ? (const unsigned char *) "nothing" : node->name), NULL); ++ (node == NULL ? (const xmlChar *) "nothing" : node->name), ++ NULL); return (NULL); } if (ret != def) { -@@ -9459,7 +9459,7 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt, +@@ -9459,7 +9460,7 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt, ctxt->states = NULL; if (found == 0) { if (cur == NULL) { - VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); -+ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const unsigned char *) "noname"); ++ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const unsigned char *) "noname"); } else { VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->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 Mon Dec 7 09:04:29 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Dec 2009 08:04:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7570] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: Revision: 7570 http://gar.svn.sourceforge.net/gar/?rev=7570&view=rev Author: wahwah Date: 2009-12-07 08:04:29 +0000 (Mon, 07 Dec 2009) Log Message: ----------- gnupg2: Splitting off CSWgnupg-agent Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-07 03:02:36 UTC (rev 7569) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-07 08:04:29 UTC (rev 7570) @@ -11,9 +11,11 @@ RFC 2440 compliant tool for secure communication and data storage endef -PACKAGES = CSWgnupg2 -CATALOGNAME_CSWgnupg2 = gnupg2 -SPKG_DESC_CSWgnupg2 = GnuPG is a complete and free replacement for PGP. +PACKAGES = CSWgnupg2 CSWgnupg-agent +CATALOGNAME_CSWgnupg2 = gnupg2 +CATALOGNAME_CSWgnupg-agent = gnupg_agent +SPKG_DESC_CSWgnupg2 = GnuPG is a complete and free replacement for PGP. +SPKG_DESC_CSWgnupg-agent = GNU privacy guard - password agent SPKG_SOURCEURL = http://www.gnupg.org/ MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ @@ -38,8 +40,7 @@ CONFIGURE_ARGS += --with-readline CONFIGURE_ARGS += --enable-threads=solaris -# Waits for pinentry to be compiled on Solaris 8. -# CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses +CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses PROTOTYPE_FILTER = awk '$$$$3 ~/\/gpg2$$$$/ { $$$$4 = 4755 } { print }' @@ -48,22 +49,34 @@ # Needed for nanosleep() EXTRA_LINKER_FLAGS += -lrt -REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt -REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn -REQUIRED_PKGS += CSWbzip2 CSWreadline CSWggettextrt CSWiconv CSWosslrt -REQUIRED_PKGS += CSWlibassuan +PKGFILES_CSWgnupg-agent = .*gpg-agent.* +PKGFILES_CSWgnupg-agent += .*gpg-connect-agent.* +PKGFILES_CSWgnupg-agent += .*gpgkey2ssh.* +PKGFILES_CSWgnupg-agent += .*symcryptrun.* -# Waits for pinentry to be compiled on Solaris 8. -# REQUIRED_PKGS += CSWpinentry +REQUIRED_PKGS_common_CSWgnupg2 = CSWbzip2 +REQUIRED_PKGS_common_CSWgnupg2 += CSWcurlrt +REQUIRED_PKGS_common_CSWgnupg2 += CSWgcrypt +REQUIRED_PKGS_common_CSWgnupg2 += CSWggettextrt +REQUIRED_PKGS_common_CSWgnupg2 += CSWgpgerr +REQUIRED_PKGS_common_CSWgnupg2 += CSWiconv +REQUIRED_PKGS_common_CSWgnupg2 += CSWlibassuan +REQUIRED_PKGS_common_CSWgnupg2 += CSWlibidn +REQUIRED_PKGS_common_CSWgnupg2 += CSWlibksba +REQUIRED_PKGS_common_CSWgnupg2 += CSWoldaprt +REQUIRED_PKGS_common_CSWgnupg2 += CSWosslrt +REQUIRED_PKGS_common_CSWgnupg2 += CSWpth +REQUIRED_PKGS_common_CSWgnupg2 += CSWreadline +REQUIRED_PKGS_common_CSWgnupg2 += CSWzlib -PREREQUISITE_PKGS = $(REQUIRED_PKGS) +REQUIRED_PKGS_CSWgnupg2 += $(REQUIRED_PKGS_common_CSWgnupg2) +REQUIRED_PKGS_CSWgnupg2 += CSWgnupg-agent -INCOMPATIBLE_PKGS = CSWgnupg +REQUIRED_PKGS_CSWgnupg-agent = CSWpinentry +PREREQUISITE_PKGS = $(REQUIRED_PKGS_common_CSWgnupg2) +PREREQUISITE_PKGS += $(REQUIRED_PKGS_CSWgnupg-agent) + TEST_TARGET = check include gar/category.mk - -post-merge: - ln -s gnupg2 $(PKGROOT)$(bindir)/gnupg - @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 7 09:55:16 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Dec 2009 08:55:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7571] csw/mgar/pkg/cheetah/trunk/Makefile Message-ID: Revision: 7571 http://gar.svn.sourceforge.net/gar/?rev=7571&view=rev Author: wahwah Date: 2009-12-07 08:55:16 +0000 (Mon, 07 Dec 2009) Log Message: ----------- cheetah: Using CSWpy-cheetah for pkgname, adding CSWpython-rt dependency Modified Paths: -------------- csw/mgar/pkg/cheetah/trunk/Makefile Modified: csw/mgar/pkg/cheetah/trunk/Makefile =================================================================== --- csw/mgar/pkg/cheetah/trunk/Makefile 2009-12-07 08:04:29 UTC (rev 7570) +++ csw/mgar/pkg/cheetah/trunk/Makefile 2009-12-07 08:55:16 UTC (rev 7571) @@ -20,5 +20,6 @@ DISTFILES = $(DISTNAME).tar.gz UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = py_cheetah -PACKAGES = CSWpycheetah +PACKAGES = CSWpy-cheetah +REQUIRED_PKGS_CSWpy-cheetah = CSWpython-rt include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 7 10:20:11 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Dec 2009 09:20:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7572] csw/mgar/pkg/dpkg/trunk/Makefile Message-ID: Revision: 7572 http://gar.svn.sourceforge.net/gar/?rev=7572&view=rev Author: wahwah Date: 2009-12-07 09:20:11 +0000 (Mon, 07 Dec 2009) Log Message: ----------- dpkg: Fixing a typo Modified Paths: -------------- csw/mgar/pkg/dpkg/trunk/Makefile Modified: csw/mgar/pkg/dpkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/dpkg/trunk/Makefile 2009-12-07 08:55:16 UTC (rev 7571) +++ csw/mgar/pkg/dpkg/trunk/Makefile 2009-12-07 09:20:11 UTC (rev 7572) @@ -10,7 +10,7 @@ CATEGORIES = lib DESCRIPTION = Debian package manager PACKAGES = CSWalternatives -SPKG_DESC_CSWalternative = Alternatives management for CSW +SPKG_DESC_CSWalternatives = Alternatives management for CSW, based on dpkg define BLURB endef SPKG_SOURCEURL = http://wiki.debian.org/Teams/Dpkg 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 Dec 7 11:20:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Dec 2009 10:20:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7573] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7573 http://gar.svn.sourceforge.net/gar/?rev=7573&view=rev Author: dmichelsen Date: 2009-12-07 10:20:50 +0000 (Mon, 07 Dec 2009) Log Message: ----------- mGAR v2: Dynamically inspect the prototype for each package to see if it should depend on CSWcswclassutils Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-12-07 09:20:11 UTC (rev 7572) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-12-07 10:20:50 UTC (rev 7573) @@ -208,13 +208,15 @@ $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' -# The TEXINFO dependency is handled dynamically by looking at the prototype for matching files -ifneq ($(MIGRATECONF)$(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) -_EXTRA_GAR_PKGS += CSWcswclassutils +# If you add another filter above, also add the class to this list. It is used +# to detect if a package needs to depends on CSWcswclassutils by looking at +# files belonging to one of these in the prototype. +_CSWCLASSES = cswmigrateconf cswcpsampleconf cswpreserveconf cswetcservices cswinetd cswinitsmf +_CSWCLASSES += cswusergroup cswcrontab cswpycompile cswtexinfo + # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. _EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.CSW=%) $(PRESERVECONF:%\.CSW=%),-s ",^\.\($(FILE)\)$$,.\1\.CSW,p") -endif PKGGET_DESTDIR ?= @@ -427,7 +429,7 @@ # The dependencies to CSWcswclassutils and CSWtexinfo are only added if there are files # actually matching the _TEXINFO_FILTER. This is done at the prototype-level. $(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype -$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),CSWcswclassutils) +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) $(WORKDIR)/%.depend: $(WORKDIR) $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_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 Dec 7 11:21:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Dec 2009 10:21:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7574] csw/mgar/pkg/dhcp/trunk/Makefile Message-ID: Revision: 7574 http://gar.svn.sourceforge.net/gar/?rev=7574&view=rev Author: dmichelsen Date: 2009-12-07 10:21:41 +0000 (Mon, 07 Dec 2009) Log Message: ----------- dhcp: Fix classutils variables Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-07 10:20:50 UTC (rev 7573) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-07 10:21:41 UTC (rev 7574) @@ -49,8 +49,8 @@ # $$$$3 ~ /\/dhcpd.leases.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ # { print }' -INITSMF_CSWdhcp = /etc/opt/csw/init.d/cswdhcpd -SAMPLECONF_CSWdhcp = /etc/opt/csw/dhcpd.conf /etc/opt/csw/dhclient.conf /var/opt/csw/dhcp/db/dhcpd.leases +INITSMF = /etc/opt/csw/init.d/cswdhcpd +SAMPLECONF = /etc/opt/csw/dhcpd.conf /etc/opt/csw/dhclient.conf /var/opt/csw/dhcp/db/dhcpd.leases SPKG_SOURCEURL = https://www.isc.org/software/dhcp #SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf 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 Dec 7 14:34:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Dec 2009 13:34:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7575] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7575 http://gar.svn.sourceforge.net/gar/?rev=7575&view=rev Author: dmichelsen Date: 2009-12-07 13:34:56 +0000 (Mon, 07 Dec 2009) Log Message: ----------- mGAR v2: Pick up SPKG_CLASSES per-package from the respective prototype file Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-12-07 10:21:41 UTC (rev 7574) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-12-07 13:34:56 UTC (rev 7575) @@ -159,12 +159,6 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg -# Handle cswclassutils -# append $2 to SPKG_CLASSES if $1 is non-null -define _spkg_cond_add -$(SPKG_CLASSES) $(if $($(1)),$(if $(filter $(2),$(SPKG_CLASSES)),,$(2))) -endef - MIGRATECONF ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) # It is NOT sufficient to change the pathes here, they must be adjusted in merge-* also @@ -176,21 +170,6 @@ INETDCONF += $(_INETDCONF_FILES) ETCSERVICES += $(_ETCSERVICES_FILES) -# NOTE: Order _can_ be important here. cswinitsmf and cswinetd should -# always be the last two added. The reason for this is that -# you need to ensure any binaries and config files are already on disk -# and able to be consumed by a service that might be started. -SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) -SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) -SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) -SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) -SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) -SPKG_CLASSES := $(call _spkg_cond_add,CRONTABS,cswcrontab) -SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) -SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) -SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) - - # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) @@ -211,9 +190,21 @@ # If you add another filter above, also add the class to this list. It is used # to detect if a package needs to depends on CSWcswclassutils by looking at # files belonging to one of these in the prototype. -_CSWCLASSES = cswmigrateconf cswcpsampleconf cswpreserveconf cswetcservices cswinetd cswinitsmf -_CSWCLASSES += cswusergroup cswcrontab cswpycompile cswtexinfo +# NOTE: Order _can_ be important here. cswinitsmf and cswinetd should +# always be the last two added. The reason for this is that +# you need to ensure any binaries and config files are already on disk +# and able to be consumed by a service that might be started. + +_CSWCLASSES = cswmigrateconf cswcpsampleconf cswpreserveconf +_CSWCLASSES += cswetcservices +_CSWCLASSES += cswusergroup +_CSWCLASSES += cswcrontab +_CSWCLASSES += cswpycompile +_CSWCLASSES += cswinetd +_CSWCLASSES += cswinitsmf +_CSWCLASSES += cswtexinfo + # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. _EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.CSW=%) $(PRESERVECONF:%\.CSW=%),-s ",^\.\($(FILE)\)$$,.\1\.CSW,p") @@ -534,7 +525,7 @@ # The texinfo filter has been taken out of the normal filters as TEXINFO has a default. $(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype -$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),cswtexinfo) +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C " if( $$F[1] eq "$C" && !$$done{$C}++ );)') $(WORKDIR)/%.pkginfo: $(WORKDIR) $(_DBG)(echo "PKG=$*"; \ 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 Dec 7 14:44:57 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 07 Dec 2009 13:44:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7576] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 7576 http://gar.svn.sourceforge.net/gar/?rev=7576&view=rev Author: bonivart Date: 2009-12-07 13:44:57 +0000 (Mon, 07 Dec 2009) Log Message: ----------- dhcp: update to beta 3, modified init script, gar updates Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-07 13:34:56 UTC (rev 7575) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-07 13:44:57 UTC (rev 7576) @@ -42,18 +42,10 @@ INSTALL_SCRIPTS = custom -#PROTOTYPE_FILTER = awk ' \ -# $$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } \ -# $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ -# $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ -# $$$$3 ~ /\/dhcpd.leases.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ -# { print }' - INITSMF = /etc/opt/csw/init.d/cswdhcpd SAMPLECONF = /etc/opt/csw/dhcpd.conf /etc/opt/csw/dhclient.conf /var/opt/csw/dhcp/db/dhcpd.leases SPKG_SOURCEURL = https://www.isc.org/software/dhcp -#SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf include gar/category.mk @@ -64,12 +56,8 @@ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @cp $(FILEDIR)/CSWdhcp.cswdhcpd $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd @chmod 755 $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd -# @( cd $(DESTDIR)/etc/opt/csw ; \ -# mv dhcpd.conf dhcpd.conf.CSW ; \ -# mv dhclient.conf dhclient.conf.CSW ) @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(FILEDIR)/CSWdhcp.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/db -# @touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases.CSW @touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases @$(MAKECOOKIE) Modified: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd 2009-12-07 13:34:56 UTC (rev 7575) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd 2009-12-07 13:44:57 UTC (rev 7576) @@ -1,8 +1,9 @@ #!/sbin/sh # rc-script for CSW DHCP -# Peter Bonivart, 2009-01-27 +# Peter Bonivart, 2009-12-04 +SERVICE=dhcp PID=/var/opt/csw/dhcp/dhcpd.pid #CONF=/opt/csw/etc/dhcpd.conf # use old location of conf file CONF=/etc/opt/csw/dhcpd.conf @@ -11,14 +12,14 @@ ZONE= # used for initialization, do not change case "$1" in - 'start') + start) if [ -f /opt/csw/sbin/dhcpd -a -f $CONF ]; then - echo 'Starting dhcp.' + echo "Starting $SERVICE." /opt/csw/sbin/dhcpd -cf $CONF $OPTIONS fi ;; - 'stop') - echo 'Shutting down dhcp.' + stop) + echo "Stopping $SERVICE." if [ -x /usr/bin/zonename ]; then if [ "`/usr/bin/zonename`" = "global" ]; then ZONE="-z global" @@ -28,8 +29,25 @@ [ -f $PID ] && /usr/bin/rm $PID exit 0 ;; + restart) + FAIL= + /opt/csw/sbin/dhcpd -cf $CONF -t || FAIL=1 + /opt/csw/sbin/dhcpd -cf $CONF -T || FAIL=2 + [ $FAIL = 1 ] && echo "Your configuration seems broken. Exiting." + [ $FAIL = 2 ] && echo "Your lease file seems broken. Exiting." + [ $FAIL ] && exit 1 + $0 stop + echo "Waiting for $SERVICE to stop.\c" + while ( /usr/bin/pgrep -x dhcpd > /dev/null ); do + echo ".\c" + sleep 1 + done + echo + sleep 1 + $0 start + ;; *) - echo "Usage: $0 { start | stop }" + echo "Usage: $0 { start | stop | restart }" exit 1 ;; esac 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 Dec 7 16:22:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Dec 2009 15:22:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7577] csw/mgar/pkg Message-ID: Revision: 7577 http://gar.svn.sourceforge.net/gar/?rev=7577&view=rev Author: wahwah Date: 2009-12-07 15:22:15 +0000 (Mon, 07 Dec 2009) Log Message: ----------- cx-oracle: Initial commit Modified Paths: -------------- csw/mgar/pkg/cx-oracle/trunk/Makefile csw/mgar/pkg/cx-oracle/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cx-oracle/ Modified: csw/mgar/pkg/cx-oracle/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-07 13:44:57 UTC (rev 7576) +++ csw/mgar/pkg/cx-oracle/trunk/Makefile 2009-12-07 15:22:15 UTC (rev 7577) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = cx-oracle +GARVERSION = 5.0.2 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -22,24 +22,29 @@ ## Possible settings are: ## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, ## utils, x11, xfce, xorg, xtra -CATEGORIES = lib +CATEGORIES = python ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = a Python db API conforming module for Oracle database access ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. define BLURB - + cx_Oracle is a Python extension module that allows access to Oracle databases + and conforms to the Python database API specification. This module is + currently built against Oracle 9.2.0, 10.2.0 and 11.1.0. For more information + on the database API specification, see here. Use the provided setup.py to + build and install the module which makes use of the DistUtils module made + available in Python 2.0 and up. endef ## ## Upstream URL that should show up in the VENDOR field as well as on ## http://opencsw.org/packages/. -SPKG_SOURCEURL = +SPKG_SOURCEURL = http://cx-oracle.sourceforge.net/ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = $(SF_MIRRORS) ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -54,9 +59,10 @@ ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DL_NAME = cx_Oracle +DISTNAME = $(DL_NAME)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz ## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ## ## Catalog name is the name to be used with pkg{-get,util} -i . @@ -176,10 +182,4 @@ ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 ## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/cx-oracle/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-12-07 13:44:57 UTC (rev 7576) +++ csw/mgar/pkg/cx-oracle/trunk/checksums 2009-12-07 15:22:15 UTC (rev 7577) @@ -0,0 +1 @@ +7f2e521142f0be47347398941438ef79 cx_Oracle-5.0.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Dec 8 00:06:50 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 07 Dec 2009 23:06:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7578] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 7578 http://gar.svn.sourceforge.net/gar/?rev=7578&view=rev Author: chninkel Date: 2009-12-07 23:06:50 +0000 (Mon, 07 Dec 2009) Log Message: ----------- openssl: made the openssl package archall Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-12-07 15:22:15 UTC (rev 7577) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-12-07 23:06:50 UTC (rev 7578) @@ -29,6 +29,7 @@ SPKG_DESC_CSWossl = Openssl meta package CATALOGNAME_CSWossl = openssl REQUIRED_PKGS_CSWossl = CSWossldevel CSWosslutils CSWosslrt +ARCH_ALL_CSWossl = 1 SPKG_DESC_CSWosslrt = Openssl runtime libraries CATALOGNAME_CSWosslrt = openssl_rt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Dec 8 00:25:16 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 07 Dec 2009 23:25:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7579] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 7579 http://gar.svn.sourceforge.net/gar/?rev=7579&view=rev Author: chninkel Date: 2009-12-07 23:25:16 +0000 (Mon, 07 Dec 2009) Log Message: ----------- openssl: updated changelog Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2009-12-07 23:06:50 UTC (rev 7578) +++ csw/mgar/pkg/openssl/trunk/checksums 2009-12-07 23:25:16 UTC (rev 7579) @@ -8,6 +8,6 @@ 521028d0016ae5a4cc8fd5e0b0add53f CSWosslrt.prototype-sparc 88634d81695a173bdb35df1a80cc9761 CSWosslutils.prototype b78faa440d6f6a2a07663de331678648 README.CSW -5c447b39d30f5ae4ede50d53dfcdfb58 changelog.CSW +28a305623ad6de6f8370e36482716873 changelog.CSW 64f7c3f3a6cae483209b69c31c82557d more_configure_targets.patch 05a0ece1372392a2cf310ebb96333025 openssl-0.9.8l.tar.gz Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2009-12-07 23:06:50 UTC (rev 7578) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2009-12-07 23:25:16 UTC (rev 7579) @@ -1,9 +1,9 @@ -openssl (0.9.8l,REV=2009.03.27) unstable +openssl (0.9.8l,REV=2009.12.08) unstable * New upstream version. * Changed package version numbering scheme. - -- Yann Rouillard Fri, 06 Nov 2009 11:16:03 +0100 + -- Yann Rouillard Fri, 08 Dec 2009 11:16:03 +0100 openssl (0.9.8,REV=2009.03.27_rev=k) unstable 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 Dec 8 02:05:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 08 Dec 2009 01:05:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7580] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 7580 http://gar.svn.sourceforge.net/gar/?rev=7580&view=rev Author: bdwalton Date: 2009-12-08 01:05:35 +0000 (Tue, 08 Dec 2009) Log Message: ----------- libxml2: further patch cleanup Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile csw/mgar/pkg/libxml2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch Removed Paths: ------------- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-07 23:25:16 UTC (rev 7579) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-08 01:05:35 UTC (rev 7580) @@ -10,7 +10,7 @@ MASTER_SITES = ftp://xmlsoft.org/libxml2/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = ld-symbol-handling-fixup.patch -PATCHFILES += 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch +PATCHFILES += 0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2009-12-07 23:25:16 UTC (rev 7579) +++ csw/mgar/pkg/libxml2/trunk/checksums 2009-12-08 01:05:35 UTC (rev 7580) @@ -1,3 +1,3 @@ -238e60413c73cb046ac5ee90dac8c848 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch +288c7d9bbe8b1a28eab9421493f1186a 0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch 5e371e0f0921fc7b366c34aded6ae993 ld-symbol-handling-fixup.patch 7740a8ec23878a2f50120e1faa2730f2 libxml2-2.7.6.tar.gz Deleted: csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch 2009-12-07 23:25:16 UTC (rev 7579) +++ csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch 2009-12-08 01:05:35 UTC (rev 7580) @@ -1,45 +0,0 @@ -From e7372dda4881e8421b55b80f556f62ec977bfe0f Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sat, 5 Dec 2009 13:32:49 -0500 -Subject: [PATCH] relaxng.c: add cast to allow compilation with sun studio 11 - -Sun Studio 11 was failing to compile relaxng.c due to a type mismatch -when calling xmlRngPErr. The issue was caused by a type mismatch with -in the outcomes of a ternary operation ("nothing" vs node->name). -Cast the string literal to const xmlChar * so that both outcomes are -of the same type and compatible with the xmlRngPErr function prototype. - -Cleanup another warning by casting a string literal to const unsigned -char *. - -Signed-off-by: Ben Walton ---- - relaxng.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/relaxng.c b/relaxng.c -index 075fc4a..e78fa18 100644 ---- a/relaxng.c -+++ b/relaxng.c -@@ -5369,7 +5369,8 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node, - } else { - xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, - "expecting name, anyName, nsName or choice : got %s\n", -- (node == NULL ? "nothing" : node->name), NULL); -+ (node == NULL ? (const xmlChar *) "nothing" : node->name), -+ NULL); - return (NULL); - } - if (ret != def) { -@@ -9459,7 +9460,7 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt, - ctxt->states = NULL; - if (found == 0) { - if (cur == NULL) { -- VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); -+ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const unsigned char *) "noname"); - } else { - VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name); - } --- -1.6.5.3 - Added: csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch (rev 0) +++ csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch 2009-12-08 01:05:35 UTC (rev 7580) @@ -0,0 +1,47 @@ +From f2cee2dd783b6c71ea3d98ab9701b9b397753f0a Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 5 Dec 2009 13:32:49 -0500 +Subject: [PATCH] relaxng.c: cast to allow compilation with sun studio 11 + +Sun Studio 11 was failing to compile relaxng.c due to a type mismatch +in a ternary operator used to provide an argument to xmlRngPErr. It +seems that sos11 cc is more pedantic about this part of the C99 +standard. GCC issues a warning but doesn't fail by default. + +After casting the string literal "nothing" to (const xmlChar *) sos11 +cc is happy. GCC no longer issues a warning either. + +Another warning was cleaned up with an identical cast. + +Signed-off-by: Ben Walton +--- + relaxng.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/relaxng.c b/relaxng.c +index 075fc4a..6dbc499 100644 +--- a/relaxng.c ++++ b/relaxng.c +@@ -5369,7 +5369,8 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node, + } else { + xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, + "expecting name, anyName, nsName or choice : got %s\n", +- (node == NULL ? "nothing" : node->name), NULL); ++ (node == NULL ? (const xmlChar *) "nothing" : node->name), ++ NULL); + return (NULL); + } + if (ret != def) { +@@ -9459,7 +9460,8 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt, + ctxt->states = NULL; + if (found == 0) { + if (cur == NULL) { +- VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); ++ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, ++ (const xmlChar *) "noname"); + } else { + VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name); + } +-- +1.6.5.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Dec 8 10:38:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Dec 2009 09:38:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7581] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 7581 http://gar.svn.sourceforge.net/gar/?rev=7581&view=rev Author: wahwah Date: 2009-12-08 09:38:30 +0000 (Tue, 08 Dec 2009) Log Message: ----------- wxwidgets: Reworked package dependencies, shuffled files around the packages to clean up the common package and move appropriate files into the devel package. Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-12-08 01:05:35 UTC (rev 7580) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-12-08 09:38:30 UTC (rev 7581) @@ -70,31 +70,39 @@ PACKAGES += CSWwxwidgetsgtk2 ARCHALL_CSWwxwidgetsdevel = 1 SPKG_DESC_CSWwxwidgetscommon = A cross-platform toolkit, common files -SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files -SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support +SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files +SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support -REQUIRED_PKGS = CSWexpat -REQUIRED_PKGS += CSWfconfig -REQUIRED_PKGS += CSWftype2 -REQUIRED_PKGS += CSWggettextrt -REQUIRED_PKGS += CSWglib2 -REQUIRED_PKGS += CSWgtk2 -REQUIRED_PKGS += CSWiconv -REQUIRED_PKGS += CSWjpeg -REQUIRED_PKGS += CSWlibatk -REQUIRED_PKGS += CSWlibsm -REQUIRED_PKGS += CSWlibxext -REQUIRED_PKGS += CSWmesa -REQUIRED_PKGS += CSWncurses -REQUIRED_PKGS += CSWpango -REQUIRED_PKGS += CSWpng -REQUIRED_PKGS += CSWsunmath -REQUIRED_PKGS += CSWtiff -REQUIRED_PKGS += CSWzlib +REQUIRED_PKGS_CSWwxwidgetscommon += CSWexpat +REQUIRED_PKGS_CSWwxwidgetscommon += CSWiconv +REQUIRED_PKGS_CSWwxwidgetscommon += CSWlibxext +REQUIRED_PKGS_CSWwxwidgetscommon += CSWncurses +REQUIRED_PKGS_CSWwxwidgetscommon += CSWsunmath +REQUIRED_PKGS_CSWwxwidgetscommon += CSWzlib -REQUIRED_PKGS_CSWwxwidgetsgtk2 = CSWwxwidgetscommon -REQUIRED_PKGS_CSWwxwidgetsdevel = CSWwxwidgetscommon +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWexpat +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWfconfig +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWftype2 +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWggettextrt +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWglib2 +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWgtk2 +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWiconv +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWjpeg +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWlibatk +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWlibsm +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWlibxext +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWmesa +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWncurses +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWpango +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWpng +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWsunmath +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWtiff +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWzlib +# Dependencies between wxwidgets subpackages +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgetscommon +REQUIRED_PKGS_CSWwxwidgetsdevel += CSWwxwidgetscommon CSWwxwidgetsgtk2 + PREREQUISITE_PKGS = $(REQUIRED_PKGS) PREREQUISITE_PKGS += CSWgtk2devel PREREQUISITE_PKGS += CSWlibpthreadstubs @@ -110,6 +118,13 @@ PKGFILES_CSWwxwidgetsdevel = $(PKGFILES_DEVEL) PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config +PKGFILES_CSWwxwidgetsdevel += /opt/csw/share/bakefile/presets.* +PKGFILES_CSWwxwidgetsdevel += /opt/csw/share/aclocal.* +PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config +PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wxrc=wxrc-2.8 +PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wxrc-2.8 +PKGFILES_CSWwxwidgetsdevel += /opt/csw/lib/wx/config.* +PKGFILES_CSWwxwidgetsdevel += /opt/csw/lib/wx/include.* PKGFILES_CSWwxwidgetsgtk2 = /opt/csw/lib/wx/(include|config)/gtk2-.* PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/lib/libwx_gtk2.* PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/bin/wx(-config|rc(|-2.8)) 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 Dec 8 11:03:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Dec 2009 10:03:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7582] csw/mgar/pkg/libstatgrab/trunk/Makefile Message-ID: Revision: 7582 http://gar.svn.sourceforge.net/gar/?rev=7582&view=rev Author: dmichelsen Date: 2009-12-08 10:03:02 +0000 (Tue, 08 Dec 2009) Log Message: ----------- libstatgrab: Make shared lib self-sufficient Modified Paths: -------------- csw/mgar/pkg/libstatgrab/trunk/Makefile Modified: csw/mgar/pkg/libstatgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/libstatgrab/trunk/Makefile 2009-12-08 09:38:30 UTC (rev 7581) +++ csw/mgar/pkg/libstatgrab/trunk/Makefile 2009-12-08 10:03:02 UTC (rev 7582) @@ -18,10 +18,13 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# Don't pull in ncurses from CSW -LINKER_FLAGS = +SPKG_SOURCEURL = http://www.i-scream.org/libstatgrab/ +# Don't pull in ncurses from CSW, but add needed libraries to be self-sufficient +LINKER_FLAGS = -lkstat -ldevinfo -lsocket -lnsl + BUILD64 = 1 +NORUNPATH = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-curses-prefix=/usr 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 Dec 8 15:27:03 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Dec 2009 14:27:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7583] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7583 http://gar.svn.sourceforge.net/gar/?rev=7583&view=rev Author: bonivart Date: 2009-12-08 14:27:03 +0000 (Tue, 08 Dec 2009) Log Message: ----------- pkgutil: update to 1.9.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 2009-12-08 10:03:02 UTC (rev 7582) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-08 14:27:03 UTC (rev 7583) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.9 +GARVERSION = 1.9.1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -13,11 +13,14 @@ # Disable inclusion of CSWcommon by default. COMMON_PKG_DEPENDS = -MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES += svn-http://gar.svn.sourceforge.net/svnroot/opencsw/ DISTFILES = $(GARNAME)-$(GARVERSION).zip DISTFILES += $(call admfiles,CSWpkgutil,prototype) DISTFILES += i.cswpkgutil DISTFILES += r.cswpkgutil +DISTFILES += utilities +NOCHECKSUM = utilities PACKAGES = CSWpkgutil CSWpkgutilplus @@ -31,6 +34,8 @@ PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* PKGFILES_CSWpkgutilplus += .*pkgutilplus.* +PKGFILES_CSWpkgutilplus += .*build_sun_catalog.* +PKGFILES_CSWpkgutilplus += .*opencsw.py.* ARCHALL_CSWpkgutilplus = 1 @@ -60,6 +65,9 @@ @ginstall $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW @ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) @ginstall $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget + @ginstall $(WORKSRC)/utilities/build_sun_catalog.py $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @ginstall $(WORKSRC)/utilities/opencsw.py $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @ln -s ../libexec/pkgutil/build_sun_catalog.py $(DESTDIR)$(bindir)/build_sun_catalog @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @ginstall $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)plus Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-08 10:03:02 UTC (rev 7582) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-08 14:27:03 UTC (rev 7583) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec a751314ee495d7477888522435b769e4 CSWpkgutil.prototype 33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil -bdc6afd165a5117c9d0f3a3a54109461 pkgutil-1.9.zip +0d33234b106bb0584af460ce249ae52d pkgutil-1.9.1.zip 6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil 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 Dec 8 19:39:58 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Dec 2009 18:39:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7584] csw/mgar/pkg/pkgutil/trunk/Makefile Message-ID: Revision: 7584 http://gar.svn.sourceforge.net/gar/?rev=7584&view=rev Author: bonivart Date: 2009-12-08 18:39:58 +0000 (Tue, 08 Dec 2009) Log Message: ----------- pkgutil: add python and pkgloghooks as deps Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-08 14:27:03 UTC (rev 7583) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-08 18:39:58 UTC (rev 7584) @@ -29,7 +29,7 @@ # Explicitly depend on CSWcommon here since it's not the default #REQUIRED_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil CSWpmwwwcurl -REQUIRED_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil +REQUIRED_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil CSWcswpkgloghooks CSWpython PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Dec 8 21:20:41 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 08 Dec 2009 20:20:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7585] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 7585 http://gar.svn.sourceforge.net/gar/?rev=7585&view=rev Author: chninkel Date: 2009-12-08 20:20:41 +0000 (Tue, 08 Dec 2009) Log Message: ----------- openssl: fixed archall Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-12-08 18:39:58 UTC (rev 7584) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-12-08 20:20:41 UTC (rev 7585) @@ -29,7 +29,7 @@ SPKG_DESC_CSWossl = Openssl meta package CATALOGNAME_CSWossl = openssl REQUIRED_PKGS_CSWossl = CSWossldevel CSWosslutils CSWosslrt -ARCH_ALL_CSWossl = 1 +ARCHALL_CSWossl = 1 SPKG_DESC_CSWosslrt = Openssl runtime libraries CATALOGNAME_CSWosslrt = openssl_rt 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 Dec 9 02:51:26 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Dec 2009 01:51:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7586] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7586 http://gar.svn.sourceforge.net/gar/?rev=7586&view=rev Author: bdwalton Date: 2009-12-09 01:51:26 +0000 (Wed, 09 Dec 2009) Log Message: ----------- coreutils: build with gcc4 for extra tools Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-08 20:20:41 UTC (rev 7585) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-09 01:51:26 UTC (rev 7586) @@ -2,6 +2,9 @@ GARVERSION = 8.1 CATEGORIES = utils +# building with gcc gets us extra tools (eg: stdbuf) +GARCOMPILER = GCC4 + SHELL = /opt/csw/bin/bash PREREQUISITE_PKGS = CSWbash This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 9 10:19:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Dec 2009 09:19:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7587] csw/mgar/pkg/automake/trunk Message-ID: Revision: 7587 http://gar.svn.sourceforge.net/gar/?rev=7587&view=rev Author: dmichelsen Date: 2009-12-09 09:19:13 +0000 (Wed, 09 Dec 2009) Log Message: ----------- automake: Update to 1.11.1 Modified Paths: -------------- csw/mgar/pkg/automake/trunk/Makefile csw/mgar/pkg/automake/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/automake/trunk/ Property changes on: csw/mgar/pkg/automake/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2009-12-09 01:51:26 UTC (rev 7586) +++ csw/mgar/pkg/automake/trunk/Makefile 2009-12-09 09:19:13 UTC (rev 7587) @@ -1,10 +1,10 @@ GARNAME = automake -GARVERSION = 1.11 +GARVERSION = 1.11.1 CATEGORIES = devel EXTRA_MODULATORS = GARVERSION # Version 1.1.2 is the last to contain libflac.so.7 where most of the binaries depend on -MODULATIONS_GARVERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.2 1.11 +MODULATIONS_GARVERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.1 DESCRIPTION = A tool for automatically generating Makefiles. define BLURB Modified: csw/mgar/pkg/automake/trunk/checksums =================================================================== --- csw/mgar/pkg/automake/trunk/checksums 2009-12-09 01:51:26 UTC (rev 7586) +++ csw/mgar/pkg/automake/trunk/checksums 2009-12-09 09:19:13 UTC (rev 7587) @@ -1,6 +1,6 @@ -ede3e08c696861a01f4d2c6a2e822053 download/automake-1.10.2.tar.gz -fab0bd2c3990a6679adaf9eeac0c6d2a download/automake-1.11.tar.gz -2bd506db63b6d10458cb644b6171ce93 download/automake-1.6.3.tar.gz -eb25355e3cf00aac83c580dde970a0b4 download/automake-1.7.9.tar.gz -ce0662da5df68014eb1683c184c47a8e download/automake-1.8.5.tar.gz -c60f77a42f103606981d456f1615f5b4 download/automake-1.9.6.tar.gz +03bc9ebfa805f9ee5635f1f53fa1fa5f automake-1.10.3.tar.gz +4ee7f0ff5f0e467d58b6bd5da96b1c74 automake-1.11.1.tar.gz +2bd506db63b6d10458cb644b6171ce93 automake-1.6.3.tar.gz +eb25355e3cf00aac83c580dde970a0b4 automake-1.7.9.tar.gz +ce0662da5df68014eb1683c184c47a8e automake-1.8.5.tar.gz +c60f77a42f103606981d456f1615f5b4 automake-1.9.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Wed Dec 9 17:02:46 2009 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Wed, 09 Dec 2009 16:02:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7588] csw/mgar/pkg Message-ID: Revision: 7588 http://gar.svn.sourceforge.net/gar/?rev=7588&view=rev Author: a_o_m Date: 2009-12-09 16:02:46 +0000 (Wed, 09 Dec 2009) Log Message: ----------- libfasttime: Initial commit Added Paths: ----------- csw/mgar/pkg/libfasttime/ csw/mgar/pkg/libfasttime/branches/ csw/mgar/pkg/libfasttime/tags/ csw/mgar/pkg/libfasttime/trunk/ csw/mgar/pkg/libfasttime/trunk/Makefile csw/mgar/pkg/libfasttime/trunk/checksums csw/mgar/pkg/libfasttime/trunk/files/ Property changes on: csw/mgar/pkg/libfasttime/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/libfasttime/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfasttime/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libfasttime/trunk/Makefile 2009-12-09 16:02:46 UTC (rev 7588) @@ -0,0 +1,22 @@ +GARNAME = libfasttime +GARVERSION = 1.0 +CATEGORIES = lib + +DESCRIPTION = a optimized, caching time() library function +define BLURB + See for details: http://developers.sun.com/solaris/articles/time_stamp.html +endef + +MASTER_SITES = http://metis.utfs.org/html/csw/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 Added: csw/mgar/pkg/libfasttime/trunk/checksums =================================================================== --- csw/mgar/pkg/libfasttime/trunk/checksums (rev 0) +++ csw/mgar/pkg/libfasttime/trunk/checksums 2009-12-09 16:02:46 UTC (rev 7588) @@ -0,0 +1 @@ +e3b5af6668664c9f370f0c431b4afbe1 libfasttime-1.0.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 Dec 10 04:35:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Dec 2009 03:35:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7589] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 7589 http://gar.svn.sourceforge.net/gar/?rev=7589&view=rev Author: bdwalton Date: 2009-12-10 03:35:34 +0000 (Thu, 10 Dec 2009) Log Message: ----------- git: depend on less, set less as default pager; revamp a few args that can be set in configure; prepare for 1.6.6 Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-12-09 16:02:46 UTC (rev 7588) +++ csw/mgar/pkg/git/trunk/Makefile 2009-12-10 03:35:34 UTC (rev 7589) @@ -1,6 +1,6 @@ GARNAME = git -GARVERSION = 1.6.5.1 -#xPATCHLEVEL = rc3 +GARVERSION = 1.6.6 +PATCHLEVEL = rc2 CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) @@ -33,7 +33,7 @@ REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWosshclient CSWiconv CSWexpat CSWbash CSWpmerror -REQUIRED_PKGS_CSWgit += CSWpmtermreadkey CSWpmnetsmtpssl +REQUIRED_PKGS_CSWgit += CSWpmtermreadkey CSWpmnetsmtpssl CSWless REQUIRED_PKGS_CSWgitk = CSWgit CSWtk @@ -86,7 +86,6 @@ GIT_TREEISH_git.git = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) DISTFILES = CSWgit.postinstall -#PATCHFILES = 0001-ls-files-die-instead-of-fprintf-exit-in-i-error.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files @@ -115,18 +114,19 @@ CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-default_pager=/opt/csw/bin/less CONFIGURE_ARGS += --with-iconv=$(prefix) CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-expat=$(prefix) CONFIGURE_ARGS += --enable-pthreads="-D_REENTRANT -lpthread" +CONFIGURE_ARGS += --with-gitconfig=$(sysconfdir)/gitconfig +CONFIGURE_ARGS += --with-pager=/opt/csw/bin/less BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ - ETC_GITCONFIG=$(sysconfdir)/gitconfig \ ASCIIDOC_NO_ROFF=YesPlease \ all doc -INSTALL_ARGS = ETC_GITCONFIG=$(sysconfdir)/gitconfig \ - INSTALLDIRS=vendor \ +INSTALL_ARGS = INSTALLDIRS=vendor \ install-man install-html # We want static libs installed for our devel 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 Thu Dec 10 09:28:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Dec 2009 08:28:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7590] csw/mgar/pkg/perl/tags/perl-5.8.8, REV=2009.11.12/ Message-ID: Revision: 7590 http://gar.svn.sourceforge.net/gar/?rev=7590&view=rev Author: dmichelsen Date: 2009-12-10 08:28:12 +0000 (Thu, 10 Dec 2009) Log Message: ----------- perl: Tag current release Added Paths: ----------- csw/mgar/pkg/perl/tags/perl-5.8.8,REV=2009.11.12/ 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 Dec 10 18:43:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Dec 2009 17:43:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7591] csw/mgar/pkg/dpkg/trunk/Makefile Message-ID: Revision: 7591 http://gar.svn.sourceforge.net/gar/?rev=7591&view=rev Author: wahwah Date: 2009-12-10 17:43:20 +0000 (Thu, 10 Dec 2009) Log Message: ----------- dpkg: Adding ARCHALL to CSWalternatives Modified Paths: -------------- csw/mgar/pkg/dpkg/trunk/Makefile Modified: csw/mgar/pkg/dpkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/dpkg/trunk/Makefile 2009-12-10 08:28:12 UTC (rev 7590) +++ csw/mgar/pkg/dpkg/trunk/Makefile 2009-12-10 17:43:20 UTC (rev 7591) @@ -10,6 +10,7 @@ CATEGORIES = lib DESCRIPTION = Debian package manager PACKAGES = CSWalternatives +ARCHALL_CSWalternatives = 1 SPKG_DESC_CSWalternatives = Alternatives management for CSW, based on dpkg define BLURB endef 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 Dec 10 20:20:17 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 10 Dec 2009 19:20:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7592] csw/mgar/pkg/pkgutil/trunk/checksums Message-ID: Revision: 7592 http://gar.svn.sourceforge.net/gar/?rev=7592&view=rev Author: bonivart Date: 2009-12-10 19:20:17 +0000 (Thu, 10 Dec 2009) Log Message: ----------- pkgutil: source update Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-10 17:43:20 UTC (rev 7591) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-10 19:20:17 UTC (rev 7592) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec a751314ee495d7477888522435b769e4 CSWpkgutil.prototype 33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil -0d33234b106bb0584af460ce249ae52d pkgutil-1.9.1.zip +a52020816f3dda83d32621f85321632a pkgutil-1.9.1.zip 6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil 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 Dec 10 21:02:51 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 10 Dec 2009 20:02:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7593] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7593 http://gar.svn.sourceforge.net/gar/?rev=7593&view=rev Author: bonivart Date: 2009-12-10 20:02:50 +0000 (Thu, 10 Dec 2009) Log Message: ----------- pkgutil: source update, update Makefile Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pkgutil/trunk/files/build_sun_catalog.py csw/mgar/pkg/pkgutil/trunk/files/opencsw.py Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-10 19:20:17 UTC (rev 7592) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-10 20:02:50 UTC (rev 7593) @@ -14,13 +14,12 @@ COMMON_PKG_DEPENDS = MASTER_SITES = $(SF_MIRRORS) -MASTER_SITES += svn-http://gar.svn.sourceforge.net/svnroot/opencsw/ DISTFILES = $(GARNAME)-$(GARVERSION).zip DISTFILES += $(call admfiles,CSWpkgutil,prototype) DISTFILES += i.cswpkgutil DISTFILES += r.cswpkgutil -DISTFILES += utilities -NOCHECKSUM = utilities +DISTFILES += build_sun_catalog.py +DISTFILES += opencsw.py PACKAGES = CSWpkgutil CSWpkgutilplus @@ -57,19 +56,18 @@ @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d - @ginstall $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW + @ginstall -m 644 $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW @ginstall -m 755 $(WORKSRC)/pkgutillog $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d/01-CSW$(GARNAME)plus-log @ginstall -m 755 -d $(DESTDIR)$(bindir) - @ginstall $(WORKSRC)/$(GARNAME) $(WORKSRC)/bldcat $(WORKSRC)/chkcat $(DESTDIR)$(bindir) - @ginstall -m 755 -d $(DESTDIR)$(sysconfdir) - @ginstall $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW + @ginstall -m 755 $(WORKSRC)/$(GARNAME) $(WORKSRC)/bldcat $(WORKSRC)/chkcat $(DESTDIR)$(bindir) + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc + @ginstall -m 644 $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/opt/csw/etc/$(GARNAME).conf.CSW @ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) - @ginstall $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget - @ginstall $(WORKSRC)/utilities/build_sun_catalog.py $(DESTDIR)/opt/csw/libexec/$(GARNAME) - @ginstall $(WORKSRC)/utilities/opencsw.py $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @ginstall -m 755 $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget + @ginstall -m 755 $(FILEDIR)/build_sun_catalog.py $(FILEDIR)/opencsw.py $(DESTDIR)/opt/csw/libexec/$(GARNAME) @ln -s ../libexec/pkgutil/build_sun_catalog.py $(DESTDIR)$(bindir)/build_sun_catalog @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ + @ginstall -m 444 $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)plus @ginstall -m 444 $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ @ginstall -m 444 $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme @@ -80,5 +78,5 @@ @chmod 444 $(DESTDIR)$(mandir)/man1/* @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/pkgask - @ginstall $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW + @ginstall -m 644 $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-10 19:20:17 UTC (rev 7592) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-10 20:02:50 UTC (rev 7593) @@ -1,5 +1,7 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec a751314ee495d7477888522435b769e4 CSWpkgutil.prototype +b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil -a52020816f3dda83d32621f85321632a pkgutil-1.9.1.zip +3a6b789b3d5e05f41d2363dd26a92acf opencsw.py +d65a85a929f3901d4a613006e7c2c7bd pkgutil-1.9.1.zip 6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil Added: csw/mgar/pkg/pkgutil/trunk/files/build_sun_catalog.py =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/build_sun_catalog.py (rev 0) +++ csw/mgar/pkg/pkgutil/trunk/files/build_sun_catalog.py 2009-12-10 20:02:50 UTC (rev 7593) @@ -0,0 +1,42 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +"""Builds a SUNW catalog in the OpenCSW format. + +$Id: build_sun_catalog.py 107 2009-12-08 18:32:37Z wahwah $ +""" + +__author__ = "Maciej Blizi?ski " + +import os +import os.path +import logging +import opencsw +import optparse +import shutil +import subprocess +import tempfile + + +def main(): + parser = optparse.OptionParser() + parser.add_option("-p", "--product", dest="product_dir", + help="Product dir, e.g. .../Solaris_10/Product") + parser.add_option("-c", "--catalog-dir", dest="catalog_dir", + help="Target catalog dir") + options, args = parser.parse_args() + logging.basicConfig(level=logging.DEBUG) + options_ok = True + if not options.product_dir: + logging.error("--product directory is required. See --help.") + options_ok = False + if not options.catalog_dir: + logging.error("--catalog-dir is required. See --help.") + options_ok = False + if options_ok: + b = opencsw.OpencswCatalogBuilder(options.product_dir, + options.catalog_dir) + b.Run() + + +if __name__ == "__main__": + main() Property changes on: csw/mgar/pkg/pkgutil/trunk/files/build_sun_catalog.py ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/pkgutil/trunk/files/opencsw.py =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/opencsw.py (rev 0) +++ csw/mgar/pkg/pkgutil/trunk/files/opencsw.py 2009-12-10 20:02:50 UTC (rev 7593) @@ -0,0 +1,680 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# +# $Id: opencsw.py 107 2009-12-08 18:32:37Z wahwah $ +# +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# Copyright (c) 2009 OpenCSW +# Author: Maciej Blizi?ski +# +# $Id: opencsw.py 107 2009-12-08 18:32:37Z wahwah $ +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by the +# Free Software Foundation. + +import datetime +import difflib +import logging +import os +import os.path +import re +import shutil +import subprocess +import tempfile +import urllib2 + +ARCHITECTURES = ["i386", "sparc", "all"] +MAJOR_VERSION = "major version" +MINOR_VERSION = "minor version" +PATCHLEVEL = "patchlevel" +REVISION = "revision" +OTHER_VERSION_INFO = "other version info" +NEW_PACKAGE = "new package" +NO_VERSION_CHANGE = "no version change" +PKG_URL_TMPL = "http://www.opencsw.org/packages/%s" +CATALOG_URL = "http://ftp.heanet.ie/pub/opencsw/current/i386/5.10/catalog" +ADMIN_FILE_CONTENT = """ +basedir=default +runlevel=nocheck +conflict=nocheck +setuid=nocheck +action=nocheck +partial=nocheck +instance=unique +idepend=quit +rdepend=quit +space=quit +authentication=nocheck +networktimeout=10 +networkretries=5 +keystore=/var/sadm/security +proxy= +""" +EMAIL_TMPL = """From: %(from)s +To: %(to)s +Cc: %(cc)s +Date: %(date)s +Subject: newpkgs %(pkgnames)s + +%(body)s + +-- +$Id: opencsw.py 107 2009-12-08 18:32:37Z wahwah $ +""" + + +class Error(Exception): + pass + + +class PackageError(Error): + pass + + +def ParsePackageFileName(p): + bits = p.split("-") + catalogname = bits[0] + version, version_info, revision_info = ParseVersionString(bits[1]) + data = { + 'catalogname': catalogname, + 'full_version_string': bits[1], + 'version': version, + 'version_info': version_info, + 'revision_info': revision_info, + } + return data + +def ParseVersionString(s): + version_bits = re.split("_|,", s) + version_str = version_bits[0] + revision_bits = version_bits[1:] + revision_info = {} + version_info = {} + version_number_bits = version_str.split(".") + version_info[MAJOR_VERSION] = version_number_bits[0] + if len(version_number_bits) >= 2: + version_info[MINOR_VERSION] = version_number_bits[1] + if len(version_number_bits) >= 3: + version_info[PATCHLEVEL] = version_number_bits[2] + for version_bit in revision_bits: + if "=" in version_bit: + (var_name, var_value) = version_bit.split("=") + revision_info[var_name] = var_value + else: + if not "extra_strings" in revision_info: + revision_info["extra_strings"] = [] + revision_info["extra_strings"].append(version_bit) + return version_str, version_info, revision_info + + +class OpencswPackage(object): + + catalog_downloaded = False + + def __init__(self, catalogname): + self.catalogname = catalogname + + def IsOnTheWeb(self): + url = PKG_URL_TMPL % self.catalogname + logging.debug("Opening %s", repr(url)) + package_page = urllib2.urlopen(url) + html = package_page.read() + # Since beautifulsoup is not installed on the buildfarm yet, a quirk in + # package page display is going to be used. + package_not_in_mantis_pattern = u"cannot find maintainer" + return html.find(package_not_in_mantis_pattern) >= 0 + + def IsNew(self): + return not self.IsOnTheWeb() + + def UpgradeType(self, new_version_string): + """What kind of upgrade would it be if the new version was X.""" + (new_version, + new_version_info, + new_revision_info) = ParseVersionString(new_version_string) + catalog_data = self.GetCatalogPkgData() + if not catalog_data: + return (NEW_PACKAGE, + "/dev/null -> %s" % new_version_string, + (None, new_version_string)) + cat_version_info = catalog_data["version_info"] + levels = (MAJOR_VERSION, MINOR_VERSION, PATCHLEVEL) + for level in levels: + if level in cat_version_info and level in new_version_info: + if (cat_version_info[level] != new_version_info[level]): + versions = (catalog_data["full_version_string"], new_version_string) + msg = "%s --> %s" % versions + return level, msg, versions + cat_rev_info = catalog_data["revision_info"] + for rev_kw in cat_rev_info: + if rev_kw in new_revision_info: + if cat_rev_info[rev_kw] != new_revision_info[rev_kw]: + msg = "%s: %s --> %s" % (rev_kw, + cat_rev_info[rev_kw], + new_revision_info[rev_kw]) + versions = cat_rev_info[rev_kw], new_revision_info[rev_kw] + return REVISION, msg, versions + if (catalog_data["version"] == new_version + and + catalog_data["revision_info"] == new_revision_info): + return NO_VERSION_CHANGE, "no", (new_version, new_version) + return OTHER_VERSION_INFO, "other", (None, None) + + @classmethod + def LazyDownloadCatalogData(cls, catalog_source=None): + if not cls.catalog_downloaded: + cls.DownloadCatalogData(catalog_source) + cls.catalog_downloaded = True + + @classmethod + def DownloadCatalogData(cls, catalog_source): + """Downloads catalog data.""" + logging.debug("Downloading catalog data from %s.", repr(CATALOG_URL)) + if not catalog_source: + catalog_source = urllib2.urlopen(CATALOG_URL) + cls.catalog = {} + for line in catalog_source: + # Working around the GPG signature + if line.startswith("#"): continue + if line.startswith("-----BEGIN PGP SIGNED MESSAGE-----"): continue + if line.startswith("Hash:"): continue + if len(line.strip()) <= 0: continue + if line.startswith("-----BEGIN PGP SIGNATURE-----"): break + fields = re.split(r"\s+", line) + try: + cls.catalog[fields[0]] = ParsePackageFileName(fields[3]) + except IndexError, e: + print repr(line) + print fields + print e + raise + + @classmethod + def _GetCatalogPkgData(cls, catalogname): + cls.LazyDownloadCatalogData() + if catalogname in cls.catalog: + return cls.catalog[catalogname] + else: + return None + + def GetCatalogPkgData(self): + """A wrapper for the classmethod _GetCatalogPkgData, supplying the catalogname.""" + return self._GetCatalogPkgData(self.catalogname) + + +class StagingDir(object): + """Represents a staging directory.""" + + def __init__(self, dir_path): + self.dir_path = dir_path + + def GetLatest(self, software, architectures=ARCHITECTURES): + files = os.listdir(self.dir_path) + package_files = [] + for a in architectures: + relevant_pkgs = sorted(shutil.fnmatch.filter(files, + "*-%s-*.pkg.gz" % a)) + relevant_pkgs = sorted(shutil.fnmatch.filter(relevant_pkgs, + "%s-*.pkg.gz" % software)) + if relevant_pkgs: + package_files.append(relevant_pkgs[-1]) + if not package_files: + raise PackageError("Could not find %s in %s" % (software, self.dir_path)) + logging.debug("The latest packages %s in %s are %s", + repr(software), + repr(self.dir_path), + repr(package_files)) + return [os.path.join(self.dir_path, x) for x in package_files] + + +class NewpkgMailer(object): + + def __init__(self, pkgnames, paths, + release_mgr_name, + release_mgr_email, + sender_name, + sender_email, + release_cc): + self.sender = u"%s <%s>" % (sender_name, sender_email) + self.pkgnames = pkgnames + self.paths = paths + self.release_mgr = u"%s <%s>" % (release_mgr_name, release_mgr_email) + self.release_cc = u"%s" % release_cc + + def FormatPackageAnnouncement(self, catalogname, new_pkgpath): + """TODO: Group common version upgrades.""" + pkg = OpencswPackage(catalogname) + new_pkg_basename = os.path.split(new_pkgpath)[1] + new_data = ParsePackageFileName(new_pkg_basename) + new_version_str = new_data["full_version_string"] + upgrade_type, upgrade_msg = pkg.UpgradeType(new_version_str) + msg = [] + if upgrade_type == NEW_PACKAGE: + msg.append("* new package") + else: + msg.append("* %s upgrade" % upgrade_type) + msg.append(" - %s" % upgrade_msg) + msg.append(" - %s" % new_pkgpath) + return msg + + def FormatMail(self): + body_list = ["The following package files are ready to be released:"] + body_list.append("") + # Gathering package information, grouping packages that are upgraded + # together. + pkgs_data = {} + for p in self.paths: + base_file_name = os.path.split(p)[1] + catalogname = base_file_name.split("-")[0] + pkg = OpencswPackage(catalogname) + new_data = ParsePackageFileName(base_file_name) + new_version_str = new_data["full_version_string"] + catalog_data = pkg.GetCatalogPkgData() + if catalog_data: + catalog_version_str = catalog_data["full_version_string"] + else: + catalog_version_str = "package not in the catalog" + upgrade_type, upgrade_msg, versions = pkg.UpgradeType(new_version_str) + pkgs_data_key = (upgrade_type, upgrade_msg, versions) + if pkgs_data_key not in pkgs_data: + pkgs_data[pkgs_data_key] = [] + pkg.srv4path = p + pkg.cat_version_str = catalog_version_str + pkg.new_version_str = new_version_str + pkgs_data[pkgs_data_key].append(pkg) + # Formatting grouped packages: + for upgrade_type, upgrade_msg, versions in pkgs_data: + msg = [] + if upgrade_type == NEW_PACKAGE: + msg.append("* %s: %s" % (upgrade_type, upgrade_msg)) + elif upgrade_type == NO_VERSION_CHANGE: + msg.append("* WARNING: no version change") + else: + msg.append("* %s upgrade" % (upgrade_type)) + msg.append(" - from: %s" % versions[0]) + msg.append(" - to: %s" % versions[1]) + for pkg in pkgs_data[(upgrade_type, upgrade_msg, versions)]: + msg.append(" + %s" % pkg.srv4path) + body_list.extend(msg) + body_list.append("") + body = "\n".join(body_list) + d = { + 'from': self.sender, + 'to': self.release_mgr, + 'cc': self.release_cc, + 'pkgnames': ", ".join(self.pkgnames), + 'body': body, + 'date': datetime.datetime.now(), + } + mail_text = EMAIL_TMPL % d + return mail_text + + def GetEditorName(self, env): + editor = "/opt/csw/bin/vim" + if "EDITOR" in env: + editor = env["EDITOR"] + if "VISUAL" in env: + editor = env["VISUAL"] + return editor + + +class ShellMixin(object): + + def ShellCommand(self, args, quiet=False): + logging.debug("Calling: %s", repr(args)) + if quiet: + sub_stdout = subprocess.PIPE + sub_stderr = subprocess.PIPE + else: + sub_stdout = None + sub_stderr = None + retcode = subprocess.call(args, + stdout=sub_stdout, + stderr=sub_stderr) + if retcode: + raise Error("Running %s has failed." % repr(args)) + return retcode + + +class CswSrv4File(ShellMixin, object): + """Represents a package in the srv4 format (pkg).""" + + def __init__(self, pkg_path): + self.pkg_path = pkg_path + self.workdir = None + self.gunzipped_path = None + self.transformed = False + self.dir_format_pkg = None + + def GetWorkDir(self): + if not self.workdir: + self.workdir = tempfile.mkdtemp(prefix="pkg_") + fd = open(os.path.join(self.workdir, "admin"), "w") + fd.write(ADMIN_FILE_CONTENT) + fd.close() + return self.workdir + + def GetAdminFilePath(self): + return os.path.join(self.GetWorkDir(), "admin") + + def GetGunzippedPath(self): + gzip_suffix = ".gz" + pkg_suffix = ".pkg" + if not self.gunzipped_path: + if self.pkg_path.endswith("%s%s" % (pkg_suffix, gzip_suffix)): + base_name_gz = os.path.split(self.pkg_path)[1] + shutil.copy(self.pkg_path, self.GetWorkDir()) + self.pkg_path = os.path.join(self.GetWorkDir(), base_name_gz) + args = ["gunzip", "-f", self.pkg_path] + retcode = self.ShellCommand(args) + self.gunzipped_path = self.pkg_path[:(-len(gzip_suffix))] + elif self.pkg_path.endswith(pkg_suffix): + self.gunzipped_path = self.pkg_path + else: + raise Error("The file name should end in either " + "%s or %s." % (gzip_suffix, pkg_suffix)) + return self.gunzipped_path + + def TransformToDir(self): + if not self.transformed: + args = ["pkgtrans", "-a", self.GetAdminFilePath(), + self.GetGunzippedPath(), self.GetWorkDir(), "all"] + retcode = self.ShellCommand(args, quiet=True) + dirs = self.GetDirs() + if len(dirs) != 1: + raise Error("Need exactly one package in the package stream: " + "%s." % (dirs)) + self.dir_format_pkg = DirectoryFormatPackage(dirs[0]) + self.transformed = True + + def GetDirFormatPkg(self): + self.TransformToDir(self) + return self.dir_format_pkg + + def GetDirs(self): + paths = os.listdir(self.GetWorkDir()) + dirs = [] + for p in paths: + abspath = os.path.join(self.GetWorkDir(), p) + if os.path.isdir(abspath): + dirs.append(abspath) + return dirs + + def GetPkgmap(self, analyze_permissions, strip=None): + dir_format_pkg = self.GetDirFormatPkg() + return dir_format_pkg.GetPkgmap(analyze_permissions, strip) + + def __del__(self): + if self.workdir: + logging.debug("Removing %s", repr(self.workdir)) + shutil.rmtree(self.workdir) + + +def ParsePkginfo(lines): + """Parses a pkginfo data.""" + d = {} + for line in lines: + try: + # Can't use split, because there might be multiple '=' characters. + line = line.strip() + # Skip empty and commented lines + if not line: continue + if line.startswith("#"): continue + var_name, var_value = line.split("=", 1) + d[var_name] = var_value + except ValueError, e: + raise PackageError("Can't parse %s: %s" % (repr(line), e)) + return d + + +def PkgnameToCatName(pkgname): + """Creates a catalog name based on the pkgname. + + SUNWbash --> sunw_bash + SUNWbashS --> sunw_bash_s + SUNWPython --> sunw_python + + Incomprehensible, but unit tested! + """ + known_prefixes = ["SUNW", "FJSV", "CSW"] + for prefix in known_prefixes: + if pkgname.startswith(prefix): + unused, tmp_prefix, the_rest = pkgname.partition(prefix) + pkgname = tmp_prefix + "_" + the_rest + return "_".join(SplitByCase(pkgname)) + + +def SplitByCase(s): + def CharType(c): + if c.isalnum(): + if c.isupper(): + return 1 + else: + return 2 + else: + return 3 + chartype_list = [CharType(x) for x in s] + neighbors = zip(chartype_list, chartype_list[1:]) + casechange = [False] + [x != y for x, y in neighbors] + str_list = [(cc * "_") + l.lower() for l, cc in zip(s, casechange)] + s2 = "".join(str_list) + return re.findall(r"[a-z]+", s2) + + +def PkginfoToSrv4Name(pkginfo_dict): + SRV4_FN_TMPL = "%(catalog_name)s-%(version)s-%(osver)s-%(arch)s-%(tag)s.pkg" + fn_data = {} + fn_data["catalog_name"] = PkgnameToCatName(pkginfo_dict["PKG"]) + fn_data["version"] = pkginfo_dict["VERSION"] + # os_version = pkginfo_dict["SUNW_PRODVERS"].split("/", 1)[0] + # fn_data["osver"] = pkginfo_dict["SUNW_PRODNAME"] + os_version + fn_data["osver"] = "SunOS5.10" # Hardcoded, because the original data contains + # trash. + fn_data["arch"] = pkginfo_dict["ARCH"] + fn_data["tag"] = "SUNW" + return SRV4_FN_TMPL % fn_data + + +class DirectoryFormatPackage(ShellMixin, object): + + def __init__(self, directory): + self.directory = directory + self.pkginfo_dict = None + + def GetParsedPkginfo(self): + if not self.pkginfo_dict: + pkginfo_fd = open(self.GetPkginfoFilename(), "r") + self.pkginfo_dict = ParsePkginfo(pkginfo_fd) + pkginfo_fd.close() + return self.pkginfo_dict + + def GetSrv4FileName(self): + """Guesses the Srv4FileName based on the package directory contents.""" + return PkginfoToSrv4Name(self.GetParsedPkginfo()) + + def ToSrv4(self, target_dir): + target_file_name = self.GetSrv4FileName() + target_path = os.path.join(target_dir, target_file_name) + if os.path.exists(target_path): + return target_path + pkg_container_dir, pkg_dir = os.path.split(self.directory) + if not os.path.isdir(target_dir): + os.makedirs(target_dir) + args = ["pkgtrans", "-s", pkg_container_dir, target_path, pkg_dir] + self.ShellCommand(args, quiet=True) + args = ["gzip", "-f", target_path] + self.ShellCommand(args, quiet=True) + return target_path + + def GetPkgmap(self, analyze_permissions=False, strip=None): + fd = open(os.path.join(self.directory, "pkgmap"), "r") + return Pkgmap(fd, analyze_permissions, strip) + + def SetPkginfoEntry(self, key, value): + pkginfo = self.GetParsedPkginfo() + logging.debug("Setting %s to %s", repr(key), repr(value)) + pkginfo[key] = value + self.WritePkginfo(pkginfo) + pkgmap_path = os.path.join(self.directory, "pkgmap") + pkgmap_fd = open(pkgmap_path, "r") + new_pkgmap_lines = [] + pkginfo_re = re.compile("1 i pkginfo") + ws_re = re.compile(r"\s+") + for line in pkgmap_fd: + if pkginfo_re.search(line): + fields = ws_re.split(line) + # 3: size + # 4: sum + pkginfo_path = os.path.join(self.directory, "pkginfo") + args = ["cksum", pkginfo_path] + cksum_process = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = cksum_process.communicate() + cksum_process.wait() + size = ws_re.split(stdout)[1] + args = ["sum", pkginfo_path] + sum_process = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = sum_process.communicate() + sum_process.wait() + sum = ws_re.split(stdout)[0] + fields[3] = size + fields[4] = sum + logging.debug("New pkgmap line: %s", fields) + line = " ".join(fields) + new_pkgmap_lines.append(line.strip()) + pkgmap_fd.close() + # Write that back + pkgmap_path_new = pkgmap_path + ".new" + logging.debug("Writing back to %s", pkgmap_path_new) + pkgmap_fd = open(pkgmap_path_new, "w") + pkgmap_fd.write("\n".join(new_pkgmap_lines)) + pkgmap_fd.close() + shutil.move(pkgmap_path_new, pkgmap_path) + + # TODO(maciej): Need to update the relevant line on pkgmap too + + def GetPkginfoFilename(self): + return os.path.join(self.directory, "pkginfo") + + def WritePkginfo(self, pkginfo_dict): + # Some packages extract read-only. To be sure, change them to be + # user-writable. + args = ["chmod", "-R", "u+w", self.directory] + self.ShellCommand(args) + pkginfo_filename = self.GetPkginfoFilename() + os.chmod(pkginfo_filename, 0644) + pkginfo_fd = open(pkginfo_filename, "w") + pkginfo_dict = self.GetParsedPkginfo() + for k, v in pkginfo_dict.items(): + pkginfo_fd.write("%s=%s\n" % (k, pkginfo_dict[k])) + pkginfo_fd.close() + + def ResetNameProperty(self): + """Sometimes, NAME= contains useless data. This method resets them.""" + pkginfo_dict = self.GetParsedPkginfo() + catalog_name = PkgnameToCatName(pkginfo_dict["PKG"]) + description = pkginfo_dict["DESC"] + pkginfo_name = "%s - %s" % (catalog_name, description) + self.SetPkginfoEntry("NAME", pkginfo_name) + +class Pkgmap(object): + + def __init__(self, input, permissions=False, + strip=None): + self.paths = set() + self.analyze_permissions = permissions + for line in input: + fields = re.split(r'\s+', line) + if strip: + strip_re = re.compile(r"^%s" % strip) + fields = [re.sub(strip_re, "", x) for x in fields] + logging.debug(fields) + line_to_add = None + if len(fields) < 2: + continue + elif fields[1] in ('f', 'd'): + line_to_add = fields[3] + if self.analyze_permissions: + line_to_add += " %s" % fields[4] + elif fields[1] in ('s', 'l'): + link_from, link_to = fields[3].split("=") + line_to_add = "%s --> %s" % (link_from, link_to) + if line_to_add: + self.paths.add(line_to_add) + + +class PackageComparator(object): + + def __init__(self, file_name_a, file_name_b, + permissions=False, + strip_a=None, + strip_b=None): + self.analyze_permissions = permissions + self.pkg_a = CswSrv4File(file_name_a) + self.pkg_b = CswSrv4File(file_name_b) + self.strip_a = strip_a + self.strip_b = strip_b + + def Run(self): + pkgmap_a = self.pkg_a.GetPkgmap(self.analyze_permissions, strip=self.strip_a) + pkgmap_b = self.pkg_b.GetPkgmap(self.analyze_permissions, strip=self.strip_b) + diff_ab = difflib.unified_diff(sorted(pkgmap_a.paths), + sorted(pkgmap_b.paths), + fromfile=self.pkg_a.pkg_path, + tofile=self.pkg_b.pkg_path) + diff_text = "\n".join(diff_ab) + if diff_text: + less_proc = subprocess.Popen(["less"], stdin=subprocess.PIPE) + less_stdout, less_stderr = less_proc.communicate(input=diff_text) + less_proc.wait() + else: + print "No differences found." + + +class OpencswCatalogBuilder(object): + + def __init__(self, product_dir, catalog_dir): + self.product_dir = product_dir + self.catalog_dir = catalog_dir + + def Run(self): + pkg_dirs = os.listdir(self.product_dir) + for pkg_dir in pkg_dirs: + pkg_path = os.path.join(self.product_dir, pkg_dir) + pkginfo_path = os.path.join(pkg_path, "pkginfo") + if (os.path.isdir(pkg_path) + and + os.path.exists(pkginfo_path)): + if not self.Srv4Exists(pkg_path): + pkg = None + tmpdir = None + try: + tmpdir = tempfile.mkdtemp(prefix="sunw-pkg-") + logging.debug("Copying %s to %s", repr(pkg_path), repr(tmpdir)) + tmp_pkg_dir = os.path.join(tmpdir, pkg_dir) + shutil.copytree(pkg_path, tmp_pkg_dir, symlinks=True) + pkg = DirectoryFormatPackage(tmp_pkg_dir) + # Replacing NAME= in the pkginfo, setting it to the catalog name. + pkg.ResetNameProperty() + pkg.ToSrv4(self.catalog_dir) + except IOError, e: + logging.warn("%s has failed: %s", pkg_path, e) + finally: + if pkg: + del(pkg) + if os.path.exists(tmpdir): + shutil.rmtree(tmpdir) + else: + logging.warn("srv4 file for %s already exists, skipping", pkg_path) + else: + logging.warn("%s is not a directory.", pkg_path) + + def Srv4Exists(self, pkg_dir): + pkg = DirectoryFormatPackage(pkg_dir) + srv4_name = pkg.GetSrv4FileName() + srv4_name += ".gz" + srv4_path = os.path.join(self.catalog_dir, srv4_name) + result = os.path.exists(srv4_path) + logging.debug("Srv4Exists(%s) => %s, %s", pkg_dir, repr(srv4_path), result) + return result 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 Dec 10 23:58:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Dec 2009 22:58:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7594] csw/mgar/pkg/pca/trunk Message-ID: Revision: 7594 http://gar.svn.sourceforge.net/gar/?rev=7594&view=rev Author: dmichelsen Date: 2009-12-10 22:58:42 +0000 (Thu, 10 Dec 2009) Log Message: ----------- pca: Update to 20091210-01 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2009-12-10 20:02:50 UTC (rev 7593) +++ csw/mgar/pkg/pca/trunk/Makefile 2009-12-10 22:58:42 UTC (rev 7594) @@ -1,5 +1,5 @@ GARNAME = pca -GARVERSION = 20091030-01 +GARVERSION = 20091210-01 CATEGORIES = utils DESCRIPTION = Patch Check Advanced Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2009-12-10 20:02:50 UTC (rev 7593) +++ csw/mgar/pkg/pca/trunk/checksums 2009-12-10 22:58:42 UTC (rev 7594) @@ -1,4 +1,4 @@ 4376789925fa9002d0567d739f717748 0001-prefer-opencsw-perl.diff 6f2f2376eba0a788795dd43d68ad32d1 COPYING -d915e06b37750db9e6d9806f1114a9b8 pca-20091030-01 +78cc7aa4238a782b5b63b0da93a2c60c pca-20091210-01 12de68ff8f67b4bb8b095e5646402208 pca.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Dec 11 13:35:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 11 Dec 2009 12:35:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7595] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 7595 http://gar.svn.sourceforge.net/gar/?rev=7595&view=rev Author: wahwah Date: 2009-12-11 12:35:23 +0000 (Fri, 11 Dec 2009) Log Message: ----------- sudo: Version bump to 1.7.2p2 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 2009-12-10 22:58:42 UTC (rev 7594) +++ csw/mgar/pkg/sudo/trunk/Makefile 2009-12-11 12:35:23 UTC (rev 7595) @@ -1,7 +1,7 @@ GARNAME = sudo GARVERSION = 1.7.2 CATEGORIES = utils -RELEASE = p1 +RELEASE = p2 DISTVERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) @@ -47,6 +47,10 @@ CONFIGURE_ARGS += --with-project endif +# sysconfdir to be enabled later +# sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + TEST_TARGET = check FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2009-12-10 22:58:42 UTC (rev 7594) +++ csw/mgar/pkg/sudo/trunk/checksums 2009-12-11 12:35:23 UTC (rev 7595) @@ -1,3 +1,3 @@ -955d99eda1432c7b7e00d98b91e35a79 download/CSWsudo-common.postinstall -157b2e5e38ca54eb36e0364706bd0292 download/install.diff -4449d466a774f5ce401c9c0e3866c026 download/sudo-1.7.2p1.tar.gz +955d99eda1432c7b7e00d98b91e35a79 CSWsudo-common.postinstall +157b2e5e38ca54eb36e0364706bd0292 install.diff +2a19cf1ab4afc94fe19d0d0899d4cd45 sudo-1.7.2p2.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 Fri Dec 11 17:30:14 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 11 Dec 2009 16:30:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7596] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 7596 http://gar.svn.sourceforge.net/gar/?rev=7596&view=rev Author: bonivart Date: 2009-12-11 16:30:14 +0000 (Fri, 11 Dec 2009) Log Message: ----------- dhcp: update to 4.1.1rc1, fix init script Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-11 12:35:23 UTC (rev 7595) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-11 16:30:14 UTC (rev 7596) @@ -1,5 +1,5 @@ GARNAME = dhcp -GARVERSION = 4.1.1b3 +GARVERSION = 4.1.1rc1 CATEGORIES = net DESCRIPTION = ISC DHCP reference implementation Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2009-12-11 12:35:23 UTC (rev 7595) +++ csw/mgar/pkg/dhcp/trunk/checksums 2009-12-11 16:30:14 UTC (rev 7596) @@ -1 +1 @@ -085da9c98f3d4ec285b319fcdda6d552 dhcp-4.1.1b3.tar.gz +f2b4dfe70640d33b29da6b75eb5c82a0 dhcp-4.1.1rc1.tar.gz Modified: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd 2009-12-11 12:35:23 UTC (rev 7595) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd 2009-12-11 16:30:14 UTC (rev 7596) @@ -33,9 +33,9 @@ FAIL= /opt/csw/sbin/dhcpd -cf $CONF -t || FAIL=1 /opt/csw/sbin/dhcpd -cf $CONF -T || FAIL=2 - [ $FAIL = 1 ] && echo "Your configuration seems broken. Exiting." - [ $FAIL = 2 ] && echo "Your lease file seems broken. Exiting." - [ $FAIL ] && exit 1 + [ "$FAIL" = 1 ] && echo "Your configuration seems broken. Not restarting." + [ "$FAIL" = 2 ] && echo "Your lease file seems broken. Not restarting." + [ "$FAIL" ] && exit 1 $0 stop echo "Waiting for $SERVICE to stop.\c" while ( /usr/bin/pgrep -x dhcpd > /dev/null ); do 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 Dec 11 19:32:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 11 Dec 2009 18:32:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7597] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: Revision: 7597 http://gar.svn.sourceforge.net/gar/?rev=7597&view=rev Author: wahwah Date: 2009-12-11 18:32:41 +0000 (Fri, 11 Dec 2009) Log Message: ----------- gnupg2: Split out the gpg-agent package, added pinentry dependency, disabled the 64-bit build due to the missing ldap library. Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-11 16:30:14 UTC (rev 7596) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-11 18:32:41 UTC (rev 7597) @@ -30,15 +30,15 @@ UFILES_REGEX = (\d+(?:\.\d+)*) NOISALIST = 1 -BUILD64 = 1 +# There are no 64-bit ldap libraries, disabling the 64-bit build +# BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-libcurl -CONFIGURE_ARGS += --with-ldap -CONFIGURE_ARGS += --with-zlib -CONFIGURE_ARGS += --with-bzip2 -CONFIGURE_ARGS += --with-readline -CONFIGURE_ARGS += --enable-threads=solaris +CONFIGURE_ARGS += --with-libcurl=/opt/csw +CONFIGURE_ARGS += --with-ldap=/opt/csw +CONFIGURE_ARGS += --with-zlib=/opt/csw +CONFIGURE_ARGS += --with-bzip2=/opt/csw +CONFIGURE_ARGS += --with-readline=/opt/csw CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses @@ -54,27 +54,35 @@ PKGFILES_CSWgnupg-agent += .*gpgkey2ssh.* PKGFILES_CSWgnupg-agent += .*symcryptrun.* -REQUIRED_PKGS_common_CSWgnupg2 = CSWbzip2 -REQUIRED_PKGS_common_CSWgnupg2 += CSWcurlrt -REQUIRED_PKGS_common_CSWgnupg2 += CSWgcrypt -REQUIRED_PKGS_common_CSWgnupg2 += CSWggettextrt -REQUIRED_PKGS_common_CSWgnupg2 += CSWgpgerr -REQUIRED_PKGS_common_CSWgnupg2 += CSWiconv -REQUIRED_PKGS_common_CSWgnupg2 += CSWlibassuan -REQUIRED_PKGS_common_CSWgnupg2 += CSWlibidn -REQUIRED_PKGS_common_CSWgnupg2 += CSWlibksba -REQUIRED_PKGS_common_CSWgnupg2 += CSWoldaprt -REQUIRED_PKGS_common_CSWgnupg2 += CSWosslrt -REQUIRED_PKGS_common_CSWgnupg2 += CSWpth -REQUIRED_PKGS_common_CSWgnupg2 += CSWreadline -REQUIRED_PKGS_common_CSWgnupg2 += CSWzlib +REQUIRED_PKGS_common = CSWbzip2 +REQUIRED_PKGS_common += CSWcurlrt +REQUIRED_PKGS_common += CSWgcrypt +REQUIRED_PKGS_common += CSWggettextrt +REQUIRED_PKGS_common += CSWgpgerr +REQUIRED_PKGS_common += CSWiconv +REQUIRED_PKGS_common += CSWlibassuan +REQUIRED_PKGS_common += CSWlibidn +REQUIRED_PKGS_common += CSWlibksba +REQUIRED_PKGS_common += CSWoldaprt +REQUIRED_PKGS_common += CSWosslrt +REQUIRED_PKGS_common += CSWpth +REQUIRED_PKGS_common += CSWreadline +REQUIRED_PKGS_common += CSWzlib -REQUIRED_PKGS_CSWgnupg2 += $(REQUIRED_PKGS_common_CSWgnupg2) + +REQUIRED_PKGS_CSWgnupg2 += $(REQUIRED_PKGS_common) REQUIRED_PKGS_CSWgnupg2 += CSWgnupg-agent -REQUIRED_PKGS_CSWgnupg-agent = CSWpinentry +REQUIRED_PKGS_CSWgnupg-agent = CSWpinentry +REQUIRED_PKGS_CSWgnupg-agent += CSWgcrypt +REQUIRED_PKGS_CSWgnupg-agent += CSWggettextrt +REQUIRED_PKGS_CSWgnupg-agent += CSWgpgerr +REQUIRED_PKGS_CSWgnupg-agent += CSWiconv +REQUIRED_PKGS_CSWgnupg-agent += CSWpth +REQUIRED_PKGS_CSWgnupg-agent += CSWreadline -PREREQUISITE_PKGS = $(REQUIRED_PKGS_common_CSWgnupg2) + +PREREQUISITE_PKGS = $(REQUIRED_PKGS_common) PREREQUISITE_PKGS += $(REQUIRED_PKGS_CSWgnupg-agent) TEST_TARGET = check 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 Dec 11 21:27:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Dec 2009 20:27:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7598] csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile Message-ID: Revision: 7598 http://gar.svn.sourceforge.net/gar/?rev=7598&view=rev Author: dmichelsen Date: 2009-12-11 20:27:43 +0000 (Fri, 11 Dec 2009) Log Message: ----------- cpan/Mail-SPF: Relocate spfd Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile Modified: csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2009-12-11 18:32:41 UTC (rev 7597) +++ csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2009-12-11 20:27:43 UTC (rev 7598) @@ -16,6 +16,6 @@ ARCHALL = 1 EXTRA_PAX_ARGS = '-s,spfquery,spfquery-cpan,p' -EXTRA_PAX_ARGS += '-s,spfd,spfd-cpan,p' +EXTRA_PAX_ARGS += '-s,/usr/sbin/spfd,$(sbindir)/spfd-cpan,p' 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 Dec 11 21:52:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Dec 2009 20:52:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7599] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 7599 http://gar.svn.sourceforge.net/gar/?rev=7599&view=rev Author: dmichelsen Date: 2009-12-11 20:52:53 +0000 (Fri, 11 Dec 2009) Log Message: ----------- nginx: Add platform support Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-11 20:27:43 UTC (rev 7598) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-11 20:52:53 UTC (rev 7599) @@ -18,6 +18,9 @@ REQUIRED_PKGS = CSWosslrt CSWpcrert CSWzlib +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv9 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 11:49:46 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 10:49:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7600] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 7600 http://gar.svn.sourceforge.net/gar/?rev=7600&view=rev Author: aigoshin Date: 2009-12-12 10:49:43 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.0 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-11 20:52:53 UTC (rev 7599) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 10:49:43 UTC (rev 7600) @@ -1,5 +1,5 @@ GARNAME = nginx -GARVERSION = 0.7.55 +GARVERSION = 0.7.64 CATEGORIES = server DESCRIPTION = HTTP server and mail proxy server @@ -18,7 +18,7 @@ REQUIRED_PKGS = CSWosslrt CSWpcrert CSWzlib -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 EXTRA_BUILD_ISAS_i386 = pentium_pro @@ -40,11 +40,11 @@ CONFIGURE_ARGS += --sbin-path=$(sbindir)/nginx CONFIGURE_ARGS += --lock-path=$(prefix)/var/run/nginx/nginx.lock CONFIGURE_ARGS += --pid-path=$(prefix)/var/run/nginx/nginx.pid -CONFIGURE_ARGS += --http-client-body-temp-path=$(prefix)/var/spool/nginx/client -CONFIGURE_ARGS += --http-fastcgi-temp-path=$(prefix)/var/spool/nginx/fastcgi -CONFIGURE_ARGS += --http-proxy-temp-path=$(prefix)/var/spool/nginx/proxy -CONFIGURE_ARGS += --error-log-path=$(prefix)/var/log/nginx/error.log -CONFIGURE_ARGS += --http-log-path=$(prefix)/var/log/nginx/access.log +CONFIGURE_ARGS += --http-client-body-temp-path=$(prefix)/var/nginx/client +CONFIGURE_ARGS += --http-fastcgi-temp-path=$(prefix)/var/nginx/fastcgi +CONFIGURE_ARGS += --http-proxy-temp-path=$(prefix)/var/nginx/proxy +CONFIGURE_ARGS += --error-log-path=$(prefix)/var/nginx/logs/error.log +CONFIGURE_ARGS += --http-log-path=$(prefix)/var/nginx/logs/access.log CONFIGURE_ARGS += --with-md5=YES CONFIGURE_ARGS += --with-sha1=YES CONFIGURE_ARGS += --with-http_ssl_module @@ -55,7 +55,7 @@ TEST_SCRIPTS = -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/spool\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }' +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }' include gar/category.mk @@ -70,11 +70,11 @@ ginstall -d $(DESTDIR)$(sysconfdir)/nginx/conf.d ginstall -d $(DESTDIR)$(sharedstatedir)/nginx/contrib ginstall -d $(DESTDIR)$(docdir)/nginx - ginstall -d $(DESTDIR)$(prefix)/var/log/nginx + ginstall -d $(DESTDIR)$(prefix)/var/nginx/client + ginstall -d $(DESTDIR)$(prefix)/var/nginx/fastcgi + ginstall -d $(DESTDIR)$(prefix)/var/nginx/logs + ginstall -d $(DESTDIR)$(prefix)/var/nginx/proxy ginstall -d $(DESTDIR)$(prefix)/var/nginx/sites - ginstall -d $(DESTDIR)$(prefix)/var/spool/nginx/client - ginstall -d $(DESTDIR)$(prefix)/var/spool/nginx/fastcgi - ginstall -d $(DESTDIR)$(prefix)/var/spool/nginx/proxy mv $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params.CSW mv $(DESTDIR)$(sysconfdir)/nginx/mime.types $(DESTDIR)$(sysconfdir)/nginx/mime.types.CSW mv $(DESTDIR)$(sysconfdir)/nginx/nginx.conf $(DESTDIR)$(sysconfdir)/nginx/nginx.conf.CSW Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2009-12-11 20:52:53 UTC (rev 7599) +++ csw/mgar/pkg/nginx/trunk/checksums 2009-12-12 10:49:43 UTC (rev 7600) @@ -1,7 +1,7 @@ -bb85ec05a172562e6de38a1e8a64198c download/CSWnginx.checkinstall -12b5333e18e985b17f8a5465646e9a8a download/CSWnginx.gspec -bb404771e330fe98f93cb2d12a808121 download/CSWnginx.postinstall -e9178dc33f2d38aab8f118a8f0550ac7 download/CSWnginx.preremove -5c832758a62ee319ea9dfd1829d736eb download/cswnginx.xml -2064dc7a1ef082eb584e3a75857853f1 download/nginx-0.7.55.tar.gz -c5b3babbd1261bcb3f3e17494822bb9f download/svc-cswnginx +bb85ec05a172562e6de38a1e8a64198c CSWnginx.checkinstall +12b5333e18e985b17f8a5465646e9a8a CSWnginx.gspec +bb404771e330fe98f93cb2d12a808121 CSWnginx.postinstall +e9178dc33f2d38aab8f118a8f0550ac7 CSWnginx.preremove +5c832758a62ee319ea9dfd1829d736eb cswnginx.xml +cfa97c0f784532820110b5eee57fef6d nginx-0.7.64.tar.gz +c5b3babbd1261bcb3f3e17494822bb9f svc-cswnginx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 13:29:30 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 12:29:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7601] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 7601 http://gar.svn.sourceforge.net/gar/?rev=7601&view=rev Author: aigoshin Date: 2009-12-12 12:29:29 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.1 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 10:49:43 UTC (rev 7600) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 12:29:29 UTC (rev 7601) @@ -21,7 +21,7 @@ PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -EXTRA_BUILD_ISAS_i386 = pentium_pro +#EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv9 NGINXCPU_pentium_pro = pentiumpro @@ -35,16 +35,16 @@ CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU) CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl" CONFIGURE_ARGS += --with-ld-opt="$(LDFLAGS)" -CONFIGURE_ARGS += --prefix=$(prefix)/var/nginx CONFIGURE_ARGS += --conf-path=$(sysconfdir)/nginx/nginx.conf CONFIGURE_ARGS += --sbin-path=$(sbindir)/nginx -CONFIGURE_ARGS += --lock-path=$(prefix)/var/run/nginx/nginx.lock -CONFIGURE_ARGS += --pid-path=$(prefix)/var/run/nginx/nginx.pid -CONFIGURE_ARGS += --http-client-body-temp-path=$(prefix)/var/nginx/client -CONFIGURE_ARGS += --http-fastcgi-temp-path=$(prefix)/var/nginx/fastcgi -CONFIGURE_ARGS += --http-proxy-temp-path=$(prefix)/var/nginx/proxy -CONFIGURE_ARGS += --error-log-path=$(prefix)/var/nginx/logs/error.log -CONFIGURE_ARGS += --http-log-path=$(prefix)/var/nginx/logs/access.log +CONFIGURE_ARGS += --prefix=$(localstatedir)/nginx +CONFIGURE_ARGS += --lock-path=$(localstatedir)/nginx/nginx.lock +CONFIGURE_ARGS += --pid-path=$(localstatedir)/nginx/nginx.pid +CONFIGURE_ARGS += --http-client-body-temp-path=$(localstatedir)/nginx/client +CONFIGURE_ARGS += --http-fastcgi-temp-path=$(localstatedir)/nginx/fastcgi +CONFIGURE_ARGS += --http-proxy-temp-path=$(localstatedir)/nginx/proxy +CONFIGURE_ARGS += --error-log-path=$(localstatedir)/nginx/logs/error.log +CONFIGURE_ARGS += --http-log-path=$(localstatedir)/nginx/logs/access.log CONFIGURE_ARGS += --with-md5=YES CONFIGURE_ARGS += --with-sha1=YES CONFIGURE_ARGS += --with-http_ssl_module @@ -55,7 +55,7 @@ TEST_SCRIPTS = -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }' +#PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }' include gar/category.mk @@ -70,11 +70,11 @@ ginstall -d $(DESTDIR)$(sysconfdir)/nginx/conf.d ginstall -d $(DESTDIR)$(sharedstatedir)/nginx/contrib ginstall -d $(DESTDIR)$(docdir)/nginx - ginstall -d $(DESTDIR)$(prefix)/var/nginx/client - ginstall -d $(DESTDIR)$(prefix)/var/nginx/fastcgi - ginstall -d $(DESTDIR)$(prefix)/var/nginx/logs - ginstall -d $(DESTDIR)$(prefix)/var/nginx/proxy - ginstall -d $(DESTDIR)$(prefix)/var/nginx/sites + ginstall -d $(DESTDIR)$(localstatedir)/nginx/client + ginstall -d $(DESTDIR)$(localstatedir)/nginx/fastcgi + ginstall -d $(DESTDIR)$(localstatedir)/nginx/logs + ginstall -d $(DESTDIR)$(localstatedir)/nginx/proxy + ginstall -d $(DESTDIR)$(localstatedir)/nginx/sites mv $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params.CSW mv $(DESTDIR)$(sysconfdir)/nginx/mime.types $(DESTDIR)$(sysconfdir)/nginx/mime.types.CSW mv $(DESTDIR)$(sysconfdir)/nginx/nginx.conf $(DESTDIR)$(sysconfdir)/nginx/nginx.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 13:45:39 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 12:45:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7602] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 7602 http://gar.svn.sourceforge.net/gar/?rev=7602&view=rev Author: aigoshin Date: 2009-12-12 12:45:39 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.2, depend problem Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 12:29:29 UTC (rev 7601) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 12:45:39 UTC (rev 7602) @@ -32,6 +32,9 @@ CFLAGS = +sysconfdir=/etc/opt/csw +localstatedir=/var/opt/csw + CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU) CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl" CONFIGURE_ARGS += --with-ld-opt="$(LDFLAGS)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 14:01:27 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 13:01:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7603] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 7603 http://gar.svn.sourceforge.net/gar/?rev=7603&view=rev Author: aigoshin Date: 2009-12-12 13:01:27 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.3, depend problem Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 12:45:39 UTC (rev 7602) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 13:01:27 UTC (rev 7603) @@ -38,11 +38,11 @@ CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU) CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl" CONFIGURE_ARGS += --with-ld-opt="$(LDFLAGS)" +CONFIGURE_ARGS += --lock-path=/var/run/nginx/nginx.lock +CONFIGURE_ARGS += --pid-path=/var/run/nginx/nginx.pid CONFIGURE_ARGS += --conf-path=$(sysconfdir)/nginx/nginx.conf CONFIGURE_ARGS += --sbin-path=$(sbindir)/nginx CONFIGURE_ARGS += --prefix=$(localstatedir)/nginx -CONFIGURE_ARGS += --lock-path=$(localstatedir)/nginx/nginx.lock -CONFIGURE_ARGS += --pid-path=$(localstatedir)/nginx/nginx.pid CONFIGURE_ARGS += --http-client-body-temp-path=$(localstatedir)/nginx/client CONFIGURE_ARGS += --http-fastcgi-temp-path=$(localstatedir)/nginx/fastcgi CONFIGURE_ARGS += --http-proxy-temp-path=$(localstatedir)/nginx/proxy 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 Dec 12 14:18:53 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Dec 2009 13:18:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7604] csw/mgar/pkg Message-ID: Revision: 7604 http://gar.svn.sourceforge.net/gar/?rev=7604&view=rev Author: wahwah Date: 2009-12-12 13:18:53 +0000 (Sat, 12 Dec 2009) Log Message: ----------- msttcorefonts: Initial commit Modified Paths: -------------- csw/mgar/pkg/msttcorefonts/trunk/Makefile csw/mgar/pkg/msttcorefonts/trunk/checksums Added Paths: ----------- csw/mgar/pkg/msttcorefonts/ Modified: csw/mgar/pkg/msttcorefonts/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-12 12:29:29 UTC (rev 7601) +++ csw/mgar/pkg/msttcorefonts/trunk/Makefile 2009-12-12 13:18:53 UTC (rev 7604) @@ -1,185 +1,94 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ +# +# It doesn't currently qualify for an OpenCSW package, because it puts fonts +# into /usr/... but the advantage is that the fonts work straight away after +# installing the package. If a similar behavior can be achieved with fonts +# underneath /opt/csw, the package could be better. +# +# This file is not intended to build a package to distribute in a binary form. +# It's for users to build the package locally. +FONTDIR = /usr/openwin/lib/X11/fonts/TrueType -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = msttcorefonts +GARVERSION = 1.3_4 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = Microsoft True Type fonts define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = corefonts +EXE_FONT_FILES = wd97vwr32.exe +EXE_FONT_FILES += webdin32.exe +EXE_FONT_FILES += verdan32.exe +EXE_FONT_FILES += trebuc32.exe +EXE_FONT_FILES += times32.exe +EXE_FONT_FILES += impact32.exe +EXE_FONT_FILES += georgi32.exe +EXE_FONT_FILES += courie32.exe +EXE_FONT_FILES += comic32.exe +EXE_FONT_FILES += arialb32.exe +EXE_FONT_FILES += arial32.exe +EXE_FONT_FILES += andale32.exe +DISTFILES = $(EXE_FONT_FILES) +# DISTFILES += msttcorefonts-$(GARVERSION).spec UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +CATALOGNAME_MSFTcorefonts = msttcorefonts +ARCHALL = 1 +PACKAGES = MSFTcorefonts +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWcabex +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = corefonts +INSTALL_SCRIPTS = corefonts +TEST_SCRIPTS = -#include gar/category.mk +LICENSE = License.txt +LICENSE += Licen.TXT +TTF_FILES += AndaleMo.TTF +TTF_FILES += AriBlk.TTF +TTF_FILES += Arial.TTF +TTF_FILES += Arialbd.TTF +TTF_FILES += Arialbi.TTF +TTF_FILES += Ariali.TTF +TTF_FILES += Comic.TTF +TTF_FILES += Comicbd.TTF +TTF_FILES += Georgia.TTF +TTF_FILES += Georgiab.TTF +TTF_FILES += Georgiai.TTF +TTF_FILES += Georgiaz.TTF +TTF_FILES += Impact.TTF +TTF_FILES += Times.TTF +TTF_FILES += Timesbd.TTF +TTF_FILES += Timesbi.TTF +TTF_FILES += Timesi.TTF +TTF_FILES += Trebucbd.ttf +TTF_FILES += Verdana.TTF +TTF_FILES += Verdanab.TTF +TTF_FILES += Verdanai.TTF +TTF_FILES += Verdanaz.TTF +TTF_FILES += Webdings.TTF +TTF_FILES += cour.ttf +TTF_FILES += courbd.ttf +TTF_FILES += courbi.ttf +TTF_FILES += couri.ttf +TTF_FILES += trebuc.ttf +TTF_FILES += trebucbi.ttf +TTF_FILES += trebucit.ttf + +include gar/category.mk + +build-corefonts: + (cd $(WORKDIR); for f in $(EXE_FONT_FILES); do \ + cabextract $${f}; \ + done; \ + tree) + @$(MAKECOOKIE) + +install-corefonts: + ginstall -d $(DESTDIR)$(FONTDIR) + for f in $(TTF_FILES); do \ + ginstall -m 644 $(WORKDIR)/$$f $(DESTDIR)$(FONTDIR); \ + done + @$(MAKECOOKIE) Modified: csw/mgar/pkg/msttcorefonts/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-12-12 12:29:29 UTC (rev 7601) +++ csw/mgar/pkg/msttcorefonts/trunk/checksums 2009-12-12 13:18:53 UTC (rev 7604) @@ -0,0 +1,13 @@ +cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe +9637df0e91703179f0723ec095a36cb5 arial32.exe +c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe +2b30de40bb5e803a0452c7715fc835d1 comic32.exe +4e412c772294403ab62fb2d247d85c60 courie32.exe +4d90016026e2da447593b41a8d8fa8bd georgi32.exe +7907c7dd6684e9bade91cff82683d9d7 impact32.exe +b33f5021f68600ae65ddf24e20ec8b80 msttcorefonts-1.3-4.spec +ed39c8ef91b9fb80f76f702568291bd5 times32.exe +0d7ea16cac6261f8513a061fbfcdb2b5 trebuc32.exe +12d2a75f8156e10607be1eaa8e8ef120 verdan32.exe +efa72d3ed0120a07326ce02f051e9b42 wd97vwr32.exe +230a1d13a365b22815f502eb24d9149b webdin32.exe This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 15:24:46 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 14:24:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7605] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 7605 http://gar.svn.sourceforge.net/gar/?rev=7605&view=rev Author: aigoshin Date: 2009-12-12 14:24:46 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.4 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 13:18:53 UTC (rev 7604) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 14:24:46 UTC (rev 7605) @@ -10,8 +10,7 @@ MASTER_SITES = http://sysoev.ru/nginx/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnginx,checkinstall postinstall preremove) -DISTFILES += cswnginx.xml svc-cswnginx +DISTFILES += cswnginx # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -60,16 +59,20 @@ #PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }' +INITSMF = $(sysconfdir)/init.d/cswnginx +SAMPLECONF = $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf + +NGINXDOCS = CHANGES CHANGES.ru LICENSE README + + include gar/category.mk -NGINXDOCS = CHANGES CHANGES.ru LICENSE README - post-configure-modulated: gsed -i s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h $(MAKECOOKIE) post-install-modulated: - cp $(WORKDIR)/svc-cswnginx $(WORKDIR)/cswnginx + ginstall -d $(DESTDIR)$(sysconfdir)/init.d ginstall -d $(DESTDIR)$(sysconfdir)/nginx/conf.d ginstall -d $(DESTDIR)$(sharedstatedir)/nginx/contrib ginstall -d $(DESTDIR)$(docdir)/nginx @@ -78,9 +81,7 @@ ginstall -d $(DESTDIR)$(localstatedir)/nginx/logs ginstall -d $(DESTDIR)$(localstatedir)/nginx/proxy ginstall -d $(DESTDIR)$(localstatedir)/nginx/sites - mv $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params.CSW - mv $(DESTDIR)$(sysconfdir)/nginx/mime.types $(DESTDIR)$(sysconfdir)/nginx/mime.types.CSW - mv $(DESTDIR)$(sysconfdir)/nginx/nginx.conf $(DESTDIR)$(sysconfdir)/nginx/nginx.conf.CSW + cp $(WORKDIR)/cswnginx $(DESTDIR)$(sysconfdir)/init.d/ cd $(WORKSRC); \ cp -r contrib/* $(DESTDIR)$(sharedstatedir)/nginx/contrib; \ cp $(NGINXDOCS) $(DESTDIR)$(docdir)/nginx Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2009-12-12 13:18:53 UTC (rev 7604) +++ csw/mgar/pkg/nginx/trunk/checksums 2009-12-12 14:24:46 UTC (rev 7605) @@ -1,7 +1,2 @@ -bb85ec05a172562e6de38a1e8a64198c CSWnginx.checkinstall -12b5333e18e985b17f8a5465646e9a8a CSWnginx.gspec -bb404771e330fe98f93cb2d12a808121 CSWnginx.postinstall -e9178dc33f2d38aab8f118a8f0550ac7 CSWnginx.preremove -5c832758a62ee319ea9dfd1829d736eb cswnginx.xml +518551b950c0243f9cdc5d978d40d3e1 cswnginx cfa97c0f784532820110b5eee57fef6d nginx-0.7.64.tar.gz -c5b3babbd1261bcb3f3e17494822bb9f svc-cswnginx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 15:28:59 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 14:28:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7606] csw/mgar/pkg/nginx/trunk/files Message-ID: Revision: 7606 http://gar.svn.sourceforge.net/gar/?rev=7606&view=rev Author: aigoshin Date: 2009-12-12 14:28:59 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.5 Added Paths: ----------- csw/mgar/pkg/nginx/trunk/files/cswnginx Removed Paths: ------------- csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall csw/mgar/pkg/nginx/trunk/files/CSWnginx.preremove csw/mgar/pkg/nginx/trunk/files/cswnginx.xml csw/mgar/pkg/nginx/trunk/files/svc-cswnginx Deleted: csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall =================================================================== --- csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall 2009-12-12 14:24:46 UTC (rev 7605) +++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall 2009-12-12 14:28:59 UTC (rev 7606) @@ -1,47 +0,0 @@ -#!/sbin/sh -################################################################################# -# CUSTOM SECTION -################################################################################# - -UPGRADE_NGINX="0" - -SMF="no" -test -f $BASEDIR/usr/sbin/svccfg -a -f $BASEDIR/usr/sbin/svcadm && SMF="yes" - -if [ "$SMF" = "yes" ]; then - STATE=`$BASEDIR/usr/bin/svcs -Ho STATE nginx 2>/dev/null` - if [ $? -eq 0 ]; then - echo "nginx service is in '$STATE' state" - if [ "$STATE" = "online" ]; then - if [ -x "$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx" ]; then - NXSTATE=`$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx status` - echo "nginx is $NXSTATE" - if [ "$NXSTATE" = "running" ]; then - echo "nginx online upgrade is requested" - UPGRADE_NGINX="1" - fi - fi - fi - fi -else - if [ -x $BASEDIR/etc/init.d/cswnginx ]; then - NXSTATE=`$BASEDIR/etc/init.d/cswnginx status` - echo "nginx is $NXSTATE" - if [ "$NXSTATE" = "running" ]; then - echo "nginx online upgrade is requested" - UPGRADE_NGINX="1" - fi - fi -fi - - -# Make env variables available to other packaging scripts - -cat >$1 </dev/null 2>&1 - case "$?" in - 0) - echo "removing unmodified $CONF_FILE" - rm -f $CONF_FILE - ;; - 1) - echo "not touching modified $CONF_FILE" - ;; - *) - ;; - esac -done - -################################################################################# -# END CUSTOM SECTION -################################################################################# - Added: csw/mgar/pkg/nginx/trunk/files/cswnginx =================================================================== --- csw/mgar/pkg/nginx/trunk/files/cswnginx (rev 0) +++ csw/mgar/pkg/nginx/trunk/files/cswnginx 2009-12-12 14:28:59 UTC (rev 7606) @@ -0,0 +1,172 @@ +#!/bin/sh +# +# SMF Method file for nginx +# + +NGINX=/opt/csw/sbin/nginx +CFGFILE=/etc/opt/csw/nginx/nginx.conf +VARRUNX=/var/run/nginx +PIDFILE=${VARRUNX}/nginx.pid +PIDFILO=${VARRUNX}/nginx.pid.oldbin + +[ ! -f ${NGINX} ] && exit 255 +[ ! -f ${CFGFILE} ] && exit 254 + +RETVAL=0 + +start() { + $NGINX + RETVAL=$? + return $RETVAL +} + +stop() { + killpidf -TERM $PIDFILO + killpidf -TERM +} + +check() { + MSG=`$NGINX -t 2>&1` + RETVAL=$? + [ $RETVAL -ne 0 ] && echo $MSG + return $RETVAL +} + +killpidf() { + if [ "$2" != "" ]; then + PIDF=$2 + else + PIDF=$PIDFILE + fi + if [ -s "$PIDF" ]; then + /bin/kill $1 `/usr/bin/cat $PIDF` + RETVAL=$? + else + RETVAL=1 + fi + return $RETVAL +} + +reload() { + killpidf -HUP + return $RETVAL +} + +restart() { + stop + start + return $RETVAL +} + +rotate() { + killpidf -USR1 + return $RETVAL +} + +status() { + if [ -s "$PIDFILE" ]; then + FPID=`/bin/cat $PIDFILE` + else + echo "not running" + RETVAL=1 + return $RETVAL + fi + PIDP=`/bin/ps -o pid= -p $FPID` + if [ "$PIDP" = "" ]; then + echo "not running" + RETVAL=1 + return $RETVAL + fi + COMM=`/bin/ps -o comm= -p $FPID` + if [ "$NGINX" = "$COMM" ]; then + echo "running" + RETVAL=0 + return $RETVAL + else + echo "running, but it is not a CSW package" + RETVAL=1 + return $RETVAL + fi +} + +upgrade() +{ + killpidf -USR2 + [ $RETVAL -ne 0 ] && return $RETVAL + OLDBINPID=0 + for i in 1 2 3 4 5; do + if [ -s $PIDFILO ]; then + OLDBINPID=1 + sleep 2 + break + else + sleep 1 + fi + done + if [ $OLDBINPID -eq 1 ]; then + status >/dev/null + if [ $RETVAL -eq 0 ]; then + killpidf -WINCH $PIDFILO + fi + else + RETVAL=1 + fi + return $RETVAL +} + +upgrade_commit() +{ + killpidf -QUIT $PIDFILO + return $RETVAL +} + +upgrade_rollback() +{ + killpidf -HUP $PIDFILO + if [ $RETVAL -eq 0 ]; then + killpidf -QUIT $PIDFILE + fi + return $RETVAL +} + + +case "$1" in +start) + [ ! -d $VARRUNX ] && /bin/mkdir -p $VARRUNX ||: + check + [ $RETVAL -eq 0 ] && start ||: + ;; +stop) + stop + ;; +refresh|reload) + check + [ $RETVAL -eq 0 ] && reload ||: + ;; +restart) + check + [ $RETVAL -eq 0 ] && restart ||: + ;; +rotate) + rotate + ;; +status) + status + ;; +upgrade) + check + [ $RETVAL -eq 0 ] && upgrade ||: + ;; +upgrade-commit) + upgrade_commit + ;; +upgrade-rollback) + upgrade_rollback + ;; +*) + echo "Usage:" `basename $0` "{start|stop|refresh|reload|restart|rotate|status|upgrade|upgrade-commit|upgrade-rollback}" + exit 1 + ;; +esac + +exit $RETVAL Property changes on: csw/mgar/pkg/nginx/trunk/files/cswnginx ___________________________________________________________________ Added: svn:executable + * Deleted: csw/mgar/pkg/nginx/trunk/files/cswnginx.xml =================================================================== --- csw/mgar/pkg/nginx/trunk/files/cswnginx.xml 2009-12-12 14:24:46 UTC (rev 7605) +++ csw/mgar/pkg/nginx/trunk/files/cswnginx.xml 2009-12-12 14:28:59 UTC (rev 7606) @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: csw/mgar/pkg/nginx/trunk/files/svc-cswnginx =================================================================== --- csw/mgar/pkg/nginx/trunk/files/svc-cswnginx 2009-12-12 14:24:46 UTC (rev 7605) +++ csw/mgar/pkg/nginx/trunk/files/svc-cswnginx 2009-12-12 14:28:59 UTC (rev 7606) @@ -1,172 +0,0 @@ -#!/bin/sh -# -# SMF Method file for nginx -# - -NGINX=/opt/csw/sbin/nginx -CFGFILE=/opt/csw/etc/nginx/nginx.conf -VARRUNX=/opt/csw/var/run/nginx -PIDFILE=${VARRUNX}/nginx.pid -PIDFILO=${VARRUNX}/nginx.pid.oldbin - -[ ! -f ${NGINX} ] && exit 255 -[ ! -f ${CFGFILE} ] && exit 254 - -RETVAL=0 - -start() { - $NGINX - RETVAL=$? - return $RETVAL -} - -stop() { - killpidf -TERM $PIDFILO - killpidf -TERM -} - -check() { - MSG=`$NGINX -t 2>&1` - RETVAL=$? - [ $RETVAL -ne 0 ] && echo $MSG - return $RETVAL -} - -killpidf() { - if [ "$2" != "" ]; then - PIDF=$2 - else - PIDF=$PIDFILE - fi - if [ -s "$PIDF" ]; then - /bin/kill $1 `/usr/bin/cat $PIDF` - RETVAL=$? - else - RETVAL=1 - fi - return $RETVAL -} - -reload() { - killpidf -HUP - return $RETVAL -} - -restart() { - stop - start - return $RETVAL -} - -rotate() { - killpidf -USR1 - return $RETVAL -} - -status() { - if [ -s "$PIDFILE" ]; then - FPID=`/bin/cat $PIDFILE` - else - echo "not running" - RETVAL=1 - return $RETVAL - fi - PIDP=`/bin/ps -o pid= -p $FPID` - if [ "$PIDP" = "" ]; then - echo "not running" - RETVAL=1 - return $RETVAL - fi - COMM=`/bin/ps -o comm= -p $FPID` - if [ "$NGINX" = "$COMM" ]; then - echo "running" - RETVAL=0 - return $RETVAL - else - echo "running, but it is not a CSW package" - RETVAL=1 - return $RETVAL - fi -} - -upgrade() -{ - killpidf -USR2 - [ $RETVAL -ne 0 ] && return $RETVAL - OLDBINPID=0 - for i in 1 2 3 4 5; do - if [ -s $PIDFILO ]; then - OLDBINPID=1 - sleep 2 - break - else - sleep 1 - fi - done - if [ $OLDBINPID -eq 1 ]; then - status >/dev/null - if [ $RETVAL -eq 0 ]; then - killpidf -WINCH $PIDFILO - fi - else - RETVAL=1 - fi - return $RETVAL -} - -upgrade_commit() -{ - killpidf -QUIT $PIDFILO - return $RETVAL -} - -upgrade_rollback() -{ - killpidf -HUP $PIDFILO - if [ $RETVAL -eq 0 ]; then - killpidf -QUIT $PIDFILE - fi - return $RETVAL -} - - -case "$1" in -start) - [ ! -d $VARRUNX ] && /bin/mkdir -p $VARRUNX ||: - check - [ $RETVAL -eq 0 ] && start ||: - ;; -stop) - stop - ;; -refresh|reload) - check - [ $RETVAL -eq 0 ] && reload ||: - ;; -restart) - check - [ $RETVAL -eq 0 ] && restart ||: - ;; -rotate) - rotate - ;; -status) - status - ;; -upgrade) - check - [ $RETVAL -eq 0 ] && upgrade ||: - ;; -upgrade-commit) - upgrade_commit - ;; -upgrade-rollback) - upgrade_rollback - ;; -*) - echo "Usage:" `basename $0` "{start|stop|refresh|reload|restart|rotate|status|upgrade|upgrade-commit|upgrade-rollback}" - exit 1 - ;; -esac - -exit $RETVAL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 17:12:22 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 16:12:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7607] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 7607 http://gar.svn.sourceforge.net/gar/?rev=7607&view=rev Author: aigoshin Date: 2009-12-12 16:12:22 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.6 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 14:28:59 UTC (rev 7606) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 16:12:22 UTC (rev 7607) @@ -12,6 +12,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += cswnginx +LICENSE = LICENSE + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec =================================================================== --- csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec 2009-12-12 14:28:59 UTC (rev 7606) +++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec 2009-12-12 16:12:22 UTC (rev 7607) @@ -1,10 +0,0 @@ -%var bitname nginx -%var pkgname CSWnginx -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%include url file://%{PKGLIB}/smf_enabled.gspec -%var SERVICE_CONF_FILES /opt/csw/etc/nginx/nginx.conf /opt/csw/etc/nginx/fastcgi_params /opt/csw/etc/nginx/mime.types -%var RC_INIT_SCRIPT cswnginx -%var INIT_KILL_PRIO 16 -%var INIT_START_PRIO 90 -%var CAN_BE_AUTOENABLED no -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE 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 Dec 12 17:53:02 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Dec 2009 16:53:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7608] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7608 http://gar.svn.sourceforge.net/gar/?rev=7608&view=rev Author: bdwalton Date: 2009-12-12 16:53:02 +0000 (Sat, 12 Dec 2009) Log Message: ----------- coreutils: bump to version 8.2 Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-12 16:12:22 UTC (rev 7607) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-12 16:53:02 UTC (rev 7608) @@ -1,5 +1,5 @@ GARNAME = coreutils -GARVERSION = 8.1 +GARVERSION = 8.2 CATEGORIES = utils # building with gcc gets us extra tools (eg: stdbuf) 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 Dec 12 18:13:05 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Dec 2009 17:13:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7609] csw/mgar/pkg/coreutils/trunk/checksums Message-ID: Revision: 7609 http://gar.svn.sourceforge.net/gar/?rev=7609&view=rev Author: bdwalton Date: 2009-12-12 17:13:05 +0000 (Sat, 12 Dec 2009) Log Message: ----------- coreutils: update checksums Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-12-12 16:53:02 UTC (rev 7608) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-12-12 17:13:05 UTC (rev 7609) @@ -1,3 +1,3 @@ 0fde2b11f34c49995765566acf6cd5b4 0001-Fix-solaris-acl-support-breakage.patch acbd08eef41092a7b348d03206dad625 0002-Add-lintl-to-xalloc-die-LDADD-flags.patch -4cde9f31604f4da188ed302ca55545ea coreutils-8.1.tar.gz +dfb0d3dbc5f555386339f4f74621cda0 coreutils-8.2.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 Sun Dec 13 15:14:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Dec 2009 14:14:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7610] csw/mgar/pkg Message-ID: Revision: 7610 http://gar.svn.sourceforge.net/gar/?rev=7610&view=rev Author: wahwah Date: 2009-12-13 14:14:04 +0000 (Sun, 13 Dec 2009) Log Message: ----------- fontforge: Initial commit Modified Paths: -------------- csw/mgar/pkg/fontforge/trunk/Makefile csw/mgar/pkg/fontforge/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fontforge/ Modified: csw/mgar/pkg/fontforge/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-12 17:13:05 UTC (rev 7609) +++ csw/mgar/pkg/fontforge/trunk/Makefile 2009-12-13 14:14:04 UTC (rev 7610) @@ -2,184 +2,25 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = fontforge +GARVERSION = 20090923 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = An outline font editor define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +SPKG_SOURCEURL = http://fontforge.sourceforge.net/ +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = fontforge +REQUIRED_PKGS += CSWggettextrt +REQUIRED_PKGS += CSWiconv +REQUIRED_PKGS += CSWlibice +REQUIRED_PKGS += CSWlibsm +REQUIRED_PKGS += CSWpython-rt -#include gar/category.mk +PATCHFILES = grayscale.patch grayscale-cvdgloss.c.patch +DISTFILES = fontforge_full-$(GARVERSION).tar.bz2 +UFILES_REGEX = fontforge_full-(\d+(?:\.\d+)*).tar.bz2 +CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_LINKER_FLAGS = -liconv -lintl -lrt +TEST_SCRIPTS = +include gar/category.mk Modified: csw/mgar/pkg/fontforge/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-12-12 17:13:05 UTC (rev 7609) +++ csw/mgar/pkg/fontforge/trunk/checksums 2009-12-13 14:14:04 UTC (rev 7610) @@ -0,0 +1,3 @@ +ea9d8dc38de79235fbe6add725b38ffe fontforge_full-20090923.tar.bz2 +90b177e8bb4c7fac6e0b8ce6470f708e grayscale-cvdgloss.c.patch +df6f242f2a0d390025cb0439e21f93ce grayscale.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 Sun Dec 13 15:14:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Dec 2009 14:14:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7611] csw/mgar/pkg/fontforge/trunk/files Message-ID: Revision: 7611 http://gar.svn.sourceforge.net/gar/?rev=7611&view=rev Author: wahwah Date: 2009-12-13 14:14:43 +0000 (Sun, 13 Dec 2009) Log Message: ----------- fontforge: patches Added Paths: ----------- csw/mgar/pkg/fontforge/trunk/files/grayscale-cvdgloss.c.patch csw/mgar/pkg/fontforge/trunk/files/grayscale.patch Added: csw/mgar/pkg/fontforge/trunk/files/grayscale-cvdgloss.c.patch =================================================================== --- csw/mgar/pkg/fontforge/trunk/files/grayscale-cvdgloss.c.patch (rev 0) +++ csw/mgar/pkg/fontforge/trunk/files/grayscale-cvdgloss.c.patch 2009-12-13 14:14:43 UTC (rev 7611) @@ -0,0 +1,13 @@ +--- fontforge-20090923/fontforge/cvdgloss.c.orig 2009-12-13 11:09:40.099444315 +0100 ++++ fontforge-20090923/fontforge/cvdgloss.c 2009-12-13 11:15:08.708601663 +0100 +@@ -1041,7 +1041,10 @@ + (val1&2) ? exc->tt_metrics.rotated ? "(rotated) | ": "(not rotated) | " : "", + (val1&4) ? exc->tt_metrics.stretched ? "(stretched) | ": "(not stretched) | " : "", + #if FREETYPE_MAJOR>2 || (FREETYPE_MAJOR==2 && (FREETYPE_MINOR>1 || (FREETYPE_MINOR==1 && FREETYPE_PATCH>11 ))) ++ /* + (val1&32) ? exc->grayscale ? "(grey scale)": "(black/white)" : "" ++ */ ++ "" + #else + "" + #endif Added: csw/mgar/pkg/fontforge/trunk/files/grayscale.patch =================================================================== --- csw/mgar/pkg/fontforge/trunk/files/grayscale.patch (rev 0) +++ csw/mgar/pkg/fontforge/trunk/files/grayscale.patch 2009-12-13 14:14:43 UTC (rev 7611) @@ -0,0 +1,12 @@ +--- fontforge-20090923/fontforge/freetypeui.c.orig 2009-12-13 11:06:55.587423639 +0100 ++++ fontforge-20090923/fontforge/freetypeui.c 2009-12-13 11:07:48.584395183 +0100 +@@ -187,7 +187,8 @@ + return( TT_Err_Execution_Too_Long ); /* Some random error code, says we're probably in a infinite loop */ + dc->exc = exc; + #if FREETYPE_MAJOR>2 || (FREETYPE_MAJOR==2 && (FREETYPE_MINOR>1 || (FREETYPE_MINOR==1 && FREETYPE_PATCH>11 ))) +- exc->grayscale = !dc->is_bitmap; /* if we are in 'prep' or 'fpgm' freetype doesn't know this yet */ ++ /* The keyword 'grayscale' doesn't come up in the freetype library headers. */ ++ /* exc->grayscale = !dc->is_bitmap; */ /* if we are in 'prep' or 'fpgm' freetype doesn't know this yet */ + #endif + + /* Set up for watch points */ 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 Dec 13 20:38:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Dec 2009 19:38:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7612] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7612 http://gar.svn.sourceforge.net/gar/?rev=7612&view=rev Author: dmichelsen Date: 2009-12-13 19:38:16 +0000 (Sun, 13 Dec 2009) Log Message: ----------- mGAR v2: Make sure the classes from CSWcswclassutils are added in the correct order Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-12-13 14:14:43 UTC (rev 7611) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-12-13 19:38:16 UTC (rev 7612) @@ -525,7 +525,7 @@ # The texinfo filter has been taken out of the normal filters as TEXINFO has a default. $(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype -$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C " if( $$F[1] eq "$C" && !$$done{$C}++ );)') +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(shell cat $(WORKDIR)/$*.prototype | perl -e 'while(<>){@F=split;$$c{$$F[1]}++};$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$c{$C});)') $(WORKDIR)/%.pkginfo: $(WORKDIR) $(_DBG)(echo "PKG=$*"; \ 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 Dec 13 22:46:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Dec 2009 21:46:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7613] csw/mgar/pkg Message-ID: Revision: 7613 http://gar.svn.sourceforge.net/gar/?rev=7613&view=rev Author: wahwah Date: 2009-12-13 21:46:47 +0000 (Sun, 13 Dec 2009) Log Message: ----------- liberation-fonts: Initial commit Modified Paths: -------------- csw/mgar/pkg/liberation-fonts/trunk/Makefile csw/mgar/pkg/liberation-fonts/trunk/checksums Added Paths: ----------- csw/mgar/pkg/liberation-fonts/ Modified: csw/mgar/pkg/liberation-fonts/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-12 12:29:29 UTC (rev 7601) +++ csw/mgar/pkg/liberation-fonts/trunk/Makefile 2009-12-13 21:46:47 UTC (rev 7613) @@ -2,184 +2,52 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = liberation-fonts +GARVERSION = 1.05.2.20091019 +FONTDIR = /usr/openwin/lib/X11/fonts/TrueType CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = replacements for Times New Roman, Arial, and Courier New define BLURB - + + On May 9, 2007, Red Hat announced the public release of these fonts under the + trademark LIBERATION at the Red Hat Summit. There are three sets: Sans (a + substitute for Arial, Albany, Helvetica, Nimbus Sans L, and Bitstream Vera + Sans), Serif (a substitute for Times New Roman, Thorndale, Nimbus Roman, and + Bitstream Vera Serif) and Mono (a substitute for Courier New, Cumberland, + Courier, Nimbus Mono L, and Bitstream Vera Sans Mono). The fonts are now + available for you to install. + + Those running Red Hat? Enterprise Linux? systems can get the fonts through + the Red Hat Network? service. For Fedor(tm) users they are available in the + Fedora YUM repositories. You can also download the latest released version as + a gzipped tarball or zip file from the Liberation Fonts project at Fedora + Hosted. The fonts are in the popular TrueType format. + + You are free to use these fonts on any system you would like. You are free to + redistribute them under the GPL+exception license found in the download. Using + these fonts does not subject your documents to the GPL--it liberates them from + any proprietary claim. Once you have installed these fonts, we encourage you + to make them your default in Thunderbird, Firefox, and Open Office. Heck, for + that matter make them your default in Microsoft? Office?, in Microsoft + Windows?, in Apple OSX?... in anything you would like. In many applications + you can set Times New Roman, Arial, and Courier New to convert to these fonts. + endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +SPKG_SOURCEURL = https://www.redhat.com/promo/fonts/ +MASTER_SITES = https://fedorahosted.org/releases/l/i/liberation-fonts/ +DISTFILES = liberation-fonts-$(GARVERSION).tar.gz +UFILES_REGEX = liberation-fonts-(\d+(?:\.\d+)*).tar.gz +CATALOGNAME = liberation_fonts +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWfontforge +CONFIGURE_SCRIPTS = +INSTALL_SCRIPTS = liberation +TEST_SCRIPTS = +ARCHALL = 1 +include gar/category.mk -#include gar/category.mk +install-liberation: + ginstall -d $(DESTDIR)$(FONTDIR) + for f in $(WORKSRC)/ttf/*.ttf; do \ + ginstall -m 644 $$f $(DESTDIR)$(FONTDIR); \ + done + @$(MAKECOOKIE) Modified: csw/mgar/pkg/liberation-fonts/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-12-12 12:29:29 UTC (rev 7601) +++ csw/mgar/pkg/liberation-fonts/trunk/checksums 2009-12-13 21:46:47 UTC (rev 7613) @@ -0,0 +1 @@ +89cd7e13588da4ca14a523233b3352f0 liberation-fonts-1.05.2.20091019.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 14 08:44:17 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Dec 2009 07:44:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7614] csw/mgar/pkg/fontforge/trunk/Makefile Message-ID: Revision: 7614 http://gar.svn.sourceforge.net/gar/?rev=7614&view=rev Author: wahwah Date: 2009-12-14 07:44:17 +0000 (Mon, 14 Dec 2009) Log Message: ----------- fontforge: Versioning with 0.${datestamp} Modified Paths: -------------- csw/mgar/pkg/fontforge/trunk/Makefile Modified: csw/mgar/pkg/fontforge/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontforge/trunk/Makefile 2009-12-13 21:46:47 UTC (rev 7613) +++ csw/mgar/pkg/fontforge/trunk/Makefile 2009-12-14 07:44:17 UTC (rev 7614) @@ -3,7 +3,8 @@ # $Id$ GARNAME = fontforge -GARVERSION = 20090923 +VERSION_DATESTAMP = 20090923 +GARVERSION = 0.$(VERSION_DATESTAMP) CATEGORIES = lib DESCRIPTION = An outline font editor define BLURB @@ -15,10 +16,13 @@ REQUIRED_PKGS += CSWiconv REQUIRED_PKGS += CSWlibice REQUIRED_PKGS += CSWlibsm +REQUIRED_PKGS += CSWpython REQUIRED_PKGS += CSWpython-rt -PATCHFILES = grayscale.patch grayscale-cvdgloss.c.patch -DISTFILES = fontforge_full-$(GARVERSION).tar.bz2 +DISTNAME = fontforge-$(VERSION_DATESTAMP) +PATCHFILES = grayscale.patch +PATCHFILES += grayscale-cvdgloss.c.patch +DISTFILES = fontforge_full-$(VERSION_DATESTAMP).tar.bz2 UFILES_REGEX = fontforge_full-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) EXTRA_LINKER_FLAGS = -liconv -lintl -lrt 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 Dec 14 09:21:16 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Dec 2009 08:21:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7615] csw/mgar/pkg/cheetah/trunk/Makefile Message-ID: Revision: 7615 http://gar.svn.sourceforge.net/gar/?rev=7615&view=rev Author: wahwah Date: 2009-12-14 08:21:16 +0000 (Mon, 14 Dec 2009) Log Message: ----------- cheetah: Add CSWpython as a dependency Modified Paths: -------------- csw/mgar/pkg/cheetah/trunk/Makefile Modified: csw/mgar/pkg/cheetah/trunk/Makefile =================================================================== --- csw/mgar/pkg/cheetah/trunk/Makefile 2009-12-14 07:44:17 UTC (rev 7614) +++ csw/mgar/pkg/cheetah/trunk/Makefile 2009-12-14 08:21:16 UTC (rev 7615) @@ -21,5 +21,5 @@ UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = py_cheetah PACKAGES = CSWpy-cheetah -REQUIRED_PKGS_CSWpy-cheetah = CSWpython-rt +REQUIRED_PKGS_CSWpy-cheetah = CSWpython-rt CSWpython 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 Dec 14 11:28:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Dec 2009 10:28:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7616] csw/mgar/pkg/perl/branches Message-ID: Revision: 7616 http://gar.svn.sourceforge.net/gar/?rev=7616&view=rev Author: dmichelsen Date: 2009-12-14 10:28:34 +0000 (Mon, 14 Dec 2009) Log Message: ----------- perl/branches/perl-5.10.1: Prepare for 5.10.1 Modified Paths: -------------- csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile csw/mgar/pkg/perl/branches/perl-5.10.1/checksums Added Paths: ----------- csw/mgar/pkg/perl/branches/perl-5.10.1/ Modified: csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2009-12-10 03:35:34 UTC (rev 7589) +++ csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile 2009-12-14 10:28:34 UTC (rev 7616) @@ -1,5 +1,5 @@ GARNAME = perl -GARVERSION = 5.8.8 +GARVERSION = 5.10.1 CATEGORIES = lang DESCRIPTION = A high-level, general-purpose programming language @@ -28,32 +28,32 @@ LICENSE = Copying # Core module updates -MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ -CORE_UPDATES += PathTools-3.30 -CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ +#CORE_UPDATES += PathTools-3.30 +#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd -MASTER_SITES += $(CPAN_FIRST_MIRROR)/L/LD/LDS/ -CORE_UPDATES += CGI.pm-3.44 -CORE_OBSOLETE += CGI* +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/L/LD/LDS/ +#CORE_UPDATES += CGI.pm-3.44 +#CORE_OBSOLETE += CGI* -MASTER_SITES += $(CPAN_FIRST_MIRROR)/M/MS/MSCHWERN/ -CORE_UPDATES += Test-Simple-0.92 -CORE_OBSOLETE += Test/Builder* Test/More.pm Test/Simple.pm Test/Tutorial.pm +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/M/MS/MSCHWERN/ +#CORE_UPDATES += Test-Simple-0.92 +#CORE_OBSOLETE += Test/Builder* Test/More.pm Test/Simple.pm Test/Tutorial.pm -MASTER_SITES += $(CPAN_FIRST_MIRROR)/T/TJ/TJENNESS/ -CORE_UPDATES += File-Temp-0.22 -CORE_OBSOLETE += File/Temp.pm +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/T/TJ/TJENNESS/ +#CORE_UPDATES += File-Temp-0.22 +#CORE_OBSOLETE += File/Temp.pm -MASTER_SITES += $(CPAN_FIRST_MIRROR)/G/GB/GBARR/ -CORE_UPDATES += IO-1.25 -CORE_OBSOLETE += IO/Socket* IO/IO* IO/Socket.pm IO/Select.pm IO/Seekable.pm IO/Poll.pm IO/Pipe.pm IO/Handle.pm IO/File.pm IO/Dir.pm IO.pm +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/G/GB/GBARR/ +#CORE_UPDATES += IO-1.25 +#CORE_OBSOLETE += IO/Socket* IO/IO* IO/Socket.pm IO/Select.pm IO/Seekable.pm IO/Poll.pm IO/Pipe.pm IO/Handle.pm IO/File.pm IO/Dir.pm IO.pm -MASTER_SITES += $(CPAN_FIRST_MIRROR)/A/AM/AMS/ -CORE_UPDATES += Storable-2.20 -CORE_OBSOLETE += Storable/* Storable.pm +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/A/AM/AMS/ +#CORE_UPDATES += Storable-2.20 +#CORE_OBSOLETE += Storable/* Storable.pm -MASTER_SITES += $(CPAN_FIRST_MIRROR)/M/MS/MSCHWERN/ -CORE_UPDATES += ExtUtils-MakeMaker-6.54 +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/M/MS/MSCHWERN/ +#CORE_UPDATES += ExtUtils-MakeMaker-6.54 #CORE_OBSOLETE += ExtUtils/* DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) @@ -66,9 +66,7 @@ CONFIGURE_SCRIPTS = perl # Compatable with all prior patch revs -PL_MAJOR = 5.8 -PL_PATCH = 0 2 4 6 7 -INC_COMPAT = $(foreach REV,$(PL_PATCH),$(PL_MAJOR).$(REV)) +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 # Force use of db-4.7 PERL_LIBS += -lsocket -lnsl -lgdbm -ldb-4.7 -ldl -lm -lpthread -lc -lperl @@ -126,10 +124,15 @@ # Tests take a long time TEST_SCRIPTS = +# Make sure we don't include the path to the newly built perl as the +# library is not in place yet. +IGNORE_DESTDIR = 1 + # Do not exclude static libs as at least DynaLoader.a is needed for XS compilation MERGE_EXCLUDE_STATICLIBS = include gar/category.mk + ifneq ($(CORE_UPDATES),) POST_TARGETS = install-core-updates include files/updatecore.mk Modified: csw/mgar/pkg/perl/branches/perl-5.10.1/checksums =================================================================== --- csw/mgar/pkg/perl/trunk/checksums 2009-12-10 03:35:34 UTC (rev 7589) +++ csw/mgar/pkg/perl/branches/perl-5.10.1/checksums 2009-12-14 10:28:34 UTC (rev 7616) @@ -1,8 +1 @@ -d1b217a7a2463d5543d25490ff1b3d14 download/CGI.pm-3.44.tar.gz -003c04b33e8c8eed693f5001fe52b647 download/ExtUtils-MakeMaker-6.54.tar.gz -a7e93cf2015881ded1f22b5b2d0cb391 download/File-Temp-0.22.tar.gz -b88aaf2bb7437725b11e9eb48dfb6c93 download/IO-1.25.tar.gz -18a72d6a66bb62ce9bbb422dfa41181a download/PathTools-3.30.tar.gz -2ba3f963daf86c1172cd7bbbd47891be download/Storable-2.20.tar.gz -eaafa92c9a21c4290dd9d0752bb744b0 download/Test-Simple-0.92.tar.gz -b8c118d4360846829beb30b02a6b91a7 download/perl-5.8.8.tar.gz +b9b2fdb957f50ada62d73f43ee75d044 perl-5.10.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 Mon Dec 14 12:50:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Dec 2009 11:50:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7617] csw/mgar/gar/v2/bin/mkpackage Message-ID: Revision: 7617 http://gar.svn.sourceforge.net/gar/?rev=7617&view=rev Author: dmichelsen Date: 2009-12-14 11:50:21 +0000 (Mon, 14 Dec 2009) Log Message: ----------- mGAR v2: Fix wrong use of last index operator according to http://rt.perl.org/rt3/Public/Bug/Display.html?id=49230 Modified Paths: -------------- csw/mgar/gar/v2/bin/mkpackage Modified: csw/mgar/gar/v2/bin/mkpackage =================================================================== --- csw/mgar/gar/v2/bin/mkpackage 2009-12-14 10:28:34 UTC (rev 7616) +++ csw/mgar/gar/v2/bin/mkpackage 2009-12-14 11:50:21 UTC (rev 7617) @@ -461,7 +461,7 @@ # specified file. my ( $dname, $spec, $line, $flag ); - for ( my $i = 0 ; $i <= $#{@$content} ; $i++ ) { + for ( my $i = 0 ; $i <= $#$content ; $i++ ) { my ( $source, $lineno, $line ) = @{ $content->[$i] }; 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 Dec 14 13:02:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Dec 2009 12:02:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7618] csw/mgar/gar Message-ID: Revision: 7618 http://gar.svn.sourceforge.net/gar/?rev=7618&view=rev Author: dmichelsen Date: 2009-12-14 12:02:11 +0000 (Mon, 14 Dec 2009) Log Message: ----------- mGAR: Reapply r7617 (bugfix for faulty use of last-index) to branches Modified Paths: -------------- csw/mgar/gar/v2-git/bin/mkpackage csw/mgar/gar/v2-relocate/bin/mkpackage csw/mgar/gar/v2-skayser/bin/mkpackage Property Changed: ---------------- csw/mgar/gar/v2-git/ csw/mgar/gar/v2-relocate/ csw/mgar/gar/v2-skayser/ Property changes on: csw/mgar/gar/v2-git ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,6915-7553 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678,6915-7553,7617 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2-git/bin/mkpackage =================================================================== --- csw/mgar/gar/v2-git/bin/mkpackage 2009-12-14 11:50:21 UTC (rev 7617) +++ csw/mgar/gar/v2-git/bin/mkpackage 2009-12-14 12:02:11 UTC (rev 7618) @@ -461,7 +461,7 @@ # specified file. my ( $dname, $spec, $line, $flag ); - for ( my $i = 0 ; $i <= $#{@$content} ; $i++ ) { + for ( my $i = 0 ; $i <= $#$content ; $i++ ) { my ( $source, $lineno, $line ) = @{ $content->[$i] }; Property changes on: csw/mgar/gar/v2-relocate ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:7617 /csw/mgar/gar/v2-git/v2-relocate:7617 Modified: csw/mgar/gar/v2-relocate/bin/mkpackage =================================================================== --- csw/mgar/gar/v2-relocate/bin/mkpackage 2009-12-14 11:50:21 UTC (rev 7617) +++ csw/mgar/gar/v2-relocate/bin/mkpackage 2009-12-14 12:02:11 UTC (rev 7618) @@ -461,7 +461,7 @@ # specified file. my ( $dname, $spec, $line, $flag ); - for ( my $i = 0 ; $i <= $#{@$content} ; $i++ ) { + for ( my $i = 0 ; $i <= $#$content ; $i++ ) { my ( $source, $lineno, $line ) = @{ $content->[$i] }; Property changes on: csw/mgar/gar/v2-skayser ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:7617 /csw/mgar/gar/v2-git/v2-skayser:7617 Modified: csw/mgar/gar/v2-skayser/bin/mkpackage =================================================================== --- csw/mgar/gar/v2-skayser/bin/mkpackage 2009-12-14 11:50:21 UTC (rev 7617) +++ csw/mgar/gar/v2-skayser/bin/mkpackage 2009-12-14 12:02:11 UTC (rev 7618) @@ -461,7 +461,7 @@ # specified file. my ( $dname, $spec, $line, $flag ); - for ( my $i = 0 ; $i <= $#{@$content} ; $i++ ) { + for ( my $i = 0 ; $i <= $#$content ; $i++ ) { my ( $source, $lineno, $line ) = @{ $content->[$i] }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Mon Dec 14 15:44:28 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Mon, 14 Dec 2009 14:44:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7619] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 7619 http://gar.svn.sourceforge.net/gar/?rev=7619&view=rev Author: aigoshin Date: 2009-12-14 14:44:28 +0000 (Mon, 14 Dec 2009) Log Message: ----------- nginx: package release 5.0 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums csw/mgar/pkg/nginx/trunk/files/cswnginx Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-14 12:02:11 UTC (rev 7618) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-14 14:44:28 UTC (rev 7619) @@ -22,14 +22,15 @@ PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -#EXTRA_BUILD_ISAS_i386 = pentium_pro +EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 EXTRA_BUILD_ISAS_sparc = sparcv9 -NGINXCPU_pentium_pro = pentiumpro -NGINXCPU_sparcv8 = sparc32 -NGINXCPU_sparcv9 = sparc64 -NGINXCPU_$(ISA) ?= $(ISA) -NGINXCPU = $(NGINXCPU_$(ISA)) +NGINXCPU_i386 = pentium +NGINXCPU_pentium_pro = pentium3 +NGINXCPU_sparcv8 = sparc32 +NGINXCPU_sparcv9 = sparc64 +NGINXCPU_$(ISA) ?= $(ISA) +NGINXCPU = $(NGINXCPU_$(ISA)) CFLAGS = @@ -51,19 +52,18 @@ CONFIGURE_ARGS += --http-log-path=$(localstatedir)/nginx/logs/access.log CONFIGURE_ARGS += --with-md5=YES CONFIGURE_ARGS += --with-sha1=YES -CONFIGURE_ARGS += --with-http_ssl_module -CONFIGURE_ARGS += --with-http_realip_module CONFIGURE_ARGS += --with-http_dav_module CONFIGURE_ARGS += --with-http_flv_module +CONFIGURE_ARGS += --with-http_realip_module +CONFIGURE_ARGS += --with-http_secure_link_module +CONFIGURE_ARGS += --with-http_ssl_module CONFIGURE_ARGS += --with-http_stub_status_module TEST_SCRIPTS = -#PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }' +INITSMF = $(sysconfdir)/init.d/cswnginx +PRESERVECONF = $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf -INITSMF = $(sysconfdir)/init.d/cswnginx -SAMPLECONF = $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf - NGINXDOCS = CHANGES CHANGES.ru LICENSE README Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2009-12-14 12:02:11 UTC (rev 7618) +++ csw/mgar/pkg/nginx/trunk/checksums 2009-12-14 14:44:28 UTC (rev 7619) @@ -1,2 +1,2 @@ -518551b950c0243f9cdc5d978d40d3e1 cswnginx +4e8863b34556eb28e3ee6849ffb1ed85 cswnginx cfa97c0f784532820110b5eee57fef6d nginx-0.7.64.tar.gz Modified: csw/mgar/pkg/nginx/trunk/files/cswnginx =================================================================== --- csw/mgar/pkg/nginx/trunk/files/cswnginx 2009-12-14 12:02:11 UTC (rev 7618) +++ csw/mgar/pkg/nginx/trunk/files/cswnginx 2009-12-14 14:44:28 UTC (rev 7619) @@ -1,6 +1,10 @@ #!/bin/sh # -# SMF Method file for nginx +#RC_KNUM 20 +#RC_SNUM 88 +#RC_KLEV 0,1,S +#RC_SLEV 2 +#AUTOENABLE no # NGINX=/opt/csw/sbin/nginx 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 Dec 14 16:52:48 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 14 Dec 2009 15:52:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7620] csw/mgar/pkg/dcc/trunk Message-ID: Revision: 7620 http://gar.svn.sourceforge.net/gar/?rev=7620&view=rev Author: bonivart Date: 2009-12-14 15:52:48 +0000 (Mon, 14 Dec 2009) Log Message: ----------- dcc: update to 1.3.116 Modified Paths: -------------- csw/mgar/pkg/dcc/trunk/Makefile csw/mgar/pkg/dcc/trunk/checksums csw/mgar/pkg/dcc/trunk/files/CSWdcc.dcc.xml Removed Paths: ------------- csw/mgar/pkg/dcc/trunk/files/CSWdcc.gspec Modified: csw/mgar/pkg/dcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/dcc/trunk/Makefile 2009-12-14 14:44:28 UTC (rev 7619) +++ csw/mgar/pkg/dcc/trunk/Makefile 2009-12-14 15:52:48 UTC (rev 7620) @@ -1,15 +1,18 @@ +# dep to perl? + GARNAME = dcc -GARVERSION = 1.3.102 +GARVERSION = 1.3.116 CATEGORIES = net DESCRIPTION = E-mail greylisting and a cooperative, distributed system to identify spam MASTER_SITES = http://www.rhyolite.com/dcc/source/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.Z -DISTFILES += $(call admfiles,CSWdcc,) +DISTFILES = $(GARNAME).tar.Z +LICENSE = LICENSE + # Upstream watch -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.Z +#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.Z #CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS = @@ -19,23 +22,32 @@ CONFIGURE_ARGS += --mandir=/opt/csw/share/man CONFIGURE_ARGS += --with-installroot=$(DESTDIR) CONFIGURE_ARGS += --with-DCC-MD5 +#CONFIGURE_ARGS += --with-uid=dcc CONFIGURE_ARGS += --with-uid=bonivart #CONFIGURE_ARGS += --with-cgibin=/var/opt/csw/dcc/cgi-bin CONFIGURE_ARGS += --with-cgibin=/opt/csw/dcc/cgi-bin CONFIGURE_ARGS += --with-rundir=/var/opt/csw/dcc/run CONFIGURE_ARGS += --with-sendmail=/home/bonivart/tmp/sendmail-8.14.2/include/libmilter +GARCOMPILER = GNU + # dcc has no tests TEST_SCRIPTS = INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk '$$$$3 ~ /.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' +SAMPLECONF = /var/opt/csw/dcc/dcc_conf +SAMPLECONF += /var/opt/csw/dcc/flod +SAMPLECONF += /var/opt/csw/dcc/grey_flod +SAMPLECONF += /var/opt/csw/dcc/grey_whitelist +SAMPLECONF += /var/opt/csw/dcc/ids +SAMPLECONF += /var/opt/csw/dcc/map.txt +SAMPLECONF += /var/opt/csw/dcc/whiteclnt +SAMPLECONF += /var/opt/csw/dcc/whitecommon +SAMPLECONF += /var/opt/csw/dcc/whitelist SPKG_SOURCEURL = http://www.rhyolite.com/dcc/ -REQUIRED_PKGS = CSWcswclassutils -SPKG_CLASSES = none cswcpsampleconf CONFFILES = dcc_conf flod grey_flod grey_whitelist ids map.txt whiteclnt whitecommon whitelist -DOCFILES = CHANGES FAQ.txt INSTALL.txt LICENSE RESTRICTIONS misc/README misc/dcc.m4 misc/dccdnsbl.m4 misc/site.config.m4 +DOCFILES = CHANGES FAQ.txt INSTALL.txt RESTRICTIONS misc/README misc/dcc.m4 misc/dccdnsbl.m4 misc/site.config.m4 include gar/category.mk @@ -53,7 +65,7 @@ @( cd $(DESTDIR)/var/opt/csw/$(GARNAME) ; \ sed 's/bonivart/dcc/' dcc_conf > tmp.sed ; \ mv tmp.sed dcc_conf ) - @$(foreach FILE, $(CONFFILES), mv $(DESTDIR)/var/opt/csw/$(GARNAME)/$(FILE) $(DESTDIR)/var/opt/csw/$(GARNAME)/$(FILE).CSW ;) +# @$(foreach FILE, $(CONFFILES), mv $(DESTDIR)/var/opt/csw/$(GARNAME)/$(FILE) $(DESTDIR)/var/opt/csw/$(GARNAME) ;) @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/misc @$(foreach FILE, $(DOCFILES), cp $(WORKSRC)/$(FILE) $(DESTDIR)$(docdir)/$(GARNAME)/$(FILE) ;) @cp $(FILEDIR)/CSWdcc.INSTALL.CSW.txt $(DESTDIR)$(docdir)/$(GARNAME)/INSTALL.CSW.txt Modified: csw/mgar/pkg/dcc/trunk/checksums =================================================================== --- csw/mgar/pkg/dcc/trunk/checksums 2009-12-14 14:44:28 UTC (rev 7619) +++ csw/mgar/pkg/dcc/trunk/checksums 2009-12-14 15:52:48 UTC (rev 7620) @@ -1,2 +1 @@ -6abf97babd8555d37ad91efc7ba4ae7b download/dcc-1.3.102.tar.Z -472a0e3cfd53e0080ddeb5db77d5b708 download/CSWdcc.gspec +dab3c668b82c931eb7191246cb11791f dcc.tar.Z Modified: csw/mgar/pkg/dcc/trunk/files/CSWdcc.dcc.xml =================================================================== --- csw/mgar/pkg/dcc/trunk/files/CSWdcc.dcc.xml 2009-12-14 14:44:28 UTC (rev 7619) +++ csw/mgar/pkg/dcc/trunk/files/CSWdcc.dcc.xml 2009-12-14 15:52:48 UTC (rev 7620) @@ -2,7 +2,7 @@ Deleted: csw/mgar/pkg/dcc/trunk/files/CSWdcc.gspec =================================================================== --- csw/mgar/pkg/dcc/trunk/files/CSWdcc.gspec 2009-12-14 14:44:28 UTC (rev 7619) +++ csw/mgar/pkg/dcc/trunk/files/CSWdcc.gspec 2009-12-14 15:52:48 UTC (rev 7620) @@ -1,7 +0,0 @@ -%var bitname dcc -%var pkgname CSWdcc -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/dcc/LICENSE for license information. - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Dec 14 21:20:59 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 14 Dec 2009 20:20:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7621] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 7621 http://gar.svn.sourceforge.net/gar/?rev=7621&view=rev Author: chninkel Date: 2009-12-14 20:20:59 +0000 (Mon, 14 Dec 2009) Log Message: ----------- openssl: added missing cswclassutils dependancy for openssl_utils Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-12-14 15:52:48 UTC (rev 7620) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-12-14 20:20:59 UTC (rev 7621) @@ -41,7 +41,7 @@ SPKG_DESC_CSWosslutils = Openssl binaries and related tools CATALOGNAME_CSWosslutils = openssl_utils -REQUIRED_PKGS_CSWosslutils = CSWosslrt +REQUIRED_PKGS_CSWosslutils = CSWosslrt CSWcswclassutils SPKG_CLASSES_CSWosslutils = none cswpreserveconf 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 Dec 14 21:22:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Dec 2009 20:22:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7622] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7622 http://gar.svn.sourceforge.net/gar/?rev=7622&view=rev Author: dmichelsen Date: 2009-12-14 20:22:34 +0000 (Mon, 14 Dec 2009) Log Message: ----------- mGAR v2: Add platforms-% Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-12-14 20:20:59 UTC (rev 7621) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-12-14 20:22:34 UTC (rev 7622) @@ -776,6 +776,17 @@ ) @$(MAKECOOKIE) +platforms-%: + $(foreach P,$(PACKAGING_PLATFORMS),\ + $(if $(PACKAGING_HOST_$P),\ + $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ + $(MAKE) PLATFORM=$P $* && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P $*" && \ + ),\ + $(error *** No host has been defined for platform $P)\ + )\ + ) true + replatforms: spotless platforms # Print relecant informations about the platform This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Dec 14 21:23:07 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 14 Dec 2009 20:23:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7623] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 7623 http://gar.svn.sourceforge.net/gar/?rev=7623&view=rev Author: chninkel Date: 2009-12-14 20:23:06 +0000 (Mon, 14 Dec 2009) Log Message: ----------- openssh: updated changelog Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2009-12-14 20:22:34 UTC (rev 7622) +++ csw/mgar/pkg/openssh/trunk/checksums 2009-12-14 20:23:06 UTC (rev 7623) @@ -5,7 +5,7 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 22ffa2a9b7bf310d58d3b299805a41b1 CSWosshlpk.prototype -d9eea5c8d787a514827e94d80e4f5574 changelog.CSW +96b1c2e2ae91fedc8d8324e246b648ef changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-12-14 20:22:34 UTC (rev 7622) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-12-14 20:23:06 UTC (rev 7623) @@ -1,3 +1,9 @@ +openssh (5.3,REV=2008.12.14_rev=p1) unstable + + * Package rebuild to solve an incorrect upload in the repository tree. + + -- Yann Rouillard Mon, 14 Dec 2009 21:19:33 +0100 + openssh (5.3,REV=2009.10.10_rev=p1) unstable * New upstream release. 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 Dec 15 01:46:17 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Dec 2009 00:46:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7624] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7624 http://gar.svn.sourceforge.net/gar/?rev=7624&view=rev Author: bdwalton Date: 2009-12-15 00:46:16 +0000 (Tue, 15 Dec 2009) Log Message: ----------- coreutils: drop cc optimization level to fix issue with seq Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-14 20:23:06 UTC (rev 7623) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-15 00:46:16 UTC (rev 7624) @@ -2,6 +2,11 @@ GARVERSION = 8.2 CATEGORIES = utils +# seq has issues related to the handling of long double's with -O2. +# this issue manifested on sol8 and sol9 x86 only. sparc was unaffected +# and sol10 x86 was fine too. +OPT_FLAGS_GCC = -O1 -pipe + # building with gcc gets us extra tools (eg: stdbuf) GARCOMPILER = GCC4 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 Dec 15 08:50:22 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Dec 2009 07:50:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7625] csw/mgar/pkg/cheetah/trunk/Makefile Message-ID: Revision: 7625 http://gar.svn.sourceforge.net/gar/?rev=7625&view=rev Author: wahwah Date: 2009-12-15 07:50:22 +0000 (Tue, 15 Dec 2009) Log Message: ----------- cheetah: Removing explicit CSWpython dependency Modified Paths: -------------- csw/mgar/pkg/cheetah/trunk/Makefile Modified: csw/mgar/pkg/cheetah/trunk/Makefile =================================================================== --- csw/mgar/pkg/cheetah/trunk/Makefile 2009-12-15 00:46:16 UTC (rev 7624) +++ csw/mgar/pkg/cheetah/trunk/Makefile 2009-12-15 07:50:22 UTC (rev 7625) @@ -21,5 +21,5 @@ UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = py_cheetah PACKAGES = CSWpy-cheetah -REQUIRED_PKGS_CSWpy-cheetah = CSWpython-rt CSWpython +REQUIRED_PKGS_CSWpy-cheetah = CSWpython-rt include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Dec 15 09:36:21 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Dec 2009 08:36:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7626] csw/mgar/pkg/sudo/branches/old-symlink-scheme/ Message-ID: Revision: 7626 http://gar.svn.sourceforge.net/gar/?rev=7626&view=rev Author: wahwah Date: 2009-12-15 08:36:21 +0000 (Tue, 15 Dec 2009) Log Message: ----------- Branching off the revision with the old symlink scheme, i.e. where the /opt/csw/bin/sudo -> sudo.minimal symlink was in CSWsudo-common. Added Paths: ----------- csw/mgar/pkg/sudo/branches/old-symlink-scheme/ 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 Dec 15 09:40:33 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Dec 2009 08:40:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7627] csw/mgar/pkg/sudo/branches/old-symlink-scheme Message-ID: Revision: 7627 http://gar.svn.sourceforge.net/gar/?rev=7627&view=rev Author: wahwah Date: 2009-12-15 08:40:33 +0000 (Tue, 15 Dec 2009) Log Message: ----------- sudo: Old symlink scheme branch version bump up to 1.7.2p2 Modified Paths: -------------- csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile csw/mgar/pkg/sudo/branches/old-symlink-scheme/checksums Modified: csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile =================================================================== --- csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile 2009-12-15 08:36:21 UTC (rev 7626) +++ csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile 2009-12-15 08:40:33 UTC (rev 7627) @@ -1,7 +1,7 @@ GARNAME = sudo GARVERSION = 1.7.2 CATEGORIES = utils -RELEASE = p1 +RELEASE = p2 DISTVERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) Modified: csw/mgar/pkg/sudo/branches/old-symlink-scheme/checksums =================================================================== --- csw/mgar/pkg/sudo/branches/old-symlink-scheme/checksums 2009-12-15 08:36:21 UTC (rev 7626) +++ csw/mgar/pkg/sudo/branches/old-symlink-scheme/checksums 2009-12-15 08:40:33 UTC (rev 7627) @@ -1,3 +1,3 @@ -955d99eda1432c7b7e00d98b91e35a79 download/CSWsudo-common.postinstall -157b2e5e38ca54eb36e0364706bd0292 download/install.diff -4449d466a774f5ce401c9c0e3866c026 download/sudo-1.7.2p1.tar.gz +955d99eda1432c7b7e00d98b91e35a79 CSWsudo-common.postinstall +157b2e5e38ca54eb36e0364706bd0292 install.diff +2a19cf1ab4afc94fe19d0d0899d4cd45 sudo-1.7.2p2.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 Dec 15 09:49:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Dec 2009 08:49:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7628] csw/mgar/pkg/sudo_ldap/trunk Message-ID: Revision: 7628 http://gar.svn.sourceforge.net/gar/?rev=7628&view=rev Author: wahwah Date: 2009-12-15 08:49:09 +0000 (Tue, 15 Dec 2009) Log Message: ----------- sudo_ldap: Version bump up to 1.7.2p2 Modified Paths: -------------- csw/mgar/pkg/sudo_ldap/trunk/Makefile csw/mgar/pkg/sudo_ldap/trunk/checksums Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/Makefile 2009-12-15 08:40:33 UTC (rev 7627) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2009-12-15 08:49:09 UTC (rev 7628) @@ -1,7 +1,7 @@ GARNAME = sudo GARVERSION = 1.7.2 CATEGORIES = utils -RELEASE = p1 +RELEASE = p2 DISTVERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) Modified: csw/mgar/pkg/sudo_ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/checksums 2009-12-15 08:40:33 UTC (rev 7627) +++ csw/mgar/pkg/sudo_ldap/trunk/checksums 2009-12-15 08:49:09 UTC (rev 7628) @@ -1,2 +1,2 @@ -157b2e5e38ca54eb36e0364706bd0292 download/install.diff -4449d466a774f5ce401c9c0e3866c026 download/sudo-1.7.2p1.tar.gz +157b2e5e38ca54eb36e0364706bd0292 install.diff +2a19cf1ab4afc94fe19d0d0899d4cd45 sudo-1.7.2p2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 15 17:15:09 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 15 Dec 2009 16:15:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7629] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 7629 http://gar.svn.sourceforge.net/gar/?rev=7629&view=rev Author: rthurner Date: 2009-12-15 16:15:09 +0000 (Tue, 15 Dec 2009) Log Message: ----------- mercurial, upgrade to 1.4.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 2009-12-15 08:49:09 UTC (rev 7628) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2009-12-15 16:15:09 UTC (rev 7629) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.4 +GARVERSION = 1.4.1 CATEGORIES = devel DESCRIPTION = Fast, lightweight Source Control Management system @@ -20,7 +20,7 @@ CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py # Some tests fail, but manual inspection of the failures show no significant failures. -TEST_TARGET = #tests +TEST_TARGET = tests INSTALL_SCRIPTS = $(WORKSRC)/setup.py INSTALL_ARGS += --root=$(DESTDIR) --prefix=/opt/csw Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2009-12-15 08:49:09 UTC (rev 7628) +++ csw/mgar/pkg/mercurial/trunk/checksums 2009-12-15 16:15:09 UTC (rev 7629) @@ -1,3 +1,3 @@ db884ecb306bcbf49b671f880d29c431 CSWmercurial.changelog.CSW d280026d7687f061371e87ff306c97c2 CSWmercurial.gspec -951ebd4a8153eaa3c56fc0ce2575ab70 mercurial-1.4.tar.gz +eacffecad59ec145e61a1edf332b3f1f mercurial-1.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 15 17:44:44 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 15 Dec 2009 16:44:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7630] csw/mgar/pkg/mod_wsgi/trunk Message-ID: Revision: 7630 http://gar.svn.sourceforge.net/gar/?rev=7630&view=rev Author: rthurner Date: 2009-12-15 16:44:43 +0000 (Tue, 15 Dec 2009) Log Message: ----------- mod_wsgi, upgrade to 3.1 Modified Paths: -------------- csw/mgar/pkg/mod_wsgi/trunk/Makefile csw/mgar/pkg/mod_wsgi/trunk/checksums Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/Makefile 2009-12-15 16:15:09 UTC (rev 7629) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2009-12-15 16:44:43 UTC (rev 7630) @@ -1,5 +1,5 @@ GARNAME = mod_wsgi -GARVERSION = 2.5 +GARVERSION = 3.1 CATEGORIES = lib DESCRIPTION = an Apache/Python WSGI adapter module Modified: csw/mgar/pkg/mod_wsgi/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/checksums 2009-12-15 16:15:09 UTC (rev 7629) +++ csw/mgar/pkg/mod_wsgi/trunk/checksums 2009-12-15 16:44:43 UTC (rev 7630) @@ -1,4 +1,4 @@ -43ad11c477799e2f780c50197c420afd download/mod_wsgi-2.5.tar.gz -a2e8679f45232e56efbc352597ffe456 download/postinstall -a67766841dedbaba0d7b15e7f08c8658 download/preremove -0dd379f20ceb32fc77bb3a9bf045097f download/space +f9aabdcd7a3f66a2319d10793477f9e9 mod_wsgi-3.1.tar.gz +a2e8679f45232e56efbc352597ffe456 postinstall +a67766841dedbaba0d7b15e7f08c8658 preremove +0dd379f20ceb32fc77bb3a9bf045097f space This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 15 18:05:58 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 15 Dec 2009 17:05:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7631] csw/mgar/pkg/trac/trunk Message-ID: Revision: 7631 http://gar.svn.sourceforge.net/gar/?rev=7631&view=rev Author: rthurner Date: 2009-12-15 17:05:57 +0000 (Tue, 15 Dec 2009) Log Message: ----------- trac: upgrade to trac-0.11.6, not working as it complains about wrong dependency CSWgenshi Modified Paths: -------------- csw/mgar/pkg/trac/trunk/Makefile csw/mgar/pkg/trac/trunk/checksums Modified: csw/mgar/pkg/trac/trunk/Makefile =================================================================== --- csw/mgar/pkg/trac/trunk/Makefile 2009-12-15 16:44:43 UTC (rev 7630) +++ csw/mgar/pkg/trac/trunk/Makefile 2009-12-15 17:05:57 UTC (rev 7631) @@ -1,5 +1,5 @@ GARNAME = Trac -GARVERSION = 0.11.5 +GARVERSION = 0.11.6 CATEGORIES = apps DESCRIPTION = Integrated SCM and Project Management @@ -16,7 +16,7 @@ PACKAGES = CSWtrac REQUIRED_PKGS_CSWtrac = CSWpysetuptools CSWpysvn CSWgenshi -REQUIRED_PKGS_CSWtrac += CSWpython-rt +REQUIRED_PKGS_CSWtrac += CSWpython CSWpython-devel CATALOGNAME_CSWtrac = trac SPKG_DESC_CSWtrac = Integrated SCM and Project Management Modified: csw/mgar/pkg/trac/trunk/checksums =================================================================== --- csw/mgar/pkg/trac/trunk/checksums 2009-12-15 16:44:43 UTC (rev 7630) +++ csw/mgar/pkg/trac/trunk/checksums 2009-12-15 17:05:57 UTC (rev 7631) @@ -1 +1 @@ -c8042490096a49478580fd599ad26322 download/Trac-0.11.5.tar.gz +f5a9542d81d3d50c3d9e46d8e2344f38 download/Trac-0.11.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Dec 16 02:41:04 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Dec 2009 01:41:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7632] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7632 http://gar.svn.sourceforge.net/gar/?rev=7632&view=rev Author: bdwalton Date: 2009-12-16 01:41:04 +0000 (Wed, 16 Dec 2009) Log Message: ----------- coreutils: remove patch that is no longer required; correct post-install for gsu Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-15 17:05:57 UTC (rev 7631) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-16 01:41:04 UTC (rev 7632) @@ -24,7 +24,6 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Fix-solaris-acl-support-breakage.patch -PATCHFILES += 0002-Add-lintl-to-xalloc-die-LDADD-flags.patch PREREQUISITE_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit PREREQUISITE_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash @@ -49,7 +48,7 @@ post-install-modulated: @echo Cleaning up install directory... rm -rf $(DESTDIR)/$(libdir) - @echo Manually install gsu (so no root rights required) + @echo Manually install gsu \(so no root rights required\) cp $(WORKSRC)/src/su $(DESTDIR)$(bindir)/gsu post-merge: Deleted: csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch 2009-12-15 17:05:57 UTC (rev 7631) +++ csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch 2009-12-16 01:41:04 UTC (rev 7632) @@ -1,29 +0,0 @@ -From 686676e0661bab3d768b5b988e277f5907142e62 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Wed, 25 Nov 2009 05:08:58 +0100 -Subject: [PATCH 2/2] Add -lintl to xalloc-die LDADD flags - -This will allow the file to be linked properly during the gnulib-tests -phase. - -Signed-off-by: Ben Walton ---- - gnulib-tests/Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in -index 427cccd..641201e 100644 ---- a/gnulib-tests/Makefile.in -+++ b/gnulib-tests/Makefile.in -@@ -1185,7 +1185,7 @@ test_wcwidth_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ - libtests.a $(am__DEPENDENCIES_1) - test_xalloc_die_SOURCES = test-xalloc-die.c - test_xalloc_die_OBJECTS = test-xalloc-die.$(OBJEXT) --test_xalloc_die_LDADD = $(LDADD) -+test_xalloc_die_LDADD = $(LDADD) $(LIBINTL) - test_xalloc_die_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ - libtests.a $(am__DEPENDENCIES_1) - test_xfprintf_posix_SOURCES = test-xfprintf-posix.c --- -1.6.5.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 16 10:01:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Dec 2009 09:01:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7633] csw/mgar/pkg/neon/trunk Message-ID: Revision: 7633 http://gar.svn.sourceforge.net/gar/?rev=7633&view=rev Author: dmichelsen Date: 2009-12-16 09:01:05 +0000 (Wed, 16 Dec 2009) Log Message: ----------- neon: Update to 0.29.1 Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile csw/mgar/pkg/neon/trunk/checksums Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2009-12-16 01:41:04 UTC (rev 7632) +++ csw/mgar/pkg/neon/trunk/Makefile 2009-12-16 09:01:05 UTC (rev 7633) @@ -1,9 +1,9 @@ GARNAME = neon -GARVERSION = 0.29.0 +GARVERSION = 0.29.1 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 0.26.4 0.29.0 +MODULATIONS_GARVERSION = 0.26.4 0.29.1 DESCRIPTION = Neon HTTP and WebDAV client library define BLURB @@ -46,24 +46,15 @@ INSTALL_OVERRIDE_VARS = docdir INSTALL_OVERRIDE_VAR_docdir = $(datadir)/doc/neon -MERGE_SCRIPTS_isa-i386-garversion-0.26.4 = copy-only -MERGE_DIRS_isa-i386-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-0.26.4 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-0.26.4 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-0.26.4 = copy-only +MERGE_DIRS_isa-default-garversion-0.26.4 = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-0.26.4 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-i386-garversion-0.29.0 = copy-all -MERGE_SCRIPTS_isa-amd64-garversion-0.29.0 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-0.29.0 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-0.29.1 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-0.29.1 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.29.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) -MERGE_SCRIPTS_isa-sparcv8-garversion-0.26.4 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-0.26.4 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-0.26.4 = $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-0.29.0 = copy-all -MERGE_SCRIPTS_isa-sparcv9-garversion-0.29.0 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-0.29.0 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) PKGFILES_CSWneon-devel += $(docdir)/.* Modified: csw/mgar/pkg/neon/trunk/checksums =================================================================== --- csw/mgar/pkg/neon/trunk/checksums 2009-12-16 01:41:04 UTC (rev 7632) +++ csw/mgar/pkg/neon/trunk/checksums 2009-12-16 09:01:05 UTC (rev 7633) @@ -1,4 +1,3 @@ -4ef5552e8930ef82b1f56c2712f8ed1e download/COPYING -2d11fff51ffa856fc6b5d4bd801d6cc4 download/neon-0.26.4.tar.gz -252578ed555552b71d15909641484951 download/neon-0.28.6.tar.gz -18a3764b70f9317f8b61509fd90d9e7a download/neon-0.29.0.tar.gz +4ef5552e8930ef82b1f56c2712f8ed1e COPYING +2d11fff51ffa856fc6b5d4bd801d6cc4 neon-0.26.4.tar.gz +eb4eac0499cb6fced6e3b11e4b720ebb neon-0.29.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Dec 16 10:01:19 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 16 Dec 2009 09:01:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7634] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 7634 http://gar.svn.sourceforge.net/gar/?rev=7634&view=rev Author: rthurner Date: 2009-12-16 09:01:19 +0000 (Wed, 16 Dec 2009) Log Message: ----------- mercurial-1.4.1, comment tests, only 2 errors left Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2009-12-16 09:01:05 UTC (rev 7633) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2009-12-16 09:01:19 UTC (rev 7634) @@ -20,7 +20,7 @@ CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py # Some tests fail, but manual inspection of the failures show no significant failures. -TEST_TARGET = tests +TEST_TARGET = #tests INSTALL_SCRIPTS = $(WORKSRC)/setup.py INSTALL_ARGS += --root=$(DESTDIR) --prefix=/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 16 11:54:37 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Dec 2009 10:54:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7635] csw/mgar/pkg/django/trunk Message-ID: Revision: 7635 http://gar.svn.sourceforge.net/gar/?rev=7635&view=rev Author: wahwah Date: 2009-12-16 10:54:37 +0000 (Wed, 16 Dec 2009) Log Message: ----------- django: Version bump to 1.1.1, using the python category Modified Paths: -------------- csw/mgar/pkg/django/trunk/Makefile csw/mgar/pkg/django/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/django/trunk/Makefile Modified: csw/mgar/pkg/django/trunk/Makefile =================================================================== --- csw/mgar/pkg/django/trunk/Makefile 2009-12-16 09:01:19 UTC (rev 7634) +++ csw/mgar/pkg/django/trunk/Makefile 2009-12-16 10:54:37 UTC (rev 7635) @@ -1,8 +1,12 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = django -GARVERSION = 1.0.2 -CATEGORIES = lib +GARVERSION = 1.1.1 +CATEGORIES = python -DESCRIPTION = high-level Python Web framework +DESCRIPTION = A high-level Python Web framework define BLURB Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design. @@ -12,41 +16,25 @@ the stringent requirements of the experienced Web developers who wrote it. It lets you build high-performing, elegant Web applications quickly. endef +SPKG_SOURCEURL = http://www.djangoproject.com/ MASTER_SITES = http://www.djangoproject.com/download/$(GARVERSION)/tarball/ -DISTFILES = Django-$(GARVERSION)-final.tar.gz - -SPKG_CLASSES = none cswpycompile +DISTFILES = Django-$(GARVERSION).tar.gz ARCHALL = 1 - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -WORKSRC = $(WORKDIR)/Django-$(GARVERSION)-final - -REQUIRED_PKGS = CSWpython CSWcswclassutils +UFILES_REGEX = Django-(\d+(?:\.\d+)*).tar.gz +WORKSRC = $(WORKDIR)/Django-$(GARVERSION) +REQUIRED_PKGS = PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWpython-devel - CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py - -INSTALL_SCRIPTS = $(WORKSRC)/setup.py -INSTALL_ARGS += --root=$(DESTDIR) --prefix=$(prefix) - TEST_SCRIPTS = - -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } \ - { print }' - -post-install-modulated: - gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \; - @$(MAKECOOKIE) - # There's a problem that the download URL of the Django source tarball does not # contain the file name. The browser is being redirected instead. Hard-coding # the URL and using a custom target to fit the rest of mGAR. -http//www.djangoproject.com/download/$(GARVERSION)/tarball/Django-$(GARVERSION)-final.tar.gz: +http//www.djangoproject.com/download/$(GARVERSION)/tarball/Django-$(GARVERSION).tar.gz: @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) http://www.djangoproject.com/download/$(GARVERSION)/tarball include gar/category.mk + +post-install-modulated: + gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \; + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/django/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/django/trunk/checksums =================================================================== --- csw/mgar/pkg/django/trunk/checksums 2009-12-16 09:01:19 UTC (rev 7634) +++ csw/mgar/pkg/django/trunk/checksums 2009-12-16 10:54:37 UTC (rev 7635) @@ -1 +1 @@ -89353e3749668778f1370d2e444f3adc download/Django-1.0.2-final.tar.gz +d7839c192e115f9c4dd8777de24dc21c Django-1.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 16 12:06:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Dec 2009 11:06:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7636] csw/mgar/pkg/django/trunk/Makefile Message-ID: Revision: 7636 http://gar.svn.sourceforge.net/gar/?rev=7636&view=rev Author: wahwah Date: 2009-12-16 11:06:24 +0000 (Wed, 16 Dec 2009) Log Message: ----------- django: Adding the py- prefix since it's a library rather than a standalone program. Modified Paths: -------------- csw/mgar/pkg/django/trunk/Makefile Modified: csw/mgar/pkg/django/trunk/Makefile =================================================================== --- csw/mgar/pkg/django/trunk/Makefile 2009-12-16 10:54:37 UTC (rev 7635) +++ csw/mgar/pkg/django/trunk/Makefile 2009-12-16 11:06:24 UTC (rev 7636) @@ -20,6 +20,10 @@ MASTER_SITES = http://www.djangoproject.com/download/$(GARVERSION)/tarball/ DISTFILES = Django-$(GARVERSION).tar.gz +PACKAGES = CSWpy-django +CATALOGNAME_CSWpy-django = py_django +# In case someone has an old version from testing +INCOMPATIBLE_PKGS = CSWdjango ARCHALL = 1 UFILES_REGEX = Django-(\d+(?:\.\d+)*).tar.gz WORKSRC = $(WORKDIR)/Django-$(GARVERSION) 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 Dec 16 14:11:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Dec 2009 13:11:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7637] csw/mgar/pkg/django/trunk/Makefile Message-ID: Revision: 7637 http://gar.svn.sourceforge.net/gar/?rev=7637&view=rev Author: wahwah Date: 2009-12-16 13:11:14 +0000 (Wed, 16 Dec 2009) Log Message: ----------- django: Adding information about the getpass() problem Modified Paths: -------------- csw/mgar/pkg/django/trunk/Makefile Modified: csw/mgar/pkg/django/trunk/Makefile =================================================================== --- csw/mgar/pkg/django/trunk/Makefile 2009-12-16 11:06:24 UTC (rev 7636) +++ csw/mgar/pkg/django/trunk/Makefile 2009-12-16 13:11:14 UTC (rev 7637) @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# A known issue: There's a problem with getpass.getpass() on Solaris, in which +# it echoes the entered password. +# http://bugs.python.org/issue7208 + GARNAME = django GARVERSION = 1.1.1 CATEGORIES = python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Dec 16 20:22:47 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 16 Dec 2009 19:22:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7638] csw/mgar/pkg/ghc/trunk Message-ID: Revision: 7638 http://gar.svn.sourceforge.net/gar/?rev=7638&view=rev Author: trygvis Date: 2009-12-16 19:22:47 +0000 (Wed, 16 Dec 2009) Log Message: ----------- ghc: Upgrading to 6.10.4. Fixing (as in removing) LD_LIBRARY_PATH requirement. Modified Paths: -------------- csw/mgar/pkg/ghc/trunk/Makefile csw/mgar/pkg/ghc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ghc/trunk/files/0001-mk-build.mk-Adding-correct-runtime-options.patch csw/mgar/pkg/ghc/trunk/files/CSWghc.postinstall Removed Paths: ------------- csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec Property Changed: ---------------- csw/mgar/pkg/ghc/trunk/ Property changes on: csw/mgar/pkg/ghc/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work *.log Modified: csw/mgar/pkg/ghc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghc/trunk/Makefile 2009-12-16 13:11:14 UTC (rev 7637) +++ csw/mgar/pkg/ghc/trunk/Makefile 2009-12-16 19:22:47 UTC (rev 7638) @@ -6,9 +6,11 @@ # software causes damage. # TODO: Run the test suite +# This assumes that you already have the stage1 compiler installed under ~/opencsw/ghc-bootstrap-$(GARVERSION) +# Download it from http://www.haskell.org/ghc/dist/$(GARVERSION)/maeder/ GARNAME = ghc -GARVERSION = 6.8.3 +GARVERSION = 6.10.4 CATEGORIES = apps DESCRIPTION = State-of-the-art, compiler and interactive environment for Haskell. @@ -23,82 +25,40 @@ GARCOMPILER = GCC4 -# Calculate the correct platform specification for ghc to use when bootstrapping -ifeq ($(shell uname -p),sparc) -GHC_PLATFORM = sparc-sun -else -GHC_PLATFORM = i386-unknown -endif +REQUIRED_PKGS_CSWghc = CSWiconv +REQUIRED_PKGS_CSWghc += CSWlibgmp +REQUIRED_PKGS_CSWghc += CSWncurses # The location of the solaris binaries seems to vary a bit from version to version +MASTER_SITES = http://www.haskell.org/ghc/dist/$(GARVERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 +PATCHFILES = 0001-mk-build.mk-Adding-correct-runtime-options.patch -MASTER_SITES = http://www.haskell.org/ghc/dist/$(GARVERSION)/ http://www.haskell.org/ghc/dist/$(GARVERSION)/maeder/ -DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 testsuite-$(GARVERSION).tar.gz -DISTFILES += $(GARNAME)-$(GARVERSION)-sparc-sun-solaris2.tar.bz2 -DISTFILES += $(GARNAME)-$(GARVERSION)-i386-unknown-solaris2.tar.bz2 -DISTFILES += $(call admfiles,CSW$(GARNAME),) -DISTFILES += $(call admfiles,CSW$(GARNAME)-prof,) - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARVERSION)/$(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PKGFILES_CSWghc-prof = $(prefix)/.*\.p_hi -PKGFILES_CSWghc-prof += $(prefix)/.*\.so +#PKGFILES_CSWghc-prof = $(prefix)/.*\.p_hi +#PKGFILES_CSWghc-prof += $(prefix)/.*\.so -#PKGFILES_CSWghc = -#PKGFILES_CSWghc = $(prefix)/.* -#PKGFILES_CSWghc += $(prefix)/.*\.a -#PKGFILES_CSWghc += $(PKGFILES_DEVEL) -#PKGFILES_CSWghc += $(PKGFILES_RT) +MERGE_EXCLUDE_STATICLIBS = +PKGFILES_CSWghc = +PKGFILES_CSWghc = $(prefix)/.* +PKGFILES_CSWghc += $(prefix)/.*\.a +PKGFILES_CSWghc += $(PKGFILES_DEVEL) +PKGFILES_CSWghc += $(PKGFILES_RT) + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-gcc=/opt/csw/gcc4/bin/gcc +CONFIGURE_ARGS += --with-gmp-includes=/opt/csw/include +CONFIGURE_ARGS += --with-gmp-libraries=/opt/csw/lib +CONFIGURE_ARGS += --with-readline-includes=/opt/csw/include +CONFIGURE_ARGS += --with-readline-libraries=/opt/csw/lib +CONFIGURE_ENV = PATH=$(HOME)/opencsw/ghc-bootstrap-6.10.4/bin:$(PATH) + +BUILD_ENV = PATH=$(HOME)/opencsw/ghc-bootstrap-6.10.4/bin:$(PATH) LD_LIBRARY_PATH=/opt/csw/lib + # Disabled for now TEST_SCRIPTS = -#TEST_SCRIPTS = custom include gar/category.mk - -# Prevent the extracttion of the binary blobs. This has to be after GAR is included -tar-bz-extract-ghc-$(GARVERSION)-sparc-sun-solaris2.tar.bz2: - @$(MAKECOOKIE) - -tar-bz-extract-ghc-$(GARVERSION)-i386-unknown-solaris2.tar.bz2: - @$(MAKECOOKIE) - -STAGE_1_FILE = $(DOWNLOADDIR)/$(GARNAME)-$(GARVERSION)-$(GHC_PLATFORM)-solaris2.tar.bz2 -STAGE_1_BASEDIR=$(WORKDIR)/stage1 -STAGE_1_SRC_DIR=$(STAGE_1_BASEDIR)/ghc-$(GARVERSION) -STAGE_1_DIR=$(shell mkdir -p $(STAGE_1_BASEDIR) && cd $(STAGE_1_BASEDIR) && pwd)/ghc - -PATH := $(STAGE_1_DIR)/bin:$(PATH) - -LD_LIBRARY_PATH=/opt/csw/lib -export LD_LIBRARY_PATH - -$(STAGE_1_SRC_DIR): - @echo Extracting the bootstrap compiler - mkdir -p $(STAGE_1_BASEDIR) - cat $(STAGE_1_FILE) | ( cd $(STAGE_1_BASEDIR) && gtar jxf -) - -$(STAGE_1_SRC_DIR)/Makefile: $(STAGE_1_SRC_DIR) - cd $(STAGE_1_SRC_DIR) && ./configure --prefix=$(STAGE_1_DIR) - -$(STAGE_1_DIR)/bin/ghc: $(STAGE_1_SRC_DIR)/Makefile - cd $(STAGE_1_SRC_DIR) && gmake install - -pre-configure-modulated: $(STAGE_1_DIR)/bin/ghc - echo $$PATH - @$(MAKECOOKIE) - -pre-test-custom: - @echo Extracting the testsuite - @( echo cd $(WORKSRC); echo gtar zxf $(DOWNLOADDIR)/testsuite-$(GARVERSION).tar.gz) - false - @$(MAKECOOKIE) - -test-custom: - @echo ******************************* - @echo *** RUNNING TESTS (not) - @echo ******************************* - @( cd $(WORKSRC)/testsuite/tests/ghc-regress; echo $(MAKE) stage=2 ) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/ghc/trunk/checksums =================================================================== --- csw/mgar/pkg/ghc/trunk/checksums 2009-12-16 13:11:14 UTC (rev 7637) +++ csw/mgar/pkg/ghc/trunk/checksums 2009-12-16 19:22:47 UTC (rev 7638) @@ -1,6 +1,2 @@ -dfa31028b4d06d1d226f55fe3a2ab7b3 download/ghc-6.8.3-src.tar.bz2 -c92b368262a194e8b859815415bc10d0 download/testsuite-6.8.3.tar.gz -ee43ceea42b9353b6613db6d4058ab0a download/ghc-6.8.3-sparc-sun-solaris2.tar.bz2 -907c15e1d7d33dfd5a829936fe18176a download/ghc-6.8.3-i386-unknown-solaris2.tar.bz2 -8f73e728ba2e6f65f738a302d1cc8ff4 download/CSWghc.gspec -2a3d93a43a4499e0c3366f660ffda4bf download/CSWghc-prof.gspec +d49c571bf1709965b97a8fc2e8f3398b 0001-mk-build.mk-Adding-correct-runtime-options.patch +167687fa582ef6702aaac24e139ec982 ghc-6.10.4-src.tar.bz2 Added: csw/mgar/pkg/ghc/trunk/files/0001-mk-build.mk-Adding-correct-runtime-options.patch =================================================================== --- csw/mgar/pkg/ghc/trunk/files/0001-mk-build.mk-Adding-correct-runtime-options.patch (rev 0) +++ csw/mgar/pkg/ghc/trunk/files/0001-mk-build.mk-Adding-correct-runtime-options.patch 2009-12-16 19:22:47 UTC (rev 7638) @@ -0,0 +1,20 @@ +From bb8a10ec43f99716c4767e0788dba2c36f66529b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Trygve=20Laugst=C3=B8l?= +Date: Wed, 16 Dec 2009 15:18:57 +0100 +Subject: [PATCH] mk/build.mk: Adding correct runtime options. + +--- + mk/build.mk | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + create mode 100644 mk/build.mk + +diff --git a/mk/build.mk b/mk/build.mk +new file mode 100644 +index 0000000..ab87adf +--- /dev/null ++++ b/mk/build.mk +@@ -0,0 +1 @@ ++SRC_HC_OPTS=-optl-R/opt/csw/lib +-- +1.6.5.1 + Deleted: csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec 2009-12-16 13:11:14 UTC (rev 7637) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec 2009-12-16 19:22:47 UTC (rev 7638) @@ -1,14 +0,0 @@ -# Copyright 2008 OpenCSW -# -# Redistribution and/or use, with or without modification, is -# permitted. This software is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. - -%var bitname ghc_prof -%var pkgname CSWghc-prof -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/ghc_prof/LICENSE for license information - Deleted: csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec 2009-12-16 13:11:14 UTC (rev 7637) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec 2009-12-16 19:22:47 UTC (rev 7638) @@ -1,14 +0,0 @@ -# Copyright 2008 OpenCSW -# -# Redistribution and/or use, with or without modification, is -# permitted. This software is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. - -%var bitname ghc -%var pkgname CSWghc -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/ghc/LICENSE for license information - Added: csw/mgar/pkg/ghc/trunk/files/CSWghc.postinstall =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc.postinstall (rev 0) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc.postinstall 2009-12-16 19:22:47 UTC (rev 7638) @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +# Implement the procedure described here: +# http://hackage.haskell.org/trac/ghc/wiki/Building/Solaris + +/opt/csw/bin/ghc-pkg describe rts > /tmp/rts.pkg.in + +cat /tmp/rts.pkg.in | sed \ + -e "s, -R/opt/csw/lib ,,g" \ + -e "s,^\(ld-options:\) \(.*\),\1 -R/opt/csw/lib \2," > /tmp/rts.pkg.out + +/opt/csw/bin/ghc-pkg update /tmp/rts.pkg.out 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 Dec 16 21:14:11 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Dec 2009 20:14:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7639] csw/mgar/pkg/python/trunk Message-ID: Revision: 7639 http://gar.svn.sourceforge.net/gar/?rev=7639&view=rev Author: wahwah Date: 2009-12-16 20:14:10 +0000 (Wed, 16 Dec 2009) Log Message: ----------- python: Upgrading to 2.6.4, removing content from CSWpython-rt with the intention to kill it, moving the distutils module to CSWpython, moving smtpd.py to the -devel package. Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile csw/mgar/pkg/python/trunk/checksums Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-16 19:22:47 UTC (rev 7638) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-16 20:14:10 UTC (rev 7639) @@ -1,7 +1,13 @@ GARNAME = Python -GARVERSION = 2.6.2 +GARVERSION = 2.6.4 CATEGORIES = lang +# Known issues: +# +# - No 64-bit build +# - ctypes module doesn't compile +# - http://forums.sun.com/thread.jspa?threadID=5148204 + SPKG_SOURCEURL = http://www.python.org/download/releases/$(GARVERSION) SPKG_CLASSES = none cswpycompile @@ -75,31 +81,46 @@ # use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -PACKAGES = CSWidle CSWpython CSWpydistutils CSWpython-devel CSWpython-rt CSWpython-tk CSWpython-test +PACKAGES = CSWidle +PACKAGES += CSWpython +PACKAGES += CSWpython-devel +PACKAGES += CSWpython-rt +PACKAGES += CSWpython-test +PACKAGES += CSWpython-tk +INCOMPATIBLE_PKGS_CSWpython = CSWpydistutils + PKGFILES_CSWidle = $(libdir)/.*/idlelib/.* PKGFILES_CSWidle += $(bindir)/idle PKGFILES_CSWpython-devel = $(includedir)/.* PKGFILES_CSWpython-devel += $(libdir)/.*/config/.* -PKGFILES_CSWpydistutils += $(libdir)/.*/distutils/.* -PKGFILES_CSWpython-rt += $(libdir)/.*libpython.* +PKGFILES_CSWpython-devel += $(bindir)/.*config.* +# No idea why would this be in CSWpython, and no good idea for a better package +# to put it. +PKGFILES_CSWpython-devel += $(bindir)/smtpd.py +PKGFILES_CSWpython-rt = non-existing PKGFILES_CSWpython-tk = $(libdir)/.*/lib-tk/.* PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* -PKGFILES_CSWpython-test = $(libdir)/python/test/.* +PKGFILES_CSWpython-test = $(libdir)/python/test/.* +PKGFILES_CSWpython-test += $(libdir)/python/bsddb/test.* +PKGFILES_CSWpython-test += $(libdir)/python/ctypes/test.* +PKGFILES_CSWpython-test += $(libdir)/python/email/test.* +PKGFILES_CSWpython-test += $(libdir)/python/distutils/tests.* +PKGFILES_CSWpython-test += $(libdir)/python/json/tests.* +PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* +PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* ENABLE_CHECK = 0 -REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk CSWcswclassutils +REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk REQUIRED_PKGS_CSWpython = CSWbdb CSWbzip2 CSWgdbm CSWggettextrt REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWpython-rt CSWreadline -REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWzlib CSWcswclassutils +REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWzlib REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk -REQUIRED_PKGS_CSWpython-tk += CSWpython-rt CSWcswclassutils -REQUIRED_PKGS_CSWpydistutils = CSWpython CSWcswclassutils -REQUIRED_PKGS_CSWpython-devel = CSWpython CSWcswclassutils -REQUIRED_PKGS_CSWpython-test = CSWpython CSWcswclassutils +REQUIRED_PKGS_CSWpython-tk += CSWpython-rt +REQUIRED_PKGS_CSWpython-devel = CSWpython +REQUIRED_PKGS_CSWpython-test = CSWpython -CATALOGNAME_CSWpydistutils = pydistutils CATALOGNAME_CSWidle = idle CATALOGNAME_CSWpython = python CATALOGNAME_CSWpython-devel = python_devel @@ -108,24 +129,20 @@ CATALOGNAME_CSWpython-test = python_test SPKG_DESC_CSWidle = Python IDE -SPKG_DESC_CSWdistutils = Python Distutils makes modules and extensions easily available SPKG_DESC_CSWpython = A high-level scripting language. SPKG_DESC_CSWpython-devel = Development Files for Python -SPKG_DESC_CSWpython-rt = Python Runtime Libraries +SPKG_DESC_CSWpython-rt = An empty, obsolete package SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) SPKG_DESC_CSWpython-test = Python Test modules -POST_INST_SCR = add-depricated-libs +include gar/category.mk -post-install-modulated: $(POST_INST_SCR) +post-install-modulated: install-deprecated-libs @$(MAKECOOKIE) -add-depricated-libs: - echo "===> Adding Depricated Libs" +install-deprecated-libs: + echo "===> Installing deprecated Libraries into $(libdir)" cp $(DOWNLOADDIR)/libpython2.5.so.1.0-$(MODULATION) \ $(DESTDIR)$(libdir)/libpython2.5.so.1.0 - cd $(DESTDIR)$(libdir);ln -s libpython2.5.so.1.0 libpython2.5.so + cd $(DESTDIR)$(libdir); ln -s libpython2.5.so.1.0 libpython2.5.so @$(MAKECOOKIE) - -include gar/category.mk - Modified: csw/mgar/pkg/python/trunk/checksums =================================================================== --- csw/mgar/pkg/python/trunk/checksums 2009-12-16 19:22:47 UTC (rev 7638) +++ csw/mgar/pkg/python/trunk/checksums 2009-12-16 20:14:10 UTC (rev 7639) @@ -1,11 +1,11 @@ -245db9f1e0f09ab7e0faaa0cf7301011 download/Python-2.6.2.tar.bz2 -42dd6523beb94a805d5764ae1276091c download/faqwiz.diff -5664b3970307d7d39d8d4061e7dccbb0 download/libpython2.5.so.1.0-isa-i386 -a87896c48b2f61b32053e6d02b07b022 download/libpython2.5.so.1.0-isa-sparcv8 -33f4094ee46ce865d3973a197f3fb4a0 download/makesetup.diff -22c5f741b1744213eaef0818ab280ad5 download/modules.diff -afcc79a94e2f8a576c7906a9700e35a0 download/multiprocess.diff -05724da367b025ce525de2bb704af6e3 download/pyport.diff -a1d114e8a20870675649aeef007a9cac download/python-config-in.diff -1d2763e140ff30a491b3ce11d1a44f97 download/setup.diff -d6c86beae46033be70c44c8e0e4c1908 download/site.diff +fee5408634a54e721a93531aba37f8c1 Python-2.6.4.tar.bz2 +42dd6523beb94a805d5764ae1276091c faqwiz.diff +5664b3970307d7d39d8d4061e7dccbb0 libpython2.5.so.1.0-isa-i386 +a87896c48b2f61b32053e6d02b07b022 libpython2.5.so.1.0-isa-sparcv8 +33f4094ee46ce865d3973a197f3fb4a0 makesetup.diff +22c5f741b1744213eaef0818ab280ad5 modules.diff +afcc79a94e2f8a576c7906a9700e35a0 multiprocess.diff +05724da367b025ce525de2bb704af6e3 pyport.diff +a1d114e8a20870675649aeef007a9cac python-config-in.diff +1d2763e140ff30a491b3ce11d1a44f97 setup.diff +d6c86beae46033be70c44c8e0e4c1908 site.diff 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 Dec 16 21:15:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Dec 2009 20:15:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7640] csw/mgar/pkg/django/trunk/Makefile Message-ID: Revision: 7640 http://gar.svn.sourceforge.net/gar/?rev=7640&view=rev Author: wahwah Date: 2009-12-16 20:15:58 +0000 (Wed, 16 Dec 2009) Log Message: ----------- django: Removing the incompatibility declaration on Phil's request Modified Paths: -------------- csw/mgar/pkg/django/trunk/Makefile Modified: csw/mgar/pkg/django/trunk/Makefile =================================================================== --- csw/mgar/pkg/django/trunk/Makefile 2009-12-16 20:14:10 UTC (rev 7639) +++ csw/mgar/pkg/django/trunk/Makefile 2009-12-16 20:15:58 UTC (rev 7640) @@ -26,8 +26,6 @@ DISTFILES = Django-$(GARVERSION).tar.gz PACKAGES = CSWpy-django CATALOGNAME_CSWpy-django = py_django -# In case someone has an old version from testing -INCOMPATIBLE_PKGS = CSWdjango ARCHALL = 1 UFILES_REGEX = Django-(\d+(?:\.\d+)*).tar.gz WORKSRC = $(WORKDIR)/Django-$(GARVERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 16 21:44:06 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 16 Dec 2009 20:44:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7641] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 7641 http://gar.svn.sourceforge.net/gar/?rev=7641&view=rev Author: chninkel Date: 2009-12-16 20:43:58 +0000 (Wed, 16 Dec 2009) Log Message: ----------- openssh: changed version numbering scheme Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2009-12-16 20:15:58 UTC (rev 7640) +++ csw/mgar/pkg/openssh/trunk/Makefile 2009-12-16 20:43:58 UTC (rev 7641) @@ -13,9 +13,8 @@ ###### Package information ####### GARNAME = openssh -GARVERSION = 5.3 -RELEASE = p1 -GSSKEX_PATCH_VERSION = $(GARVERSION)$(RELEASE) +GARVERSION = 5.3p1 +GSSKEX_PATCH_VERSION = $(GARVERSION) GSSKEX_PATCH_DATE = 20090726 CATEGORIES = server @@ -53,10 +52,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*p\d+).tar.gz -DISTVERSION = $(GARVERSION)$(RELEASE) -DISTNAME = $(GARNAME)-$(DISTVERSION) - -DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWossh.prototype CSWossh.preinstall CSWossh.checkinstall DISTFILES += CSWosshlpk.prototype CSWosshlpk.preinstall CSWosshlpk.checkinstall DISTFILES += CSWosshclient.prototype @@ -156,4 +152,3 @@ @$(MAKECOOKIE) -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2009-12-16 20:15:58 UTC (rev 7640) +++ csw/mgar/pkg/openssh/trunk/checksums 2009-12-16 20:43:58 UTC (rev 7641) @@ -5,7 +5,7 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 22ffa2a9b7bf310d58d3b299805a41b1 CSWosshlpk.prototype -96b1c2e2ae91fedc8d8324e246b648ef changelog.CSW +5323516aa6c7714d03473a0879599fc5 changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-12-16 20:15:58 UTC (rev 7640) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-12-16 20:43:58 UTC (rev 7641) @@ -1,6 +1,7 @@ -openssh (5.3,REV=2008.12.14_rev=p1) unstable +openssh (5.3p1,REV=2008.12.16) unstable * Package rebuild to solve an incorrect upload in the repository tree. + * Changed package version numbering scheme. -- Yann Rouillard Mon, 14 Dec 2009 21:19:33 +0100 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 Dec 16 22:33:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Dec 2009 21:33:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7642] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 7642 http://gar.svn.sourceforge.net/gar/?rev=7642&view=rev Author: bdwalton Date: 2009-12-16 21:33:37 +0000 (Wed, 16 Dec 2009) Log Message: ----------- libxml2: py_libxml2 needs to depend on CSWpython-rt too Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-16 20:43:58 UTC (rev 7641) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-16 21:33:37 UTC (rev 7642) @@ -27,7 +27,7 @@ REQUIRED_PKGS_CSWlibxml2 = CSWiconv CSWzlib REQUIRED_PKGS_CSWlibxml2devel = CSWlibxml2 -REQUIRED_PKGS_CSWpylibxml2 = CSWpython CSWlibxml2 +REQUIRED_PKGS_CSWpylibxml2 = CSWpython CSWpython-rt CSWlibxml2 # We don't have 64 bit Python yet CONFIGURE_ARGS_32 = --with-python=$(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 Dec 17 02:04:09 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 17 Dec 2009 01:04:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7643] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 7643 http://gar.svn.sourceforge.net/gar/?rev=7643&view=rev Author: bdwalton Date: 2009-12-17 01:04:08 +0000 (Thu, 17 Dec 2009) Log Message: ----------- libxml2: py_libxml2 directly depends on iconv and zlib too Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-16 21:33:37 UTC (rev 7642) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-17 01:04:08 UTC (rev 7643) @@ -27,7 +27,7 @@ REQUIRED_PKGS_CSWlibxml2 = CSWiconv CSWzlib REQUIRED_PKGS_CSWlibxml2devel = CSWlibxml2 -REQUIRED_PKGS_CSWpylibxml2 = CSWpython CSWpython-rt CSWlibxml2 +REQUIRED_PKGS_CSWpylibxml2 = CSWpython CSWpython-rt CSWlibxml2 CSWiconv CSWzlib # We don't have 64 bit Python yet CONFIGURE_ARGS_32 = --with-python=$(prefix) 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 Dec 17 11:19:42 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 17 Dec 2009 10:19:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7644] csw/mgar/pkg/python/trunk Message-ID: Revision: 7644 http://gar.svn.sourceforge.net/gar/?rev=7644&view=rev Author: wahwah Date: 2009-12-17 10:19:41 +0000 (Thu, 17 Dec 2009) Log Message: ----------- python: Adding the patch from http://bugs.python.org/issue7208 Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile csw/mgar/pkg/python/trunk/checksums Added Paths: ----------- csw/mgar/pkg/python/trunk/files/getpass.patch Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-17 01:04:08 UTC (rev 7643) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-17 10:19:41 UTC (rev 7644) @@ -43,6 +43,7 @@ PATCHFILES += site.diff PATCHFILES += python-config-in.diff PATCHFILES += setup.diff +PATCHFILES += getpass.patch # Test for sunaudiodev fails. SKIPTEST = 1 Modified: csw/mgar/pkg/python/trunk/checksums =================================================================== --- csw/mgar/pkg/python/trunk/checksums 2009-12-17 01:04:08 UTC (rev 7643) +++ csw/mgar/pkg/python/trunk/checksums 2009-12-17 10:19:41 UTC (rev 7644) @@ -1,5 +1,6 @@ fee5408634a54e721a93531aba37f8c1 Python-2.6.4.tar.bz2 42dd6523beb94a805d5764ae1276091c faqwiz.diff +88e213f865894051cdd8d3247502d612 getpass.patch 5664b3970307d7d39d8d4061e7dccbb0 libpython2.5.so.1.0-isa-i386 a87896c48b2f61b32053e6d02b07b022 libpython2.5.so.1.0-isa-sparcv8 33f4094ee46ce865d3973a197f3fb4a0 makesetup.diff Added: csw/mgar/pkg/python/trunk/files/getpass.patch =================================================================== --- csw/mgar/pkg/python/trunk/files/getpass.patch (rev 0) +++ csw/mgar/pkg/python/trunk/files/getpass.patch 2009-12-17 10:19:41 UTC (rev 7644) @@ -0,0 +1,30 @@ +--- release26-maint/Lib/getpass.py 2009/11/01 16:17:0676014 ++++ release26-maint/Lib/getpass.py 2009/11/01 18:31:1376015 +@@ -62,12 +62,16 @@ + try: + old = termios.tcgetattr(fd) # a copy to save + new = old[:] +- new[3] &= ~termios.ECHO # 3 == 'lflags' ++ new[3] &= ~(termios.ECHO|termios.ISIG) # 3 == 'lflags' ++ tcsetattr_flags = termios.TCSAFLUSH ++ if hasattr(termios, 'TCSASOFT'): ++ tcsetattr_flags |= termios.TCSASOFT + try: +- termios.tcsetattr(fd, termios.TCSADRAIN, new) ++ termios.tcsetattr(fd, tcsetattr_flags, new) + passwd = _raw_input(prompt, stream, input=input) + finally: +- termios.tcsetattr(fd, termios.TCSADRAIN, old) ++ termios.tcsetattr(fd, tcsetattr_flags, old) ++ stream.flush() # issue7208 + except termios.error, e: + if passwd is not None: + # _raw_input succeeded. The final tcsetattr failed. Reraise +@@ -125,6 +129,7 @@ + if prompt: + stream.write(prompt) + stream.flush() ++ # NOTE: The Python C API calls flockfile() (and unlock) during readline. + line = input.readline() + if not line: + raise EOFError 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 Dec 17 11:56:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Dec 2009 10:56:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7645] csw/mgar/pkg/pca/trunk Message-ID: Revision: 7645 http://gar.svn.sourceforge.net/gar/?rev=7645&view=rev Author: dmichelsen Date: 2009-12-17 10:56:06 +0000 (Thu, 17 Dec 2009) Log Message: ----------- pca: Update to 20091216-02 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2009-12-17 10:19:41 UTC (rev 7644) +++ csw/mgar/pkg/pca/trunk/Makefile 2009-12-17 10:56:06 UTC (rev 7645) @@ -1,5 +1,5 @@ GARNAME = pca -GARVERSION = 20091210-01 +GARVERSION = 20091216-02 CATEGORIES = utils DESCRIPTION = Patch Check Advanced Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2009-12-17 10:19:41 UTC (rev 7644) +++ csw/mgar/pkg/pca/trunk/checksums 2009-12-17 10:56:06 UTC (rev 7645) @@ -1,4 +1,4 @@ 4376789925fa9002d0567d739f717748 0001-prefer-opencsw-perl.diff 6f2f2376eba0a788795dd43d68ad32d1 COPYING -78cc7aa4238a782b5b63b0da93a2c60c pca-20091210-01 +7236327edeb969fd2a223cd5b60c0b57 pca-20091216-02 12de68ff8f67b4bb8b095e5646402208 pca.conf 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 Dec 17 11:59:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Dec 2009 10:59:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7646] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 7646 http://gar.svn.sourceforge.net/gar/?rev=7646&view=rev Author: dmichelsen Date: 2009-12-17 10:59:20 +0000 (Thu, 17 Dec 2009) Log Message: ----------- neon: Add new dependency to pakchois Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2009-12-17 10:56:06 UTC (rev 7645) +++ csw/mgar/pkg/neon/trunk/Makefile 2009-12-17 10:59:20 UTC (rev 7646) @@ -25,7 +25,7 @@ CATALOGNAME_CSWneon = neon CATALOGNAME_CSWneon-devel = neon_devel -REQUIRED_PKGS_CSWneon = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt +REQUIRED_PKGS_CSWneon = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt CSWpakchois REQUIRED_PKGS_CSWneon-devel = CSWneon SPKG_DESC_CSWneon = Neon HTTP and WebDAV client library 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 Dec 17 14:17:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Dec 2009 13:17:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7647] csw/mgar/pkg/libcdio/trunk/Makefile Message-ID: Revision: 7647 http://gar.svn.sourceforge.net/gar/?rev=7647&view=rev Author: dmichelsen Date: 2009-12-17 13:17:08 +0000 (Thu, 17 Dec 2009) Log Message: ----------- libcdio: Fix testsuite and add required pkgs Modified Paths: -------------- csw/mgar/pkg/libcdio/trunk/Makefile Modified: csw/mgar/pkg/libcdio/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcdio/trunk/Makefile 2009-12-17 10:59:20 UTC (rev 7646) +++ csw/mgar/pkg/libcdio/trunk/Makefile 2009-12-17 13:17:08 UTC (rev 7647) @@ -17,7 +17,20 @@ GARCOMPILER = GNU +REQUIRED_PKGS = CSWgcc4corert CSWgcc4g++rt CSWiconv + BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +MERGE_DIRS_isa-extra = $(libdir) + +# There is a minor test regarding timezones failing. +# Disable tests for now until this is fixed: +# https://savannah.gnu.org/support/index.php?107175 +SKIPTEST = 1 + include gar/category.mk + +# Force GNU ld +PATH := /opt/csw/gnu:$(PATH) 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 Dec 17 15:55:25 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 17 Dec 2009 14:55:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7648] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 7648 http://gar.svn.sourceforge.net/gar/?rev=7648&view=rev Author: bonivart Date: 2009-12-17 14:55:24 +0000 (Thu, 17 Dec 2009) Log Message: ----------- memconf: update to 2.12 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 2009-12-17 13:17:08 UTC (rev 7647) +++ csw/mgar/pkg/memconf/trunk/Makefile 2009-12-17 14:55:24 UTC (rev 7648) @@ -1,5 +1,5 @@ GARNAME = memconf -GARVERSION = 2.11 +GARVERSION = 2.12 CATEGORIES = utils DESCRIPTION = perl script that displays memory modules installed Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2009-12-17 13:17:08 UTC (rev 7647) +++ csw/mgar/pkg/memconf/trunk/checksums 2009-12-17 14:55:24 UTC (rev 7648) @@ -1,3 +1,3 @@ -0b50e833d8d48cd471f88fc42f378ed9 download/memconf.gz -fc6326ab5ca12b131f656339b515af59 download/memconf.man -818efbe29da417ad462e3f6345690c3d download/COPYING +818efbe29da417ad462e3f6345690c3d COPYING +25f0fc4fcd06e749dedc2e0fa7e0287b memconf.gz +a99158c0948d76ecb9012494697c840b memconf.man 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 Dec 17 17:37:57 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 17 Dec 2009 16:37:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7649] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 7649 http://gar.svn.sourceforge.net/gar/?rev=7649&view=rev Author: bonivart Date: 2009-12-17 16:37:57 +0000 (Thu, 17 Dec 2009) Log Message: ----------- spamassassin: update to 3.3.0 beta 1 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.checkinstall csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.depend csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.gspec csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.postinstall Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-17 14:55:24 UTC (rev 7648) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-17 16:37:57 UTC (rev 7649) @@ -1,6 +1,6 @@ GARNAME = spamassassin SPKG_NAME = Mail-SpamAssassin -GARVERSION = 3.2.5 +GARVERSION = 3.3.0 CATEGORIES = net DESCRIPTION = mail filter with a wide range of tests @@ -10,30 +10,33 @@ DNS blocklists, and collaborative filtering databases. endef -MASTER_SITES = http://apache.jumper.nu/spamassassin/source/ -DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz +#MASTER_SITES = http://apache.jumper.nu/spamassassin/source/ +MASTER_SITES = http://people.apache.org/~wtogami/devel/ +#DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz +DISTFILES = $(SPKG_NAME)-$(GARVERSION)-beta1.tar.gz LICENSE = $(WORKDIR)/$(SPKG_NAME)-$(GARVERSION)/LICENSE -REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha1 CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetdns CSWpmuri CSWpmhtmlparser CSWzlib CSWcswclassutils +REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha1 +REQUIRED_PKGS += CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib +REQUIRED_PKGS += CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim +REQUIRED_PKGS += CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetdns +REQUIRED_PKGS += CSWpmuri CSWpmhtmlparser CSWzlib # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(SPKG_NAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_CLASSES_CSWspamassassin = none cswusergroup cswcpsampleconf cswinitsmf +SAMPLECONF = /opt/csw/etc/spamassassin/.+\.pre\.CSW +SAMPLECONF += /opt/csw/etc/spamassassin/local\.cf\.CSW +INITSMF = /etc/opt/csw/init.d/cswspamd +USERGROUP = /opt/csw/etc/CSWspamassassin/cswusergroup CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom -TEST_SCRIPTS = custom +#TEST_SCRIPTS = custom +TEST_SCRIPTS = INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/opt\/csw\/etc\/spamassassin\/.+\.pre\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /\/opt\/csw\/etc\/spamassassin\/local\.cf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /\/opt\/csw\/etc\/CSWspamassassin\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \ - $$$$3 ~ /\/init.d\/cswspamd$$$$/ { $$$$2 = "cswinitsmf" } \ - { print }' - include gar/category.mk WORKSRC = $(WORKDIR)/$(SPKG_NAME)-$(GARVERSION) @@ -45,12 +48,12 @@ perl Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) CONFDIR=/opt/csw/etc/spamassassin LOCALSTATEDIR=/var/opt/csw/spamassassin CONTACT_ADDRESS=postmaster ) @$(MAKECOOKIE) -pre-build-modulated: - @echo " ==> Pre-build $(GARNAME) (custom)" - @( cd $(WORKSRC)/spamc ; \ - sed 's/CFLAGS = /CFLAGS = -xarch=v8 /' Makefile.in > Makefile.tmp ; \ - cp Makefile.tmp Makefile.in ) - @$(MAKECOOKIE) +#pre-build-modulated: +# @echo " ==> Pre-build $(GARNAME) (custom)" +# @( cd $(WORKSRC)/spamc ; \ +# sed 's/CFLAGS = /CFLAGS = -xarch=v8 /' Makefile.in > Makefile.tmp ; \ +# cp Makefile.tmp Makefile.in ) +# @$(MAKECOOKIE) build-custom: @echo " ==> Building $(GARNAME) (custom)" @@ -66,6 +69,8 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" + @echo "LICENSE = $(WORKSRC)/LICENSE" + @ls -l $(WORKSRC)/LICENSE @rm -rf $(DESTDIR) @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME) @@ -75,8 +80,9 @@ @ginstall -m 644 $(FILEDIR)/CSWspamassassin.cswusergroup $(DESTDIR)$(sysconfdir)/CSWspamassassin/cswusergroup @cp $(FILEDIR)/CSWspamassassin.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @cp $(FILEDIR)/CSWspamassassin.README.spamd $(DESTDIR)$(docdir)/$(GARNAME)/README.spamd + echo "WORKSRC: $(WORKSRC)" @( cd $(WORKSRC) ; \ - gmake install ) + gmake DESTDIR=$(DESTDIR) install ) @( cd $(WORKSRC) ; \ cp -r C* INSTALL NOTICE README TRADEMARK U* ldap/ sql/ procmailrc.example sample-* $(DESTDIR)$(docdir)/$(GARNAME)/ ) @( cd $(DESTDIR)/opt/csw/etc/spamassassin ; \ Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-17 14:55:24 UTC (rev 7648) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-17 16:37:57 UTC (rev 7649) @@ -1,5 +1 @@ -7fdc1651d0371c4a7f95ac9ae6f828a6 download/Mail-SpamAssassin-3.2.5.tar.gz -cab47048b63840594cdbef3067760ec6 download/CSWspamassassin.gspec -7048882870e87e1f8eaa193b5dcaa7a8 download/CSWspamassassin.checkinstall -ace3e9b5c2b93703e134992fcd73522b download/CSWspamassassin.depend -b9e397df2e43ffe120332465da5fd68f download/CSWspamassassin.postinstall +530fb1bd28977271f30b348bc2b68db1 Mail-SpamAssassin-3.3.0-beta1.tar.gz Deleted: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.checkinstall =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.checkinstall 2009-12-17 14:55:24 UTC (rev 7648) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.checkinstall 2009-12-17 16:37:57 UTC (rev 7649) @@ -1,35 +0,0 @@ -# checkinstall for CSWspamassassin -# This script saves the existing configuration directory user and group -# in variables used by postinstall to reset the configuration directory -# permissions. - -# If installing on a filesystem that is not running the OS, exit this script. -if [ ! x"$PKG_INSTALL_ROOT" = x"" -a ! x"$PKG_INSTALL_ROOT" = x"/" ] ; then exit 0 ; fi - -if [ x"$PKG_INSTALL_ROOT" = x"" ] ; then - PKG_INSTALL_ROOT="/" -fi - -# If available, save user and group permissions for /opt/csw/etc/spamassassin -# directory -CONFDIR="/etc/opt/csw/spamassassin" -if [ ! -d "$CONFDIR" ] ; then - CONFDIR="/opt/csw/etc/spamassassin" - if [ ! -d "$CONFDIR" ] ; then - CONFDIR="" - fi -fi - -if [ x"$CONFDIR" != x ] ; then - SPAMDUSER=`ls -ld "$CONFDIR" |awk '{print $3;}'` - SPAMDGROUP=`ls -ld "$CONFDIR" |awk '{print $4;}'` -# Make env variables available to other packaging scripts -cat >$1 < Revision: 7650 http://gar.svn.sourceforge.net/gar/?rev=7650&view=rev Author: bonivart Date: 2009-12-17 16:48:34 +0000 (Thu, 17 Dec 2009) Log Message: ----------- spamassassin: fix license file Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Added Paths: ----------- csw/mgar/pkg/spamassassin/trunk/files/COPYING Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-17 16:37:57 UTC (rev 7649) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-17 16:48:34 UTC (rev 7650) @@ -14,9 +14,8 @@ MASTER_SITES = http://people.apache.org/~wtogami/devel/ #DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz DISTFILES = $(SPKG_NAME)-$(GARVERSION)-beta1.tar.gz +DISTFILES += COPYING -LICENSE = $(WORKDIR)/$(SPKG_NAME)-$(GARVERSION)/LICENSE - REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha1 REQUIRED_PKGS += CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib REQUIRED_PKGS += CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-17 16:37:57 UTC (rev 7649) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-17 16:48:34 UTC (rev 7650) @@ -1 +1,2 @@ +3b83ef96387f14655fc854ddc3c6bd57 COPYING 530fb1bd28977271f30b348bc2b68db1 Mail-SpamAssassin-3.3.0-beta1.tar.gz Added: csw/mgar/pkg/spamassassin/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/spamassassin/trunk/files/COPYING 2009-12-17 16:48:34 UTC (rev 7650) @@ -0,0 +1,202 @@ + + 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. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Thu Dec 17 20:35:20 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Thu, 17 Dec 2009 19:35:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7651] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 7651 http://gar.svn.sourceforge.net/gar/?rev=7651&view=rev Author: harpchad Date: 2009-12-17 19:35:19 +0000 (Thu, 17 Dec 2009) Log Message: ----------- Bump version to 2.6.4 Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2009-12-17 16:48:34 UTC (rev 7650) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2009-12-17 19:35:19 UTC (rev 7651) @@ -1,7 +1,7 @@ # $Id$ GARNAME = pidgin -GARVERSION = 2.6.3 +GARVERSION = 2.6.4 CATEGORIES = apps DESCRIPTION = Multi-protocol IM client Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2009-12-17 16:48:34 UTC (rev 7650) +++ csw/mgar/pkg/pidgin/trunk/checksums 2009-12-17 19:35:19 UTC (rev 7651) @@ -1 +1 @@ -d0b030f0f746251b48fc78f59fe71861 download/pidgin-2.6.3.tar.gz +81acb7d7e4a5d21ba83b5b00cfb60ac5 download/pidgin-2.6.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Thu Dec 17 21:14:05 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Thu, 17 Dec 2009 20:14:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7652] csw/mgar/pkg/vim/trunk Message-ID: Revision: 7652 http://gar.svn.sourceforge.net/gar/?rev=7652&view=rev Author: harpchad Date: 2009-12-17 20:14:04 +0000 (Thu, 17 Dec 2009) Log Message: ----------- Bump patch level to 320 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vim/trunk/checksums Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2009-12-17 19:35:19 UTC (rev 7651) +++ csw/mgar/pkg/vim/trunk/Makefile 2009-12-17 20:14:04 UTC (rev 7652) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.2 -PATCHREV = 266 +PATCHREV = 320 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2009-12-17 19:35:19 UTC (rev 7651) +++ csw/mgar/pkg/vim/trunk/checksums 2009-12-17 20:14:04 UTC (rev 7652) @@ -264,6 +264,60 @@ 352951ed477e83d3527c2ff95a7c2484 download/7.2.264 4b12ddc88794c20ad3dbe238ccf91807 download/7.2.265 9bfd540da3982b9841421cabc564f958 download/7.2.266 +ff87b49c02d7c7f3a084a1b594ae88ac download/7.2.267 +333855dceb650a83a3a2c0bc39e59883 download/7.2.268 +b668c729a8116bd73296a93807234d86 download/7.2.269 +08dcef5d1f22d8667454b0ab487e533c download/7.2.270 +e7982aaa6e1582e8313b07ad92f7cbec download/7.2.271 +42af89bdd081e67af66ab7ac896ec82f download/7.2.272 +db4a84251344f9be6bc466f0e93b56c2 download/7.2.273 +8375467c6e837d41ffca1044264f07d7 download/7.2.274 +7b01fe74c4b97ca52674c7b48917c8f8 download/7.2.275 +18d2eded81ed3743fb33886856dcaaca download/7.2.276 +2fab085fbd95c7f1ccd5432b42ac171e download/7.2.277 +650cfd7a47be176206e32adb2eb2fbd6 download/7.2.278 +91bd881902deb859eb88a9661a818a06 download/7.2.279 +6718336ff2eda0aebe0ad2f79a87bb72 download/7.2.280 +9021fcb03db3247f052bc2bc8c101554 download/7.2.281 +fd8c5680ec0a72516205f36068987b0f download/7.2.282 +630bfb6d7eb4fe4a365facaf60943151 download/7.2.283 +49f8814cd8e54bc21fe8dffc917b51c3 download/7.2.284 +371d70c8fd279238037d3b8c28a69479 download/7.2.285 +6074a34e9de9ea214aaa9059415ecff7 download/7.2.286 +30399617fc60ba7c6721aba1aa4cb4fe download/7.2.287 +e4af9091b9bd725a03d6f59f24a05d8f download/7.2.288 +b644db8f7cc6fb0dfd72578659d4dd5b download/7.2.289 +4f59608390ca566ef8ddfcf1dedf9cb8 download/7.2.290 +816dda0f77bda27759f5d3cff96ec1d2 download/7.2.291 +fd6f78dbdf02404c49c83e0fc50fdcb1 download/7.2.292 +51d2685c3fd4357d70472bf89c7674f7 download/7.2.293 +60ae3ec3e8c490b139d06260eea95ed6 download/7.2.294 +9029fd778fcbe2d67d2884ab34bd6aa1 download/7.2.295 +204298e1f5edb50ce68dcb5bdf6e0dbb download/7.2.296 +4646ae4272a7ed72ed4531214c1a94ea download/7.2.297 +cb5197804af66e8b7b568d5cbb9aea39 download/7.2.298 +50e000c313d6061be06b7110c101fb49 download/7.2.299 +54512d653ae4947911df73046024c07d download/7.2.300 +dba442d3c7ab15794c48d89ac2bd50ab download/7.2.301 +76ddee93248aaaaeb56a926f90a92d48 download/7.2.302 +9e448cc39db6bca1421c58fd91994c2e download/7.2.303 +dc47073f62ba8b87d29593042e6b9c24 download/7.2.304 +87698db3201d95b973430479872fb70c download/7.2.305 +4927e5f5c757b610db1184ed05c1c355 download/7.2.306 +a3f136eb3e73254fe1bc90dd3319886f download/7.2.307 +366670c20b3dccd17ba16b48c0643543 download/7.2.308 +a33bf5b244644dc1dfcedb58b64e224a download/7.2.309 +2b4e530e0286197917cccc4d5ddad75b download/7.2.310 +a121e8d4f5d3ef109b7dc708160c48ed download/7.2.311 +9d43a4cb5261144c5368afb47e91b15e download/7.2.312 +fc0905f652a5c3e2f8144ad940454ceb download/7.2.313 +bbc2bc5e522158c34f5a957e9a43ec85 download/7.2.314 +abda87ae0b9590203661dff5cf212918 download/7.2.315 +9551787240e4d4d0ba9962a88ffd295e download/7.2.316 +b7cda2d415ef56e93b436b157da65512 download/7.2.317 +d323859a6998ab7566837e4ee487db4d download/7.2.318 +93fcc07a053e4bf17cc329eebf4eec69 download/7.2.319 +d81436a10e166fd5ad0503961bb63f7e download/7.2.320 73612b6658c597ee478abf27a0a89ed5 download/COPYING 80304427884b8b78134bc7c7c9097679 download/gvimrc 35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 17 21:18:13 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 17 Dec 2009 20:18:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7653] csw/mgar/pkg/puppet/branches/puppet-0.24.x/ Message-ID: Revision: 7653 http://gar.svn.sourceforge.net/gar/?rev=7653&view=rev Author: wahwah Date: 2009-12-17 20:18:12 +0000 (Thu, 17 Dec 2009) Log Message: ----------- Branching off to maintain the 0.24.x version. Added Paths: ----------- csw/mgar/pkg/puppet/branches/puppet-0.24.x/ 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 Dec 17 21:24:12 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 17 Dec 2009 20:24:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7654] csw/mgar/pkg/puppet/branches/puppet-0.24.x Message-ID: Revision: 7654 http://gar.svn.sourceforge.net/gar/?rev=7654&view=rev Author: wahwah Date: 2009-12-17 20:24:12 +0000 (Thu, 17 Dec 2009) Log Message: ----------- puppet-0.24.x: Version downgrade to 0.24.8 Modified Paths: -------------- csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums Modified: csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile 2009-12-17 20:18:12 UTC (rev 7653) +++ csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile 2009-12-17 20:24:12 UTC (rev 7654) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh GARNAME = puppet -GARVERSION = 0.25.1 +GARVERSION = 0.24.8 CATEGORIES = apps define BLURB @@ -21,9 +21,9 @@ endef MASTER_SITES = http://reductivelabs.com/downloads/puppet/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/ INITSMF = $(sysconfdir)/init\.d/cswpuppetd @@ -35,7 +35,7 @@ PACKAGES = CSWpuppet CSWpuppetmaster REQUIRED_PKGS = CSWfacter -#PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS = REQUIRED_PKGS_CSWpuppetmaster = CSWpuppet PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd Modified: csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums 2009-12-17 20:18:12 UTC (rev 7653) +++ csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums 2009-12-17 20:24:12 UTC (rev 7654) @@ -3,4 +3,4 @@ f4a95dece2231805abf4754d72471de4 cswpuppetd aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup -55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.1.tar.gz +288d46dee00acad64d0f3ecc6d8ba6fa puppet-0.24.8.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Thu Dec 17 21:48:03 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Thu, 17 Dec 2009 20:48:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7655] csw/mgar/pkg/gvim/trunk Message-ID: Revision: 7655 http://gar.svn.sourceforge.net/gar/?rev=7655&view=rev Author: harpchad Date: 2009-12-17 20:48:03 +0000 (Thu, 17 Dec 2009) Log Message: ----------- Bump patch level to 320 Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gvim/trunk/checksums Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2009-12-17 20:24:12 UTC (rev 7654) +++ csw/mgar/pkg/gvim/trunk/Makefile 2009-12-17 20:48:03 UTC (rev 7655) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.2 -PATCHREV = 266 +PATCHREV = 320 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2009-12-17 20:24:12 UTC (rev 7654) +++ csw/mgar/pkg/gvim/trunk/checksums 2009-12-17 20:48:03 UTC (rev 7655) @@ -1,8 +1,3 @@ -f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 -d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz -35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz -47396843634a6e3c05d4f5d6b4bf8a72 download/gvim.desktop -73612b6658c597ee478abf27a0a89ed5 download/COPYING 7c2dc4a956cf315e546e347bc349968c download/7.2.001 7f16f80814f1e071a689806c2056b39d download/7.2.002 0de916fdfd450a4a0d95bed44ae2c398 download/7.2.003 @@ -269,4 +264,63 @@ 352951ed477e83d3527c2ff95a7c2484 download/7.2.264 4b12ddc88794c20ad3dbe238ccf91807 download/7.2.265 9bfd540da3982b9841421cabc564f958 download/7.2.266 +ff87b49c02d7c7f3a084a1b594ae88ac download/7.2.267 +333855dceb650a83a3a2c0bc39e59883 download/7.2.268 +b668c729a8116bd73296a93807234d86 download/7.2.269 +08dcef5d1f22d8667454b0ab487e533c download/7.2.270 +e7982aaa6e1582e8313b07ad92f7cbec download/7.2.271 +42af89bdd081e67af66ab7ac896ec82f download/7.2.272 +db4a84251344f9be6bc466f0e93b56c2 download/7.2.273 +8375467c6e837d41ffca1044264f07d7 download/7.2.274 +7b01fe74c4b97ca52674c7b48917c8f8 download/7.2.275 +18d2eded81ed3743fb33886856dcaaca download/7.2.276 +2fab085fbd95c7f1ccd5432b42ac171e download/7.2.277 +650cfd7a47be176206e32adb2eb2fbd6 download/7.2.278 +91bd881902deb859eb88a9661a818a06 download/7.2.279 +6718336ff2eda0aebe0ad2f79a87bb72 download/7.2.280 +9021fcb03db3247f052bc2bc8c101554 download/7.2.281 +fd8c5680ec0a72516205f36068987b0f download/7.2.282 +630bfb6d7eb4fe4a365facaf60943151 download/7.2.283 +49f8814cd8e54bc21fe8dffc917b51c3 download/7.2.284 +371d70c8fd279238037d3b8c28a69479 download/7.2.285 +6074a34e9de9ea214aaa9059415ecff7 download/7.2.286 +30399617fc60ba7c6721aba1aa4cb4fe download/7.2.287 +e4af9091b9bd725a03d6f59f24a05d8f download/7.2.288 +b644db8f7cc6fb0dfd72578659d4dd5b download/7.2.289 +4f59608390ca566ef8ddfcf1dedf9cb8 download/7.2.290 +816dda0f77bda27759f5d3cff96ec1d2 download/7.2.291 +fd6f78dbdf02404c49c83e0fc50fdcb1 download/7.2.292 +51d2685c3fd4357d70472bf89c7674f7 download/7.2.293 +60ae3ec3e8c490b139d06260eea95ed6 download/7.2.294 +9029fd778fcbe2d67d2884ab34bd6aa1 download/7.2.295 +204298e1f5edb50ce68dcb5bdf6e0dbb download/7.2.296 +4646ae4272a7ed72ed4531214c1a94ea download/7.2.297 +cb5197804af66e8b7b568d5cbb9aea39 download/7.2.298 +50e000c313d6061be06b7110c101fb49 download/7.2.299 +54512d653ae4947911df73046024c07d download/7.2.300 +dba442d3c7ab15794c48d89ac2bd50ab download/7.2.301 +76ddee93248aaaaeb56a926f90a92d48 download/7.2.302 +9e448cc39db6bca1421c58fd91994c2e download/7.2.303 +dc47073f62ba8b87d29593042e6b9c24 download/7.2.304 +87698db3201d95b973430479872fb70c download/7.2.305 +4927e5f5c757b610db1184ed05c1c355 download/7.2.306 +a3f136eb3e73254fe1bc90dd3319886f download/7.2.307 +366670c20b3dccd17ba16b48c0643543 download/7.2.308 +a33bf5b244644dc1dfcedb58b64e224a download/7.2.309 +2b4e530e0286197917cccc4d5ddad75b download/7.2.310 +a121e8d4f5d3ef109b7dc708160c48ed download/7.2.311 +9d43a4cb5261144c5368afb47e91b15e download/7.2.312 +fc0905f652a5c3e2f8144ad940454ceb download/7.2.313 +bbc2bc5e522158c34f5a957e9a43ec85 download/7.2.314 +abda87ae0b9590203661dff5cf212918 download/7.2.315 +9551787240e4d4d0ba9962a88ffd295e download/7.2.316 +b7cda2d415ef56e93b436b157da65512 download/7.2.317 +d323859a6998ab7566837e4ee487db4d download/7.2.318 +93fcc07a053e4bf17cc329eebf4eec69 download/7.2.319 +d81436a10e166fd5ad0503961bb63f7e download/7.2.320 +73612b6658c597ee478abf27a0a89ed5 download/COPYING +47396843634a6e3c05d4f5d6b4bf8a72 download/gvim.desktop +35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz +d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz +f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.patch 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 Dec 18 09:51:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Dec 2009 08:51:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7656] csw/mgar/pkg Message-ID: Revision: 7656 http://gar.svn.sourceforge.net/gar/?rev=7656&view=rev Author: dmichelsen Date: 2009-12-18 08:51:10 +0000 (Fri, 18 Dec 2009) Log Message: ----------- pdfjam: Initial commit Added Paths: ----------- csw/mgar/pkg/pdfjam/ csw/mgar/pkg/pdfjam/branches/ csw/mgar/pkg/pdfjam/tags/ csw/mgar/pkg/pdfjam/trunk/ csw/mgar/pkg/pdfjam/trunk/Makefile csw/mgar/pkg/pdfjam/trunk/checksums csw/mgar/pkg/pdfjam/trunk/files/ Property changes on: csw/mgar/pkg/pdfjam/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/pdfjam/trunk/Makefile =================================================================== --- csw/mgar/pkg/pdfjam/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pdfjam/trunk/Makefile 2009-12-18 08:51:10 UTC (rev 7656) @@ -0,0 +1,38 @@ +GARNAME = pdfjam +GARVERSION = 1.21 +CATEGORIES = utils + +DESCRIPTION = Small collection of shell scripts to enhance pdflatex +define BLURB + PDFjam is a small collection of shell scripts which provide a simple interface + to some of the functionality of the excellent pdfpages package (by Andreas Matthias) + for pdfLaTeX. +endef + +MASTER_SITES = http://www.warwick.ac.uk/go/pdfjam/ +DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam + +DISTNAME = pdfjam + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +ARCHALL = 1 + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + (cd $(WORKSRC) && ginstall scripts/* $(DESTDIR)$(bindir)) + ginstall -d $(DESTDIR)$(docdir)/pdfjam + (cd $(WORKSRC) && ginstall VERSION PDFjam-README.html pdfdroplets.png $(DESTDIR)$(docdir)/pdfjam) + ginstall -d $(DESTDIR)$(mandir)/man1 + (cd $(WORKSRC) && ginstall man1/* $(DESTDIR)$(mandir)/man1) + @$(MAKECOOKIE) Added: csw/mgar/pkg/pdfjam/trunk/checksums =================================================================== --- csw/mgar/pkg/pdfjam/trunk/checksums (rev 0) +++ csw/mgar/pkg/pdfjam/trunk/checksums 2009-12-18 08:51:10 UTC (rev 7656) @@ -0,0 +1 @@ +71d2d664777d32ec4154ab4c2e5965dc pdfjam_1.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 12:32:41 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 11:32:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7657] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 7657 http://gar.svn.sourceforge.net/gar/?rev=7657&view=rev Author: rthurner Date: 2009-12-18 11:32:41 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apache2 - upgrade to 2.2.14, and new gar Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/checksums Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 08:51:10 UTC (rev 7656) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 11:32:41 UTC (rev 7657) @@ -8,6 +8,14 @@ best around in terms of functionality, efficiency, security and speed. endef +SPKG_DESC_CSWapache2 = Apache 2.2 web server +SPKG_DESC_CSWapache2c = Apache 2.2 web server (core) +SPKG_DESC_CSWapache2rt = Apache 2.2 runtime libraries +SPKG_DESC_CSWap2prefork = Apache 2.2 prefork MPM +SPKG_DESC_CSWap2suexec = Apache 2.2 suEXEC support +SPKG_DESC_CSWapache2-devel = Apache 2.2 development support +SPKG_DESC_CSWapache2-manual = Apache 2.2 manual + include files/config.mk # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2009-12-18 08:51:10 UTC (rev 7656) +++ csw/mgar/pkg/apache2/trunk/checksums 2009-12-18 11:32:41 UTC (rev 7657) @@ -1,31 +1,31 @@ -03b893953995a59649b9afbc5253f9e1 download/CSWap2prefork.gspec -b30329626b94f5e22447c7032c4735b3 download/CSWap2prefork.postinstall -9df2944f619992604f78f477ff5e8c1f download/CSWap2prefork.postremove -f02746d1ed7d57d1171fc4c536451fdb download/CSWap2prefork.prototype -0dd379f20ceb32fc77bb3a9bf045097f download/CSWap2prefork.space -f90d0488f01ba57bffa88a4c1897ca28 download/CSWap2suexec.gspec -405bc4df4662e9faebe34f9b6a093d14 download/CSWap2suexec.postinstall -36128341749fa79f9942f4156b85f5b6 download/CSWap2suexec.preremove -27cc92536c2335868e727f4517a967db download/CSWap2suexec.prototype -020f593630a0d59a4e398814e0e02c0f download/CSWapache2-devel.gspec -557c1d7fea8d6cd6674be399c0ab10d5 download/CSWapache2-devel.prototype -cb25d4b9c4e32f9e308c84824a4ca8f3 download/CSWapache2-manual.gspec -03d560ad0cd320ead33dc6fa2e72ad4c download/CSWapache2-manual.prototype -1b57e8fd32556ee3a3d9fb2a908ddc6c download/CSWapache2.gspec -61b6b11aa70677da9386e90c3b5ba21c download/CSWapache2.killproc -d41d8cd98f00b204e9800998ecf8427e download/CSWapache2.prototype -68cf0129905c2aae52cd23e614a05eb6 download/CSWapache2c.gspec -e629a549294b2d91e8a0365c43d097cd download/CSWapache2c.postinstall -e9af24bf68414f2c1c571e344cc1227a download/CSWapache2c.prototype -0dd379f20ceb32fc77bb3a9bf045097f download/CSWapache2c.space -523b1f316a67090dfc08fe7506cb1aa0 download/CSWapache2rt.checkinstall -7546bc4336d9656e5b02e392264ce114 download/CSWapache2rt.gspec -602b5bc079c3dbf441e9d0b4e1bc3fc7 download/CSWapache2rt.prototype -308836569bf0cc1be27ac45e3123e0c2 download/apu-iconv.diff -a7467a756cbd980d4cfe3c2cfb6a9e35 download/config.layout -b3c2086facecc3f898d29f3c8c74da11 download/cswapache2 -2803e35be6650f5b739e6e91faa824dd download/httpd-2.2.13.tar.gz -d9d1abded665674800f3e5c246a4163f download/httpd-mpm.conf.CSW -796a7d5095ce154c274a2ccfd60ec753 download/httpd-ssl.conf.CSW -f0941e5782e4bee45c2c95bd9460796b download/httpd.conf.CSW -033a19975c59bffcc5b144628f8a8e06 download/update20to22 +03b893953995a59649b9afbc5253f9e1 CSWap2prefork.gspec +b30329626b94f5e22447c7032c4735b3 CSWap2prefork.postinstall +9df2944f619992604f78f477ff5e8c1f CSWap2prefork.postremove +f02746d1ed7d57d1171fc4c536451fdb CSWap2prefork.prototype +0dd379f20ceb32fc77bb3a9bf045097f CSWap2prefork.space +f90d0488f01ba57bffa88a4c1897ca28 CSWap2suexec.gspec +405bc4df4662e9faebe34f9b6a093d14 CSWap2suexec.postinstall +36128341749fa79f9942f4156b85f5b6 CSWap2suexec.preremove +27cc92536c2335868e727f4517a967db CSWap2suexec.prototype +020f593630a0d59a4e398814e0e02c0f CSWapache2-devel.gspec +557c1d7fea8d6cd6674be399c0ab10d5 CSWapache2-devel.prototype +cb25d4b9c4e32f9e308c84824a4ca8f3 CSWapache2-manual.gspec +03d560ad0cd320ead33dc6fa2e72ad4c CSWapache2-manual.prototype +1b57e8fd32556ee3a3d9fb2a908ddc6c CSWapache2.gspec +61b6b11aa70677da9386e90c3b5ba21c CSWapache2.killproc +d41d8cd98f00b204e9800998ecf8427e CSWapache2.prototype +68cf0129905c2aae52cd23e614a05eb6 CSWapache2c.gspec +e629a549294b2d91e8a0365c43d097cd CSWapache2c.postinstall +e9af24bf68414f2c1c571e344cc1227a CSWapache2c.prototype +0dd379f20ceb32fc77bb3a9bf045097f CSWapache2c.space +523b1f316a67090dfc08fe7506cb1aa0 CSWapache2rt.checkinstall +7546bc4336d9656e5b02e392264ce114 CSWapache2rt.gspec +602b5bc079c3dbf441e9d0b4e1bc3fc7 CSWapache2rt.prototype +308836569bf0cc1be27ac45e3123e0c2 apu-iconv.diff +a7467a756cbd980d4cfe3c2cfb6a9e35 config.layout +b3c2086facecc3f898d29f3c8c74da11 cswapache2 +2c1e3c7ba00bcaa0163da7b3e66aaa1e httpd-2.2.14.tar.gz +d9d1abded665674800f3e5c246a4163f httpd-mpm.conf.CSW +796a7d5095ce154c274a2ccfd60ec753 httpd-ssl.conf.CSW +f0941e5782e4bee45c2c95bd9460796b httpd.conf.CSW +033a19975c59bffcc5b144628f8a8e06 update20to22 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 12:39:14 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 11:39:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7658] csw/mgar/pkg/apache2/trunk/files Message-ID: Revision: 7658 http://gar.svn.sourceforge.net/gar/?rev=7658&view=rev Author: rthurner Date: 2009-12-18 11:39:13 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apache2 - gspec remove duplicate information Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec 2009-12-18 11:32:41 UTC (rev 7657) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec 2009-12-18 11:39:13 UTC (rev 7658) @@ -1,5 +1,4 @@ %var bitname apache2_devel %var pkgname CSWapache2-devel %include url file://%{PKGLIB}/csw_standard.gspec -%var desc Apache 2.2 development support %copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec 2009-12-18 11:32:41 UTC (rev 7657) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec 2009-12-18 11:39:13 UTC (rev 7658) @@ -2,5 +2,4 @@ %var pkgname CSWapache2-manual %var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache 2.2 manual %copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec 2009-12-18 11:32:41 UTC (rev 7657) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec 2009-12-18 11:39:13 UTC (rev 7658) @@ -2,5 +2,4 @@ %var pkgname CSWapache2 %var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache 2.2 web server %copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec 2009-12-18 11:32:41 UTC (rev 7657) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec 2009-12-18 11:39:13 UTC (rev 7658) @@ -1,5 +1,4 @@ %var bitname apache2c %var pkgname CSWapache2c %include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache 2.2 web server (core) %copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec 2009-12-18 11:32:41 UTC (rev 7657) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec 2009-12-18 11:39:13 UTC (rev 7658) @@ -1,5 +1,4 @@ %var bitname apache2rt %var pkgname CSWapache2rt %include url file://%{PKGLIB}/csw_standard.gspec -%var desc Apache 2.2 runtime libraries %copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 13:33:03 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 12:33:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7659] csw/mgar/pkg/apr/trunk Message-ID: Revision: 7659 http://gar.svn.sourceforge.net/gar/?rev=7659&view=rev Author: rthurner Date: 2009-12-18 12:33:03 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apr - upgrade to 1.3.9, upgrade to gar-v2 build Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile csw/mgar/pkg/apr/trunk/checksums Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2009-12-18 11:39:13 UTC (rev 7658) +++ csw/mgar/pkg/apr/trunk/Makefile 2009-12-18 12:33:03 UTC (rev 7659) @@ -1,5 +1,5 @@ GARNAME = apr -GARVERSION = 1.3.8 +GARVERSION = 1.3.9 CATEGORIES = lib DESCRIPTION = Apache Portable Runtime Modified: csw/mgar/pkg/apr/trunk/checksums =================================================================== --- csw/mgar/pkg/apr/trunk/checksums 2009-12-18 11:39:13 UTC (rev 7658) +++ csw/mgar/pkg/apr/trunk/checksums 2009-12-18 12:33:03 UTC (rev 7659) @@ -1,2 +1 @@ -310fac12285d94a162c488f4b8f1aabc apr-1.3.8.tar.gz -263cd22b83bd6593398013792c2a3ce4 config.layout +85bcd8005153b8fa63b1e3f95ea31f07 apr-1.3.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 13:38:04 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 12:38:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7660] csw/mgar/pkg/apr-util/trunk Message-ID: Revision: 7660 http://gar.svn.sourceforge.net/gar/?rev=7660&view=rev Author: rthurner Date: 2009-12-18 12:38:04 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apr-util: update to gar v2, and apr-util-1.3.9 Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/apr-util/trunk/ Property changes on: csw/mgar/pkg/apr-util/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2009-12-18 12:33:03 UTC (rev 7659) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2009-12-18 12:38:04 UTC (rev 7660) @@ -1,5 +1,5 @@ GARNAME = apr-util -GARVERSION = 1.2.2 +GARVERSION = 1.3.9 CATEGORIES = lib DESCRIPTION = Apache Portable Runtime Utilities This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 13:45:06 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 12:45:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7661] csw/mgar/pkg/apr-util/trunk Message-ID: Revision: 7661 http://gar.svn.sourceforge.net/gar/?rev=7661&view=rev Author: rthurner Date: 2009-12-18 12:45:06 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apr-util: gar-v2 upgrade Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile csw/mgar/pkg/apr-util/trunk/checksums csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.gspec Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2009-12-18 12:38:04 UTC (rev 7660) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2009-12-18 12:45:06 UTC (rev 7661) @@ -9,6 +9,8 @@ interface to underlying platform-specific implementations. endef +SPKG_DESC_CSWaprutil-devel = Apache Portable Runtime Utility development support + MASTER_SITES = http://apache.crihan.fr/dist/apr/ MASTER_SITES += http://apache.webthing.com/database/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz Modified: csw/mgar/pkg/apr-util/trunk/checksums =================================================================== --- csw/mgar/pkg/apr-util/trunk/checksums 2009-12-18 12:38:04 UTC (rev 7660) +++ csw/mgar/pkg/apr-util/trunk/checksums 2009-12-18 12:45:06 UTC (rev 7661) @@ -1,9 +1,9 @@ -8b3f04dde7048946c3c94f85b4debb94 download/apr-util-1.2.2.tar.gz -1e0b81300c99eacfda07803e345ac3d7 download/CSWaprutil.gspec -985b4fb9c04239118d19ca522072171b download/CSWaprutil.depend -b02e8b9e9d9fc81896aa3741bec37145 download/CSWaprutil.prototype -ab86b57383e04f4b4bc0a1a7c1252bbb download/CSWaprutil-devel.gspec -9e96a2c06d116f2f530b17f0cabd9aff download/CSWaprutil-devel.depend -1b93f3d66d2cc681ecb5905716b79d1e download/CSWaprutil-devel.prototype -f25418280a6214bcf0af804fcef4c950 download/config.layout -2aec82eff00f526a0f2e4c1380a3541e download/iconv.diff +d35666b332b173698383deec8e56e1b3 CSWaprutil-devel.depend +963516b990780cf17616ba32673443a6 CSWaprutil-devel.gspec +094f42b8b66199c1047d9828a82249e4 CSWaprutil-devel.prototype +4447f1d66b43786a4c123f75c1d16962 CSWaprutil.depend +1e0b81300c99eacfda07803e345ac3d7 CSWaprutil.gspec +d1a6d531eef93140a3aebe1e96803b09 CSWaprutil.prototype +cc2ec0ba4f01d88375f1170f762518fa apr-util-1.3.9.tar.gz +f25418280a6214bcf0af804fcef4c950 config.layout +2aec82eff00f526a0f2e4c1380a3541e iconv.diff Modified: csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.gspec =================================================================== --- csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.gspec 2009-12-18 12:38:04 UTC (rev 7660) +++ csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.gspec 2009-12-18 12:45:06 UTC (rev 7661) @@ -1,5 +1,4 @@ %var bitname aprutil_devel %var pkgname CSWaprutil-devel %include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache Portable Runtime Utility development support %copyright url file://%{WORKSRC}/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 Fri Dec 18 14:06:33 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 18 Dec 2009 13:06:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7662] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 7662 http://gar.svn.sourceforge.net/gar/?rev=7662&view=rev Author: wahwah Date: 2009-12-18 13:06:33 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apache2: A comment for Rupert, adding the Id keyword Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 12:45:06 UTC (rev 7661) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 13:06:33 UTC (rev 7662) @@ -1,3 +1,5 @@ +# $Id$ + GARNAME = httpd GARVERSION = 2.2.14 CATEGORIES = server @@ -18,9 +20,11 @@ include files/config.mk -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# All the admfiles can go away. Move the static prototype files +# aside, replace them with PKGFILES_CSWfoo = regexp lines. + # Dummy toplevel package DISTFILES += $(call admfiles,CSWapache2,prototype) # Runtime @@ -124,4 +128,3 @@ gmv -v $$file $$file.CSW ; \ done ) @$(MAKECOOKIE) - Property changes on: csw/mgar/pkg/apache2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 18 14:21:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Dec 2009 13:21:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7663] csw/mgar/pkg Message-ID: Revision: 7663 http://gar.svn.sourceforge.net/gar/?rev=7663&view=rev Author: dmichelsen Date: 2009-12-18 13:21:05 +0000 (Fri, 18 Dec 2009) Log Message: ----------- man2html: Initial commit Added Paths: ----------- csw/mgar/pkg/man2html/ csw/mgar/pkg/man2html/branches/ csw/mgar/pkg/man2html/tags/ csw/mgar/pkg/man2html/trunk/ csw/mgar/pkg/man2html/trunk/Makefile csw/mgar/pkg/man2html/trunk/checksums csw/mgar/pkg/man2html/trunk/files/ Property changes on: csw/mgar/pkg/man2html/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/man2html/trunk/Makefile =================================================================== --- csw/mgar/pkg/man2html/trunk/Makefile (rev 0) +++ csw/mgar/pkg/man2html/trunk/Makefile 2009-12-18 13:21:05 UTC (rev 7663) @@ -0,0 +1,48 @@ +GARNAME = man2html +GARVERSION = 3.0.1 +CATEGORIES = utils + +DESCRIPTION = A Unix manpage-to-HTML converter +define BLURB + A Unix manpage-to-HTML converter. +endef + +MASTER_SITES = http://hydra.nac.uci.edu/indiv/ehood/tar/ +DISTNAME = $(GARNAME)$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://hydra.nac.uci.edu/indiv/ehood/man2html.html + +REQUIRED_PKGS = CSWperl + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +ARCHALL = 1 + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man1 + cd $(WORKSRC) && perl install.me -batch \ + -binpath $(DESTDIR)$(bindir) \ + -manpath $(DESTDIR)$(mandir) \ + -perlpath $(bindir)/perl + ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + cd $(WORKSRC) && ginstall \ + README CHANGES \ + doc/man2html.ps doc/man2html.html doc/man2html.txt \ + $(DESTDIR)$(docdir)/$(GARNAME) + ginstall -d $(DESTDIR)$(sharedstatedir)/www/$(GARNAME)/cgi-bin + cd $(WORKSRC) && ginstall man.cgi \ + $(DESTDIR)$(sharedstatedir)/www/$(GARNAME)/cgi-bin + ginstall -d $(DESTDIR)/opt/csw/apache2/share/cgi-bin + gln -s ../../../share/www/$(GARNAME)/cgi-bin/man.cgi \ + $(DESTDIR)/opt/csw/apache2/share/cgi-bin/man.cgi + @$(MAKECOOKIE) Added: csw/mgar/pkg/man2html/trunk/checksums =================================================================== --- csw/mgar/pkg/man2html/trunk/checksums (rev 0) +++ csw/mgar/pkg/man2html/trunk/checksums 2009-12-18 13:21:05 UTC (rev 7663) @@ -0,0 +1 @@ +1c0d28c83225d0ebc845f2386c8f8384 man2html3.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 Fri Dec 18 14:35:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 18 Dec 2009 13:35:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7664] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 7664 http://gar.svn.sourceforge.net/gar/?rev=7664&view=rev Author: wahwah Date: 2009-12-18 13:35:20 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apache2: Hints for Rupert Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 13:21:05 UTC (rev 7663) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 13:35:20 UTC (rev 7664) @@ -10,6 +10,23 @@ best around in terms of functionality, efficiency, security and speed. endef +include files/config.mk + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# All the admfiles can go away. Move the static prototype files +# aside, replace them with PKGFILES_CSWfoo = regexp lines. + +# The PACKAGES variable tell GAR which packages to build +PACKAGES = CSWapache2 +PACKAGES += CSWapache2c +PACKAGES += CSWapache2rt +PACKAGES += CSWap2prefork +PACKAGES += CSWap2suexec +PACKAGES += CSWapache2-devel +PACKAGES += CSWapache2-manual + +# Descriptions for every package SPKG_DESC_CSWapache2 = Apache 2.2 web server SPKG_DESC_CSWapache2c = Apache 2.2 web server (core) SPKG_DESC_CSWapache2rt = Apache 2.2 runtime libraries @@ -18,31 +35,44 @@ SPKG_DESC_CSWapache2-devel = Apache 2.2 development support SPKG_DESC_CSWapache2-manual = Apache 2.2 manual -include files/config.mk +# Contents for every package. +# The CSWapache2 package is supposed to be an empty meta-package +PKGFILES_CSWapache2 = non-existing +# You don't define PKGFILES_CSWapache2c, it's going to be the default, +# catch-all package. +# PKGFILES_CSWapache2c = +# The runtime package might use the GAR shortcut for the runtime +# files. +PKGFILES_CSWapache2rt = $(PKGFILES_RT) +PKGFILES_CSWap2prefork = $(sbindir)/httpd.prefork +PKGFILES_CSWap2suexec = $(libexecdir)/mod_suexec.so +PKGFILES_CSWap2suexec += $(mandir)/man8/suexec.8 +PKGFILES_CSWap2suexec += $(sbindir)/suexec -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# The rest of PKGFILES is for you to do. You look at the rest of the +# prototype files and construct appropriate regexes for every package. -# All the admfiles can go away. Move the static prototype files -# aside, replace them with PKGFILES_CSWfoo = regexp lines. +# You don't need the $(call admfiles,...) any more. But you might +# need the files/*.prototype files to figure out how to populate packages by +# writing regexes. +## # Dummy toplevel package +## DISTFILES += $(call admfiles,CSWapache2,prototype) +## # Runtime +## DISTFILES += $(call admfiles,CSWapache2rt,prototype checkinstall) +## # Server (core) +## CSWapache2c_admfiles = prototype postinstall space +## DISTFILES += $(call admfiles,CSWapache2c,$(CSWapache2c_admfiles)) +## # Prefork MPM (default) +## CSWap2prefork_admfiles = prototype postinstall postremove space +## DISTFILES += $(call admfiles,CSWap2prefork,$(CSWap2prefork_admfiles)) +## # mod_suexec +## CSWap2suexec_admfiles = prototype postinstall preremove +## DISTFILES += $(call admfiles,CSWap2suexec,$(CSWap2suexec_admfiles)) +## # Manual +## DISTFILES += $(call admfiles,CSWapache2-manual,prototype) +## # Development support +## DISTFILES += $(call admfiles,CSWapache2-devel,prototype) -# Dummy toplevel package -DISTFILES += $(call admfiles,CSWapache2,prototype) -# Runtime -DISTFILES += $(call admfiles,CSWapache2rt,prototype checkinstall) -# Server (core) -CSWapache2c_admfiles = prototype postinstall space -DISTFILES += $(call admfiles,CSWapache2c,$(CSWapache2c_admfiles)) -# Prefork MPM (default) -CSWap2prefork_admfiles = prototype postinstall postremove space -DISTFILES += $(call admfiles,CSWap2prefork,$(CSWap2prefork_admfiles)) -# mod_suexec -CSWap2suexec_admfiles = prototype postinstall preremove -DISTFILES += $(call admfiles,CSWap2suexec,$(CSWap2suexec_admfiles)) -# Manual -DISTFILES += $(call admfiles,CSWapache2-manual,prototype) -# Development support -DISTFILES += $(call admfiles,CSWapache2-devel,prototype) - # Standard package bits DISTFILES += CSWapache2.killproc cswapache2 @@ -66,8 +96,14 @@ REQUIRED_PKGS_CSWapache2-devel = CSWapache2rt REQUIRED_PKGS_CSWapache2-manual = CSWapache2 -SPKG_CLASSES_CSWapache2c = none cswinitsmf +# The SMF support: you don't need to specify cswinitsmf any more. You need to +# make sure the the /etc/opt/csw/init.d/cswapache file gets installed during +# the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to +# the Makefile. +# The following line can go: +## SPKG_CLASSES_CSWapache2c = none cswinitsmf + pre-configure-modulated: (cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); \ ./buildconf) 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 Dec 18 14:58:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Dec 2009 13:58:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7665] csw/mgar/pkg/mtr/trunk Message-ID: Revision: 7665 http://gar.svn.sourceforge.net/gar/?rev=7665&view=rev Author: dmichelsen Date: 2009-12-18 13:58:32 +0000 (Fri, 18 Dec 2009) Log Message: ----------- mtr: Add prototype modifiers and merge wildcards Modified Paths: -------------- csw/mgar/pkg/mtr/trunk/Makefile csw/mgar/pkg/mtr/trunk/checksums Modified: csw/mgar/pkg/mtr/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtr/trunk/Makefile 2009-12-18 13:35:20 UTC (rev 7664) +++ csw/mgar/pkg/mtr/trunk/Makefile 2009-12-18 13:58:32 UTC (rev 7665) @@ -48,6 +48,7 @@ TEST_SCRIPTS = + CONFIGURE_ARGS = $(DIRPATHS) # ------------------ BEWARE: NASTY HACK AHEAD -------------------- @@ -60,38 +61,31 @@ EXTRA_MODULATORS = GUI MODULATIONS_GUI = disable enable -ifeq ($(GUI), disable) -CONFIGURE_ARGS += --without-gtk -endif -ifeq ($(GUI), enable) -CONFIGURE_ARGS += --disable-gtktest -EXTRA_PKG_CONFIG_PATH = /opt/csw/X11/lib/pkgconfig -endif +CONFIGURE_ARGS_GUI-disable = --without-gtk +CONFIGURE_ARGS_GUI-enable = --disable-gtktest +CONFIGURE_ARGS += $(CONFIGURE_ARGS_GUI-$(GUI)) + +EXTRA_PKG_CONFIG_PATH_GUI-enable = /opt/csw/X11/lib/pkgconfig +EXTRA_PKG_CONFIG_PATH += $(EXTRA_PKG_CONFIG_PATH_GUI-$(GUI)) + # Rename the modulated binaries so that we can distinguish them # Could also be done via ./configure --program-suffix, but the # install-exec-hook for mtr doesn't honor the transformed name # and fails. -EXTRA_PAX_ARGS_isa-sparcv8-gui-enable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-gui,p" -EXTRA_PAX_ARGS_isa-sparcv8-gui-disable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-nongui,p" -EXTRA_PAX_ARGS_isa-i386-gui-enable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-gui,p" -EXTRA_PAX_ARGS_isa-i386-gui-disable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-nongui,p" +EXTRA_PAX_ARGS_isa-default-gui-enable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-gui,p" +EXTRA_PAX_ARGS_isa-default-gui-disable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-nongui,p" # Simply copy all files, EXTRA_PAX_ARGS above takes care not to overwrite the # mtr binary on merging. -MERGE_SCRIPTS_isa-sparcv8-gui-enable = copy-all -MERGE_SCRIPTS_isa-sparcv8-gui-disable = copy-all -MERGE_SCRIPTS_isa-i386-gui-enable = copy-all -MERGE_SCRIPTS_isa-i386-gui-disable = copy-all +MERGE_SCRIPTS_isa-default-gui-enable = copy-all +MERGE_SCRIPTS_isa-default-gui-disable = copy-all -# 1) Move the GUI/non-GUI binaries to their proper location -# 2) Make mtr setuid so that it can access raw sockets -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /^\/opt\/csw\/sbin\/mtr-/ { \ - $$$$3 = "/opt/csw/sbin/mtr=" $$$$3; \ - $$$$4 = "4755"; \ - } { print }' +# Make mtr setuid so that it can access raw sockets +PROTOTYPE_MODIFIERS = makesuid +PROTOTYPE_FILES_makesuid = $(sbindir)/mtr-.* +PROTOTYPE_PERMS_makesuid = 4755 # ------------------ /BEWARE: NASTY HACK AHEAD -------------------- Modified: csw/mgar/pkg/mtr/trunk/checksums =================================================================== --- csw/mgar/pkg/mtr/trunk/checksums 2009-12-18 13:35:20 UTC (rev 7664) +++ csw/mgar/pkg/mtr/trunk/checksums 2009-12-18 13:58:32 UTC (rev 7665) @@ -1,2 +1,2 @@ -4a3e6fef662eb4794e61e334f6c33722 download/gar-base.diff -23baca52d0922c2ecba7eba05317868c download/mtr-0.75.tar.gz +4a3e6fef662eb4794e61e334f6c33722 gar-base.diff +23baca52d0922c2ecba7eba05317868c mtr-0.75.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 Dec 18 15:26:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Dec 2009 14:26:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7666] csw/mgar/pkg Message-ID: Revision: 7666 http://gar.svn.sourceforge.net/gar/?rev=7666&view=rev Author: dmichelsen Date: 2009-12-18 14:26:46 +0000 (Fri, 18 Dec 2009) Log Message: ----------- pulseaudio: Initial commit Added Paths: ----------- csw/mgar/pkg/pulseaudio/ csw/mgar/pkg/pulseaudio/branches/ csw/mgar/pkg/pulseaudio/tags/ csw/mgar/pkg/pulseaudio/trunk/ csw/mgar/pkg/pulseaudio/trunk/Makefile csw/mgar/pkg/pulseaudio/trunk/checksums csw/mgar/pkg/pulseaudio/trunk/files/ Property changes on: csw/mgar/pkg/pulseaudio/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/pulseaudio/trunk/Makefile =================================================================== --- csw/mgar/pkg/pulseaudio/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pulseaudio/trunk/Makefile 2009-12-18 14:26:46 UTC (rev 7666) @@ -0,0 +1,20 @@ +GARNAME = pulseaudio +GARVERSION = 0.9.21 +CATEGORIES = lib + +DESCRIPTION = PulseAudio is a sound server for POSIX systems +define BLURB +endef + +MASTER_SITES = http://0pointer.de/lennart/projects/pulseaudio/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://pulseaudio.org/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/pulseaudio/trunk/checksums =================================================================== --- csw/mgar/pkg/pulseaudio/trunk/checksums (rev 0) +++ csw/mgar/pkg/pulseaudio/trunk/checksums 2009-12-18 14:26:46 UTC (rev 7666) @@ -0,0 +1 @@ +76e623c4c72e2258bc8bdeb1599bad74 pulseaudio-0.9.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 15:45:50 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 14:45:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7667] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 7667 http://gar.svn.sourceforge.net/gar/?rev=7667&view=rev Author: rthurner Date: 2009-12-18 14:45:50 +0000 (Fri, 18 Dec 2009) Log Message: ----------- subversion: package names with - Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 14:26:46 UTC (rev 7666) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 14:45:50 UTC (rev 7667) @@ -25,6 +25,9 @@ PACKAGES += CSWap2suexec PACKAGES += CSWapache2-devel PACKAGES += CSWapache2-manual +# packages with dashes need this so gar does not thing -devel is a version number +CATALOGNAME_CSWapache2-devel = apache2_devel +CATALOGNAME_CSWapache2-manual = apache2_manual # Descriptions for every package SPKG_DESC_CSWapache2 = Apache 2.2 web server @@ -43,14 +46,18 @@ # PKGFILES_CSWapache2c = # The runtime package might use the GAR shortcut for the runtime # files. -PKGFILES_CSWapache2rt = $(PKGFILES_RT) -PKGFILES_CSWap2prefork = $(sbindir)/httpd.prefork -PKGFILES_CSWap2suexec = $(libexecdir)/mod_suexec.so -PKGFILES_CSWap2suexec += $(mandir)/man8/suexec.8 -PKGFILES_CSWap2suexec += $(sbindir)/suexec +PKGFILES_CSWapache2rt = $(PKGFILES_RT) +PKGFILES_CSWap2prefork = $(sbindir)/httpd.prefork +PKGFILES_CSWap2suexec = $(libexecdir)/mod_suexec.so +PKGFILES_CSWap2suexec += $(mandir)/man8/suexec.8 +PKGFILES_CSWap2suexec += $(sbindir)/suexec # The rest of PKGFILES is for you to do. You look at the rest of the # prototype files and construct appropriate regexes for every package. +# - this tseems not to work +# PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL) +# PKGFILES_CSWapache2-manual = $(PKGFILES_DOC) +# PKGFILES_CSWapache2-manual += $(prefix)/etc/extra/httpd-manual.conf # You don't need the $(call admfiles,...) any more. But you might # need the files/*.prototype files to figure out how to populate packages by @@ -82,18 +89,18 @@ DISTFILES += httpd-ssl.conf.CSW DISTFILES += update20to22 -REQUIRED_PKGS_CSWapache2 = CSWapache2c CSWap2prefork -REQUIRED_PKGS_CSWapache2c = CSWapache2rt CSWbdb CSWexpat CSWgdbm CSWiconv -REQUIRED_PKGS_CSWapache2c += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib -REQUIRED_PKGS_CSWapache2c += CSWsqlite3 CSWcswclassutils -REQUIRED_PKGS_CSWapache2rt = CSWbdb CSWexpat CSWgdbm CSWggettextrt CSWgsed -REQUIRED_PKGS_CSWapache2rt += CSWiconv CSWoldaprt CSWosslrt CSWperl CSWsasl -REQUIRED_PKGS_CSWapache2rt += CSWzlib CSWsqlite3 CSWlibnet CSWsqlite3rt -REQUIRED_PKGS_CSWap2prefork = CSWapache2c CSWapache2rt CSWbdb CSWexpat CSWgdbm -REQUIRED_PKGS_CSWap2prefork += CSWiconv CSWlibnet CSWoldaprt CSWosslrt CSWsasl -REQUIRED_PKGS_CSWap2prefork += CSWzlib CSWsqlite3 -REQUIRED_PKGS_CSWap2suexec = CSWapache2 -REQUIRED_PKGS_CSWapache2-devel = CSWapache2rt +REQUIRED_PKGS_CSWapache2 = CSWapache2c CSWap2prefork +REQUIRED_PKGS_CSWapache2c = CSWapache2rt CSWbdb CSWexpat CSWgdbm CSWiconv +REQUIRED_PKGS_CSWapache2c += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib +REQUIRED_PKGS_CSWapache2c += CSWsqlite3 CSWcswclassutils +REQUIRED_PKGS_CSWapache2rt = CSWbdb CSWexpat CSWgdbm CSWggettextrt CSWgsed +REQUIRED_PKGS_CSWapache2rt += CSWiconv CSWoldaprt CSWosslrt CSWperl CSWsasl +REQUIRED_PKGS_CSWapache2rt += CSWzlib CSWsqlite3 CSWlibnet CSWsqlite3rt +REQUIRED_PKGS_CSWap2prefork = CSWapache2c CSWapache2rt CSWbdb CSWexpat CSWgdbm +REQUIRED_PKGS_CSWap2prefork += CSWiconv CSWlibnet CSWoldaprt CSWosslrt CSWsasl +REQUIRED_PKGS_CSWap2prefork += CSWzlib CSWsqlite3 +REQUIRED_PKGS_CSWap2suexec = CSWapache2 +REQUIRED_PKGS_CSWapache2-devel = CSWapache2rt REQUIRED_PKGS_CSWapache2-manual = CSWapache2 # The SMF support: you don't need to specify cswinitsmf any more. You need to 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 Dec 18 15:53:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Dec 2009 14:53:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7668] csw/mgar/pkg Message-ID: Revision: 7668 http://gar.svn.sourceforge.net/gar/?rev=7668&view=rev Author: dmichelsen Date: 2009-12-18 14:52:58 +0000 (Fri, 18 Dec 2009) Log Message: ----------- mpg123: Initial commit Added Paths: ----------- csw/mgar/pkg/mpg123/ csw/mgar/pkg/mpg123/branches/ csw/mgar/pkg/mpg123/tags/ csw/mgar/pkg/mpg123/trunk/ csw/mgar/pkg/mpg123/trunk/Makefile csw/mgar/pkg/mpg123/trunk/checksums csw/mgar/pkg/mpg123/trunk/files/ Property changes on: csw/mgar/pkg/mpg123/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/mpg123/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg123/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mpg123/trunk/Makefile 2009-12-18 14:52:58 UTC (rev 7668) @@ -0,0 +1,35 @@ +GARNAME = mpg123 +GARVERSION = 1.10.0 +CATEGORIES = apps + +DESCRIPTION = A command-line MP3 player +define BLURB + This is a console based decoder/player for mono/stereo mpeg audio files, + probably more familiar as MP3 or MP2 files. It's focus is speed. + It can play MPEG1.0/2.0/2.5 layer I, II, II (1, 2, 3;-) files + (VBR files are fine, too) and produce output on a number of different ways: + raw data to stdout and different sound systems depending on your platform. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +REQUIRED_PKGS = CSWesound CSWlibsdl CSWlibtoolrt + +BUILD64 = 1 +NO_ISAEXEC = 1 +EXTRA_BUILD_ISAS = sparcv8plus+vis pentium +CONFIGURE_ARGS = $(DIRPATHS) + +# When we compile 64 bit largefiles are always on +CONFIGURE_ARGS_mm-64 += --disable-largefile +CONFIGURE_ARGS += $(CONFIGURE_ARGS_mm-$(MEMORYMODEL)) + +TEST_TARGET = check + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Added: csw/mgar/pkg/mpg123/trunk/checksums =================================================================== --- csw/mgar/pkg/mpg123/trunk/checksums (rev 0) +++ csw/mgar/pkg/mpg123/trunk/checksums 2009-12-18 14:52:58 UTC (rev 7668) @@ -0,0 +1 @@ +0005c9a89c381484e2d2ff450b3dfe5e mpg123-1.10.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Dec 18 17:20:00 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 18 Dec 2009 16:20:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7669] csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/ Message-ID: Revision: 7669 http://gar.svn.sourceforge.net/gar/?rev=7669&view=rev Author: wahwah Date: 2009-12-18 16:20:00 +0000 (Fri, 18 Dec 2009) Log Message: ----------- Tagging Ihsan's build of Apache 2. Added Paths: ----------- csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 17:28:54 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 16:28:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7670] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 7670 http://gar.svn.sourceforge.net/gar/?rev=7670&view=rev Author: rthurner Date: 2009-12-18 16:28:54 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apache2 - change to only one package, apache2, for the moment Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 16:20:00 UTC (rev 7669) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 16:28:54 UTC (rev 7670) @@ -4,7 +4,7 @@ GARVERSION = 2.2.14 CATEGORIES = server -DESCRIPTION = A high performance Unix-based HTTP server. +DESCRIPTION = A high performance HTTP server. define BLURB Apache is the world\'s most popular HTTP server, being quite possibly the best around in terms of functionality, efficiency, security and speed. @@ -14,72 +14,19 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# All the admfiles can go away. Move the static prototype files -# aside, replace them with PKGFILES_CSWfoo = regexp lines. - -# The PACKAGES variable tell GAR which packages to build +# The PACKAGES variable tell GAR which packages to build PACKAGES = CSWapache2 -PACKAGES += CSWapache2c -PACKAGES += CSWapache2rt -PACKAGES += CSWap2prefork -PACKAGES += CSWap2suexec -PACKAGES += CSWapache2-devel -PACKAGES += CSWapache2-manual # packages with dashes need this so gar does not thing -devel is a version number -CATALOGNAME_CSWapache2-devel = apache2_devel -CATALOGNAME_CSWapache2-manual = apache2_manual +# CATALOGNAME_CSWapache2-devel = apache2_devel # Descriptions for every package -SPKG_DESC_CSWapache2 = Apache 2.2 web server -SPKG_DESC_CSWapache2c = Apache 2.2 web server (core) -SPKG_DESC_CSWapache2rt = Apache 2.2 runtime libraries -SPKG_DESC_CSWap2prefork = Apache 2.2 prefork MPM -SPKG_DESC_CSWap2suexec = Apache 2.2 suEXEC support -SPKG_DESC_CSWapache2-devel = Apache 2.2 development support -SPKG_DESC_CSWapache2-manual = Apache 2.2 manual +# SPKG_DESC_CSWapache2 = $(DESCRIPTION) # Contents for every package. -# The CSWapache2 package is supposed to be an empty meta-package -PKGFILES_CSWapache2 = non-existing -# You don't define PKGFILES_CSWapache2c, it's going to be the default, +# You don't define PKGFILES_CSWapache2, it's going to be the default, # catch-all package. -# PKGFILES_CSWapache2c = -# The runtime package might use the GAR shortcut for the runtime -# files. -PKGFILES_CSWapache2rt = $(PKGFILES_RT) -PKGFILES_CSWap2prefork = $(sbindir)/httpd.prefork -PKGFILES_CSWap2suexec = $(libexecdir)/mod_suexec.so -PKGFILES_CSWap2suexec += $(mandir)/man8/suexec.8 -PKGFILES_CSWap2suexec += $(sbindir)/suexec +# PKGFILES_CSWapache2 = -# The rest of PKGFILES is for you to do. You look at the rest of the -# prototype files and construct appropriate regexes for every package. -# - this tseems not to work -# PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL) -# PKGFILES_CSWapache2-manual = $(PKGFILES_DOC) -# PKGFILES_CSWapache2-manual += $(prefix)/etc/extra/httpd-manual.conf - -# You don't need the $(call admfiles,...) any more. But you might -# need the files/*.prototype files to figure out how to populate packages by -# writing regexes. -## # Dummy toplevel package -## DISTFILES += $(call admfiles,CSWapache2,prototype) -## # Runtime -## DISTFILES += $(call admfiles,CSWapache2rt,prototype checkinstall) -## # Server (core) -## CSWapache2c_admfiles = prototype postinstall space -## DISTFILES += $(call admfiles,CSWapache2c,$(CSWapache2c_admfiles)) -## # Prefork MPM (default) -## CSWap2prefork_admfiles = prototype postinstall postremove space -## DISTFILES += $(call admfiles,CSWap2prefork,$(CSWap2prefork_admfiles)) -## # mod_suexec -## CSWap2suexec_admfiles = prototype postinstall preremove -## DISTFILES += $(call admfiles,CSWap2suexec,$(CSWap2suexec_admfiles)) -## # Manual -## DISTFILES += $(call admfiles,CSWapache2-manual,prototype) -## # Development support -## DISTFILES += $(call admfiles,CSWapache2-devel,prototype) - # Standard package bits DISTFILES += CSWapache2.killproc cswapache2 @@ -89,31 +36,19 @@ DISTFILES += httpd-ssl.conf.CSW DISTFILES += update20to22 -REQUIRED_PKGS_CSWapache2 = CSWapache2c CSWap2prefork -REQUIRED_PKGS_CSWapache2c = CSWapache2rt CSWbdb CSWexpat CSWgdbm CSWiconv -REQUIRED_PKGS_CSWapache2c += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib -REQUIRED_PKGS_CSWapache2c += CSWsqlite3 CSWcswclassutils -REQUIRED_PKGS_CSWapache2rt = CSWbdb CSWexpat CSWgdbm CSWggettextrt CSWgsed -REQUIRED_PKGS_CSWapache2rt += CSWiconv CSWoldaprt CSWosslrt CSWperl CSWsasl -REQUIRED_PKGS_CSWapache2rt += CSWzlib CSWsqlite3 CSWlibnet CSWsqlite3rt -REQUIRED_PKGS_CSWap2prefork = CSWapache2c CSWapache2rt CSWbdb CSWexpat CSWgdbm -REQUIRED_PKGS_CSWap2prefork += CSWiconv CSWlibnet CSWoldaprt CSWosslrt CSWsasl -REQUIRED_PKGS_CSWap2prefork += CSWzlib CSWsqlite3 -REQUIRED_PKGS_CSWap2suexec = CSWapache2 -REQUIRED_PKGS_CSWapache2-devel = CSWapache2rt -REQUIRED_PKGS_CSWapache2-manual = CSWapache2 +REQUIRED_PKGS_CSWapache2 = CSWbdb CSWexpat CSWgdbm CSWiconv +REQUIRED_PKGS_CSWapache2 += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib +REQUIRED_PKGS_CSWapache2 += CSWsqlite3rt CSWsqlite3 CSWcswclassutils +REQUIRED_PKGS_CSWapache2 += CSWggettextrt CSWgsed +REQUIRED_PKGS_CSWapache2 += CSWperl # The SMF support: you don't need to specify cswinitsmf any more. You need to # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during # the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to # the Makefile. -# The following line can go: -## SPKG_CLASSES_CSWapache2c = none cswinitsmf - pre-configure-modulated: - (cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); \ - ./buildconf) + (cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf) # Build Configuration CONFIGURE_ARGS += --with-mpm=prefork Copied: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall (from rev 7664, csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall) =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2009-12-18 16:28:54 UTC (rev 7670) @@ -0,0 +1,75 @@ +#!/bin/sh + +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +AP2_PREFIX=$CSW_PREFIX/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_EXTRADIR=$AP2_CONFDIR/extra + +UPGRADE_CONFIGS="\ + httpd.conf \ + ssl.conf \ + extra/httpd-ssl.conf \ + extra/httpd-mpm.conf \ + " +# Don't overwrite config if it exists +warn_update=0 +echo "Checking configuration files:" +for file in $UPGRADE_CONFIGS; do + config=$AP2_CONFDIR/$file + if [ -f "$config" ]; then + if [ -n "`grep mod_auth.so $config`" ]; then + echo "Updating syntax of $config to Apache 2.2" + $AP2_BINDIR/update20to22 $config + warn_update=1 + fi + # Ensure that the PidFile is pointed at ServerRoot relative path. + perl -i -plne 's#PidFile /var#PidFile var#' + elif [ -f "$config.CSW" ]; then + echo "Creating $config from template" + hostname=`hostname` + sed -e s, at HOSTNAME@,$hostname,g \ + -e s, at USER@,nobody,g \ + -e s, at GROUP@,nobody,g \ + -e s, at ADMIN@,root@$hostname,g $config.CSW > $config + fi +done + +if [ $warn_update -eq 1 ] ; then +cat << EOF + +*** NOTICE: Existing configuration files have been updated to +*** Apache 2.2 syntax. Additional files can be updated using +*** /opt/csw/apache2/sbin/update20to22. + +EOF +fi + +# Copy templates +template_list="\ + share/htdocs/index.html \ + etc/extra/httpd-autoindex.conf \ + etc/extra/httpd-dav.conf \ + etc/extra/httpd-default.conf \ + etc/extra/httpd-info.conf \ + etc/extra/httpd-languages.conf \ + etc/extra/httpd-multilang-errordoc.conf \ + etc/extra/httpd-userdir.conf \ + etc/extra/httpd-vhosts.conf \ + etc/magic \ + etc/mime.types" + +echo Copying CSW templates: +for file in $template_list +do + filepath=$AP2_PREFIX/$file + if [ -f "$filepath" ]; then + echo " preserving $filepath" + elif [ -f "$filepath.CSW" ]; then + echo " creating $filepath" + cp $filepath.CSW $filepath + fi +done + +exit 0 Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall 2009-12-18 16:20:00 UTC (rev 7669) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall 2009-12-18 16:28:54 UTC (rev 7670) @@ -1,75 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -AP2_PREFIX=$CSW_PREFIX/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_LIBEXEC=$AP2_PREFIX/libexec -AP2_CONFDIR=$AP2_PREFIX/etc -AP2_EXTRADIR=$AP2_CONFDIR/extra - -UPGRADE_CONFIGS="\ - httpd.conf \ - ssl.conf \ - extra/httpd-ssl.conf \ - extra/httpd-mpm.conf \ - " -# Don't overwrite config if it exists -warn_update=0 -echo "Checking configuration files:" -for file in $UPGRADE_CONFIGS; do - config=$AP2_CONFDIR/$file - if [ -f "$config" ]; then - if [ -n "`grep mod_auth.so $config`" ]; then - echo "Updating syntax of $config to Apache 2.2" - $AP2_BINDIR/update20to22 $config - warn_update=1 - fi - # Ensure that the PidFile is pointed at ServerRoot relative path. - perl -i -plne 's#PidFile /var#PidFile var#' - elif [ -f "$config.CSW" ]; then - echo "Creating $config from template" - hostname=`hostname` - sed -e s, at HOSTNAME@,$hostname,g \ - -e s, at USER@,nobody,g \ - -e s, at GROUP@,nobody,g \ - -e s, at ADMIN@,root@$hostname,g $config.CSW > $config - fi -done - -if [ $warn_update -eq 1 ] ; then -cat << EOF - -*** NOTICE: Existing configuration files have been updated to -*** Apache 2.2 syntax. Additional files can be updated using -*** /opt/csw/apache2/sbin/update20to22. - -EOF -fi - -# Copy templates -template_list="\ - share/htdocs/index.html \ - etc/extra/httpd-autoindex.conf \ - etc/extra/httpd-dav.conf \ - etc/extra/httpd-default.conf \ - etc/extra/httpd-info.conf \ - etc/extra/httpd-languages.conf \ - etc/extra/httpd-multilang-errordoc.conf \ - etc/extra/httpd-userdir.conf \ - etc/extra/httpd-vhosts.conf \ - etc/magic \ - etc/mime.types" - -echo Copying CSW templates: -for file in $template_list -do - filepath=$AP2_PREFIX/$file - if [ -f "$filepath" ]; then - echo " preserving $filepath" - elif [ -f "$filepath.CSW" ]; then - echo " creating $filepath" - cp $filepath.CSW $filepath - fi -done - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 17:30:31 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 16:30:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7671] csw/mgar/pkg/apache2/trunk/files Message-ID: Revision: 7671 http://gar.svn.sourceforge.net/gar/?rev=7671&view=rev Author: rthurner Date: 2009-12-18 16:30:31 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apache2 - remove gspec files for former packages, these should be anyway in Makefile now. Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.gspec csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,7 +0,0 @@ -%var bitname ap2_prefork -%var pkgname CSWap2prefork -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache 2.2 prefork MPM -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE -%preinstall url file://%{WORKDIR}/CSWapache2.killproc -%preremove url file://%{WORKDIR}/CSWapache2.killproc Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,5 +0,0 @@ -%var bitname ap2_suexec -%var pkgname CSWap2suexec -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache 2.2 suEXEC support -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,4 +0,0 @@ -%var bitname apache2_devel -%var pkgname CSWapache2-devel -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,5 +0,0 @@ -%var bitname apache2_manual -%var pkgname CSWapache2-manual -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,5 +0,0 @@ -%var bitname apache2 -%var pkgname CSWapache2 -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,4 +0,0 @@ -%var bitname apache2c -%var pkgname CSWapache2c -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,4 +0,0 @@ -%var bitname apache2rt -%var pkgname CSWapache2rt -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE 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 Dec 19 00:41:32 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 23:41:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7672] csw/mgar/pkg/trac/trunk/Makefile Message-ID: Revision: 7672 http://gar.svn.sourceforge.net/gar/?rev=7672&view=rev Author: rthurner Date: 2009-12-18 23:41:32 +0000 (Fri, 18 Dec 2009) Log Message: ----------- trac - newly depend on CSWpythonsvn Modified Paths: -------------- csw/mgar/pkg/trac/trunk/Makefile Modified: csw/mgar/pkg/trac/trunk/Makefile =================================================================== --- csw/mgar/pkg/trac/trunk/Makefile 2009-12-18 16:30:31 UTC (rev 7671) +++ csw/mgar/pkg/trac/trunk/Makefile 2009-12-18 23:41:32 UTC (rev 7672) @@ -15,7 +15,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWtrac -REQUIRED_PKGS_CSWtrac = CSWpysetuptools CSWpysvn CSWgenshi +REQUIRED_PKGS_CSWtrac = CSWpysetuptools CSWpythonsvn CSWgenshi REQUIRED_PKGS_CSWtrac += CSWpython CSWpython-devel CATALOGNAME_CSWtrac = trac 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 Dec 19 01:05:13 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 19 Dec 2009 00:05:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7673] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 7673 http://gar.svn.sourceforge.net/gar/?rev=7673&view=rev Author: rthurner Date: 2009-12-19 00:05:11 +0000 (Sat, 19 Dec 2009) Log Message: ----------- python - remove www from urls Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-18 23:41:32 UTC (rev 7672) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-19 00:05:11 UTC (rev 7673) @@ -8,7 +8,7 @@ # - ctypes module doesn't compile # - http://forums.sun.com/thread.jspa?threadID=5148204 -SPKG_SOURCEURL = http://www.python.org/download/releases/$(GARVERSION) +SPKG_SOURCEURL = http://python.org/download/releases/$(GARVERSION) SPKG_CLASSES = none cswpycompile DESCRIPTION = A high-level scripting language. @@ -22,8 +22,8 @@ an extension language for applications that need a programmable interface. endef -MASTER_SITES = http://www.python.org/ftp/python/$(GARVERSION)/ -UPSTREAM_MASTER_SITES = http://www.python.org/ftp/python/ +MASTER_SITES = http://python.org/ftp/python/$(GARVERSION)/ +UPSTREAM_MASTER_SITES = http://python.org/ftp/python/ DISTFILES = $(DISTNAME).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Dec 19 20:53:17 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 19 Dec 2009 19:53:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7674] csw/mgar/pkg/trac/trunk/Makefile Message-ID: Revision: 7674 http://gar.svn.sourceforge.net/gar/?rev=7674&view=rev Author: rthurner Date: 2009-12-19 19:53:17 +0000 (Sat, 19 Dec 2009) Log Message: ----------- trac - remove cswclassutils as it gives a 'duplicate dependendy error', and also some whitespace changes Modified Paths: -------------- csw/mgar/pkg/trac/trunk/Makefile Modified: csw/mgar/pkg/trac/trunk/Makefile =================================================================== --- csw/mgar/pkg/trac/trunk/Makefile 2009-12-19 00:05:11 UTC (rev 7673) +++ csw/mgar/pkg/trac/trunk/Makefile 2009-12-19 19:53:17 UTC (rev 7674) @@ -15,27 +15,26 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWtrac -REQUIRED_PKGS_CSWtrac = CSWpysetuptools CSWpythonsvn CSWgenshi -REQUIRED_PKGS_CSWtrac += CSWpython CSWpython-devel +REQUIRED_PKGS_CSWtrac = CSWpysetuptools CSWpythonsvn CSWgenshi +REQUIRED_PKGS_CSWtrac += CSWpython -CATALOGNAME_CSWtrac = trac -SPKG_DESC_CSWtrac = Integrated SCM and Project Management +CATALOGNAME_CSWtrac = trac +SPKG_DESC_CSWtrac = Integrated SCM and Project Management # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://trac.edgewall.org/wiki/TracDownload +SPKG_SOURCEURL = http://trac.edgewall.org/wiki/TracDownload +SPKG_CLASSES = none cswpycompile EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -REQUIRED_PKGS += CSWcswclassutils -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py -TEST_SCRIPTS = -INSTALL_SCRIPTS = $(WORKSRC)/setup.py -INSTALL_ARGS = --root=$(DESTDIR) +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = $(WORKSRC)/setup.py +TEST_SCRIPTS = +INSTALL_SCRIPTS = $(WORKSRC)/setup.py +INSTALL_ARGS = --root=$(DESTDIR) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Dec 20 00:45:44 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 19 Dec 2009 23:45:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7675] csw/mgar/pkg/exiftool/trunk Message-ID: Revision: 7675 http://gar.svn.sourceforge.net/gar/?rev=7675&view=rev Author: hson Date: 2009-12-19 23:45:44 +0000 (Sat, 19 Dec 2009) Log Message: ----------- exiftool: Update to 8.0.2 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile csw/mgar/pkg/exiftool/trunk/checksums Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-12-19 19:53:17 UTC (rev 7674) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-12-19 23:45:44 UTC (rev 7675) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 8.00 +GARVERSION = 8.02 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information @@ -13,9 +13,8 @@ MASTER_SITES = http://owl.phy.queensu.ca/~phil/exiftool/ MODDIST = DISTFILES = $(DISTNAME).tar.gz -DISTFILES += COPYING -REQUIRED_PKGS = CSWpmiocompress +REQUIRED_PKGS += CSWpmiocompress # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = Image-ExifTool-(\d+(?:\.\d+)*).tar.gz @@ -26,6 +25,4 @@ CONFIGURE_ARGS = $(DIRPATHS) -ARCHALL = 1 - include gar/category.mk Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2009-12-19 19:53:17 UTC (rev 7674) +++ csw/mgar/pkg/exiftool/trunk/checksums 2009-12-19 23:45:44 UTC (rev 7675) @@ -1,2 +1,2 @@ -13f9aae615a5de5e3c145b374950a75c COPYING -525f52712c2ab21c467ade83ceb567b8 Image-ExifTool-8.00.tar.gz +13f9aae615a5de5e3c145b374950a75c CSWexiftool.gspec +fac7cef8a5e618ce84d090320403583c Image-ExifTool-8.02.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Dec 20 01:26:24 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 20 Dec 2009 00:26:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7676] csw/mgar/pkg/libiptcdata/trunk Message-ID: Revision: 7676 http://gar.svn.sourceforge.net/gar/?rev=7676&view=rev Author: hson Date: 2009-12-20 00:26:24 +0000 (Sun, 20 Dec 2009) Log Message: ----------- libiptcdata: Update to 1.0.4 Modified Paths: -------------- csw/mgar/pkg/libiptcdata/trunk/Makefile csw/mgar/pkg/libiptcdata/trunk/checksums Modified: csw/mgar/pkg/libiptcdata/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiptcdata/trunk/Makefile 2009-12-19 23:45:44 UTC (rev 7675) +++ csw/mgar/pkg/libiptcdata/trunk/Makefile 2009-12-20 00:26:24 UTC (rev 7676) @@ -1,5 +1,5 @@ GARNAME = libiptcdata -GARVERSION = 1.0.2 +GARVERSION = 1.0.4 CATEGORIES = lib DESCRIPTION = IPTC Tag Parsing Library @@ -10,7 +10,7 @@ viewing, modifying, and saving this metadata. endef -MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES += $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz SPKG_SOURCEURL = http://libiptcdata.sourceforge.net @@ -22,14 +22,14 @@ # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=130582 UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = # Patch submitted to upstream, pending new release -PATCHFILES = iptc-dataset.patch +#PATCHFILES = iptc-dataset.patch CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libiptcdata/trunk/checksums =================================================================== --- csw/mgar/pkg/libiptcdata/trunk/checksums 2009-12-19 23:45:44 UTC (rev 7675) +++ csw/mgar/pkg/libiptcdata/trunk/checksums 2009-12-20 00:26:24 UTC (rev 7676) @@ -1,3 +1 @@ -4ed81889846a5d9b750331f684651f89 download/libiptcdata-1.0.2.tar.gz -bf0eb61461a91469296b988fccbd8b07 download/CSWlibiptcdata.gspec -741fbca6ca1072a2b3a2a36eff702435 download/iptc-dataset.patch +af886556ecb129b694f2d365d03d95a8 libiptcdata-1.0.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 Sun Dec 20 10:32:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 20 Dec 2009 09:32:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7677] csw/mgar/pkg/help2man Message-ID: Revision: 7677 http://gar.svn.sourceforge.net/gar/?rev=7677&view=rev Author: dmichelsen Date: 2009-12-20 09:32:25 +0000 (Sun, 20 Dec 2009) Log Message: ----------- help2man: Tag old release and update to 1.37.1 Modified Paths: -------------- csw/mgar/pkg/help2man/trunk/Makefile csw/mgar/pkg/help2man/trunk/checksums Added Paths: ----------- csw/mgar/pkg/help2man/tags/help2man-1.36.4,REV=2008.09.18/ Removed Paths: ------------- csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.depend csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.gspec Property Changed: ---------------- csw/mgar/pkg/help2man/trunk/ Property changes on: csw/mgar/pkg/help2man/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/help2man/trunk/Makefile =================================================================== --- csw/mgar/pkg/help2man/trunk/Makefile 2009-12-20 00:26:24 UTC (rev 7676) +++ csw/mgar/pkg/help2man/trunk/Makefile 2009-12-20 09:32:25 UTC (rev 7677) @@ -1,5 +1,5 @@ GARNAME = help2man -GARVERSION = 1.36.4 +GARVERSION = 1.37.1 CATEGORIES = devel DESCRIPTION = A tool for automatically generating simple manual pages from program output @@ -11,11 +11,11 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWhelp2man,depend) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWpmlocalegettext +REQUIRED_PKGS = CSWpmlocalegettext +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CONFIGURE_ARGS = $(DIRPATHS) # We need to disable NLS as we don't have preloadable_libintl.so @@ -24,8 +24,6 @@ TEST_SCRIPTS = -include gar/category.mk +ARCHALL = 1 -post-install: - @echo " ==> Fixing install anomalies" - @rm -f $(DESTDIR)$(prefix)/share/info/dir +include gar/category.mk Modified: csw/mgar/pkg/help2man/trunk/checksums =================================================================== --- csw/mgar/pkg/help2man/trunk/checksums 2009-12-20 00:26:24 UTC (rev 7676) +++ csw/mgar/pkg/help2man/trunk/checksums 2009-12-20 09:32:25 UTC (rev 7677) @@ -1,3 +1 @@ -d31a0a38c2ec71faa06723f6b8bd3076 download/help2man-1.36.4.tar.gz -484faf002d8e710353bcbbcd74b72d94 download/CSWhelp2man.gspec -45b2b2cac12e100249501f8a017e6da8 download/CSWhelp2man.depend +371b5cc74fe9c2ea3ee1ca23c19b19a8 help2man-1.37.1.tar.gz Deleted: csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.depend =================================================================== --- csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.depend 2009-12-20 00:26:24 UTC (rev 7676) +++ csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.depend 2009-12-20 09:32:25 UTC (rev 7677) @@ -1,2 +0,0 @@ -P CSWperl perl - A high-level, general-purpose programming language. -P CSWpmlocalegettext pm_localegettext - Message handling functions Deleted: csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.gspec =================================================================== --- csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.gspec 2009-12-20 00:26:24 UTC (rev 7676) +++ csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.gspec 2009-12-20 09:32:25 UTC (rev 7677) @@ -1,5 +0,0 @@ -%var bitname help2man -%var pkgname CSWhelp2man -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Dec 20 11:55:28 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 20 Dec 2009 10:55:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7678] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 7678 http://gar.svn.sourceforge.net/gar/?rev=7678&view=rev Author: hson Date: 2009-12-20 10:55:28 +0000 (Sun, 20 Dec 2009) Log Message: ----------- imagemagick: Update to 6.5.8-6 Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-12-20 09:32:25 UTC (rev 7677) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-12-20 10:55:28 UTC (rev 7678) @@ -1,6 +1,6 @@ GARNAME = imagemagick -GARVERSION = 6.5.4 -GARSUBREV = 1 +GARVERSION = 6.5.8 +GARSUBREV = 6 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -24,7 +24,7 @@ REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit REQUIRED_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2 REQUIRED_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib -REQUIRED_PKGS += CSWlibtoolrt +REQUIRED_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2009-12-20 09:32:25 UTC (rev 7677) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2009-12-20 10:55:28 UTC (rev 7678) @@ -1,2 +1,2 @@ -fd1641acb602bda064467d277dab590d download/ImageMagick-6.5.4-1.tar.bz2 -6bd361fe352c7d497d60d8d2cbe7cfd4 download/Makefile.patch +7ba3d32af33d716cc0fedb4d4a9e359f ImageMagick-6.5.8-6.tar.bz2 +6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Dec 20 12:49:51 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 20 Dec 2009 11:49:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7679] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 7679 http://gar.svn.sourceforge.net/gar/?rev=7679&view=rev Author: hson Date: 2009-12-20 11:49:51 +0000 (Sun, 20 Dec 2009) Log Message: ----------- librsvg: Added /opt/csw/X11/lib to EXTRA_LD_OPTIONS Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2009-12-20 10:55:28 UTC (rev 7678) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2009-12-20 11:49:51 UTC (rev 7679) @@ -47,6 +47,8 @@ EXTRA_COMMON_EXPORTS = LIBS CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared=yes --enable-static=no +EXTRA_LD_OPTIONS = -R/opt/csw/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib STRIP_LIBTOOL=1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 15:32:45 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 14:32:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7680] csw/mgar/pkg Message-ID: Revision: 7680 http://gar.svn.sourceforge.net/gar/?rev=7680&view=rev Author: rthurner Date: 2009-12-20 14:32:44 +0000 (Sun, 20 Dec 2009) Log Message: ----------- libtorrent - initial checkin - build fails, would need to be gnu? Added Paths: ----------- csw/mgar/pkg/libtorrent/ csw/mgar/pkg/libtorrent/branches/ csw/mgar/pkg/libtorrent/tags/ csw/mgar/pkg/libtorrent/trunk/ csw/mgar/pkg/libtorrent/trunk/Makefile csw/mgar/pkg/libtorrent/trunk/checksums csw/mgar/pkg/libtorrent/trunk/files/ Property changes on: csw/mgar/pkg/libtorrent/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/libtorrent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtorrent/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/Makefile 2009-12-20 14:32:44 UTC (rev 7680) @@ -0,0 +1,25 @@ +GARNAME = libtorrent +GARVERSION = 0.12.6 +CATEGORIES = lib + +DESCRIPTION = BitTorrent library written in C++ for *nix. +define BLURB + BitTorrent library written in C++ for *nix, with a focus on high performance and good code. + The library differentiates itself from other implementations by transfering directly from + file pages to the network stack. On high-bandwidth connections it is able to seed at 3 times + the speed of the official client. +endef + +MASTER_SITES = http://libtorrent.rakshasa.no/downloads/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 Added: csw/mgar/pkg/libtorrent/trunk/checksums =================================================================== --- csw/mgar/pkg/libtorrent/trunk/checksums (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/checksums 2009-12-20 14:32:44 UTC (rev 7680) @@ -0,0 +1 @@ +037499ed708aaf72988cee60e5a8d96b libtorrent-0.12.6.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 Sun Dec 20 15:35:08 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Dec 2009 14:35:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7681] csw/mgar/pkg/mysql5/trunk Message-ID: Revision: 7681 http://gar.svn.sourceforge.net/gar/?rev=7681&view=rev Author: wahwah Date: 2009-12-20 14:35:08 +0000 (Sun, 20 Dec 2009) Log Message: ----------- mysql5: Work around a problem with the libtool version mismatch. Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile csw/mgar/pkg/mysql5/trunk/checksums Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-20 14:32:44 UTC (rev 7680) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-20 14:35:08 UTC (rev 7681) @@ -162,6 +162,10 @@ include gar/category.mk +pre-configure-modulated: + # To work around the libtool version mismatch problem. + cd $(WORKSRC) && autoreconf --force --install --symlink + post-install-modulated: ginstall -m 755 -d $(DESTDIR)$(localstatedir) ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc Modified: csw/mgar/pkg/mysql5/trunk/checksums =================================================================== --- csw/mgar/pkg/mysql5/trunk/checksums 2009-12-20 14:32:44 UTC (rev 7680) +++ csw/mgar/pkg/mysql5/trunk/checksums 2009-12-20 14:35:08 UTC (rev 7681) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -747637bc4be42207974ae845d832ae65 CSWmysql5.postinstall -60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall +558bd157ae37f9d109c6ad02a8f5b049 CSWmysql5.postinstall +a02c82ada9e610d6c6375856161575ec CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW -aaca748fc044834e71ad544ab293c494 cswmysql5 +45f5ca05ed0c61f21951bd2a7122c036 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup 32e7373c16271606007374396e6742ad mysql-5.1.40.tar.gz -90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw +60bc6bed72839668ef6496fd31a01ad3 quick_start-csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Dec 20 15:36:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Dec 2009 14:36:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7682] csw/mgar/pkg/nss/trunk/Makefile Message-ID: Revision: 7682 http://gar.svn.sourceforge.net/gar/?rev=7682&view=rev Author: wahwah Date: 2009-12-20 14:36:40 +0000 (Sun, 20 Dec 2009) Log Message: ----------- nss: Adding options for the optimized build Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-12-20 14:35:08 UTC (rev 7681) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-12-20 14:36:40 UTC (rev 7682) @@ -64,6 +64,7 @@ ifneq (DBG,$(GARFLAVOR)) BUILD_OPT = 1 export BUILD_OPT + CONFIGURE_ARGS += --disable-debug --enable-optimize endif # NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig 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 Dec 20 15:51:01 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Dec 2009 14:51:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7683] csw/mgar/pkg/googletest/trunk/Makefile Message-ID: Revision: 7683 http://gar.svn.sourceforge.net/gar/?rev=7683&view=rev Author: wahwah Date: 2009-12-20 14:51:01 +0000 (Sun, 20 Dec 2009) Log Message: ----------- googletest: Enable tests, they fail. Modified Paths: -------------- csw/mgar/pkg/googletest/trunk/Makefile Modified: csw/mgar/pkg/googletest/trunk/Makefile =================================================================== --- csw/mgar/pkg/googletest/trunk/Makefile 2009-12-20 14:36:40 UTC (rev 7682) +++ csw/mgar/pkg/googletest/trunk/Makefile 2009-12-20 14:51:01 UTC (rev 7683) @@ -20,4 +20,10 @@ WORKSRC = $(WORKDIR)/gtest-$(GARVERSION) UFILES_REGEX = gtest-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = googletest +TEST_TARGETS = check include gar/category.mk + +test-googletest: + (cd $(WORKSRC) && gmake check) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 16:40:36 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 15:40:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7684] csw/mgar/pkg Message-ID: Revision: 7684 http://gar.svn.sourceforge.net/gar/?rev=7684&view=rev Author: rthurner Date: 2009-12-20 15:40:36 +0000 (Sun, 20 Dec 2009) Log Message: ----------- rtorrent - first try, but libtorrent does not compile yet Added Paths: ----------- csw/mgar/pkg/rtorrent/ csw/mgar/pkg/rtorrent/branches/ csw/mgar/pkg/rtorrent/tags/ csw/mgar/pkg/rtorrent/trunk/ csw/mgar/pkg/rtorrent/trunk/Makefile csw/mgar/pkg/rtorrent/trunk/checksums csw/mgar/pkg/rtorrent/trunk/files/ Property changes on: csw/mgar/pkg/rtorrent/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/rtorrent/trunk/Makefile =================================================================== --- csw/mgar/pkg/rtorrent/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/Makefile 2009-12-20 15:40:36 UTC (rev 7684) @@ -0,0 +1,27 @@ +GARNAME = rtorrent +GARVERSION = 0.8.6 +CATEGORIES = apps + +DESCRIPTION = BitTorrent client. +define BLURB + BitTorrent library written in C++ for *nix, with a focus on high performance and good code. + The library differentiates itself from other implementations by transfering directly from + file pages to the network stack. On high-bandwidth connections it is able to seed at 3 times + the speed of the official client. +endef + +MASTER_SITES = http://libtorrent.rakshasa.no/downloads/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +REQUIRED_PKGS = CSWlibtorrent + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/rtorrent/trunk/checksums =================================================================== --- csw/mgar/pkg/rtorrent/trunk/checksums (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/checksums 2009-12-20 15:40:36 UTC (rev 7684) @@ -0,0 +1 @@ +b804c45c01c40312926bcea6b55bb084 rtorrent-0.8.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 19:51:06 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 18:51:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7685] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 7685 http://gar.svn.sourceforge.net/gar/?rev=7685&view=rev Author: rthurner Date: 2009-12-20 18:51:06 +0000 (Sun, 20 Dec 2009) Log Message: ----------- change sysconfig dir Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 15:40:36 UTC (rev 7684) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 18:51:06 UTC (rev 7685) @@ -78,6 +78,7 @@ # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html PATCHFILES += javahl_headers_for_nested_classes.diff PATCHFILES += subversion161.diff +PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch DEPENDS = server/apache2 DEPENDS = lib/neon Added: csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch =================================================================== --- csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch (rev 0) +++ csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch 2009-12-20 18:51:06 UTC (rev 7685) @@ -0,0 +1,25 @@ +From e522142a1517f9c9ffdd670eb2fd0aa974a9a9a1 Mon Sep 17 00:00:00 2001 +From: Rupert Thurner +Date: Sun, 20 Dec 2009 12:33:52 -0600 +Subject: [PATCH] make subversion sysconfigdir as it should be for csw + +--- + subversion/libsvn_subr/config_impl.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/subversion/libsvn_subr/config_impl.h b/subversion/libsvn_subr/config_impl.h +index b5c9d4b..67d46aa 100644 +--- a/subversion/libsvn_subr/config_impl.h ++++ b/subversion/libsvn_subr/config_impl.h +@@ -110,7 +110,7 @@ svn_error_t *svn_config__parse_registry(svn_config_t *cfg, + #ifdef WIN32 + # define SVN_CONFIG__SUBDIRECTORY "Subversion" + #else /* ! WIN32 */ +-# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" ++# define SVN_CONFIG__SYS_DIRECTORY "/etc/opt/csw/subversion" + # define SVN_CONFIG__USR_DIRECTORY ".subversion" + #endif /* WIN32 */ + +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 19:52:04 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 18:52:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7686] csw/mgar/pkg/subversion/trunk/checksums Message-ID: Revision: 7686 http://gar.svn.sourceforge.net/gar/?rev=7686&view=rev Author: rthurner Date: 2009-12-20 18:52:04 +0000 (Sun, 20 Dec 2009) Log Message: ----------- change sysconfig dir Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2009-12-20 18:51:06 UTC (rev 7685) +++ csw/mgar/pkg/subversion/trunk/checksums 2009-12-20 18:52:04 UTC (rev 7686) @@ -1,3 +1,4 @@ +5e2c9e1d117c41a0eb6c977c984e7c36 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch 32b2cc8a237404d160a5617ea2da53d8 CSWap2svn.postinstall 586b9c9924c1547d44451a84d2aca702 CSWap2svn.preremove 395ec6d1bfe07efadc1c0aa8816673fa CSWsvn.checkinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Dec 20 20:12:17 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 20 Dec 2009 19:12:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7687] csw/mgar/pkg/watch/trunk Message-ID: Revision: 7687 http://gar.svn.sourceforge.net/gar/?rev=7687&view=rev Author: skayser Date: 2009-12-20 19:12:17 +0000 (Sun, 20 Dec 2009) Log Message: ----------- watch: updated to procps 3.2.8, refactored Makefile, non-ASCII handling still broken Modified Paths: -------------- csw/mgar/pkg/watch/trunk/Makefile csw/mgar/pkg/watch/trunk/checksums Modified: csw/mgar/pkg/watch/trunk/Makefile =================================================================== --- csw/mgar/pkg/watch/trunk/Makefile 2009-12-20 18:52:04 UTC (rev 7686) +++ csw/mgar/pkg/watch/trunk/Makefile 2009-12-20 19:12:17 UTC (rev 7687) @@ -1,3 +1,8 @@ +# TODO +# - Although watch links against ncursesw, non-ASCII character handling +# is broken. German umlauts for example won't display at all. Try: +# python -c 'print u"\u00E4"' vs. watch -d python -c 'print u"\u00E4"' +# Needs further investigation. GARNAME = watch GARVERSION = 0.2.0 CATEGORIES = utils @@ -10,7 +15,7 @@ # Usually we would use $(SF_MIRROR), but the procps folks didn't upload # procps the usual way SF_PROJ = procps -SF_PROJ_VER = 3.2.7 +SF_PROJ_VER = 3.2.8 MASTER_SITES = http://$(SF_PROJ).sourceforge.net/ DISTFILES = $(SF_PROJ)-$(SF_PROJ_VER).tar.gz DISTNAME = $(SF_PROJ)-$(SF_PROJ_VER) @@ -30,7 +35,7 @@ CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_INC = /opt/csw/include/ncurses +EXTRA_INC = /opt/csw/include/ncursesw include gar/category.mk @@ -43,36 +48,39 @@ # GNU getopt taken from # http://svn.cherokee-project.com/browser/cherokee/trunk/cherokee/getopt # snprintf.c taken from http://www.jhweiss.de/software/snprintf.html -# -# Don't tell snprintf.c that you have v?snprintf, output will be garbled +pre-build-modulated: + rm $(WORKSRC)/ps/module.mk $(WORKSRC)/proc/module.mk + cp $(FILEDIR)/snprintf* $(WORKSRC) + cp $(FILEDIR)/getopt* $(WORKSRC) + cp $(FILEDIR)/gettext.h* $(WORKSRC) + @$(MAKECOOKIE) + +# Feature flags for snprintf.c. Don't tell it that you have v?snprintf, +# output will be garbled. CFLAGS := $(CFLAGS) -DHAVE_STDARG_H -DHAVE_STDLIB_H -DHAVE_STDDEF CFLAGS := $(CFLAGS) -DHAVE_INTTYPES_H -DHAVE_LOCALE_H -DHAVE_LOCALECONV CFLAGS := $(CFLAGS) -DHAVE_LOCALECONV -DHAVE_UINTMAX_T -DHAVE_VA_COPY -pre-build-modulated: - @rm $(WORKSRC)/ps/module.mk $(WORKSRC)/proc/module.mk - @cp $(FILEDIR)/snprintf* $(WORKSRC) - @cp $(FILEDIR)/getopt* $(WORKSRC) - @cp $(FILEDIR)/gettext.h* $(WORKSRC) - $(MAKECOOKIE) - +# CURSES and BUILD_ARGS w/ ALL_?FLAGS req. for $(WORKSRC)/Makefile +build-custom: CURSES=-lncursesw build-custom: BUILD_ARGS:=ALL_CFLAGS="$(CFLAGS)" ALL_LDFLAGS="$(LDFLAGS)" build-custom: - @$(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) snprintf.o - @$(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt.o - @$(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt1.o - @$(BUILD_ENV) gmake -C $(WORKSRC) \ + $(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) snprintf.o + $(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt.o + $(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt1.o + $(BUILD_ENV) gmake -C $(WORKSRC) \ ALL_CFLAGS="$(CFLAGS) snprintf.o getopt.o getopt1.o" \ - ALL_LDFLAGS="$(LDFLAGS)" watch - $(MAKECOOKIE) + ALL_LDFLAGS="$(LDFLAGS)" \ + CURSES=$(CURSES) watch + @$(MAKECOOKIE) install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) install-custom: - @ginstall -d $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(mandir)/man1 - @ginstall -d $(DOCDEST) - @ginstall -m 755 $(WORKSRC)/watch $(DESTDIR)$(bindir) - @cp $(WORKSRC)/watch.1 $(DESTDIR)$(mandir)/man1 - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) - $(MAKECOOKIE) + ginstall -d $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall -d $(DOCDEST) + ginstall -m 755 $(WORKSRC)/watch $(DESTDIR)$(bindir) + cp $(WORKSRC)/watch.1 $(DESTDIR)$(mandir)/man1 + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/watch/trunk/checksums =================================================================== --- csw/mgar/pkg/watch/trunk/checksums 2009-12-20 18:52:04 UTC (rev 7686) +++ csw/mgar/pkg/watch/trunk/checksums 2009-12-20 19:12:17 UTC (rev 7687) @@ -1,3 +1,4 @@ -f490bca772b16472962c7b9f23b1e97d download/procps-3.2.7.tar.gz -05f5e9e304c4300b056ffd61eafebffa download/patch-extralibs.diff -c29461ef280f8a7dca7ef1d5aeec8e2d download/patch-sigpipe.diff +05f5e9e304c4300b056ffd61eafebffa patch-extralibs.diff +c29461ef280f8a7dca7ef1d5aeec8e2d patch-sigpipe.diff +9532714b6846013ca9898984ba4cd7e0 procps-3.2.8.tar.gz +b8b8809849fa14e39da359fb2bd2d955 wide-char-fix.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 22:26:18 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 21:26:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7688] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 7688 http://gar.svn.sourceforge.net/gar/?rev=7688&view=rev Author: rthurner Date: 2009-12-20 21:26:17 +0000 (Sun, 20 Dec 2009) Log Message: ----------- provide old svn libraries to allow startup of the ancient kde apps like kdesdk Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.i csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.s csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.i csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.s Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 19:12:17 UTC (rev 7687) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 21:26:17 UTC (rev 7688) @@ -73,6 +73,10 @@ DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW DISTFILES += fixme.sh +DISTFILES += libsvn_fs_base-1.so.0.0.0.i +DISTFILES += libsvn_fs_base-1.so.0.0.0.s +DISTFILES += libsvn_ra_dav-1.so.0.0.0.i +DISTFILES += libsvn_ra_dav-1.so.0.0.0.s # Fix: Add java headers for nested classes # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html @@ -220,4 +224,17 @@ $(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl; $(MAKECOOKIE) +post-install-isa-sparcv8: + ginstall $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 + ginstall $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 + ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 + ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 + @$(MAKECOOKIE) +post-install-isa-i386: + cp $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 + cp $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 + ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 + ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 + @$(MAKECOOKIE) + Added: csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.i =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.i ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.s =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.s ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.i =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.i ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.s =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.s ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 22:30:31 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 21:30:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7689] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 7689 http://gar.svn.sourceforge.net/gar/?rev=7689&view=rev Author: rthurner Date: 2009-12-20 21:30:31 +0000 (Sun, 20 Dec 2009) Log Message: ----------- subversion - add checksums as well for the old lib files Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 21:26:17 UTC (rev 7688) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 21:30:31 UTC (rev 7689) @@ -225,16 +225,16 @@ $(MAKECOOKIE) post-install-isa-sparcv8: - ginstall $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 - ginstall $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 - ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 - ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 - @$(MAKECOOKIE) + ginstall $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 + ginstall $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 + ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 + ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 + @$(MAKECOOKIE) post-install-isa-i386: - cp $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 - cp $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 - ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 - ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 - @$(MAKECOOKIE) + cp $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 + cp $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 + ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 + ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2009-12-20 21:26:17 UTC (rev 7688) +++ csw/mgar/pkg/subversion/trunk/checksums 2009-12-20 21:30:31 UTC (rev 7689) @@ -5,6 +5,10 @@ 41ec540885de7c34625768aa1fb9682b fixme.sh f107831ad0c702ff32e51df6a207237b httpd-svn.conf.CSW f0aa58c145ae99f8e4d72499ab826169 javahl_headers_for_nested_classes.diff +e6adf167a1050c3f434b7b60e8d94848 libsvn_fs_base-1.so.0.0.0.i +6f9987b00f66c8347f05fc13efc82322 libsvn_fs_base-1.so.0.0.0.s +1e71a0256e2709cd8f6a0f4870bca255 libsvn_ra_dav-1.so.0.0.0.i +15c92123c517b66956e097caaa56ddfa libsvn_ra_dav-1.so.0.0.0.s e5109da756d74c7d98f683f004a539af subversion-1.6.6.tar.bz2 f7d05c59656dcf01fb844295c9912f78 subversion161.diff 1b532d3055708a97771f5cd959983628 svn_access.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 22:36:21 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 21:36:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7690] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 7690 http://gar.svn.sourceforge.net/gar/?rev=7690&view=rev Author: rthurner Date: 2009-12-20 21:36:21 +0000 (Sun, 20 Dec 2009) Log Message: ----------- subversion - classutils causes a double depend Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 21:30:31 UTC (rev 7689) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 21:36:21 UTC (rev 7690) @@ -101,7 +101,6 @@ EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' SPKG_CLASSES_CSWpythonsvn = none cswpycompile -REQUIRED_PKGS_CSWpythonsvn += CSWcswclassutils CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 23:22:49 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 22:22:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7691] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 7691 http://gar.svn.sourceforge.net/gar/?rev=7691&view=rev Author: rthurner Date: 2009-12-20 22:22:49 +0000 (Sun, 20 Dec 2009) Log Message: ----------- libsvn_fs_base is there, so no need to provide it Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.i csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.s Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 21:36:21 UTC (rev 7690) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 22:22:49 UTC (rev 7691) @@ -73,8 +73,6 @@ DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW DISTFILES += fixme.sh -DISTFILES += libsvn_fs_base-1.so.0.0.0.i -DISTFILES += libsvn_fs_base-1.so.0.0.0.s DISTFILES += libsvn_ra_dav-1.so.0.0.0.i DISTFILES += libsvn_ra_dav-1.so.0.0.0.s @@ -224,16 +222,12 @@ $(MAKECOOKIE) post-install-isa-sparcv8: - ginstall $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 ginstall $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 - ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 @$(MAKECOOKIE) post-install-isa-i386: - cp $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 cp $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 - ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 @$(MAKECOOKIE) Deleted: csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.s =================================================================== (Binary files differ) 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 Dec 21 15:15:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Dec 2009 14:15:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7692] csw/mgar/pkg Message-ID: Revision: 7692 http://gar.svn.sourceforge.net/gar/?rev=7692&view=rev Author: dmichelsen Date: 2009-12-21 14:15:23 +0000 (Mon, 21 Dec 2009) Log Message: ----------- cdecl: Initial commit Added Paths: ----------- csw/mgar/pkg/cdecl/ csw/mgar/pkg/cdecl/branches/ csw/mgar/pkg/cdecl/tags/ csw/mgar/pkg/cdecl/trunk/ csw/mgar/pkg/cdecl/trunk/Makefile csw/mgar/pkg/cdecl/trunk/checksums csw/mgar/pkg/cdecl/trunk/files/ csw/mgar/pkg/cdecl/trunk/files/0001-Remove-keyword-for-Sun-Studio.patch Property changes on: csw/mgar/pkg/cdecl/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/cdecl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cdecl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cdecl/trunk/Makefile 2009-12-21 14:15:23 UTC (rev 7692) @@ -0,0 +1,44 @@ +GARNAME = cdecl +GARVERSION = 2.5 +CATEGORIES = utils + +DESCRIPTION = C declaration guide/tool +define BLURB +endef + +MASTER_SITES = http://www.cdecl.org/files/ +DISTNAME = cdecl-blocks-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz +PATCHFILES = 0001-Remove-keyword-for-Sun-Studio.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-blocks-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.cdecl.org/ + +LICENSE = README + +REQUIRED_PKGS = CSWreadline +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +CONFIGURE_SCRIPTS = + +LIBS = -lreadline +EXTRA_CFLAGS = $(CPPFLAGS) $(LDFLAGS) -DUSE_READLINE +BUILD_OVERRIDE_DIRS = CFLAGS CC LIBS + +TEST_TARGET = test +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + ginstall $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/cdecl $(DESTDIR)$(bindir)/cdecl + gln -s cdecl $(DESTDIR)$(bindir)/c++decl + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKSRC)/cdecl.1 $(DESTDIR)$(mandir)/man1 + gln -s cdecl.1 $(DESTDIR)$(mandir)/man1/c++decl.1 + @$(MAKECOOKIE) Added: csw/mgar/pkg/cdecl/trunk/checksums =================================================================== --- csw/mgar/pkg/cdecl/trunk/checksums (rev 0) +++ csw/mgar/pkg/cdecl/trunk/checksums 2009-12-21 14:15:23 UTC (rev 7692) @@ -0,0 +1,2 @@ +0aedb14385504f8e03713029e3922679 0001-Remove-keyword-for-Sun-Studio.patch +c1927e146975b1c7524cbaf07a7c10f8 cdecl-blocks-2.5.tar.gz Added: csw/mgar/pkg/cdecl/trunk/files/0001-Remove-keyword-for-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/cdecl/trunk/files/0001-Remove-keyword-for-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/cdecl/trunk/files/0001-Remove-keyword-for-Sun-Studio.patch 2009-12-21 14:15:23 UTC (rev 7692) @@ -0,0 +1,78 @@ +From d8a9a04271a883179f2b565d1b8b6d49bc50593d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 21 Dec 2009 14:46:57 +0100 +Subject: [PATCH] Remove keyword for Sun Studio + +--- + cdecl.c | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/cdecl.c b/cdecl.c +index 73ad493..8f88658 100644 +--- a/cdecl.c ++++ b/cdecl.c +@@ -76,8 +76,8 @@ char cdeclsccsid[] = "@(#)cdecl.c 2.5 1/15/96"; + # ifndef NOVARARGS + # include + # endif /* ndef NOVARARGS */ +-char *malloc(); +-void free(), exit(), perror(); ++/* char *malloc(); */ ++/* void free(), exit(), perror(); */ + # ifdef BSD + # include + extern int errno; +@@ -245,7 +245,7 @@ struct + /* for unsupported combinations of types. */ + void mbcheck() + { +- register int i, j, restrict; ++ register int i, j, restr; + char *t1, *t2; + + /* Loop through the types */ +@@ -262,26 +262,26 @@ void mbcheck() + if (!(modbits & crosstypes[j].bit)) + continue; + /* check the type of restriction */ +- restrict = crosscheck[i][j]; +- if (restrict == ALWAYS) ++ restr = crosscheck[i][j]; ++ if (restr == ALWAYS) + continue; + t1 = crosstypes[i].name; + t2 = crosstypes[j].name; +- if (restrict == NEVER) ++ if (restr == NEVER) + { + notsupported("", t1, t2); + } +- else if (restrict == RITCHIE) ++ else if (restr == RITCHIE) + { + if (RitchieFlag) + notsupported(" (Ritchie Compiler)", t1, t2); + } +- else if (restrict == PREANSI) ++ else if (restr == PREANSI) + { + if (PreANSIFlag || RitchieFlag) + notsupported(" (Pre-ANSI Compiler)", t1, t2); + } +- else if (restrict == ANSI) ++ else if (restr == ANSI) + { + if (!RitchieFlag && !PreANSIFlag) + notsupported(" (ANSI Compiler)", t1, t2); +@@ -290,7 +290,7 @@ void mbcheck() + { + (void) fprintf (stderr, + "%s: Internal error in crosscheck[%d,%d]=%d!\n", +- progname, i, j, restrict); ++ progname, i, j, restr); + exit(1); /* NOTREACHED */ + } + } +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 21 15:29:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Dec 2009 14:29:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7693] csw/mgar/pkg/pdfjam/trunk Message-ID: Revision: 7693 http://gar.svn.sourceforge.net/gar/?rev=7693&view=rev Author: dmichelsen Date: 2009-12-21 14:29:03 +0000 (Mon, 21 Dec 2009) Log Message: ----------- pdfjam: Fix dependencies and hardcode CSW pathes and tools Modified Paths: -------------- csw/mgar/pkg/pdfjam/trunk/Makefile csw/mgar/pkg/pdfjam/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pdfjam/trunk/files/0001-Hardcode-CSW-tools-and-pathes.patch Modified: csw/mgar/pkg/pdfjam/trunk/Makefile =================================================================== --- csw/mgar/pkg/pdfjam/trunk/Makefile 2009-12-21 14:15:23 UTC (rev 7692) +++ csw/mgar/pkg/pdfjam/trunk/Makefile 2009-12-21 14:29:03 UTC (rev 7693) @@ -11,12 +11,15 @@ MASTER_SITES = http://www.warwick.ac.uk/go/pdfjam/ DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz +PATCHFILES = 0001-Hardcode-CSW-tools-and-pathes.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam +REQUIRED_PKGS = CSWtetex + DISTNAME = pdfjam CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/pdfjam/trunk/checksums =================================================================== --- csw/mgar/pkg/pdfjam/trunk/checksums 2009-12-21 14:15:23 UTC (rev 7692) +++ csw/mgar/pkg/pdfjam/trunk/checksums 2009-12-21 14:29:03 UTC (rev 7693) @@ -1 +1,2 @@ +ad3f63f1304a73f7ef25d4ea70c03b7f 0001-Hardcode-CSW-tools-and-pathes.patch 71d2d664777d32ec4154ab4c2e5965dc pdfjam_1.21.tar.gz Added: csw/mgar/pkg/pdfjam/trunk/files/0001-Hardcode-CSW-tools-and-pathes.patch =================================================================== --- csw/mgar/pkg/pdfjam/trunk/files/0001-Hardcode-CSW-tools-and-pathes.patch (rev 0) +++ csw/mgar/pkg/pdfjam/trunk/files/0001-Hardcode-CSW-tools-and-pathes.patch 2009-12-21 14:29:03 UTC (rev 7693) @@ -0,0 +1,80 @@ +From 260e4cde6050335998d92f62b068e357e2d1ca4c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 21 Dec 2009 15:14:31 +0100 +Subject: [PATCH] Hardcode CSW tools and pathes + +--- + scripts/pdf90 | 4 ++-- + scripts/pdfjoin | 4 ++-- + scripts/pdfnup | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/scripts/pdf90 b/scripts/pdf90 +index 8b9ac02..7402567 100755 +--- a/scripts/pdf90 ++++ b/scripts/pdf90 +@@ -23,7 +23,7 @@ echo "This is pdf90 version ""$version" + ## + ## First say where your "pdflatex" program lives: + ## +-pdflatex=pdflatex ++pdflatex=/opt/csw/bin/pdflatex + #pdflatex="pdflatex.exe" ## this for Windows computers + ## + ## Next a permitted location for temporary files on your system: +@@ -40,7 +40,7 @@ tidy=true ## delete all temporary files immediately + ## + ## Read the configuration file(s) if such exist: + ## +-for d in /etc /usr/share/etc /usr/local/share /usr/local/etc ++for d in /opt/csw/etc /etc/opt/csw + do if test -f $d/pdfnup.conf; then + echo "Reading site configuration from $d/pdfnup.conf" + . $d/pdfnup.conf +diff --git a/scripts/pdfjoin b/scripts/pdfjoin +index 761c68a..afce83a 100755 +--- a/scripts/pdfjoin ++++ b/scripts/pdfjoin +@@ -28,7 +28,7 @@ shopt -u xpg_echo ## mainly to cope with Mac OS 10.5 "Leopard" + ## + ## First say where your "pdflatex" program lives: + ## +-pdflatex=pdflatex ++pdflatex=/opt/csw/bin/pdflatex + #pdflatex="pdflatex.exe" ## this for Windows computers + ## + ## Next a permitted location for temporary files on your system: +@@ -52,7 +52,7 @@ tidy=true ## delete all temporary files immediately + ## + ## Read the configuration file(s) if such exist: + ## +-for d in /etc /usr/share/etc /usr/local/share /usr/local/etc ++for d in /opt/csw/etc /etc/opt/csw + do if test -f $d/pdfnup.conf; then + echo "Reading site configuration from $d/pdfnup.conf" + . $d/pdfnup.conf +diff --git a/scripts/pdfnup b/scripts/pdfnup +index b4efe1c..71330c3 100755 +--- a/scripts/pdfnup ++++ b/scripts/pdfnup +@@ -24,7 +24,7 @@ echo "This is pdfnup version ""$version" + ## + ## First say where your "pdflatex" program lives: + ## +-pdflatex=pdflatex ++pdflatex=/opt/csw/bin/pdflatex + #pdflatex="pdflatex.exe" ## this for Windows computers + ## + ## Next a permitted location for temporary files on your system: +@@ -55,7 +55,7 @@ tidy=true ## delete all temporary files immediately + ## + ## Read the configuration file(s) if such exist: + ## +-for d in /etc /usr/share/etc /usr/local/share /usr/local/etc ++for d in /opt/csw/etc /etc/opt/csw + do if test -f $d/pdfnup.conf; then + echo "Reading site configuration from $d/pdfnup.conf" + . $d/pdfnup.conf +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 21 15:43:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Dec 2009 14:43:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7694] csw/mgar/pkg/pdfjam/trunk Message-ID: Revision: 7694 http://gar.svn.sourceforge.net/gar/?rev=7694&view=rev Author: dmichelsen Date: 2009-12-21 14:43:04 +0000 (Mon, 21 Dec 2009) Log Message: ----------- pdfjam: Some patches for Solaris Modified Paths: -------------- csw/mgar/pkg/pdfjam/trunk/Makefile csw/mgar/pkg/pdfjam/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pdfjam/trunk/files/0002-Step-out-of-tempdir-before-removing-it.patch csw/mgar/pkg/pdfjam/trunk/files/0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch Modified: csw/mgar/pkg/pdfjam/trunk/Makefile =================================================================== --- csw/mgar/pkg/pdfjam/trunk/Makefile 2009-12-21 14:29:03 UTC (rev 7693) +++ csw/mgar/pkg/pdfjam/trunk/Makefile 2009-12-21 14:43:04 UTC (rev 7694) @@ -11,14 +11,16 @@ MASTER_SITES = http://www.warwick.ac.uk/go/pdfjam/ DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz -PATCHFILES = 0001-Hardcode-CSW-tools-and-pathes.patch +PATCHFILES = 0001-Hardcode-CSW-tools-and-pathes.patch +PATCHFILES += 0002-Step-out-of-tempdir-before-removing-it.patch +PATCHFILES += 0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam -REQUIRED_PKGS = CSWtetex +REQUIRED_PKGS = CSWtetex CSWbash DISTNAME = pdfjam Modified: csw/mgar/pkg/pdfjam/trunk/checksums =================================================================== --- csw/mgar/pkg/pdfjam/trunk/checksums 2009-12-21 14:29:03 UTC (rev 7693) +++ csw/mgar/pkg/pdfjam/trunk/checksums 2009-12-21 14:43:04 UTC (rev 7694) @@ -1,2 +1,4 @@ ad3f63f1304a73f7ef25d4ea70c03b7f 0001-Hardcode-CSW-tools-and-pathes.patch +267c5818992a3c1de19f2bcc074892b3 0002-Step-out-of-tempdir-before-removing-it.patch +3b0072b467cb1d961056a1164c531602 0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch 71d2d664777d32ec4154ab4c2e5965dc pdfjam_1.21.tar.gz Added: csw/mgar/pkg/pdfjam/trunk/files/0002-Step-out-of-tempdir-before-removing-it.patch =================================================================== --- csw/mgar/pkg/pdfjam/trunk/files/0002-Step-out-of-tempdir-before-removing-it.patch (rev 0) +++ csw/mgar/pkg/pdfjam/trunk/files/0002-Step-out-of-tempdir-before-removing-it.patch 2009-12-21 14:43:04 UTC (rev 7694) @@ -0,0 +1,53 @@ +From 339813fa03f83e99b0f98626f1ca72f75ab82ca5 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 21 Dec 2009 15:22:00 +0100 +Subject: [PATCH] Step out of tempdir before removing it + +--- + scripts/pdf90 | 2 +- + scripts/pdfjoin | 2 +- + scripts/pdfnup | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/scripts/pdf90 b/scripts/pdf90 +index 7402567..5df5a37 100755 +--- a/scripts/pdf90 ++++ b/scripts/pdf90 +@@ -213,7 +213,7 @@ EndTemplate + "$outfileDir"/"$outfileNameRoot"".pdf" + fi + case "$tidy" in +- true) rm "$tempfileDir"/"$uniqueName"* ;; ++ true) cd && rm "$tempfileDir"/"$uniqueName"* ;; + esac + outFile="" + else echo " Failed: output file not written" +diff --git a/scripts/pdfjoin b/scripts/pdfjoin +index afce83a..24551ce 100755 +--- a/scripts/pdfjoin ++++ b/scripts/pdfjoin +@@ -263,7 +263,7 @@ if test -f "$tempfileDir"/"$uniqueName"".aux"; + "$outfileDir"/"$outfileNameRoot"".pdf" + fi + case "$tidy" in +- true) rm "$tempfileDir"/"$uniqueName"* ;; ++ true) cd && rm "$tempfileDir"/"$uniqueName"* ;; + esac + else echo " Failed: output file not written" + fi +diff --git a/scripts/pdfnup b/scripts/pdfnup +index 71330c3..d7872ac 100755 +--- a/scripts/pdfnup ++++ b/scripts/pdfnup +@@ -342,7 +342,7 @@ EndTemplate + "$outfileDir"/"$outfileNameRoot"".pdf" + fi + case "$tidy" in +- true) rm "$tempfileDir"/"$uniqueName"* ;; ++ true) cd && rm "$tempfileDir"/"$uniqueName"* ;; + esac + outFile="" + else echo " Failed: output file not written" +-- +1.6.5.1 + Added: csw/mgar/pkg/pdfjam/trunk/files/0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch =================================================================== --- csw/mgar/pkg/pdfjam/trunk/files/0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch (rev 0) +++ csw/mgar/pkg/pdfjam/trunk/files/0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch 2009-12-21 14:43:04 UTC (rev 7694) @@ -0,0 +1,44 @@ +From 5f8d163c0b2fa7c6eb6eba6dc271e96573293340 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 21 Dec 2009 15:28:31 +0100 +Subject: [PATCH] Use CSW bash because the Solaris shipped one is too old + +--- + scripts/pdf90 | 2 +- + scripts/pdfjoin | 2 +- + scripts/pdfnup | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/scripts/pdf90 b/scripts/pdf90 +index 5df5a37..cf15109 100755 +--- a/scripts/pdf90 ++++ b/scripts/pdf90 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/opt/csw/bin/bash + ## + ## pdf90: A shell program to rotate all pages of PDF files + ## +diff --git a/scripts/pdfjoin b/scripts/pdfjoin +index 24551ce..0bac762 100755 +--- a/scripts/pdfjoin ++++ b/scripts/pdfjoin +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/opt/csw/bin/bash + ## + ## pdfjoin: A shell program to concatenate PDF pages into one file + ## +diff --git a/scripts/pdfnup b/scripts/pdfnup +index d7872ac..6baeeb1 100755 +--- a/scripts/pdfnup ++++ b/scripts/pdfnup +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/opt/csw/bin/bash + ## + ## pdfnup: A shell program to generate a "n-up" version of a PDF file + ## +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 21 15:59:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 14:59:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7695] csw/mgar/pkg/clusterssh/trunk Message-ID: Revision: 7695 http://gar.svn.sourceforge.net/gar/?rev=7695&view=rev Author: wahwah Date: 2009-12-21 14:59:32 +0000 (Mon, 21 Dec 2009) Log Message: ----------- clusterssh: Moved to GARv2, version bump up to 3.28 Modified Paths: -------------- csw/mgar/pkg/clusterssh/trunk/Makefile csw/mgar/pkg/clusterssh/trunk/checksums Added Paths: ----------- csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.postinstall Removed Paths: ------------- csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.depend csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.gspec Property Changed: ---------------- csw/mgar/pkg/clusterssh/trunk/ Property changes on: csw/mgar/pkg/clusterssh/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/clusterssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterssh/trunk/Makefile 2009-12-21 14:43:04 UTC (rev 7694) +++ csw/mgar/pkg/clusterssh/trunk/Makefile 2009-12-21 14:59:32 UTC (rev 7695) @@ -1,29 +1,30 @@ GARNAME = clusterssh -GARVERSION = 3.25 +GARVERSION = 3.28 CATEGORIES = net DESCRIPTION = ClusterSSH controls a number of xterm windows via a single graphical console window define BLURB - ClusterSSH controls a number of xterm windows via a single graphical console window to allow commands to be interactively run on multiple servers over an ssh connection. + ClusterSSH controls a number of xterm windows via a single graphical console + window to allow commands to be interactively run on multiple servers over an + ssh connection. endef SF_PROJ = $(GARNAME) MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWclusterssh,) -# We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=89139 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -REQUIRED_PKGS = CSWperl CSWpmtk CSWpmx11protocol +REQUIRED_PKGS = CSWperl +REQUIRED_PKGS += CSWpmtk +REQUIRED_PKGS += CSWpmx11protocol +# REQUIRED_PKGS += CSWossh -PREFIX = /opt/csw/ -CONFIGURE_ARGS = --prefix=$(PREFIX) +CONFIGURE_ARGS = $(DIRPATHS) # Not gonna do it TEST_SCRIPTS = include gar/category.mk - Modified: csw/mgar/pkg/clusterssh/trunk/checksums =================================================================== --- csw/mgar/pkg/clusterssh/trunk/checksums 2009-12-21 14:43:04 UTC (rev 7694) +++ csw/mgar/pkg/clusterssh/trunk/checksums 2009-12-21 14:59:32 UTC (rev 7695) @@ -1,2 +1 @@ -dc31291abac025a51cbb95a71f792801 download/clusterssh-3.25.tar.gz -5171cb4f2d0a4df5ade011f46d883ff5 download/CSWclusterssh.gspec +11e012329d2c62e1f7b17f3ac517769a clusterssh-3.28.tar.gz Deleted: csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.depend =================================================================== --- csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.depend 2009-12-21 14:43:04 UTC (rev 7694) +++ csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.depend 2009-12-21 14:59:32 UTC (rev 7695) @@ -1,2 +0,0 @@ -P CSWpmx11protocol -P CSWossh Deleted: csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.gspec =================================================================== --- csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.gspec 2009-12-21 14:43:04 UTC (rev 7694) +++ csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.gspec 2009-12-21 14:59:32 UTC (rev 7695) @@ -1,14 +0,0 @@ -%var bitname clusterssh -%var pkgname CSWclusterssh -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING -%postinstall -echo '*************************************************************************' -echo '*************************************************************************' -echo 'ClusterSSH may not work correctly with Sun's ssh client' -echo 'For best results always use the CSW openSSH client' -echo 'ensure /opt/csw/bin is first in your path, or adjust your .ccshrc' -echo '*************************************************************************' -echo '*************************************************************************' - Added: csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.postinstall =================================================================== --- csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.postinstall (rev 0) +++ csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.postinstall 2009-12-21 14:59:32 UTC (rev 7695) @@ -0,0 +1,10 @@ +#!/bin/sh + +echo "*************************************************************************" +echo "*************************************************************************" +echo "ClusterSSH may not work correctly with Sun's ssh client" +echo "For best results always use the CSW openSSH client" +echo "ensure /opt/csw/bin is first in your path, or adjust your .ccshrc" +echo "*************************************************************************" +echo "*************************************************************************" + 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 Dec 21 16:03:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 15:03:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7696] csw/mgar/pkg/clusterssh/trunk/Makefile Message-ID: Revision: 7696 http://gar.svn.sourceforge.net/gar/?rev=7696&view=rev Author: wahwah Date: 2009-12-21 15:03:32 +0000 (Mon, 21 Dec 2009) Log Message: ----------- clusterssh: adding ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/clusterssh/trunk/Makefile Modified: csw/mgar/pkg/clusterssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterssh/trunk/Makefile 2009-12-21 14:59:32 UTC (rev 7695) +++ csw/mgar/pkg/clusterssh/trunk/Makefile 2009-12-21 15:03:32 UTC (rev 7696) @@ -22,6 +22,8 @@ REQUIRED_PKGS += CSWpmx11protocol # REQUIRED_PKGS += CSWossh +ARCHALL = 1 + CONFIGURE_ARGS = $(DIRPATHS) # Not gonna do it 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 Dec 21 16:06:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Dec 2009 15:06:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7697] csw/mgar/pkg Message-ID: Revision: 7697 http://gar.svn.sourceforge.net/gar/?rev=7697&view=rev Author: dmichelsen Date: 2009-12-21 15:06:18 +0000 (Mon, 21 Dec 2009) Log Message: ----------- a52dec+liba52: Split off a52dec package Modified Paths: -------------- csw/mgar/pkg/liba52/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/liba52/ Removed Paths: ------------- csw/mgar/pkg/a52dec/ Modified: csw/mgar/pkg/liba52/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2009-12-07 09:20:11 UTC (rev 7572) +++ csw/mgar/pkg/liba52/trunk/Makefile 2009-12-21 15:06:18 UTC (rev 7697) @@ -17,10 +17,17 @@ UPSTREAM_MASTER_SITES = http://liba52.sourceforge.net/ UFILES_REGEX = (\d+(?:\.\d+)*) -PACKAGES = CSWliba52 -CATALOGNAME = liba52 +PACKAGES = CSWliba52 CSWa52dec -REQUIRED_PKGS = CSWsunmath +CATALOGNAME_CSWliba52 = liba52 +CATALOGNAME_CSWa52dec = a52dec + +SPKG_DESC_CSWliba52 = $(DESCRIPTION) library +SPKG_DESC_CSWa52dec = $(DESCRIPTION) application + +REQUIRED_PKGS_CSWliba52 = CSWsunmath +REQUIRED_PKGS_CSWa52dec = CSWsunmath CSWliba52 + EXTRA_LINKER_FLAGS = -lsunmath BUILD64 = 1 @@ -34,6 +41,9 @@ MERGE_DIRS_isa-extra = $(libdir) +PKGFILES_CSWa52dec = $(bindir)/.* +PKGFILES_CSWa52dec += $(mandir)/man1/.* + include gar/category.mk post-install-modulated: 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 Dec 21 19:50:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 18:50:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7698] csw/mgar/pkg/gnupg/trunk Message-ID: Revision: 7698 http://gar.svn.sourceforge.net/gar/?rev=7698&view=rev Author: wahwah Date: 2009-12-21 18:50:40 +0000 (Mon, 21 Dec 2009) Log Message: ----------- gnupg: Version bump up 1.4.10 Modified Paths: -------------- csw/mgar/pkg/gnupg/trunk/Makefile csw/mgar/pkg/gnupg/trunk/checksums Modified: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2009-12-21 15:06:18 UTC (rev 7697) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2009-12-21 18:50:40 UTC (rev 7698) @@ -1,5 +1,5 @@ GARNAME = gnupg -GARVERSION = 1.4.9 +GARVERSION = 1.4.10 CATEGORIES = apps DESCRIPTION = GnuPG is a complete and free replacement for PGP. Modified: csw/mgar/pkg/gnupg/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg/trunk/checksums 2009-12-21 15:06:18 UTC (rev 7697) +++ csw/mgar/pkg/gnupg/trunk/checksums 2009-12-21 18:50:40 UTC (rev 7698) @@ -1 +1 @@ -cc52393087480ac8d245625004a6a30c download/gnupg-1.4.9.tar.bz2 +dcf7ed712997888d616e029637bfc303 gnupg-1.4.10.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 Mon Dec 21 20:51:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 19:51:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7699] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7699 http://gar.svn.sourceforge.net/gar/?rev=7699&view=rev Author: wahwah Date: 2009-12-21 19:50:58 +0000 (Mon, 21 Dec 2009) Log Message: ----------- mysql5: removing the incompatible mark against mysql4, working around the libtool version problem 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 2009-12-21 18:50:40 UTC (rev 7698) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-12-21 19:50:58 UTC (rev 7699) @@ -3,7 +3,9 @@ # $Id$ GARNAME = mysql5 -GARVERSION = 5.0.87 +MYSQL_MINOR_VERSION = 0 +MYSQL_PATCHLEVEL = 87 +GARVERSION = 5.$(MYSQL_MINOR_VERSION).$(MYSQL_PATCHLEVEL) CATEGORIES = server DISTNAME = mysql-$(GARVERSION) @@ -38,12 +40,6 @@ CATALOGNAME_CSWmysql5rt = $(GARNAME)rt CATALOGNAME_CSWmysql5test = $(GARNAME)test -INCOMPATIBLE_PKGS_CSWmysql5bench = CSWmysql4bench -INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client -INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 -INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel -INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test - SPKG_DESC_CSWmysql5 = Multithreaded SQL database SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking SPKG_DESC_CSWmysql5client = MySQL 5 client binaries @@ -95,7 +91,7 @@ REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/ +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.$(MYSQL_MINOR_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog DISTFILES += CSWmysql5.preinstall @@ -152,7 +148,11 @@ include gar/category.mk -post-install: +pre-configure-modulated: + # To work around the libtool version mismatch problem. + cd $(WORKSRC) && autoreconf --force --install --symlink + +post-install-modulated: ginstall -m 755 -d $(DESTDIR)$(localstatedir) ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc 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 Dec 21 20:59:55 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 19:59:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7700] csw/mgar/pkg/nss/trunk/files/nss.pc Message-ID: Revision: 7700 http://gar.svn.sourceforge.net/gar/?rev=7700&view=rev Author: wahwah Date: 2009-12-21 19:59:48 +0000 (Mon, 21 Dec 2009) Log Message: ----------- nss: Updating nss.pc to point at /opt/csw/lib, not /opt/csw/lib/nss Modified Paths: -------------- csw/mgar/pkg/nss/trunk/files/nss.pc Modified: csw/mgar/pkg/nss/trunk/files/nss.pc =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss.pc 2009-12-21 19:50:58 UTC (rev 7699) +++ csw/mgar/pkg/nss/trunk/files/nss.pc 2009-12-21 19:59:48 UTC (rev 7700) @@ -1,6 +1,6 @@ prefix=/opt/csw exec_prefix=${prefix} -libdir=${prefix}/lib/nss +libdir=${prefix}/lib includedir=${prefix}/include/nss Name: NSS 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 Dec 21 21:12:02 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 20:12:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7701] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 7701 http://gar.svn.sourceforge.net/gar/?rev=7701&view=rev Author: wahwah Date: 2009-12-21 20:11:57 +0000 (Mon, 21 Dec 2009) Log Message: ----------- python: Depend on CSWbdb47, not CSWbdb; don't depend on CSWpython-rt Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-21 19:59:48 UTC (rev 7700) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-21 20:11:57 UTC (rev 7701) @@ -114,11 +114,11 @@ ENABLE_CHECK = 0 REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk -REQUIRED_PKGS_CSWpython = CSWbdb CSWbzip2 CSWgdbm CSWggettextrt -REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWpython-rt CSWreadline +REQUIRED_PKGS_CSWpython = CSWbdb47 CSWbzip2 CSWgdbm CSWggettextrt +REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWreadline REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWzlib REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk -REQUIRED_PKGS_CSWpython-tk += CSWpython-rt +REQUIRED_PKGS_CSWpython-tk += CSWpython REQUIRED_PKGS_CSWpython-devel = CSWpython REQUIRED_PKGS_CSWpython-test = CSWpython 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 Dec 21 21:42:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 20:42:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7702] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 7702 http://gar.svn.sourceforge.net/gar/?rev=7702&view=rev Author: wahwah Date: 2009-12-21 20:42:10 +0000 (Mon, 21 Dec 2009) Log Message: ----------- python: Removing double depends from CSWpython-tk Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-21 20:11:57 UTC (rev 7701) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-21 20:42:10 UTC (rev 7702) @@ -118,7 +118,6 @@ REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWreadline REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWzlib REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk -REQUIRED_PKGS_CSWpython-tk += CSWpython REQUIRED_PKGS_CSWpython-devel = CSWpython REQUIRED_PKGS_CSWpython-test = CSWpython This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 21 22:14:50 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 21 Dec 2009 21:14:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7703] csw/mgar/pkg/apr/trunk/Makefile Message-ID: Revision: 7703 http://gar.svn.sourceforge.net/gar/?rev=7703&view=rev Author: rthurner Date: 2009-12-21 21:14:50 +0000 (Mon, 21 Dec 2009) Log Message: ----------- apr - disable tests as one in testsockets fail Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2009-12-21 20:42:10 UTC (rev 7702) +++ csw/mgar/pkg/apr/trunk/Makefile 2009-12-21 21:14:50 UTC (rev 7703) @@ -22,7 +22,9 @@ CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-other-child -TEST_TARGET = check +# ipv6 tests fail +# TEST_TARGET = check +TEST_TARGET = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 21 23:11:59 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 21 Dec 2009 22:11:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7704] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 7704 http://gar.svn.sourceforge.net/gar/?rev=7704&view=rev Author: rthurner Date: 2009-12-21 22:11:47 +0000 (Mon, 21 Dec 2009) Log Message: ----------- subversion - remove libsvn_ra_dav again, the link should be created in the Makefile Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.i csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.s Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-12-21 21:14:50 UTC (rev 7703) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-12-21 22:11:47 UTC (rev 7704) @@ -73,8 +73,6 @@ DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW DISTFILES += fixme.sh -DISTFILES += libsvn_ra_dav-1.so.0.0.0.i -DISTFILES += libsvn_ra_dav-1.so.0.0.0.s # Fix: Add java headers for nested classes # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html @@ -174,10 +172,8 @@ @# libsvn_ra_dav-1* has been renamed to libsvn_ra_neon-1* @# in the new versions of subversion, @# we need to link for backward compatability - @(gln -s $(DESTDIR)$(libdir)/libsvn_ra_neon-1.so.0.0.0 \ - $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0) - @(gln -s $(DESTDIR)$(libdir)/libsvn_ra_neon-1.so.0.0.0 \ - $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so) + @(gln -s libsvn_ra_neon-1.so.0.0.0 $(DESTDIR)$(SVNLIB)/libsvn_ra_dav-1.so.0) + @(gln -s libsvn_ra_neon-1.so.0.0.0 $(DESTDIR)$(SVNLIB)/libsvn_ra_dav-1.so) @$(MAKECOOKIE) install-extras: @@ -220,14 +216,3 @@ $(BUILD_ENV) gmake -C $(WORKSRC) javahl; $(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl; $(MAKECOOKIE) - -post-install-isa-sparcv8: - ginstall $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 - ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 - @$(MAKECOOKIE) - -post-install-isa-i386: - cp $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 - ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 - @$(MAKECOOKIE) - Deleted: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.s =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 21 23:20:32 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 21 Dec 2009 22:20:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7705] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 7705 http://gar.svn.sourceforge.net/gar/?rev=7705&view=rev Author: rthurner Date: 2009-12-21 22:20:32 +0000 (Mon, 21 Dec 2009) Log Message: ----------- libserf - add CSWbdb47 because of an apr bug ... Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2009-12-21 22:11:47 UTC (rev 7704) +++ csw/mgar/pkg/libserf/trunk/Makefile 2009-12-21 22:20:32 UTC (rev 7705) @@ -15,7 +15,7 @@ MASTER_SITES = http://serf.googlecode.com/files/ DISTFILES = $(DISTNAME).tar.bz2 -REQUIRED_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib +REQUIRED_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib CSWbdb47 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 21 23:46:46 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 21 Dec 2009 22:46:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7706] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 7706 http://gar.svn.sourceforge.net/gar/?rev=7706&view=rev Author: rthurner Date: 2009-12-21 22:46:46 +0000 (Mon, 21 Dec 2009) Log Message: ----------- libserf - remove CSWbdb47, apr is fixed now ... Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2009-12-21 22:20:32 UTC (rev 7705) +++ csw/mgar/pkg/libserf/trunk/Makefile 2009-12-21 22:46:46 UTC (rev 7706) @@ -15,7 +15,7 @@ MASTER_SITES = http://serf.googlecode.com/files/ DISTFILES = $(DISTNAME).tar.bz2 -REQUIRED_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib CSWbdb47 +REQUIRED_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Dec 22 01:07:28 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 22 Dec 2009 00:07:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7707] csw/mgar/pkg/exiftool/trunk/Makefile Message-ID: Revision: 7707 http://gar.svn.sourceforge.net/gar/?rev=7707&view=rev Author: hson Date: 2009-12-22 00:07:27 +0000 (Tue, 22 Dec 2009) Log Message: ----------- exiftool: Add ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-12-21 22:46:46 UTC (rev 7706) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-12-22 00:07:27 UTC (rev 7707) @@ -25,4 +25,5 @@ CONFIGURE_ARGS = $(DIRPATHS) +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 dmichelsen at users.sourceforge.net Tue Dec 22 14:14:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Dec 2009 13:14:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7708] csw/mgar/pkg/euler/trunk/Makefile Message-ID: Revision: 7708 http://gar.svn.sourceforge.net/gar/?rev=7708&view=rev Author: dmichelsen Date: 2009-12-22 13:14:36 +0000 (Tue, 22 Dec 2009) Log Message: ----------- euler: Force CFLAGS in all targets Modified Paths: -------------- csw/mgar/pkg/euler/trunk/Makefile Modified: csw/mgar/pkg/euler/trunk/Makefile =================================================================== --- csw/mgar/pkg/euler/trunk/Makefile 2009-12-22 00:07:27 UTC (rev 7707) +++ csw/mgar/pkg/euler/trunk/Makefile 2009-12-22 13:14:36 UTC (rev 7708) @@ -36,6 +36,11 @@ BUILD_OVERRIDE_DIRS = CFLAGS CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check +# Strange thing - there are no tests done during this phase, but everything gets +# rebuild (and CFLAGS are again ignored...) +TEST_SCRIPTS = +INSTALL_OVERRIDE_VARS = CFLAGS +INSTALL_OVERRIDE_VAR_CFLAGS = $(CFLAGS) + 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 Dec 22 14:52:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Dec 2009 13:52:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7709] csw/mgar/pkg Message-ID: Revision: 7709 http://gar.svn.sourceforge.net/gar/?rev=7709&view=rev Author: dmichelsen Date: 2009-12-22 13:52:02 +0000 (Tue, 22 Dec 2009) Log Message: ----------- zshdb: Initial commit Added Paths: ----------- csw/mgar/pkg/zshdb/ csw/mgar/pkg/zshdb/branches/ csw/mgar/pkg/zshdb/tags/ csw/mgar/pkg/zshdb/trunk/ csw/mgar/pkg/zshdb/trunk/Makefile csw/mgar/pkg/zshdb/trunk/checksums csw/mgar/pkg/zshdb/trunk/files/ Property changes on: csw/mgar/pkg/zshdb/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/zshdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/zshdb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/zshdb/trunk/Makefile 2009-12-22 13:52:02 UTC (rev 7709) @@ -0,0 +1,31 @@ +GARNAME = zshdb +GARVERSION = 0_gitcurrent +# PATCHLEVEL = 75eadce +CATEGORIES = utils + +DESCRIPTION = ZSH Debugger +define BLURB + This is a port and cleanup of my bash debugger bashdb +endef + +# MASTER_SITES = http://cloud.github.com/downloads/rocky/zshdb/ +GIT_REPOS = git://github.com/rocky/zshdb.git +GIT_USE_PROXY = 1 +# GIT_TREEISH_zshdb.git = $(PATCHLEVEL) + +# DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWzsh + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +post-extract-isa-sparcv8: + cd $(WORKSRC) && ./autogen.sh --with-zsh=/opt/csw/bin/zsh + @$(MAKECOOKIE) Added: csw/mgar/pkg/zshdb/trunk/checksums =================================================================== --- csw/mgar/pkg/zshdb/trunk/checksums (rev 0) +++ csw/mgar/pkg/zshdb/trunk/checksums 2009-12-22 13:52:02 UTC (rev 7709) @@ -0,0 +1 @@ +faab06bdb35626033fd795d9c1ccfd41 zshdb-0.04.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 Dec 22 14:53:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Dec 2009 13:53:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7710] csw/mgar/pkg/zshdb/trunk/Makefile Message-ID: Revision: 7710 http://gar.svn.sourceforge.net/gar/?rev=7710&view=rev Author: dmichelsen Date: 2009-12-22 13:53:43 +0000 (Tue, 22 Dec 2009) Log Message: ----------- zshdb: Make ARCHALL Modified Paths: -------------- csw/mgar/pkg/zshdb/trunk/Makefile Modified: csw/mgar/pkg/zshdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/zshdb/trunk/Makefile 2009-12-22 13:52:02 UTC (rev 7709) +++ csw/mgar/pkg/zshdb/trunk/Makefile 2009-12-22 13:53:43 UTC (rev 7710) @@ -24,6 +24,8 @@ TEST_TARGET = check +ARCHALL = 1 + include gar/category.mk post-extract-isa-sparcv8: 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 Dec 22 17:10:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Dec 2009 16:10:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7711] csw/mgar/pkg Message-ID: Revision: 7711 http://gar.svn.sourceforge.net/gar/?rev=7711&view=rev Author: dmichelsen Date: 2009-12-22 16:10:13 +0000 (Tue, 22 Dec 2009) Log Message: ----------- bashdb: Initial commit Added Paths: ----------- csw/mgar/pkg/bashdb/ csw/mgar/pkg/bashdb/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/bashdb/trunk/Makefile Deleted: csw/mgar/pkg/bashdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/zshdb/trunk/Makefile 2009-12-22 13:52:02 UTC (rev 7709) +++ csw/mgar/pkg/bashdb/trunk/Makefile 2009-12-22 16:10:13 UTC (rev 7711) @@ -1,31 +0,0 @@ -GARNAME = zshdb -GARVERSION = 0_gitcurrent -# PATCHLEVEL = 75eadce -CATEGORIES = utils - -DESCRIPTION = ZSH Debugger -define BLURB - This is a port and cleanup of my bash debugger bashdb -endef - -# MASTER_SITES = http://cloud.github.com/downloads/rocky/zshdb/ -GIT_REPOS = git://github.com/rocky/zshdb.git -GIT_USE_PROXY = 1 -# GIT_TREEISH_zshdb.git = $(PATCHLEVEL) - -# DISTFILES = $(DISTNAME).tar.gz - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -REQUIRED_PKGS = CSWzsh - -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - -include gar/category.mk - -post-extract-isa-sparcv8: - cd $(WORKSRC) && ./autogen.sh --with-zsh=/opt/csw/bin/zsh - @$(MAKECOOKIE) Copied: csw/mgar/pkg/bashdb/trunk/Makefile (from rev 7710, csw/mgar/pkg/zshdb/trunk/Makefile) =================================================================== --- csw/mgar/pkg/bashdb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bashdb/trunk/Makefile 2009-12-22 16:10:13 UTC (rev 7711) @@ -0,0 +1,33 @@ +GARNAME = bashdb +GARVERSION = 0_gitcurrent +# PATCHLEVEL = 75eadce +CATEGORIES = utils + +DESCRIPTION = Bash Debugger +define BLURB + This is a port and cleanup of my bash debugger bashdb +endef + +# MASTER_SITES = http://cloud.github.com/downloads/rocky/bashdb/ +GIT_REPOS = git://bashdb.git.sourceforge.net/gitroot/bashdb/bashdb +GIT_USE_PROXY = 1 +# GIT_TREEISH_zshdb.git = $(PATCHLEVEL) + +# DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWbash + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +ARCHALL = 1 + +include gar/category.mk + +post-extract-isa-sparcv8: + cd $(WORKSRC) && ./autogen.sh --with-bash=/opt/csw/bin/bash + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Dec 22 17:25:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Dec 2009 16:25:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7712] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7712 http://gar.svn.sourceforge.net/gar/?rev=7712&view=rev Author: wahwah Date: 2009-12-22 16:25:37 +0000 (Tue, 22 Dec 2009) Log Message: ----------- mysql5: mysql5bench ARCHALL = 1 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 2009-12-22 16:10:13 UTC (rev 7711) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-12-22 16:25:37 UTC (rev 7712) @@ -47,6 +47,8 @@ SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files SPKG_DESC_CSWmysql5test = MySQL 5 testing files +ARCHALL_CSWmysql5bench = 1 + # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSWmysql5client_programs = myisamlog 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 Dec 22 18:48:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Dec 2009 17:48:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7713] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 7713 http://gar.svn.sourceforge.net/gar/?rev=7713&view=rev Author: wahwah Date: 2009-12-22 17:48:23 +0000 (Tue, 22 Dec 2009) Log Message: ----------- python: setting CSWpython-rt to depend on CSWpython Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-22 16:25:37 UTC (rev 7712) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-22 17:48:23 UTC (rev 7713) @@ -120,6 +120,7 @@ REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk REQUIRED_PKGS_CSWpython-devel = CSWpython REQUIRED_PKGS_CSWpython-test = CSWpython +REQUIRED_PKGS_CSWpython-rt = CSWpython CATALOGNAME_CSWidle = idle CATALOGNAME_CSWpython = python 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 Dec 22 18:49:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Dec 2009 17:49:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7714] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 7714 http://gar.svn.sourceforge.net/gar/?rev=7714&view=rev Author: wahwah Date: 2009-12-22 17:49:40 +0000 (Tue, 22 Dec 2009) Log Message: ----------- python: Removing ENABLE_CHECK = 0, setting CSWpython-rt to ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-22 17:48:23 UTC (rev 7713) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-22 17:49:40 UTC (rev 7714) @@ -111,7 +111,7 @@ PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* -ENABLE_CHECK = 0 +ARCHALL_CSWpython-rt = 1 REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk REQUIRED_PKGS_CSWpython = CSWbdb47 CSWbzip2 CSWgdbm CSWggettextrt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 23 00:12:19 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Dec 2009 23:12:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7715] csw/mgar/pkg/rlwrap/trunk Message-ID: Revision: 7715 http://gar.svn.sourceforge.net/gar/?rev=7715&view=rev Author: chninkel Date: 2009-12-22 23:12:18 +0000 (Tue, 22 Dec 2009) Log Message: ----------- rlwrap: updated to 0.34 Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile csw/mgar/pkg/rlwrap/trunk/checksums csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2009-12-22 17:49:40 UTC (rev 7714) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2009-12-22 23:12:18 UTC (rev 7715) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = rlwrap -GARVERSION = 0.33 +GARVERSION = 0.34 CATEGORIES = utils DESCRIPTION = A readline wrapper Modified: csw/mgar/pkg/rlwrap/trunk/checksums =================================================================== --- csw/mgar/pkg/rlwrap/trunk/checksums 2009-12-22 17:49:40 UTC (rev 7714) +++ csw/mgar/pkg/rlwrap/trunk/checksums 2009-12-22 23:12:18 UTC (rev 7715) @@ -1,2 +1,2 @@ -ada93921f64eaa8153db0307bc11795f changelog.CSW -831f375ca6c9d7ac77bebff616bd03a6 rlwrap-0.33.tar.gz +4fc3209edf432acc97c2457887e525e4 changelog.CSW +c0972f1803db4d45a047da6301ad1633 rlwrap-0.34.tar.gz Modified: csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2009-12-22 17:49:40 UTC (rev 7714) +++ csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2009-12-22 23:12:18 UTC (rev 7715) @@ -1,3 +1,9 @@ +rlwrap (0.34,REV=2009.12.29) unstable + + * New upstream release. + + -- Yann Rouillard Wed, 23 Dec 2009 00:09:01 +0100 + rlwrap (0.33,REV=2009.12.02) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 23 00:15:55 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Dec 2009 23:15:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7716] csw/mgar/pkg/cadaver/trunk Message-ID: Revision: 7716 http://gar.svn.sourceforge.net/gar/?rev=7716&view=rev Author: chninkel Date: 2009-12-22 23:15:55 +0000 (Tue, 22 Dec 2009) Log Message: ----------- cadaver: updated to 0.23.3 Modified Paths: -------------- csw/mgar/pkg/cadaver/trunk/Makefile csw/mgar/pkg/cadaver/trunk/checksums csw/mgar/pkg/cadaver/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cadaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/cadaver/trunk/Makefile 2009-12-22 23:12:18 UTC (rev 7715) +++ csw/mgar/pkg/cadaver/trunk/Makefile 2009-12-22 23:15:55 UTC (rev 7716) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = cadaver -GARVERSION = 0.23.2 +GARVERSION = 0.23.3 CATEGORIES = net DESCRIPTION = WebDAV commandline tool Modified: csw/mgar/pkg/cadaver/trunk/checksums =================================================================== --- csw/mgar/pkg/cadaver/trunk/checksums 2009-12-22 23:12:18 UTC (rev 7715) +++ csw/mgar/pkg/cadaver/trunk/checksums 2009-12-22 23:15:55 UTC (rev 7716) @@ -1,3 +1,3 @@ -5ac79e41f3b7b4f68bf4003beed5dc26 download/cadaver-0.23.2.tar.gz -7a78f71995cd40263b04470976eba5a6 download/CSWcadav.prototype -0db916e7303fe1fac02ba69acbd41ce9 download/changelog.CSW +7a78f71995cd40263b04470976eba5a6 CSWcadav.prototype +502ecd601e467f8b16056d2acca39a6f cadaver-0.23.3.tar.gz +54a9c550b382e7b53ecdacd0b07a2f1b changelog.CSW Modified: csw/mgar/pkg/cadaver/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2009-12-22 23:12:18 UTC (rev 7715) +++ csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2009-12-22 23:15:55 UTC (rev 7716) @@ -1,36 +1,44 @@ -cadaver (0.23.2,REV=2009.04.07) unstable +cadaver (0.23.3,rev=2009.12.23) unstable - * New upstream version. - * Dropped destdir.patch as DESTDIR support has been added upstream. + * new upstream version. - -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 + -- Yann rouillard Wed, 23 Dec 2009 00:07:23 +0100 +cadaver (0.23.2,rev=2009.04.07) unstable + + * new upstream version. + * dropped destdir.patch as destdir support has been added upstream. + + -- Yann rouillard Mar, 14 Jul 2009 21:34:36 +0100 + cadaver (0.22.5,REV=2009.02.15) unstable * Changed gettext dependancy to follow gettext package split (Closes: #3134). - -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 + -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 cadaver (0.22.5,REV=2007.08.21) unstable * Replaced "? ? ?" with "0755 root bin" in the prototype. * Added missing dependancies gnutls, libgcrypt and libgpg_error. + -- Yann Rouillard + cadaver (0.22.5,REV=2007.07.28) unstable * Depends on openssl_rt rather than openssl. - -- Yann Rouillard Sat, 28 Jul 2007 17:30:07 +0200 + -- Yann Rouillard Sat, 28 Jul 2007 17:30:07 +0200 cadaver (0.22.5,REV=2007.03.10) unstable * New upstream version. - -- Yann Rouillard Sat, 10 Mar 2007 00:15:32 +0100 + -- Yann Rouillard Sat, 10 Mar 2007 00:15:32 +0100 cadaver (0.22.3) unstable * New upstream version. - -- Yann Rouillard Tue, 11 Jul 2006 12:25:32 +0200 + -- Yann Rouillard Tue, 11 Jul 2006 12:25:32 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 23 00:24:19 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Dec 2009 23:24:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7717] csw/mgar/pkg/bash/trunk Message-ID: Revision: 7717 http://gar.svn.sourceforge.net/gar/?rev=7717&view=rev Author: chninkel Date: 2009-12-22 23:24:19 +0000 (Tue, 22 Dec 2009) Log Message: ----------- bash: fixed source url Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2009-12-22 23:15:55 UTC (rev 7716) +++ csw/mgar/pkg/bash/trunk/Makefile 2009-12-22 23:24:19 UTC (rev 7717) @@ -29,6 +29,8 @@ REQUIRED_PKGS = CSWggettextrt REQUIRED_PKGS += CSWiconv +SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/bash/bashtop.html + SPKG_CLASSES = none build ###### Upstream and opencsw files information ####### Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2009-12-22 23:15:55 UTC (rev 7716) +++ csw/mgar/pkg/bash/trunk/checksums 2009-12-22 23:24:19 UTC (rev 7717) @@ -35,6 +35,6 @@ d3e77d2a0a051478aca8c30d13ded834 bash40-033 05a54807fd388e71bac8912ad530ac6d bash40-034 fc3d8fdb83ccc407ab7f6d1b7ac6a221 bash40-035 -52c58cea6ccac9d7e51fb63adffbbfb3 changelog.CSW +fd14570004ad0895c04ca969609712ed changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-12-22 23:15:55 UTC (rev 7716) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-12-22 23:24:19 UTC (rev 7717) @@ -1,3 +1,9 @@ +bash (4.0.35,REV=2009.12.23) unstable + + * Fixed Source url info (bug #4087). + + -- Yann Rouillard Wed, 23 Dec 2009 00:22:40 +0100 + bash (4.0.35,REV=2009.11.01) unstable * Added bash patches bash40-034 to bash40-035. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 23 00:25:15 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Dec 2009 23:25:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7718] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 7718 http://gar.svn.sourceforge.net/gar/?rev=7718&view=rev Author: chninkel Date: 2009-12-22 23:25:15 +0000 (Tue, 22 Dec 2009) Log Message: ----------- cyrus_imapd: updated to 2.3.16 Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW Removed Paths: ------------- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-12-22 23:24:19 UTC (rev 7717) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-12-22 23:25:15 UTC (rev 7718) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = cyrus_imapd -GARVERSION = 2.3.15 +GARVERSION = 2.3.16 CATEGORIES = server DESCRIPTION = Pop and Imap server from the Cyrus mail system @@ -49,8 +49,7 @@ ###### Upstream and opencsw files information ####### -#MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(GARVERSION)/ -MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.14/ +MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(GARVERSION)/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(shell echo $(GARNAME) | tr '_' '-')-(\d+(?:\.\d+)*).tar.gz @@ -78,8 +77,7 @@ # University of Athens patchs to allow autocreation of mailboxes # and autocreation of sub-lolders for filter rules -#PATCHFILES = cyrus-imapd-$(GARVERSION)-autocreate-0.10-0.diff cyrus-imapd-$(GARVERSION)-autosieve-0.6.0.diff -PATCHFILES = cyrus-imapd-2.3.15-autocreate-0.10-0.diff cyrus-imapd-2.3.14-autosieve-0.6.0.diff +PATCHFILES = cyrus-imapd-$(GARVERSION)-autocreate-0.10-0.diff cyrus-imapd-$(GARVERSION)-autosieve-0.6.0.diff # This patch makes cyrus more tolerant with mails containing # invalid From headers Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-12-22 23:24:19 UTC (rev 7717) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-12-22 23:25:15 UTC (rev 7718) @@ -7,20 +7,20 @@ 9cbebaeeafa6eb3320eafa594c253bc1 compile_et 1c2b850f7a264704eefec741a75977ab cswcyrus 628c5cf5f5b01f9e173e090ee0c969aa cswcyrus.xml -4f010ee86b24f737c9de9fffa0d194e4 cyrus-imapd-2.3.14-autosieve-0.6.0.diff -318f1d2bd48bb4a7c2db5fb9f82c9e3d cyrus-imapd-2.3.15-autocreate-0.10-0.diff -d89cb1b55023188938f332b7ef120fae cyrus-imapd-2.3.15.tar.gz +98b88f89e72bbabfd3da35fc94809247 cyrus-imapd-2.3.16-autocreate-0.10-0.diff +bb5171a5824f600b8a41cb00ab36cf02 cyrus-imapd-2.3.16-autosieve-0.6.0.diff +6a37feb1985974eee8a4a4b2932dd54c cyrus-imapd-2.3.16.tar.gz b4c99489eacf0fb7befeef5e3098a5c1 cyrus-imapd-2.3.7-nobarenewlinescheck.patch 6127a7b62ec4679a54985f6a2d915e52 cyrus-imapd-acceptinvalidfrom.patch fdb3416ec41f3a56d1594ca25a6dcd7d cyrus.conf -1228b6378951f1b5434bd785973cab34 cyrus_imapd.changelog.CSW -da92e9f3f78942431ad5ca9f9c842083 cyrus_imapd_utils.changelog.CSW +5fd9ad3890fa606394ff28d7f761bc5c cyrus_imapd.changelog.CSW +75e91c95ff7fa59482d20058036a6f5b cyrus_imapd_utils.changelog.CSW 5375c25c8bc325a90553d0be87a64a04 et_c.awk d1d86e61463a1dfefccbadedb11a8604 et_h.awk 79211aee56db01e15566ced1ba4078da i.services 908dbf764d3ccd541c4de881ac81a6ae imapd.conf 14bb6e8c6d6914351f80df293982e88a install-upgrade -fc47edab821dfac970ca342b7f20bde8 pm_cyrus.changelog.CSW +f5b73bbd54935e6c082b6a64e2668b78 pm_cyrus.changelog.CSW 149ac6b6d82ef9ef4bb1b314f1a1cac4 r.services dce627f9a464ae4efe8a66c8dbd358d5 restore_allowplaintext_default.patch 6dfee20f7c02139350caf9f75199e587 services Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff 2009-12-22 23:24:19 UTC (rev 7717) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff 2009-12-22 23:25:15 UTC (rev 7718) @@ -1,2399 +0,0 @@ -diff -Naur cyrus-imapd-2.3.15.orig/imap/autosieve.c cyrus-imapd-2.3.15/imap/autosieve.c ---- cyrus-imapd-2.3.15.orig/imap/autosieve.c 1970-01-01 01:00:00.000000000 +0100 -+++ cyrus-imapd-2.3.15/imap/autosieve.c 2009-09-09 16:13:03.000000000 +0200 -@@ -0,0 +1,590 @@ -+#include -+#include -+#include -+ -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "global.h" -+#include "util.h" -+#include "xmalloc.h" -+#include "xstrlcpy.h" -+#include "xstrlcat.h" -+#include "mailbox.h" -+#include "imap_err.h" -+#include "sieve_interface.h" -+#include "script.h" -+ -+#define TIMSIEVE_FAIL -1 -+#define TIMSIEVE_OK 0 -+#define MAX_FILENAME 1024 -+ -+static int get_script_name(char *sievename, size_t buflen, const char *filename); -+static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir); -+int autoadd_sieve(char *userid, const char *source_script); -+ -+//static void fatal(const char *s, int code); -+static void foo(void); -+static int sieve_notify(void *ac __attribute__((unused)), -+ void *interp_context __attribute__((unused)), -+ void *script_context __attribute__((unused)), -+ void *message_context __attribute__((unused)), -+ const char **errmsg __attribute__((unused))); -+static int mysieve_error(int lineno, const char *msg, -+ void *i __attribute__((unused)), void *s); -+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret); -+ -+ -+sieve_vacation_t vacation2 = { -+ 0, /* min response */ -+ 0, /* max response */ -+ (sieve_callback *) &foo, /* autorespond() */ -+ (sieve_callback *) &foo /* send_response() */ -+}; -+ -+ -+/* -+ * Find the name of the sieve script -+ * given the source script and compiled script names -+ */ -+static int get_script_name(char *sievename, size_t buflen, const char *filename) -+{ -+ char *p; -+ int r; -+ -+ p = strrchr(filename, '/'); -+ if (p == NULL) -+ p = (char *) filename; -+ else -+ p++; -+ -+ r = strlcpy(sievename, p, buflen) - buflen; -+ return (r >= 0 || r == -buflen ? 1 : 0); -+} -+ -+ -+/* -+ * Find the directory where the sieve scripts of the user -+ * reside -+ */ -+static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir) -+{ -+ char *user = NULL, *domain = NULL; -+ -+ /* Setup the user and the domain */ -+ if(config_virtdomains && (domain = strchr(userid, '@'))) { -+ user = (char *) xmalloc((domain - userid +1) * sizeof(char)); -+ strlcpy(user, userid, domain - userid + 1); -+ domain++; -+ } else -+ user = userid; -+ -+ /* Find the dir path where the sieve scripts of the user will reside */ -+ if (config_virtdomains && domain) { -+ if(snprintf(sieve_script_dir, buflen, "%s%s%c/%s/%c/%s/", -+ sieve_dir, FNAME_DOMAINDIR, dir_hash_c(domain, config_fulldirhash), domain, dir_hash_c(user,config_fulldirhash), user) >= buflen) { -+ free(user); -+ return 1; -+ } -+ } else { -+ if(snprintf(sieve_script_dir, buflen, "%s/%c/%s/", -+ sieve_dir, dir_hash_c(user,config_fulldirhash), user) >= buflen) -+ return 1; -+ } -+ -+ /* Free the xmalloced user memory, reserved above */ -+ if(user != userid) -+ free(user); -+ -+ return 0; -+} -+ -+int autoadd_sieve(char *userid, const char *source_script) -+{ -+ sieve_script_t *s = NULL; -+ bytecode_info_t *bc = NULL; -+ char *err = NULL; -+ FILE *in_stream, *out_fp; -+ int out_fd, in_fd, r, k; -+ int do_compile = 0; -+ const char *sieve_dir = NULL; -+ const char *compiled_source_script = NULL; -+ char sievename[MAX_FILENAME]; -+ char sieve_script_name[MAX_FILENAME]; -+ char sieve_script_dir[MAX_FILENAME]; -+ char sieve_bcscript_name[MAX_FILENAME]; -+ char sieve_default[MAX_FILENAME]; -+ char sieve_tmpname[MAX_FILENAME]; -+ char sieve_bctmpname[MAX_FILENAME]; -+ char sieve_bclink_name[MAX_FILENAME]; -+ char buf[4096]; -+ mode_t oldmask; -+ struct stat statbuf; -+ -+ /* We don't support using the homedirectory, like timsieved */ -+ if (config_getswitch(IMAPOPT_SIEVEUSEHOMEDIR)) { -+ syslog(LOG_WARNING,"autocreate_sieve: autocreate_sieve does not work with sieveusehomedir option in imapd.conf"); -+ return 1; -+ } -+ -+ /* Check if sievedir is defined in imapd.conf */ -+ if(!(sieve_dir = config_getstring(IMAPOPT_SIEVEDIR))) { -+ syslog(LOG_WARNING, "autocreate_sieve: sievedir option is not defined. Check imapd.conf"); -+ return 1; -+ } -+ -+ /* Check if autocreate_sieve_compiledscript is defined in imapd.conf */ -+ if(!(compiled_source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) { -+ syslog(LOG_WARNING, "autocreate_sieve: autocreate_sieve_compiledscript option is not defined. Compiling it"); -+ do_compile = 1; -+ } -+ -+ if(get_script_dir(sieve_script_dir, sizeof(sieve_script_dir), userid, sieve_dir)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Cannot find sieve scripts directory"); -+ return 1; -+ } -+ -+ if (get_script_name(sievename, sizeof(sievename), source_script)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve script %s", source_script); -+ return 1; -+ } -+ -+ if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s%s.script.NEW",sieve_script_dir, sievename) >= sizeof(sieve_tmpname)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_bctmpname, sizeof(sieve_bctmpname), "%s%s.bc.NEW",sieve_script_dir, sievename) >= sizeof(sieve_bctmpname)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_script_name, sizeof(sieve_script_name), "%s%s.script",sieve_script_dir, sievename) >= sizeof(sieve_script_name)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_bcscript_name, sizeof(sieve_bcscript_name), "%s%s.bc",sieve_script_dir, sievename) >= sizeof(sieve_bcscript_name)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_default, sizeof(sieve_default), "%s%s",sieve_script_dir,"defaultbc") >= sizeof(sieve_default)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_bclink_name, sizeof(sieve_bclink_name), "%s.bc", sievename) >= sizeof(sieve_bclink_name)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ -+ /* Check if a default sieve filter alrady exists */ -+ if(!stat(sieve_default,&statbuf)) { -+ syslog(LOG_WARNING,"autocreate_sieve: Default sieve script already exists"); -+ fclose(in_stream); -+ return 1; -+ } -+ -+ /* Open the source script. if there is a problem with that exit */ -+ in_stream = fopen(source_script, "r"); -+ if(!in_stream) { -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to open sieve script %s. Check permissions",source_script); -+ return 1; -+ } -+ -+ -+ /* -+ * At this point we start the modifications of the filesystem -+ */ -+ -+ /* Create the directory where the sieve scripts will reside */ -+ r = cyrus_mkdir(sieve_script_dir, 0755); -+ if(r == -1) { -+ /* If this fails we just leave */ -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to create directory %s. Check permissions",sieve_script_name); -+ return 1; -+ } -+ -+ /* -+ * We open the file that will be used as the bc file. If this file exists, overwrite it -+ * since something bad has happened. We open the file here so that this error checking is -+ * done before we try to open the rest of the files to start copying etc. -+ */ -+ out_fd = open(sieve_bctmpname, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); -+ if(out_fd < 0) { -+ if(errno == EEXIST) { -+ syslog(LOG_WARNING,"autocreate_sieve: File %s already exists. Probaly left over. Ignoring",sieve_bctmpname); -+ } else if (errno == EACCES) { -+ syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_bctmpname); -+ fclose(in_stream); -+ return 1; -+ } else { -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s. Unknown error",sieve_bctmpname); -+ fclose(in_stream); -+ return 1; -+ } -+ } -+ -+ if(!do_compile && compiled_source_script && (in_fd = open(compiled_source_script, O_RDONLY)) != -1) { -+ while((r = read(in_fd, buf, sizeof(buf))) > 0) { -+ if((k=write(out_fd, buf,r)) < 0) { -+ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_bctmpname, errno); -+ close(out_fd); -+ close(in_fd); -+ fclose(in_stream); -+ unlink(sieve_bctmpname); -+ return 1; -+ } -+ } -+ -+ if(r == 0) { /* EOF */ -+ close(out_fd); -+ close(in_fd); -+ } else if (r < 0) { -+ syslog(LOG_WARNING, "autocreate_sieve: Error reading compiled script file: %s. Will try to compile it", -+ compiled_source_script); -+ close(in_fd); -+ do_compile = 1; -+ if(lseek(out_fd, 0, SEEK_SET)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Major IO problem. Aborting"); -+ return 1; -+ } -+ } -+ close(in_fd); -+ } else { -+ if(compiled_source_script) -+ syslog(LOG_WARNING,"autocreate_sieve: Problem opening compiled script file: %s. Compiling it", compiled_source_script); -+ do_compile = 1; -+ } -+ -+ -+ /* Because we failed to open a precompiled bc sieve script, we compile one */ -+ if(do_compile) { -+ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) { -+ if(err && *err) { -+ syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script %s.",err); -+ free(err); -+ } else -+ syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script"); -+ -+ unlink(sieve_bctmpname); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ /* generate the bytecode */ -+ if(sieve_generate_bytecode(&bc, s) == TIMSIEVE_FAIL) { -+ syslog(LOG_WARNING,"autocreate_sieve: problem compiling sieve script"); -+ /* removing the copied script and cleaning up memory */ -+ unlink(sieve_bctmpname); -+ sieve_script_free(&s); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ if(sieve_emit_bytecode(out_fd, bc) == TIMSIEVE_FAIL) { -+ syslog(LOG_WARNING,"autocreate_sieve: problem emiting sieve script"); -+ /* removing the copied script and cleaning up memory */ -+ unlink(sieve_bctmpname); -+ sieve_free_bytecode(&bc); -+ sieve_script_free(&s); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ /* clean up the memory */ -+ sieve_free_bytecode(&bc); -+ sieve_script_free(&s); -+ } -+ -+ close(out_fd); -+ rewind(in_stream); -+ -+ /* Copy the initial script */ -+ oldmask = umask(077); -+ if((out_fp = fopen(sieve_tmpname, "w")) == NULL) { -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to open %s destination sieve script", sieve_tmpname); -+ unlink(sieve_bctmpname); -+ umask(oldmask); -+ fclose(in_stream); -+ return 1; -+ } -+ umask(oldmask); -+ -+ while((r = fread(buf,sizeof(char), sizeof(buf), in_stream))) { -+ if( fwrite(buf,sizeof(char), r, out_fp) != r) { -+ syslog(LOG_WARNING,"autocreate_sieve: Problem writing to sieve script file: %s",sieve_tmpname); -+ fclose(out_fp); -+ unlink(sieve_tmpname); -+ unlink(sieve_bctmpname); -+ fclose(in_stream); -+ return 1; -+ } -+ } -+ -+ if(feof(in_stream)) { -+ fclose(out_fp); -+ } else { /* ferror */ -+ fclose(out_fp); -+ unlink(sieve_tmpname); -+ unlink(sieve_bctmpname); -+ fclose(in_stream); -+ return 1; -+ } -+ -+ /* Renaming the necessary stuff */ -+ if(rename(sieve_tmpname, sieve_script_name)) { -+ unlink(sieve_tmpname); -+ unlink(sieve_bctmpname); -+ return 1; -+ } -+ -+ if(rename(sieve_bctmpname, sieve_bcscript_name)) { -+ unlink(sieve_bctmpname); -+ unlink(sieve_bcscript_name); -+ return 1; -+ } -+ -+ /* end now with the symlink */ -+ if(symlink(sieve_bclink_name, sieve_default)) { -+ if(errno != EEXIST) { -+ syslog(LOG_WARNING, "autocreate_sieve: problem making the default link."); -+ /* Lets delete the files */ -+ unlink(sieve_script_name); -+ unlink(sieve_bcscript_name); -+ } -+ } -+ -+ /* -+ * If everything has succeeded AND we have compiled the script AND we have requested -+ * to generate the global script so that it is not compiled each time then we create it. -+ */ -+ if(do_compile && -+ config_getswitch(IMAPOPT_GENERATE_COMPILED_SIEVE_SCRIPT)) { -+ -+ if(!compiled_source_script) { -+ syslog(LOG_WARNING, "autocreate_sieve: To save a compiled sieve script, autocreate_sieve_compiledscript must have been defined in imapd.conf"); -+ return 0; -+ } -+ -+ if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script) >= sizeof(sieve_tmpname)) -+ return 0; -+ -+ /* -+ * Copy everything from the newly created bc sieve sieve script. -+ */ -+ if((in_fd = open(sieve_bcscript_name, O_RDONLY))<0) { -+ return 0; -+ } -+ -+ if((out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0) { -+ if(errno == EEXIST) { -+ /* Someone is already doing this so just bail out. */ -+ syslog(LOG_WARNING, "autocreate_sieve: %s already exists. Some other instance processing it, or it is left over", sieve_tmpname); -+ close(in_fd); -+ return 0; -+ } else if (errno == EACCES) { -+ syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_tmpname); -+ close(in_fd); -+ return 0; -+ } else { -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s",sieve_tmpname); -+ close(in_fd); -+ return 0; -+ } -+ } -+ -+ while((r = read(in_fd, buf, sizeof(buf))) > 0) { -+ if((k = write(out_fd,buf,r)) < 0) { -+ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno); -+ close(out_fd); -+ close(in_fd); -+ unlink(sieve_tmpname); -+ return 0; -+ } -+ } -+ -+ if(r == 0 ) { /*EOF */ -+ close(out_fd); -+ close(in_fd); -+ } else if (r < 0) { -+ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno); -+ close(out_fd); -+ close(in_fd); -+ unlink(sieve_tmpname); -+ return 0; -+ } -+ -+ /* Rename the temporary created sieve script to its final name. */ -+ if(rename(sieve_tmpname, compiled_source_script)) { -+ if(errno != EEXIST) { -+ unlink(sieve_tmpname); -+ unlink(compiled_source_script); -+ } -+ return 0; -+ } -+ -+ syslog(LOG_NOTICE, "autocreate_sieve: Compiled sieve script was successfully saved in %s", compiled_source_script); -+ } -+ -+ return 0; -+} -+ -+/*static void fatal(const char *s, int code) -+{ -+ printf("Fatal error: %s (%d)\r\n", s, code); -+ exit(1); -+}*/ -+ -+/* to make larry's stupid functions happy :) */ -+static void foo(void) -+{ -+ fatal("stub function called", 0); -+} -+ -+static int sieve_notify(void *ac __attribute__((unused)), -+ void *interp_context __attribute__((unused)), -+ void *script_context __attribute__((unused)), -+ void *message_context __attribute__((unused)), -+ const char **errmsg __attribute__((unused))) -+{ -+ fatal("stub function called", 0); -+ return SIEVE_FAIL; -+} -+ -+static int mysieve_error(int lineno, const char *msg, -+ void *i __attribute__((unused)), void *s) -+{ -+ char buf[1024]; -+ char **errstr = (char **) s; -+ -+ snprintf(buf, 80, "line %d: %s\r\n", lineno, msg); -+ *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30); -+ syslog(LOG_DEBUG, "%s", buf); -+ strcat(*errstr, buf); -+ -+ return SIEVE_OK; -+} -+ -+/* end the boilerplate */ -+ -+/* returns TRUE or FALSE */ -+int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret) -+{ -+ sieve_interp_t *i; -+ sieve_script_t *s; -+ int res; -+ -+ res = sieve_interp_alloc(&i, NULL); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_interp_alloc() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_redirect(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_redirect() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_discard(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_discard() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_reject(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_reject() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_fileinto(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_fileinto() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_keep(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_keep() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_imapflags(i, NULL); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_imapflags() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_size(i, (sieve_get_size *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_size() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_header(i, (sieve_get_header *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_header() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_envelope(i, (sieve_get_envelope *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_envelope() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_vacation(i, &vacation2); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_vacation() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_notify(i, &sieve_notify); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_notify() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_parse_error(i, &mysieve_error); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_parse_error() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ rewind(stream); -+ -+ *errstr = (char *) xmalloc(20 * sizeof(char)); -+ strcpy(*errstr, "script errors:\r\n"); -+ -+ res = sieve_script_parse(i, stream, errstr, &s); -+ -+ if (res == SIEVE_OK) { -+ if(ret) { -+ *ret = s; -+ } else { -+ sieve_script_free(&s); -+ } -+ free(*errstr); -+ *errstr = NULL; -+ } -+ -+ /* free interpreter */ -+ sieve_interp_free(&i); -+ -+ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL; -+} -+ -+/* -+ * Btw the initial date of this patch is Sep, 02 2004 which is the birthday of -+ * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present -+ */ -+ -diff -Naur cyrus-imapd-2.3.15.orig/imap/compile_sieve.c cyrus-imapd-2.3.15/imap/compile_sieve.c ---- cyrus-imapd-2.3.15.orig/imap/compile_sieve.c 1970-01-01 01:00:00.000000000 +0100 -+++ cyrus-imapd-2.3.15/imap/compile_sieve.c 2009-09-09 16:13:03.000000000 +0200 -@@ -0,0 +1,365 @@ -+/* This tool compiles the sieve script from a command -+line so that it can be used wby the autoadd patch */ -+#include -+#include -+ -+#include -+#include -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "global.h" -+ -+#include "util.h" -+#include "xmalloc.h" -+#include "xstrlcpy.h" -+#include "xstrlcat.h" -+#include "mailbox.h" -+#include "imap_err.h" -+#include "sieve_interface.h" -+#include "script.h" -+ -+#include -+ -+#define TIMSIEVE_FAIL -1 -+#define TIMSIEVE_OK 0 -+#define MAX_FILENAME_SIZE 100 -+ -+/* Needed by libconfig */ -+const int config_need_data = 0; -+ -+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret); -+ -+/*static void fatal(const char *s, int code) -+{ -+ printf("Fatal error: %s (%d)\r\n", s, code); -+ -+ exit(1); -+}*/ -+ -+void usage(void) -+{ -+ fprintf(stderr, -+ "Usage:\n\tcompile_sieve [-C ] [-i -o ]\n"); -+ exit(-1); -+} -+ -+ -+int main (int argc, char **argv) -+{ -+ -+ sieve_script_t *s = NULL; -+ bytecode_info_t *bc = NULL; -+ char *err = NULL; -+ FILE *in_stream; -+ int out_fd, opt; -+ char *source_script = NULL; -+ char *compiled_source_script = NULL; -+ char *alt_config = NULL; -+ extern char *optarg; -+ char sieve_tmpname[MAX_MAILBOX_NAME+1]; -+ -+ if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE); -+ -+ while((opt = getopt(argc, argv, "C:i:o:")) != EOF) { -+ switch (opt) { -+ case 'C': /* alt config file */ -+ alt_config = optarg; -+ break; -+ case 'i': /* input script file */ -+ source_script = optarg; -+ break; -+ case 'o': /* output script file */ -+ compiled_source_script = optarg; -+ break; -+ default: -+ usage(); -+ break; -+ } -+ } -+ -+ if(source_script && !compiled_source_script) { -+ fprintf(stderr, "No output file was defined\n"); -+ usage(); -+ } else if (!source_script && compiled_source_script) { -+ fprintf(stderr, "No input file was defined\n"); -+ usage(); -+ } -+ -+ /* -+ * If no has been defined, then read them from -+ * the configuration file. -+ */ -+ if (!source_script && !compiled_source_script) { -+ cyrus_init(alt_config, "compile_sieve", 0); -+ -+ /* Initially check if we want to have the sieve script created */ -+ if(!(source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT))) { -+ fprintf(stderr,"autocreate_sieve_script option not defined. Check imapd.conf\n"); -+ return 1; -+ } -+ -+ /* Check if we have an already compiled sieve script*/ -+ if(!(compiled_source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) { -+ fprintf(stderr, "autocreate_sieve_compiledscript option not defined. Check imapd.conf\n"); -+ return 1; -+ } -+ -+ if(!strrchr(source_script,'/') || !strrchr(compiled_source_script,'/')) { -+ /* -+ * At this point the only think that is inconsistent is the directory -+ * that was created. But if the user will have any sieve scripts then -+ * they will eventually go there, so no big deal -+ */ -+ fprintf(stderr, -+ "In imapd.conf the full path of the filenames must be defined\n"); -+ return 1; -+ } -+ } -+ -+ printf("input file : %s, output file : %s\n", source_script, compiled_source_script); -+ -+ -+ if(strlen(compiled_source_script) + sizeof(".NEW") + 1 > sizeof(sieve_tmpname)) { -+ fprintf(stderr, "Filename %s is too big\n", compiled_source_script); -+ return 1; -+ } -+ -+ snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script); -+ -+ in_stream = fopen(source_script,"r"); -+ -+ if(!in_stream) { -+ fprintf(stderr,"Unable to open %s source sieve script\n",source_script); -+ return 1; -+ } -+ -+ /* -+ * We open the file that will be used as the bc file. If this file exists, overwrite it -+ * since something bad has happened. We open the file here so that this error checking is -+ * done before we try to open the rest of the files to start copying etc. -+ */ -+ out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); -+ if(out_fd < 0) { -+ if(errno == EEXIST) { -+ fprintf(stderr, "File %s already exists\n", sieve_tmpname); -+ } else if (errno == EACCES) { -+ fprintf(stderr,"No access to create file %s. Please check that you have the correct permissions\n", -+ sieve_tmpname); -+ } else { -+ fprintf(stderr,"Unable to create %s. Please check that you have the correct permissions\n", -+ sieve_tmpname); -+ } -+ -+ fclose(in_stream); -+ return 1; -+ } -+ -+ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) { -+ if(err && *err) { -+ fprintf(stderr, "Error while parsing script %s\n",err); -+ free(err); -+ } -+ else -+ fprintf(stderr,"Error while parsing script\n"); -+ unlink(sieve_tmpname); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ -+ /* generate the bytecode */ -+ if(sieve_generate_bytecode(&bc,s) == TIMSIEVE_FAIL) { -+ fprintf(stderr,"Error occured while compiling sieve script\n"); -+ /* removing the copied script and cleaning up memory */ -+ unlink(sieve_tmpname); -+ sieve_script_free(&s); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ if(sieve_emit_bytecode(out_fd,bc) == TIMSIEVE_FAIL) { -+ fprintf(stderr, "Error occured while emitting sieve script\n"); -+ unlink(sieve_tmpname); -+ sieve_free_bytecode(&bc); -+ sieve_script_free(&s); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ /* clean up the memory */ -+ sieve_free_bytecode(&bc); -+ sieve_script_free(&s); -+ -+ close(out_fd); -+ -+ if(rename(sieve_tmpname, compiled_source_script)) { -+ if(errno != EEXIST) { -+ unlink(sieve_tmpname); -+ unlink(compiled_source_script); -+ return 1; -+ } -+ } -+ return 0; -+} -+ -+ -+/* to make larry's stupid functions happy :) */ -+static void foo(void) -+{ -+ fatal("stub function called", 0); -+} -+ -+extern sieve_vacation_t vacation2;/* = { -+ 0, / min response / -+ 0, / max response / -+ (sieve_callback *) &foo, / autorespond() / -+ (sieve_callback *) &foo / send_response() / -+}; */ -+ -+static int sieve_notify(void *ac __attribute__((unused)), -+ void *interp_context __attribute__((unused)), -+ void *script_context __attribute__((unused)), -+ void *message_context __attribute__((unused)), -+ const char **errmsg __attribute__((unused))) -+{ -+ fatal("stub function called", 0); -+ return SIEVE_FAIL; -+} -+ -+static int mysieve_error(int lineno, const char *msg, -+ void *i __attribute__((unused)), void *s) -+{ -+ char buf[1024]; -+ char **errstr = (char **) s; -+ -+ snprintf(buf, 80, "line %d: %s\r\n", lineno, msg); -+ *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30); -+ fprintf(stderr, "%s\n", buf); -+ strcat(*errstr, buf); -+ -+ return SIEVE_OK; -+} -+ -+/* end the boilerplate */ -+ -+/* returns TRUE or FALSE */ -+int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret) -+{ -+ sieve_interp_t *i; -+ sieve_script_t *s; -+ int res; -+ -+ res = sieve_interp_alloc(&i, NULL); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_interp_alloc() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_redirect(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_redirect() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_discard(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_discard() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_reject(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_reject() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_fileinto(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_fileinto() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_keep(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_keep() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_imapflags(i, NULL); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_imapflags() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_size(i, (sieve_get_size *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_size() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_header(i, (sieve_get_header *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_header() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_envelope(i, (sieve_get_envelope *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_envelope() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_vacation(i, &vacation2); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_vacation() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_notify(i, &sieve_notify); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_notify() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_parse_error(i, &mysieve_error); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_parse_error() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ rewind(stream); -+ -+ *errstr = (char *) xmalloc(20 * sizeof(char)); -+ strcpy(*errstr, "script errors:\r\n"); -+ -+ res = sieve_script_parse(i, stream, errstr, &s); -+ -+ if (res == SIEVE_OK) { -+ if(ret) { -+ *ret = s; -+ } else { -+ sieve_script_free(&s); -+ } -+ free(*errstr); -+ *errstr = NULL; -+ } -+ -+ /* free interpreter */ -+ sieve_interp_free(&i); -+ -+ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL; -+} -+ -+ -+ -+ -+ -+ -diff -Naur cyrus-imapd-2.3.15.orig/imap/imapd.c cyrus-imapd-2.3.15/imap/imapd.c ---- cyrus-imapd-2.3.15.orig/imap/imapd.c 2009-07-29 17:51:21.000000000 +0200 -+++ cyrus-imapd-2.3.15/imap/imapd.c 2009-09-09 16:13:03.000000000 +0200 -@@ -211,6 +211,7 @@ - void motd_file(int fd); - void shut_down(int code); - void fatal(const char *s, int code); -+void autocreate_inbox(void); - - void cmdloop(void); - void cmd_login(char *tag, char *user); -@@ -2003,6 +2004,43 @@ - } - - /* -+ * Autocreate Inbox and subfolders upon login -+ */ -+void autocreate_inbox() -+{ -+ char inboxname[MAX_MAILBOX_NAME+1]; -+ int autocreatequota; -+ int r; -+ -+ /* -+ * Exlude admin's accounts -+ */ -+ if (imapd_userisadmin || imapd_userisproxyadmin) -+ return; -+ -+ /* -+ * Exclude anonymous -+ */ -+ if (!strcmp(imapd_userid, "anonymous")) -+ return; -+ -+ if ((autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) { -+ /* This is actyally not required -+ as long as the lenght of userid is ok */ -+ r = (*imapd_namespace.mboxname_tointernal) (&imapd_namespace, -+ "INBOX", imapd_userid, inboxname); -+ if (!r) -+ r = mboxlist_lookup(inboxname, NULL, NULL); -+ -+ if (r == IMAP_MAILBOX_NONEXISTENT) { -+ mboxlist_autocreateinbox(&imapd_namespace, imapd_userid, -+ imapd_authstate, inboxname, autocreatequota); -+ } -+ } -+} -+ -+ -+/* - * Perform a LOGIN command - */ - void cmd_login(char *tag, char *user) -@@ -2179,6 +2217,9 @@ - strcspn(imapd_userid, "@") : 0); - - freebuf(&passwdbuf); -+ -+ autocreate_inbox(); -+ - return; - } - -@@ -2336,6 +2377,8 @@ - config_virtdomains ? - strcspn(imapd_userid, "@") : 0); - -+ autocreate_inbox(); -+ - return; - } - -diff -Naur cyrus-imapd-2.3.15.orig/imap/lmtpd.c cyrus-imapd-2.3.15/imap/lmtpd.c ---- cyrus-imapd-2.3.15.orig/imap/lmtpd.c 2009-04-23 19:10:06.000000000 +0200 -+++ cyrus-imapd-2.3.15/imap/lmtpd.c 2009-09-09 16:13:03.000000000 +0200 -@@ -117,6 +117,8 @@ - static FILE *spoolfile(message_data_t *msgdata); - static void removespool(message_data_t *msgdata); - -+static int autocreate_inbox(const char *user, const char *domain); -+ - /* current namespace */ - static struct namespace lmtpd_namespace; - -@@ -977,6 +979,86 @@ - exit(code); - } - -+ -+/* -+ * Autocreate Inbox and subfolders upon login -+ */ -+int autocreate_inbox(const char *user, const char *domain) -+{ -+ struct auth_state *auth_state; -+ char inboxname[MAX_MAILBOX_NAME+1]; -+ char *rcpt_userid = NULL; -+ int autocreatequota; -+ int r = 0; -+ -+ if (user == NULL) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ if (domain != NULL) { -+ int k; -+ -+ rcpt_userid = (char *) xmalloc((strlen(user) + strlen(domain) + 2) * sizeof(char)); -+ k = strlcpy(rcpt_userid, user, strlen(user) + 1); -+ *(rcpt_userid + k) = '@'; -+ strlcpy(rcpt_userid + k + 1, domain, strlen(domain) + 1); -+ } else { -+ rcpt_userid = (char *) user; -+ } -+ -+ -+ /* -+ * Exclude anonymous -+ */ -+ if (!strcmp(rcpt_userid, "anonymous")) { -+ if (rcpt_userid != user) { -+ free(rcpt_userid); -+ } -+ -+ return IMAP_MAILBOX_NONEXISTENT; -+ } -+ -+ /* -+ * Check for autocreatequota and createonpost -+ */ -+ if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA)) || -+ !(config_getswitch(IMAPOPT_CREATEONPOST))) { -+ -+ if (rcpt_userid != user) { -+ free(rcpt_userid); -+ } -+ -+ return IMAP_MAILBOX_NONEXISTENT; -+ } -+ -+ -+ /* -+ * Exclude admin's accounts -+ */ -+ auth_state = auth_newstate(rcpt_userid); -+ -+ if (global_authisa(auth_state, IMAPOPT_ADMINS)) { -+ if (rcpt_userid != user) { -+ free(rcpt_userid); -+ } -+ -+ return IMAP_MAILBOX_NONEXISTENT; -+ } -+ -+ r = (*lmtpd_namespace.mboxname_tointernal) (&lmtpd_namespace, -+ "INBOX", rcpt_userid, inboxname); -+ -+ if (!r) -+ r = mboxlist_autocreateinbox(&lmtpd_namespace, rcpt_userid, -+ auth_state, inboxname, autocreatequota); -+ -+ if (rcpt_userid != user) { -+ free(rcpt_userid); -+ } -+ -+ return r; -+} -+ -+ - static int verify_user(const char *user, const char *domain, char *mailbox, - quota_t quotacheck, struct auth_state *authstate) - { -@@ -1020,6 +1102,15 @@ - */ - r = mlookup(namebuf, &server, &acl, NULL); - -+ /* If user mailbox does not exist, then invoke autocreate inbox function */ -+ if (r == IMAP_MAILBOX_NONEXISTENT) { -+ r = autocreate_inbox(user, domain); -+ -+ /* Try to locate the mailbox again */ -+ if (!r) -+ r = mlookup(namebuf, &server, &acl, NULL); -+ } -+ - if (r == IMAP_MAILBOX_NONEXISTENT && !user && - config_getswitch(IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH) && - /* see if we have a mailbox whose name is close */ -@@ -1046,6 +1137,7 @@ - aclcheck, (quotacheck < 0) - || config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ? - quotacheck : 0); -+ - } - } - -diff -Naur cyrus-imapd-2.3.15.orig/imap/Makefile.in cyrus-imapd-2.3.15/imap/Makefile.in ---- cyrus-imapd-2.3.15.orig/imap/Makefile.in 2009-03-30 18:04:56.000000000 +0200 -+++ cyrus-imapd-2.3.15/imap/Makefile.in 2009-09-09 16:28:02.000000000 +0200 -@@ -101,7 +101,7 @@ - convert_code.o duplicate.o saslclient.o saslserver.o signals.o \ - annotate.o search_engines.o squat.o squat_internal.o mbdump.o \ - imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \ -- sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ -+ sync_log.o autosieve.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ - statuscache_db.o - - IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o -@@ -118,7 +118,7 @@ - fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \ - cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \ - ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \ -- unexpunge cyr_df @IMAP_PROGS@ -+ unexpunge cyr_df compile_sieve @IMAP_PROGS@ - - BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \ - lmtpstats.c lmtpstats.h xversion.h mupdate_err.c mupdate_err.h \ -@@ -183,9 +183,9 @@ - mupdate_err.h: mupdate_err.c - - ### Services --idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) -+idled: idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o idled \ -- idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) -+ idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - - lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \ - libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) -@@ -199,166 +199,170 @@ - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) -+imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o imapd \ - $(SERVICE) $(IMAPDOBJS) mutex_fake.o \ -- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) -+imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \ - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) -+imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \ - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \ -- libimap.a $(DEPLIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o mupdate \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ - mutex_pthread.o tls.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread - - mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ -- libimap.a $(DEPLIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ -- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ mutex_pthread.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread - - pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \ -- $(DEPLIBS) $(SERVICE) -+ $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \ -- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \ -- mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE) -+ mutex_fake.o nntp_err.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \ - smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \ -- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) -+fud: fud.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) -+smmapd: smmapd.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - sync_server: sync_server.o sync_support.o sync_commit.o \ -- imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) -+ imapparse.o tls.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o \ - sync_server sync_server.o sync_support.o sync_commit.o \ - imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - ### Command Line Utilities --arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS) -+arbitron: arbitron.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS) -+cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS) -+cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS) -+cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS) -+chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS) -+deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \ -- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) -+ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) -+ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $@ ctl_deliver.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS) -+ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) -+ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS) -+cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) -+fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $@ fetchnews.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS) -+squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \ -- $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS) -+mbpath: mbpath.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \ -- $(DEPLIBS) $(LIBS) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS) -+ipurge: ipurge.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cyr_virusscan: cyr_virusscan.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) -+cyr_virusscan: cyr_virusscan.o index.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyr_virusscan cyr_virusscan.o index.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -lclamav -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) -lclamav - --cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) -+cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) -+cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- cyr_df cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ cyr_df cyr_df.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) -+mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ mbexamine mbexamine.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) -+reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ reconstruct reconstruct.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS) -+quota: quota.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) -+tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS) -+unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS) -- $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) -+make_md5: make_md5.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) -+ $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) -- $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) -+make_sha1: make_sha1.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) -+ $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - - sync_client: sync_client.o sync_support.o \ -- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) -+ backend.o tls.o imapparse.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ - sync_client sync_client.o sync_support.o \ -- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) -+ backend.o tls.o imapparse.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - - sync_reset: sync_reset.o sync_support.o sync_commit.o \ -- libimap.a mutex_fake.o $(DEPLIBS) -+ libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ - sync_reset sync_reset.o sync_support.o sync_commit.o \ -- libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) -+ libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) -+ -+compile_sieve: compile_sieve.o libimap.a $(DEPLIBS) $(SIEVE_LIBS) -+ $(CC) $(LDFLAGS) -o compile_sieve compile_sieve.o $(CLIOBJS) \ -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - - ### Other Misc Targets - -diff -Naur cyrus-imapd-2.3.15.orig/imap/mboxlist.c cyrus-imapd-2.3.15/imap/mboxlist.c ---- cyrus-imapd-2.3.15.orig/imap/mboxlist.c 2009-07-28 04:46:23.000000000 +0200 -+++ cyrus-imapd-2.3.15/imap/mboxlist.c 2009-09-09 16:13:03.000000000 +0200 -@@ -83,6 +83,12 @@ - #include "quota.h" - #include "sync_log.h" - -+#ifdef USE_SIEVE -+extern int autoadd_sieve(char *userid, -+ const char *source_script); -+#endif -+ -+ - #define DB config_mboxlist_db - #define SUBDB config_subscription_db - -@@ -100,11 +106,29 @@ - static int mboxlist_changequota(const char *name, int matchlen, int maycreate, - void *rock); - -+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate, -+ void *rock); -+ -+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace, -+ char *userid, char *auth_userid, -+ struct auth_state *auth_state); -+ - struct change_rock { - struct quota *quota; - struct txn **tid; - }; - -+/* -+ * Struct needed to be passed as void *rock to -+ * mboxlist_autochangesub(); -+ */ -+struct changesub_rock_st { -+ char *userid; -+ char *auth_userid; -+ struct auth_state *auth_state; -+}; -+ -+ - #define FNAME_SUBSSUFFIX ".sub" - - /* -@@ -3413,3 +3437,349 @@ - - return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED); - } -+ -+/* -+ * Automatically subscribe user to *ALL* shared folders, -+ * one has permissions to be subscribed to. -+ * INBOX subfolders are excluded. -+ */ -+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate, -+ void *rock) { -+ -+ struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock; -+ char *userid = changesub_rock->userid; -+ char *auth_userid = changesub_rock->auth_userid; -+ struct auth_state *auth_state = changesub_rock->auth_state; -+ int r; -+ -+ -+ if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */ -+ (strlen(name) > 5 && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */ -+ (strlen(name) > 4 && !strncmp(name, "user.", 5))) /* Exclude other users' folders */ -+ return 0; -+ -+ -+ r = mboxlist_changesub(name, userid, auth_state, 1, 0); -+ -+ if (r) { -+ syslog(LOG_WARNING, -+ "autosubscribe: User %s to folder %s, subscription failed: %s", -+ auth_userid, name, error_message(r)); -+ } else { -+ syslog(LOG_NOTICE, -+ "autosubscribe: User %s to folder %s, subscription succeeded", -+ auth_userid, name); -+ } -+ -+ return 0; -+} -+ -+#define SEP '|' -+ -+/* -+ * Automatically subscribe user to a shared folder. -+ * Subscription is done successfully, if the shared -+ * folder exists and the user has the necessary -+ * permissions. -+ */ -+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace, -+ char *userid, char *auth_userid, -+ struct auth_state *auth_state) { -+ -+ const char *sub ; -+ char *p, *q, *next_sub; -+ char folder[MAX_MAILBOX_NAME+1], name[MAX_MAILBOX_NAME+1], mailboxname[MAX_MAILBOX_NAME+1]; -+ int len; -+ int r = 0; -+ int subscribe_all_sharedfolders = 0; -+ -+ subscribe_all_sharedfolders = config_getswitch(IMAPOPT_AUTOSUBSCRIBE_ALL_SHAREDFOLDERS); -+ -+ /* -+ * If subscribeallsharedfolders is set to yes in imapd.conf, then -+ * subscribe user to every shared folder one has the apropriate -+ * permissions. -+ */ -+ if(subscribe_all_sharedfolders) { -+ char pattern[MAX_MAILBOX_PATH+1]; -+ struct changesub_rock_st changesub_rock; -+ -+ strcpy(pattern, "*"); -+ changesub_rock.userid = userid; -+ changesub_rock.auth_userid = auth_userid; -+ changesub_rock.auth_state = auth_state; -+ -+ r = mboxlist_findall(namespace, pattern, 0, userid, -+ auth_state, mboxlist_autochangesub, &changesub_rock); -+ -+ return r; -+ } -+ -+ if ((sub=config_getstring(IMAPOPT_AUTOSUBSCRIBESHAREDFOLDERS)) == NULL) -+ return r; -+ -+ next_sub = (char *) sub; -+ while (*next_sub) { -+ for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++); -+ for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++); -+ for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--); -+ if (!*p ) continue; -+ -+ len = q - p + 1; -+ /* Check for folder length */ -+ if (len > sizeof(folder)-1) -+ continue; -+ -+ if (!r) { -+ strncpy(folder, p, len); -+ folder[len] = '\0'; -+ -+ strlcpy(name, namespace->prefix[NAMESPACE_SHARED], sizeof(name)); -+ len = strlcat(name, folder, sizeof(name)); -+ -+ r = (namespace->mboxname_tointernal) (namespace, name, userid, -+ mailboxname); -+ } -+ -+ if (!r) -+ r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 0); -+ -+ if (!r) { -+ syslog(LOG_NOTICE, "autosubscribe: User %s to %s succeeded", -+ userid, folder); -+ } else { -+ syslog(LOG_WARNING, "autosubscribe: User %s to %s failed: %s", -+ userid, folder, error_message(r)); -+ r = 0; -+ } -+ } -+ -+ return r; -+} -+ -+ -+ -+int mboxlist_autocreateinbox(struct namespace *namespace, -+ char *userid, -+ struct auth_state *auth_state, -+ char *mailboxname, int autocreatequota) { -+ char name [MAX_MAILBOX_NAME+1]; -+ char folder [MAX_MAILBOX_NAME+1]; -+ char *auth_userid = NULL; -+ char *partition = NULL; -+ const char *crt; -+ const char *sub; -+ char *p, *q, *next_crt, *next_sub; -+ int len; -+ int r = 0; -+ int numcrt = 0; -+ int numsub = 0; -+#ifdef USE_SIEVE -+ const char *source_script; -+#endif -+ -+ -+ -+ auth_userid = auth_canonuser(auth_state); -+ if (auth_userid == NULL) { -+ /* -+ * Couldn't get cannon userid -+ */ -+ syslog(LOG_ERR, -+ "autocreateinbox: Could not get canonified userid for user %s", userid); -+ return IMAP_PARTITION_UNKNOWN; -+ } -+ -+ /* Added this for debug information. */ -+ syslog(LOG_DEBUG, "autocreateinbox: autocreate inbox for user %s was called", auth_userid); -+ -+ /* -+ * While this is not needed for admins -+ * and imap_admins accounts, it would be -+ * better to separate *all* admins and -+ * proxyservers from normal accounts -+ * (accounts that have mailboxes). -+ * UOA Specific note(1): Even if we do not -+ * exclude these servers-classes here, -+ * UOA specific code, will neither return -+ * role, nor create INBOX, because none of these -+ * administrative accounts belong to the -+ * mailRecipient objectclass, or have imapPartition. -+ * UOA Specific note(2): Another good reason for doing -+ * this, is to prevent the code, from getting into -+ * cyrus_ldap.c because of the continues MSA logins to LMTPd. -+ */ -+ -+ /* -+ * admins and the coresponding imap -+ * service, had already been excluded. -+ */ -+ -+ /* -+ * Do we really need group membership -+ * for admins or service_admins? -+ */ -+ if (global_authisa(auth_state, IMAPOPT_ADMINS)) return 0; -+ -+ /* -+ * Do we really need group membership -+ * for proxyservers? -+ */ -+ if (global_authisa(auth_state, IMAPOPT_PROXYSERVERS)) return 0; -+ -+ /* -+ * Check if user belongs to the autocreate_users group. This option -+ * controls for whom the mailbox may be automatically created. Default -+ * value for this option is 'anyone'. So, if not declared, all mailboxes -+ * will be created. -+ */ -+ if (!global_authisa(auth_state, IMAPOPT_AUTOCREATE_USERS)) { -+ syslog(LOG_DEBUG, "autocreateinbox: User %s does not belong to the autocreate_users. No mailbox is created", -+ auth_userid); -+ return IMAP_MAILBOX_NONEXISTENT; -+ } -+ -+#if 0 -+ /* -+ * Get Partition info or return. -+ * (Here you should propably use -+ * you own "get_partition(char *userid)" -+ * function. Otherwise all new INBOXes will be -+ * created into whatever partition has been declared -+ * as default in your imapd.conf) -+ */ -+ -+ partition = get_partition(userid); -+ if (partition == NULL) { -+ /* -+ * Couldn't get partition info -+ */ -+ syslog(LOG_ERR, -+ "Could not get imapPartition info for user %s", userid); -+ return IMAP_PARTITION_UNKNOWN; -+ } -+#endif -+ -+ r = mboxlist_createmailbox(mailboxname, MAILBOX_FORMAT_NORMAL, NULL, -+ 1, userid, auth_state, 0, 0, 0); -+ -+ if (!r && autocreatequota > 0) -+ r = mboxlist_setquota(mailboxname, autocreatequota, 0); -+ -+ if (!r) -+ r = mboxlist_changesub(mailboxname, userid, -+ auth_state, 1, 1); -+ -+ if (!r) { -+ syslog(LOG_NOTICE, "autocreateinbox: User %s, INBOX was successfully created in partition %s", -+ auth_userid, partition == NULL ? "default" : partition); -+ } else { -+ syslog(LOG_ERR, "autocreateinbox: User %s, INBOX failed. %s", -+ auth_userid, error_message(r)); -+ } -+ -+#if 0 -+ /* Allocated from get_partition, and not needed any more */ -+ free_partition(partition); -+#endif -+ -+ if (r) return r; -+ -+ /* INBOX's subfolders */ -+ if ((crt=config_getstring(IMAPOPT_AUTOCREATEINBOXFOLDERS))) -+ sub=config_getstring(IMAPOPT_AUTOSUBSCRIBEINBOXFOLDERS); -+ -+ /* Roll through crt */ -+ next_crt = (char *) crt; -+ while (next_crt!=NULL && *next_crt) { -+ for (p = next_crt ; isspace((int) *p) || *p == SEP ; p++); -+ for (next_crt = p ; *next_crt && *next_crt != SEP ; next_crt++); -+ for (q = next_crt ; q > p && (isspace((int) *q) || *q == SEP || !*q); q--); -+ -+ if (!*p) continue; -+ -+ len = q - p + 1; -+ -+ /* First time we check for length */ -+ if (len > sizeof(folder) - 5) -+ r = IMAP_MAILBOX_BADNAME; -+ -+ if (!r) { -+ strncpy(folder, p, len); -+ folder[len] = '\0'; -+ -+ strlcpy(name, namespace->prefix[NAMESPACE_INBOX], sizeof(name)); -+ len = strlcat(name, folder, sizeof(name)); -+ } -+ -+ if (!r) -+ r = (namespace->mboxname_tointernal) (namespace, name, userid, -+ mailboxname); -+ if (!r) -+ r = mboxlist_createmailbox(mailboxname, MAILBOX_FORMAT_NORMAL, NULL, -+ 1, userid, auth_state, 0, 0, 0); -+ -+ if (!r) { -+ numcrt++; -+ syslog(LOG_NOTICE, "autocreateinbox: User %s, subfolder %s creation succeeded.", -+ auth_userid, name); -+ } else { -+ syslog(LOG_WARNING, "autocreateinbox: User %s, subfolder %s creation failed. %s", -+ auth_userid, name, error_message(r)); -+ r=0; -+ continue; -+ } -+ -+ /* Roll through sub */ -+ next_sub = (char *) sub; -+ while (next_sub!=NULL && *next_sub) { -+ for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++); -+ for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++); -+ for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--); -+ if (!*p ) continue; -+ -+ len = q - p + 1; -+ -+ if (len != strlen(folder) || strncmp(folder, p, len)) -+ continue; -+ -+ r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 1); -+ -+ if (!r) { -+ numsub++; -+ syslog(LOG_NOTICE,"autocreateinbox: User %s, subscription to %s succeeded", -+ auth_userid, name); -+ } else -+ syslog(LOG_WARNING, "autocreateinbox: User %s, subscription to %s failed. %s", -+ auth_userid, name, error_message(r)); -+ -+ break; -+ } -+ } -+ -+ if (crt!=NULL && *crt) -+ syslog(LOG_INFO, "User %s, Inbox subfolders, created %d, subscribed %d", -+ auth_userid, numcrt, numsub); -+ -+ /* -+ * Check if shared folders are available for subscription. -+ */ -+ mboxlist_autosubscribe_sharedfolders(namespace, userid, auth_userid, auth_state); -+ -+#ifdef USE_SIEVE -+ /* -+ * Here the autocreate sieve script feature is iniated from. -+ */ -+ source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT); -+ -+ if (source_script) { -+ if (!autoadd_sieve(userid, source_script)) -+ syslog(LOG_NOTICE, "autocreate_sieve: User %s, default sieve script creation succeeded", auth_userid); -+ else -+ syslog(LOG_WARNING, "autocreate_sieve: User %s, default sieve script creation failed", auth_userid); -+ } -+#endif -+ -+ return r; -+} -+ -diff -Naur cyrus-imapd-2.3.15.orig/imap/mboxlist.h cyrus-imapd-2.3.15/imap/mboxlist.h ---- cyrus-imapd-2.3.15.orig/imap/mboxlist.h 2009-05-05 03:20:03.000000000 +0200 -+++ cyrus-imapd-2.3.15/imap/mboxlist.h 2009-09-09 16:13:03.000000000 +0200 -@@ -216,4 +216,8 @@ - int mboxlist_abort(struct txn *tid); - - int mboxlist_delayed_delete_isenabled(void); -+int mboxlist_autocreateinbox(struct namespace *namespace,char *userid, -+ struct auth_state *auth_state, char *mailboxname, -+ int autocreatequota); -+ - #endif -diff -Naur cyrus-imapd-2.3.15.orig/imap/pop3d.c cyrus-imapd-2.3.15/imap/pop3d.c ---- cyrus-imapd-2.3.15.orig/imap/pop3d.c 2009-04-23 19:10:07.000000000 +0200 -+++ cyrus-imapd-2.3.15/imap/pop3d.c 2009-09-09 16:13:03.000000000 +0200 -@@ -173,6 +173,8 @@ - static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* */ - static void cmd_apop(char *response); - -+static int autocreate_inbox(char *inboxname, char *userid); -+ - static void cmd_auth(char *arg); - static void cmd_capa(void); - static void cmd_pass(char *pass); -@@ -1246,6 +1248,7 @@ - popd_userid = xstrdup(userbuf); - prot_printf(popd_out, "+OK Name is a valid mailbox\r\n"); - } -+ - } - - void cmd_pass(char *pass) -@@ -1549,6 +1552,43 @@ - } - - /* -+ * Autocreate Inbox and subfolders upon login -+ */ -+int autocreate_inbox(char *inboxname, char *auth_userid) -+{ -+ struct auth_state *auth_state; -+ int autocreatequota; -+ int r; -+ -+ if (inboxname == NULL || auth_userid == NULL) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ /* -+ * Exclude anonymous -+ */ -+ if (!strcmp(popd_userid, "anonymous")) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ /* -+ * Check for autocreatequota -+ */ -+ if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ /* -+ * Exclude admin's accounts -+ */ -+ auth_state = auth_newstate(popd_userid); -+ if (global_authisa(auth_state, IMAPOPT_ADMINS)) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ r = mboxlist_autocreateinbox(&popd_namespace, auth_userid, -+ auth_state, inboxname, autocreatequota); -+ return r; -+} -+ -+ -+/* - * Complete the login process by opening and locking the user's inbox - */ - int openinbox(void) -@@ -1577,6 +1617,12 @@ - - if (!r) r = mboxlist_detail(inboxname, &type, NULL, NULL, - &server, &acl, NULL); -+ -+ /* Try once again after autocreate_inbox */ -+ if (r == IMAP_MAILBOX_NONEXISTENT && !(r = autocreate_inbox(inboxname, userid))) -+ r = mboxlist_detail(inboxname, &type, NULL, NULL, -+ &server, &acl, NULL); -+ - if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) && - (!acl || - !((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) { -diff -Naur cyrus-imapd-2.3.15.orig/lib/auth.c cyrus-imapd-2.3.15/lib/auth.c ---- cyrus-imapd-2.3.15.orig/lib/auth.c 2008-03-24 18:43:08.000000000 +0100 -+++ cyrus-imapd-2.3.15/lib/auth.c 2009-09-09 16:13:03.000000000 +0200 -@@ -118,3 +118,11 @@ - - auth->freestate(auth_state); - } -+ -+char *auth_canonuser(struct auth_state *auth_state) -+{ -+ struct auth_mech *auth = auth_fromname(); -+ -+ return auth->auth_canonuser(auth_state); -+} -+ -diff -Naur cyrus-imapd-2.3.15.orig/lib/auth.h cyrus-imapd-2.3.15/lib/auth.h ---- cyrus-imapd-2.3.15.orig/lib/auth.h 2008-03-24 18:43:08.000000000 +0100 -+++ cyrus-imapd-2.3.15/lib/auth.h 2009-09-09 16:13:03.000000000 +0200 -@@ -55,6 +55,7 @@ - const char *identifier); - struct auth_state *(*newstate)(const char *identifier); - void (*freestate)(struct auth_state *auth_state); -+ char *(*auth_canonuser)(struct auth_state *auth_state); - }; - - extern struct auth_mech *auth_mechs[]; -@@ -77,5 +78,6 @@ - const char *identifier); - struct auth_state *auth_newstate(const char *identifier); - void auth_freestate(struct auth_state *auth_state); -+char *auth_canonuser(struct auth_state *auth_state); - - #endif /* INCLUDED_AUTH_H */ -diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_krb5.c cyrus-imapd-2.3.15/lib/auth_krb5.c ---- cyrus-imapd-2.3.15.orig/lib/auth_krb5.c 2008-03-24 18:43:08.000000000 +0100 -+++ cyrus-imapd-2.3.15/lib/auth_krb5.c 2009-09-09 16:13:03.000000000 +0200 -@@ -199,6 +199,14 @@ - free(auth_state); - } - -+static char *mycanonuser(struct auth_state *auth_state) -+{ -+ if (auth_state) -+ return auth_state->userid; -+ -+ return NULL; -+} -+ - #else /* HAVE_GSSAPI_H */ - - static int mymemberof( -@@ -230,6 +238,13 @@ - fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG); - } - -+static char *mycanonuser( -+ struct auth_state *auth_state __attribute__((unused))) -+{ -+ fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG); -+ return NULL; -+} -+ - #endif - - struct auth_mech auth_krb5 = -@@ -240,4 +255,5 @@ - &mymemberof, - &mynewstate, - &myfreestate, -+ &mycanonuser, - }; -diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_krb.c cyrus-imapd-2.3.15/lib/auth_krb.c ---- cyrus-imapd-2.3.15.orig/lib/auth_krb.c 2009-03-31 06:11:21.000000000 +0200 -+++ cyrus-imapd-2.3.15/lib/auth_krb.c 2009-09-09 16:13:03.000000000 +0200 -@@ -341,6 +341,15 @@ - free((char *)auth_state); - } - -+static char *mycanonuser(struct auth_state *auth_state) -+{ -+ if (auth_state) -+ return auth_state->userid; -+ -+ return NULL; -+} -+ -+ - #else /* HAVE_KRB */ - - static int mymemberof( -@@ -372,6 +381,13 @@ - fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG); - } - -+static char *mycanonuser( -+ struct auth_state *auth_state __attribute__((unused))) -+{ -+ fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG); -+} -+ -+ - #endif - - struct auth_mech auth_krb = -@@ -382,4 +398,5 @@ - &mymemberof, - &mynewstate, - &myfreestate, -+ &mycanonuser, - }; -diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_pts.c cyrus-imapd-2.3.15/lib/auth_pts.c ---- cyrus-imapd-2.3.15.orig/lib/auth_pts.c 2008-03-24 18:43:08.000000000 +0100 -+++ cyrus-imapd-2.3.15/lib/auth_pts.c 2009-09-09 16:13:03.000000000 +0200 -@@ -512,6 +512,14 @@ - free(auth_state); - } - -+static char *mycanonuser(struct auth_state *auth_state) -+{ -+ if (auth_state) -+ return auth_state->userid.id; -+ -+ return NULL; -+} -+ - struct auth_mech auth_pts = - { - "pts", /* name */ -@@ -520,4 +528,5 @@ - &mymemberof, - &mynewstate, - &myfreestate, -+ &mycanonuser, - }; -diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_unix.c cyrus-imapd-2.3.15/lib/auth_unix.c ---- cyrus-imapd-2.3.15.orig/lib/auth_unix.c 2009-03-31 06:11:22.000000000 +0200 -+++ cyrus-imapd-2.3.15/lib/auth_unix.c 2009-09-09 16:13:03.000000000 +0200 -@@ -315,6 +315,16 @@ - free((char *)auth_state); - } - -+static char *mycanonuser(auth_state) -+ struct auth_state *auth_state; -+{ -+ if (auth_state) -+ return auth_state->userid; -+ -+ return NULL; -+} -+ -+ - - struct auth_mech auth_unix = - { -@@ -324,4 +334,5 @@ - &mymemberof, - &mynewstate, - &myfreestate, -+ &mycanonuser, - }; -diff -Naur cyrus-imapd-2.3.15.orig/lib/imapoptions cyrus-imapd-2.3.15/lib/imapoptions ---- cyrus-imapd-2.3.15.orig/lib/imapoptions 2009-06-29 19:21:06.000000000 +0200 -+++ cyrus-imapd-2.3.15/lib/imapoptions 2009-09-09 16:13:03.000000000 +0200 -@@ -198,6 +198,55 @@ - /* Number of seconds to wait before returning a timeout failure when - performing a client connection (e.g., in a murder environment) */ - -+{ "createonpost", 0, SWITCH } -+/* If yes, when lmtpd receives an incoming mail for an INBOX that does not exist, -+ then the INBOX is automatically created by lmtpd. */ -+ -+{ "autocreateinboxfolders", NULL, STRING } -+/* If a user does not have an INBOX created then the INBOX as well as some INBOX -+ subfolders are created under two conditions. -+ 1. The user logins via the IMAP or the POP3 protocol. (autocreatequota option must have a nonzero value) -+ 2. A message arrives for the user through the LMTPD protocol.(createonpost option must be yes) -+ autocreateinboxfolders is a list of INBOX's subfolders separated by a "|", that -+ are automatically created by the server under the previous two situations. */ -+ -+{ "autosubscribeinboxfolders", NULL, STRING } -+/* A list of folder names, separated by "|", that the users get automatically subscribed to, -+ when their INBOX is created. These folder names must have been included in the -+ autocreateinboxfolders option of the imapd.conf. */ -+ -+{ "autosubscribesharedfolders", NULL, STRING } -+/* A list of shared folders (bulletin boards), separated by "|", that the users get -+ automatically subscribed to, after their INBOX is created. The shared folder must -+ have been created and the user must have the required permissions to get subscribed -+ to it. Otherwise, subscribing to the shared folder fails. */ -+ -+{ "autosubscribe_all_sharedfolders", 0, SWITCH } -+/* If set to yes, the user is automatically subscribed to all shared folders, one has permission -+ to subscribe to. */ -+ -+{ "autocreate_sieve_script", NULL, STRING } -+/* The full path of a file that contains a sieve script. This script automatically becomes a -+ user's initial default sieve filter script. When this option is not defined, no default -+ sieve filter is created. The file must be readable by the cyrus daemon. */ -+ -+{ "autocreate_sieve_compiledscript", NULL, STRING } -+/* The full path of a file that contains a compiled in bytecode sieve script. This script -+ automatically becomes a user's initial default sieve filter script. If this option is -+ not specified, or the filename doesn't exist then the script defined by -+ autocreate_sieve_script is compiled on the fly and installed as the user's default -+ sieve script */ -+ -+{ "generate_compiled_sieve_script", 0, SWITCH } -+/* If set to yes and no compiled sieve script file exists, the sieve script which is -+ compiled on the fly will be saved in the file name that autocreate_sieve_compiledscript -+ option points to. In order a compiled script to be generated, autocreate_sieve_script and -+ autocreate_sieve_compiledscript must have valid values */ -+ -+{ "autocreate_users", "anyone", STRING } -+/* A space separated list of users and/or groups that are allowed their INBOX to be -+ automatically created. */ -+ - { "configdirectory", NULL, STRING } - /* The pathname of the IMAP configuration directory. This field is - required. */ -diff -Naur cyrus-imapd-2.3.15.orig/notifyd/Makefile.in cyrus-imapd-2.3.15/notifyd/Makefile.in ---- cyrus-imapd-2.3.15.orig/notifyd/Makefile.in 2008-03-24 20:59:32.000000000 +0100 -+++ cyrus-imapd-2.3.15/notifyd/Makefile.in 2009-09-09 16:13:03.000000000 +0200 -@@ -71,10 +71,11 @@ - SERVICE=../master/service.o - - IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ -+SIEVE_LIBS = @SIEVE_LIBS@ - IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@ - LIB_WRAP = @LIB_WRAP@ - LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS) --DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ -+DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ - - PURIFY=/usr/local/bin/purify - PUREOPT=-best-effort -diff -Naur cyrus-imapd-2.3.15.orig/notifyd/notifyd.c cyrus-imapd-2.3.15/notifyd/notifyd.c ---- cyrus-imapd-2.3.15.orig/notifyd/notifyd.c 2008-03-24 20:59:32.000000000 +0100 -+++ cyrus-imapd-2.3.15/notifyd/notifyd.c 2009-09-09 16:13:03.000000000 +0200 -@@ -96,7 +96,7 @@ - - #define NOTIFY_MAXSIZE 8192 - --int do_notify() -+static int do_notify() - { - struct sockaddr_un sun_data; - socklen_t sunlen = sizeof(sun_data); -diff -Naur cyrus-imapd-2.3.15.orig/ptclient/Makefile.in cyrus-imapd-2.3.15/ptclient/Makefile.in ---- cyrus-imapd-2.3.15.orig/ptclient/Makefile.in 2008-03-24 19:34:22.000000000 +0100 -+++ cyrus-imapd-2.3.15/ptclient/Makefile.in 2009-09-09 16:13:03.000000000 +0200 -@@ -57,10 +57,11 @@ - AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@ - AFS_LIBS = @AFS_LIBS@ - IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ -+SIEVE_LIBS = @SIEVE_LIBS@ - LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@ - LIB_SASL = @LIB_SASL@ - LIB_WRAP = @LIB_WRAP@ --DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ -+DEPLIBS = ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ - UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o - - LDAP_LIBS=@LDAP_LIBS@ -diff -Naur cyrus-imapd-2.3.15.orig/README.autocreate cyrus-imapd-2.3.15/README.autocreate ---- cyrus-imapd-2.3.15.orig/README.autocreate 1970-01-01 01:00:00.000000000 +0100 -+++ cyrus-imapd-2.3.15/README.autocreate 2009-09-09 16:13:03.000000000 +0200 -@@ -0,0 +1,211 @@ -+Cyrus IMAP autocreate Inbox patch -+---------------------------------- -+ -+NOTE : This patch has been created at the University of Athens. For more info, as well -+as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr/ -+ -+The design of Cyrus IMAP server does not predict the automatic creation of users' -+INBOX folders. The creation of a user's INBOX is considered to be an external task, -+that has to be completed as part of the user email account creation procedure. -+Hence, to create a new email account the site administrator has to: -+ -+ a) Include the new account in the user database for the authentication procedure -+ (e.g. sasldb, shadow, mysql, ldap). -+ b) Create the corresponding INBOX folder. -+ -+Alternatively, the user, if succesfully authenticated, may create his own INBOX folder, -+as long as the configuration of the site allows it (see "autocreatequota" in imapd.conf). -+Unlike what not careful readers may think, enabling the "autocreatequota" option, doesn't -+lead to the automatic INBOX folder creation by Cyrus IMAP server. -+In fact, "autocreate" means that the IMAP clients are allowed to automatically create -+the user INBOX. -+ -+This patch adds the functionality of automatic creation of the users' INBOX folders into -+the Cyrus IMAP server. It is implemented as two features, namely the "create on login" -+and "create on post". -+ -+ -+ -+Create on login -+=============== -+This feauture provides automatic creation of a user's INBOX folder when all of the -+following requirements are met: -+ -+i) The user has succesfully passed the authentication procedure. -+ -+ii) The user's authorisation ID (typically the same as the user's -+authentication ID) doesn't belong to the imap_admins or admins -+accounts (see imapd.conf). -+ -+iii) The "autocreatequota" option in the imap configuration file -+has been set to a non zero value. -+ -+iv) The corresponding to the user's authorisation ID INBOX folder -+does not exist. -+ -+The user's first login is the most typical case when all four requirements are met. -+Note that if the authenticated ID is allowed to proxy to another account for which -+all of the above requirements are met, the corresponding INBOX folder for that account -+will be created. -+ -+ -+ -+Create on post -+============== -+This feauture provides automatic creation of a user's INBOX folder when all of the -+following requirements are met. -+ -+i) An email message addressed to the user has been received. -+ -+ii) The recipient is not any of the imap_admins or admins accounts. -+Note that passing emails to admins or imap_admins accounts from -+the MTA to LMTP should be avoided in any case. -+ -+iii) The recipient's INBOX does not exist. -+ -+iv) The "autocreatequota" option in the imap configuration file -+has been set to a non zero value. -+ -+v) The "createonpost" option in the imap configuration file -+has been switched on. -+ -+ -+Besides the automatic creation of INBOX folder, additional functionalities are -+provided: -+ -+ (A) Automatic creation of INBOX subfolders controlled by "autocreateinboxfolders" -+configuration option. eg -+ -+autocreateinboxfolders: sent|drafts|spam|templates -+ -+ (B) Automatic subscription of INBOX subfolders controlled by "autosubscribeinboxfolders" -+configuration option. eg -+ -+autosubscribeinboxfolders: sent|spam -+ -+Obviously, only subscription to subfolders included in the "autocreateinboxfolder" -+list is meaningful. -+ -+ (C) Automatic subscription to shared folders (bulletin boards). The user gets -+automatically subscribed to the shared folders declared in the "autosubscribesharedfolders" -+configuration option in imapd.conf. -+eg autosubscribesharedfolders: public_folder | public_folder.subfolder -+ -+In order the above action to succeed, the shared folder has to pre-exist the INBOX creation -+and the user must have the appropriate permissions in order to be able to subscribe to the -+shared folder. -+ -+* A new config option has been added. 'autosubscribe_all_sharedfolders' is a yes/no -+option. When set to yes, the user is automatically subscribed to all shared folders one -+has permission to subscribe to. Please, note that when this option is set to yes, then -+'autosubscribesharedfolders' option is overriden. -+ -+ (D) Automatic creation of a predefined default sieve script. -+ -+This is very useful when a default sieve script is used for every user. Usually, a -+default anti-spam script may me be written in a file and copied to each user -+sieve scripts upon the INBOX creation. The imapd.conf options that have been added -+are 'autocreate_sieve_script', 'autocreate_sieve_compiledscript' and -+'generate_compiled_sieve_script'. -+ -+autocreate_sieve_script configuration option refers to the full path of the file -+that contains the sieve script. The default value is null and if no file is defined, -+then no default script is created upon INBOX creation. (The feature is disabled) -+eg autocreate_sieve_script: /etc/default_sieve_script -+ -+autocreate_sieve_compiledscript configuration option refers to the full path of the -+file that contains the bytecode compiled sieve script. If this filename is defined -+in imapd.conf and the file exists, then it is automatically copied in the user's sieve -+directory. If it is not defined, then a bytecode sieve script gets on the fly compiled -+by the daemon. -+eg autocreate_sieve_compiledscript: /etc/default_sieve_script.bc -+ -+generate_compiled_sieve_script is a boolean option that triggers the compilation of the -+source sieve script to bytecode sieve script. The file that the bytecode script will -+be saved is pointed by autocreate_sieve_compiledscript. -+ -+Ways of compiling a sieve script : -+1. Compile a sieve script using the standard sievec utility, distributed by CMU -+2. Compile a sieve script using the compile_sieve utility, released by UoA. This -+ tool is almost identical to the sievec utility, with the difference that it -+ reads the input and output file from autocreate_sieve_script and -+ autocreate_sieve_compiledscript options in imapd.conf -+3. Let cyrus create a compiled sieve script using a source script. Cyrus can be -+ instructed to save the compiled script any time a compiled script does not exist. -+ -+NOTES : -+1. In order this functionality to work, the following requirements must have been met: -+ - 'sieveusehomedir' option must be 'no' in the configuration (default). -+ - 'sievedir' option must have a valid value. -+2. Currently, this patch checks the validity of the source script while generating a -+ bytecode compiled script, but not the validity of the bytecode sieve script file. -+ The administrator should make sure that the provided files contain a valid sieve -+ script as well as the compiled script is updated every time the source script changes. -+ -+ -+ (E) The administrator may control for which users and/or groups may the INBOXes -+automatically be created. The autocreate_users option restricts the groups -+for which the patch will create the mailboxes. -+ -+The default value of autocreate_users is anyone. So, if not set at all, the patch will -+work for all users. However, one may set: -+ -+autocreate_users: user1 user2 group:group1 group:group2 -+ -+In that case, the INBOX will be created only for user1, user2 and the users that belong -+to group1 and group2. -+ -+More refined control per service is provided by the options imap_autocreate_users, -+pop3_autocreate_users and lmtp_autocreate_users. These options override the -+autocreate_users option and offer per service control. -+ -+Example: -+One may want to restrict the create on post functionality only for a specific group -+of users. To achieve this, the following lines must be added in the imapd.conf file: -+ -+createonpost: yes -+lmtp_autocreate_users: group:groupname -+ -+ -+ -+Issues to be considered -+======================= -+ -+I) In order to use the create on post feauture one should be absolutely sure that: -+a) The MTA checks the validity of the email recipient before sending the email to -+LMTP. This is an RFC821 requirement. This usually expands to "the mta should be -+able to use the account database as user mailbox database". -+b) Only authorised accounts/services can talk to LMTP. -+ -+II) Especially in the case of imap logins, the current patch implementation checks -+for the INBOX folder existence upon login, causing an extra mailbox lookup in most -+of the cases. -+A better approach would be to chase the "IMAP_MAILBOX_NONEXISTENT" error code and -+check if the error is associated with an INBOX folder. However, this would mess up -+Cyrus code. The way it was implemented may not have been the most performance -+optimised, but it produces a much cleaner and simple patch. -+ -+ -+ -+Virtual Domains Support -+======================= -+ -+Virtual domains are supported by all versions of the patch for cyrus-imapd-2.2.1-BETA and -+later. However, it is not possible to declare different INBOX subfolders to be created or -+shared folders to be subscribed to for every domain. -+ -+ -+ -+Things to be done -+================= -+ -+1. Support MUPDATE -+ -+It is within the developers' intentions to support the mupdate protocol, but serious -+design issues on future cyrus releases have to resolved first. -+ -+2. Select different attributes (quota, partition, sieve filter, etc) depending on the group -+a user belongs to. -+ -+For more information and updates please visit http://email.uoa.gr/projects/cyrus/autocreate -+ Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-12-22 23:24:19 UTC (rev 7717) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-12-22 23:25:15 UTC (rev 7718) @@ -1,3 +1,9 @@ +cyrus_imapd (2.3.16,REV=2009.12.23) unstable + + * New upstream version. + + -- Yann Rouillard Wed, 23 Dec 2009 00:10:44 +0100 + cyrus_imapd (2.3.15,REV=2009.10.11) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-12-22 23:24:19 UTC (rev 7717) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-12-22 23:25:15 UTC (rev 7718) @@ -1,3 +1,9 @@ +cyrus_imapd_utils (2.3.16,REV=2009.12.23) unstable + + * New upstream version. + + -- Yann Rouillard Wed, 23 Dec 2009 00:10:44 +0100 + cyrus_imapd_utils (2.3.15,REV=2009.10.11) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-12-22 23:24:19 UTC (rev 7717) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-12-22 23:25:15 UTC (rev 7718) @@ -1,3 +1,9 @@ +pm_cyrus (2.3.16,REV=2009.12.23) unstable + + * New upstream version. + + -- Yann Rouillard Wed, 23 Dec 2009 00:10:44 +0100 + pm_cyrus (2.3.15,REV=2009.10.11) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 23 00:28:06 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Dec 2009 23:28:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7719] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 7719 http://gar.svn.sourceforge.net/gar/?rev=7719&view=rev Author: chninkel Date: 2009-12-22 23:28:06 +0000 (Tue, 22 Dec 2009) Log Message: ----------- lftp: updated to 4.0.5 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2009-12-22 23:25:15 UTC (rev 7718) +++ csw/mgar/pkg/lftp/trunk/Makefile 2009-12-22 23:28:06 UTC (rev 7719) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = lftp -GARVERSION = 4.0.4 +GARVERSION = 4.0.5 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-12-22 23:25:15 UTC (rev 7718) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-12-22 23:28:06 UTC (rev 7719) @@ -1,3 +1,3 @@ 5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype -e813870b518281ca71c398a9b05494e6 changelog.CSW -08461f56eb149382dfd120f461f49b5f lftp-4.0.4.tar.gz +31fd702308b4cd4042d3ddb043f83a9c changelog.CSW +73ea519c9e9cdfa47b714c5c91093a0d lftp-4.0.5.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-12-22 23:25:15 UTC (rev 7718) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-12-22 23:28:06 UTC (rev 7719) @@ -1,3 +1,9 @@ +lftp (4.0.5,REV=2009.12.23) unstable + + * New upstream release. + + -- Yann Rouillard Wed, 23 Dec 2009 00:13:55 +0100 + lftp (4.0.4,REV=2009.12.02) unstable * New upstream release. @@ -2,9 +8,15 @@ - -- Yann Rouillard Wed, 02 Dec 2009 21:47:50 +0100 + -- Yann Rouillard Wed, 02 Dec 2009 21:47:50 +0100 +lftp (4.0.4,REV=2009.12.02) unstable + + * New upstream release. + + -- Yann Rouillard Wed, 02 Dec 2009 21:47:50 +0100 + lftp (4.0.3,REV=2009.11.01) unstable * New upstream release. - -- Yann Rouillard Sun, 01 Nov 2009 01:23:45 +0100 + -- Yann Rouillard Sun, 01 Nov 2009 01:23:45 +0100 @@ -14,94 +26,94 @@ * New upstream release. - -- Yann Rouillard Fri, 11 Oct 2009 00:45:36 +0200 + -- Yann Rouillard Fri, 11 Oct 2009 00:45:36 +0200 lftp (3.7.15,REV=2009.07.25) unstable * New upstream release. - -- Yann Rouillard Sat, 25 Jul 2009 13:10:19 +0200 + -- Yann Rouillard Sat, 25 Jul 2009 13:10:19 +0200 lftp (3.7.14,REV=2009.05.16) unstable * New upstream release. - -- Yann Rouillard Sat, 16 May 2009 15:40:33 +0200 + -- Yann Rouillard Sat, 16 May 2009 15:40:33 +0200 lftp (3.7.13,REV=2009.05.09) unstable * New upstream release. - -- Yann Rouillard Fri, 09 May 2009 17:17:30 +0200 + -- Yann Rouillard Fri, 09 May 2009 17:17:30 +0200 lftp (3.7.11,REV=2009.03.29) unstable * Now uses cswpreserveconf class from cswclassutils to handle lftp.conf configuration file. - -- Yann Rouillard Sun, 29 Mar 2009 16:16:22 +0200 + -- Yann Rouillard Sun, 29 Mar 2009 16:16:22 +0200 lftp (3.7.11,REV=2009.03.27) unstable * Fixed double CSWcommon dependancy. - -- Yann Rouillard Wed, 25 Mar 2009 23:08:42 +0100 + -- Yann Rouillard Wed, 25 Mar 2009 23:08:42 +0100 lftp (3.7.11,REV=2009.03.21) unstable * New upstream version. - -- Yann Rouillard Sat, 21 Mar 2009 12:55:58 +0100 + -- Yann Rouillard Sat, 21 Mar 2009 12:55:58 +0100 lftp (3.7.8,REV=2009.02.15) unstable * Changed gettext dependancy to follow gettext package split (Closes: #3099). - -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 + -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 lftp (3.7.8,REV=2009.01.24) unstable * New upstream version. - -- Yann Rouillard Sat, 24 Jan 2009 16:14:12 +0100 + -- Yann Rouillard Sat, 24 Jan 2009 16:14:12 +0100 lftp (3.7.7,REV=2008.12.12) unstable * New upstream version. - -- Yann Rouillard Sat, 13 Dec 2008 11:53:59 +0100 + -- Yann Rouillard Sat, 13 Dec 2008 11:53:59 +0100 lftp (3.7.6,REV=2008.11.30) unstable * New upstream version. - -- Yann Rouillard Sun, 30 Nov 2008 22:43:16 +0100 + -- Yann Rouillard Sun, 30 Nov 2008 22:43:16 +0100 lftp (3.7.4,REV=2008.10.04) unstable * New upstream version. - -- Yann Rouillard Fri, 04 Oct 2008 23:41:47 +0200 + -- Yann Rouillard Fri, 04 Oct 2008 23:41:47 +0200 lftp (3.7.3,REV=2008.06.02) unstable * New upstream version. - -- Yann Rouillard Mon, 02 Jun 2008 22:08:32 +0200 + -- Yann Rouillard Mon, 02 Jun 2008 22:08:32 +0200 lftp (3.6.3,REV=2008.02.16) unstable * New upstream version. - -- Yann Rouillard Sat, 16 Feb 2008 10:58:45 +0100 + -- Yann Rouillard Sat, 16 Feb 2008 10:58:45 +0100 lftp (3.6.2,REV=2008.01.21) unstable * New upstream version. * Removed files/xstring_char_cast_bugfix.patch: bug fixed upstream. - -- Yann Rouillard Mon, 21 Jan 2008 23:54:26 +0100 + -- Yann Rouillard Mon, 21 Jan 2008 23:54:26 +0100 lftp (3.6.1,REV=2007.12.21) unstable @@ -109,51 +121,51 @@ * Added files/xstring_char_cast_bugfix.patch: workaround a cast problem - -- Yann Rouillard Fri, 21 Dec 2007 23:20:29 +0100 + -- Yann Rouillard Fri, 21 Dec 2007 23:20:29 +0100 lftp (3.5.13,REV=2007.08.24) unstable * New upstream version. * Removed static libraries files. - -- Yann Rouillard Fri, 24 Aug 2007 01:50:48 +0200 + -- Yann Rouillard Fri, 24 Aug 2007 01:50:48 +0200 lftp (3.5.12,REV=2007.08.17) unstable * New upstream version. - -- Yann Rouillard Fri, 17 Aug 2007 20:17:39 +0200 + -- Yann Rouillard Fri, 17 Aug 2007 20:17:39 +0200 lftp (3.5.11) unstable * Depends on openssl_rt rather than openssl. - -- Yann Rouillard Sat, 28 Jul 2007 17:30:07 +0200 + -- Yann Rouillard Sat, 28 Jul 2007 17:30:07 +0200 lftp (3.5.11) unstable * New upstream version. - -- Yann Rouillard Wed, 06 May 2007 04:42:47 +0200 + -- Yann Rouillard Wed, 06 May 2007 04:42:47 +0200 lftp (3.5.10) unstable * New upstream version. - -- Yann Rouillard Wed, 11 Apr 2007 00:30:58 +0200 + -- Yann Rouillard Wed, 11 Apr 2007 00:30:58 +0200 lftp (3.5.9) unstable * New upstream version. - -- Yann Rouillard Mon, 15 Jan 2007 23:48:35 +0100 + -- Yann Rouillard Mon, 15 Jan 2007 23:48:35 +0100 lftp (3.5.6) unstable * New upstream version. * Removed MakeRef_macro.patch not necessary anymore. - -- Yann Rouillard Mon, 4 Dec 2006 23:07:36 +0100 + -- Yann Rouillard Mon, 4 Dec 2006 23:07:36 +0100 lftp (3.5.4) unstable @@ -162,7 +174,7 @@ * Added MakeRef_macro.patch to fixed a incorrect macro call which caused segmentation fault with sftp protocol. - -- Yann Rouillard Sat, 19 Aug 2006 20:24:04 +0200 + -- Yann Rouillard Sat, 19 Aug 2006 20:24:04 +0200 lftp (3.5.2) unstable 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 Dec 23 10:13:34 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Dec 2009 09:13:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7720] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 7720 http://gar.svn.sourceforge.net/gar/?rev=7720&view=rev Author: wahwah Date: 2009-12-23 09:13:34 +0000 (Wed, 23 Dec 2009) Log Message: ----------- mysql5: Porting changes from the 5.1-optcsw branch to prevent the two from diverging too much. Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-22 23:28:06 UTC (rev 7719) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-23 09:13:34 UTC (rev 7720) @@ -3,10 +3,16 @@ # $Id$ GARNAME = mysql5 -GARVERSION = 5.1.40 +BASE_VERSION = 5.1 +PATCHLEVEL = 40 +GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server +# Useful when making a series of builds on the same day +GARFLAVOR ?= DBG + DISTNAME = mysql-$(GARVERSION) +SPKG_SOURCEURL = http://www.mysql.com/ DESCRIPTION = Multithreaded SQL database server define BLURB @@ -14,24 +20,32 @@ (Structured Query Language) database server. endef -GARFLAVOR = DBG - # Change prefix to /opt/csw/mysql5 prefix = /opt/csw/mysql5 +localstatedir = /var/opt/csw/mysql5 sysconfdir = /etc/opt/csw/mysql5 -localstatedir = /var/opt/csw/mysql5 + +# Where to put the init script global_sysconfdir = /etc/opt/csw +# Where to link the binaries global_bindir = /opt/csw/bin -INITSMF = $(global_sysconfdir)/init\.d/cswmysql5 +INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION) +PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel +PACKAGES += CSWmysql5rt CSWmysql5test + 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 -PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel -PACKAGES += CSWmysql5rt CSWmysql5test +SPKG_DESC_CSWmysql5 = Multithreaded SQL database +SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking +SPKG_DESC_CSWmysql5client = MySQL 5 client binaries +SPKG_DESC_CSWmysql5devel = MySQL 5 header files +SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files +SPKG_DESC_CSWmysql5test = MySQL 5 testing files CATALOGNAME_CSWmysql5 = $(GARNAME) CATALOGNAME_CSWmysql5bench = $(GARNAME)bench @@ -46,13 +60,6 @@ INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test -SPKG_DESC_CSWmysql5 = Multithreaded SQL database -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking -SPKG_DESC_CSWmysql5client = MySQL 5 client binaries -SPKG_DESC_CSWmysql5devel = MySQL 5 header files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files -SPKG_DESC_CSWmysql5test = MySQL 5 testing files - # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSWmysql5client_programs = myisamlog @@ -72,8 +79,21 @@ CSWmysql5client_programs += perror CSWmysql5client_programs += replace +# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared +# library not found. EXTRA_LIB was tried too, but did not work, as the -R path +# ended up with having two $ISALIST tokens. +# +# Without this setting it looks for: +# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 +# The library is at: +# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql + CSWmysql5devel_programs += mysql_config +# Enable 64 bits build +BUILD64 = 1 + PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5client = $(bindir) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) @@ -97,7 +117,7 @@ REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog DISTFILES += CSWmysql5.preinstall @@ -115,20 +135,11 @@ EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared -# library not found. EXTRA_LIB was tried too, but did not work, as the -R path -# ended up with having two $ISALIST tokens. -# -# Without this setting it looks for: -# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 -# The library is at: -# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 -EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql - # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler -CONFIGURE_ARGS += --without-docs +# Why not have a docs package? +# CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile CONFIGURE_ARGS += --with-charset=utf8 CONFIGURE_ARGS += --with-extra-charsets=all @@ -146,46 +157,48 @@ # TEST_SCRIPTS = TEST_TARGETS = check -# Enable 64 bits build -BUILD64 = 1 USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup -PROTOTYPE_MODIFIERS = ownmysql -PROTOTYPE_FILES_ownmysql = /var/opt/csw/mysql5 -PROTOTYPE_USER_ownmysql = mysql -PROTOTYPE_GROUP_ownmysql = mysql -PROTOTYPE_PERMS_ownmysql = 0700 -PROTOTYPE_CLASS_ownmysql = ugfiles +PROTOTYPE_MODIFIERS = dbdir +PROTOTYPE_FILES_dbdir = $(localstatedir) +PROTOTYPE_USER_dbdir = mysql +PROTOTYPE_GROUP_dbdir = mysql +PROTOTYPE_PERMS_dbdir = 0700 +PROTOTYPE_CLASS_dbdir = ugfiles SPKG_CLASSES = none ugfiles include gar/category.mk +CFLAGS := $(filter-out -I%,$(CFLAGS)) + pre-configure-modulated: # To work around the libtool version mismatch problem. cd $(WORKSRC) && autoreconf --force --install --symlink -post-install-modulated: - ginstall -m 755 -d $(DESTDIR)$(localstatedir) - ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc +post-merge: + ginstall -m 755 -d $(PKGROOT)$(localstatedir) + ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ - $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW - ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql - ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW + ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/cswmysql5 $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql + ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 # A symlink for mysql5 include files - ginstall -m 755 -d $(DESTDIR)/opt/csw/include - ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql + ginstall -m 755 -d $(PKGROOT)/opt/csw/include + ln -s ../mysql5/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries - ginstall -m 755 -d $(DESTDIR)$(global_bindir) - for f in $(DESTDIR)$(bindir)/*; do \ - ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + ginstall -m 755 -d $(PKGROOT)$(global_bindir) + for f in $(PKGROOT)$(bindir)/*; do \ + ln -s ../mysql5/bin/`basename $$f` \ + $(PKGROOT)$(global_bindir)/`basename $$f`; \ done + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 23 10:31:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Dec 2009 09:31:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7721] csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Message-ID: Revision: 7721 http://gar.svn.sourceforge.net/gar/?rev=7721&view=rev Author: wahwah Date: 2009-12-23 09:31:15 +0000 (Wed, 23 Dec 2009) Log Message: ----------- mysql5: Making the mysql-5.1.x branch more similar to the trunk Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2009-12-23 09:13:34 UTC (rev 7720) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2009-12-23 09:31:15 UTC (rev 7721) @@ -3,10 +3,16 @@ # $Id$ GARNAME = mysql5 -GARVERSION = 5.1.40 +BASE_VERSION = 5.1 +PATCHLEVEL = 40 +GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server +# Useful when making a series of builds on the same day +GARFLAVOR ?= DBG + DISTNAME = mysql-$(GARVERSION) +SPKG_SOURCEURL = http://www.mysql.com/ DESCRIPTION = Multithreaded SQL database server define BLURB @@ -14,24 +20,32 @@ (Structured Query Language) database server. endef -GARFLAVOR = DBG - # Change prefix to /opt/csw/mysql5 prefix = /opt/csw/mysql5 +localstatedir = /var/opt/csw/mysql5 sysconfdir = /etc/opt/csw/mysql5 -localstatedir = /var/opt/csw/mysql5 + +# Where to put the init script global_sysconfdir = /etc/opt/csw +# Where to link the binaries global_bindir = /opt/csw/bin -INITSMF = $(global_sysconfdir)/init\.d/cswmysql5 +INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION) +PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel +PACKAGES += CSWmysql5rt CSWmysql5test + 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 -PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel -PACKAGES += CSWmysql5rt CSWmysql5test +SPKG_DESC_CSWmysql5 = Multithreaded SQL database +SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking +SPKG_DESC_CSWmysql5client = MySQL 5 client binaries +SPKG_DESC_CSWmysql5devel = MySQL 5 header files +SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files +SPKG_DESC_CSWmysql5test = MySQL 5 testing files CATALOGNAME_CSWmysql5 = $(GARNAME) CATALOGNAME_CSWmysql5bench = $(GARNAME)bench @@ -46,13 +60,6 @@ INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test -SPKG_DESC_CSWmysql5 = Multithreaded SQL database -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking -SPKG_DESC_CSWmysql5client = MySQL 5 client binaries -SPKG_DESC_CSWmysql5devel = MySQL 5 header files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files -SPKG_DESC_CSWmysql5test = MySQL 5 testing files - # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSWmysql5client_programs = myisamlog @@ -72,8 +79,32 @@ CSWmysql5client_programs += perror CSWmysql5client_programs += replace +# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared +# library not found. EXTRA_LIB was tried too, but did not work, as the -R path +# ended up with having two $ISALIST tokens. +# +# Without this setting it looks for: +# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 +# The library is at: +# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql + +COMMON_CFLAGS = -mt -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt + +EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) +EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_CFLAGS) +EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) + +EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) +EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_CFLAGS) +EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) + + CSWmysql5devel_programs += mysql_config +# Enable 64 bits build +BUILD64 = 1 + PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5client = $(bindir) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) @@ -97,7 +128,7 @@ REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog DISTFILES += CSWmysql5.preinstall @@ -112,25 +143,17 @@ # MySQL-5.1.40 doesn't compile without setting EXTRA_INC. EXTRA_INC = /opt/csw/include EXTRA_LIB = /opt/csw/lib -EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared -# library not found. EXTRA_LIB was tried too, but did not work, as the -R path -# ended up with having two $ISALIST tokens. -# -# Without this setting it looks for: -# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 -# The library is at: -# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 -EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql - # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler -CONFIGURE_ARGS += --without-docs +# Why not have a docs package? +# CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile -CONFIGURE_ARGS += --with-extra-charsets=all +#CONFIGURE_ARGS += --with-extra-charsets=all +CONFIGURE_ARGS += --with-extra-charsets=complex CONFIGURE_ARGS += --with-low-memory CONFIGURE_ARGS += --with-pthread CONFIGURE_ARGS += --with-readline @@ -138,49 +161,62 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb CONFIGURE_ARGS += --with-comment +CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc +CONFIGURE_ARGS += --with-big-tables +CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TODO: Make the tests pass. They don't at the moment. -# TEST_SCRIPTS = +SKIPTEST ?= 1 +TEST_SCRIPTS = custom TEST_TARGETS = check -# Enable 64 bits build -BUILD64 = 1 USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup -PROTOTYPE_MODIFIERS = ownmysql -PROTOTYPE_FILES_ownmysql = /var/opt/csw/mysql5 -PROTOTYPE_USER_ownmysql = mysql -PROTOTYPE_GROUP_ownmysql = mysql -PROTOTYPE_PERMS_ownmysql = 0700 -PROTOTYPE_CLASS_ownmysql = ugfiles +PROTOTYPE_MODIFIERS = dbdir +PROTOTYPE_FILES_dbdir = $(localstatedir) +PROTOTYPE_USER_dbdir = mysql +PROTOTYPE_GROUP_dbdir = mysql +PROTOTYPE_PERMS_dbdir = 0700 +PROTOTYPE_CLASS_dbdir = ugfiles SPKG_CLASSES = none ugfiles include gar/category.mk -post-install-modulated: - ginstall -m 755 -d $(DESTDIR)$(localstatedir) - ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc +CFLAGS := $(filter-out -I%,$(CFLAGS)) + +test-custom: + alias sh=/usr/bin/bash; cd $(WORKSRC)/mysql-test; perl mysql-test-run.pl --mem --big-test --force --skip-test=archive-big --skip-test=/gis/ + +pre-configure-modulated: + # To work around the libtool version mismatch problem. + cd $(WORKSRC) && autoreconf --force --install --symlink + +post-merge: + ginstall -m 755 -d $(PKGROOT)$(localstatedir) + ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ - $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW - ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql - ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW + ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/cswmysql5 $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql + ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 # A symlink for mysql5 include files - ginstall -m 755 -d $(DESTDIR)/opt/csw/include - ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql + ginstall -m 755 -d $(PKGROOT)/opt/csw/include + ln -s ../mysql5/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries - ginstall -m 755 -d $(DESTDIR)$(global_bindir) - for f in $(DESTDIR)$(bindir)/*; do \ - ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + ginstall -m 755 -d $(PKGROOT)$(global_bindir) + for f in $(PKGROOT)$(bindir)/*; do \ + ln -s ../mysql5/bin/`basename $$f` \ + $(PKGROOT)$(global_bindir)/`basename $$f`; \ done + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 23 15:38:35 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Dec 2009 14:38:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7722] csw/mgar/gar/v2-checkpkg/ Message-ID: Revision: 7722 http://gar.svn.sourceforge.net/gar/?rev=7722&view=rev Author: wahwah Date: 2009-12-23 14:38:35 +0000 (Wed, 23 Dec 2009) Log Message: ----------- Branching gar to experiment with checkpkg. Added Paths: ----------- csw/mgar/gar/v2-checkpkg/ Property changes on: csw/mgar/gar/v2-checkpkg ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 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 Dec 23 15:59:17 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Dec 2009 14:59:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7723] csw/mgar/gar/v2-checkpkg/bin Message-ID: Revision: 7723 http://gar.svn.sourceforge.net/gar/?rev=7723&view=rev Author: wahwah Date: 2009-12-23 14:59:16 +0000 (Wed, 23 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: First sketch -- runs executables from the checkpkg.d directory. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Property Changed: ---------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-23 14:38:35 UTC (rev 7722) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-23 14:59:16 UTC (rev 7723) @@ -1,6 +1,13 @@ #!/bin/ksh -p - -# checkpkg 1.50 (diff to 1.46a: check multiple package files) +# +# $Id$ +# +# checkpkg 1.51 +# +# diff to 1.46a +# - check multiple package files +# - checkpkg.d plugin support +# # This script examines a package that has been put together # for submittal to the CSW archive at opencsw.org # @@ -443,13 +450,12 @@ exit 1 fi -# Verify that there are no double depends +# Verify that there are no multiple depends repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" if [[ "$repeated_depends" -gt 1 ]]; then cat $EXTRACTDIR/$pkgname/install/depend - print ERROR: $pkgname has double depends - exit 1 + errmsg "$pkgname has multiple depends" fi #to retain a record of all packages currently being examined from $@ @@ -530,7 +536,35 @@ fi fi +# Plugin section. +# +# Plugins should live in checkpkg.d subdirectory in the same directory in which +# checkpkg is. Each plugin file name should be an executable and begin with +# "checkpkg-". +echo "Running the experimental plugin infrastructure." +checkpkg_scriptname=`basename $0` +checkpkg_basedir=${0%/${checkpkg_scriptname}} +plugindir=${checkpkg_basedir}/checkpkg.d +echo "plugindir: '$plugindir'" +if [[ -d "$plugindir" ]]; then + # echo plugin dir exists + for plugin in "${plugindir}"/checkpkg-*; do + if [[ -x "${plugin}" ]]; then + echo "Executing: '${plugin} -e \"${EXTRACTDIR}\" -p \"${pkgname}\"'" + ${plugin} -e "${EXTRACTDIR}" -p "${pkgname}" + if [[ "$?" -ne 0 ]]; then + errmsg "Plugin ${plugin} has returned an error." + fi + else + echo "'${plugin}' is not executable" + fi + done +else + echo plugin dir does not exist +fi +# End of plugin section + cleanup print "" Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py 2009-12-23 14:59:16 UTC (rev 7723) @@ -0,0 +1,17 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import checkpkg +import os.path + +def main(): + options, args = checkpkg.GetOptions() + pkgpath = os.path.join(options.extractdir, options.pkgname) + if not os.path.isdir(pkgpath): + raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) + print ("Dummy plugin says the package %s is extracted to %s" + % (options.pkgname, options.extractdir)) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-23 14:59:16 UTC (rev 7723) @@ -0,0 +1,16 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ +# +# A check for dependencies between shared libraries. + +import checkpkg +import os.path + +def main(): + options, args = checkpkg.GetOptions() + pkgpath = os.path.join(options.extractdir, options.pkgname) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-23 14:59:16 UTC (rev 7723) @@ -0,0 +1,22 @@ +# This is a checkpkg library, common for all checkpkg tests written in Python. + +import optparse + +class Error(Exception): + pass + +class ConfigurationError(Error): + pass + +def GetOptions(): + parser = optparse.OptionParser() + parser.add_option("-e", dest="extractdir", + help="The directory into which the package has been extracted") + parser.add_option("-p", dest="pkgname", + help="The pkgname, e.g. CSWfoo") + (options, args) = parser.parse_args() + if not options.extractdir: + raise ConfigurationError("ERROR: -e option is missing.") + if not options.pkgname: + raise ConfigurationError("ERROR: -p option is missing.") + return options, args Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Dec 24 00:20:57 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 23 Dec 2009 23:20:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7724] csw/mgar/pkg Message-ID: Revision: 7724 http://gar.svn.sourceforge.net/gar/?rev=7724&view=rev Author: skayser Date: 2009-12-23 23:20:56 +0000 (Wed, 23 Dec 2009) Log Message: ----------- mkrdns: initial commit Added Paths: ----------- csw/mgar/pkg/mkrdns/ csw/mgar/pkg/mkrdns/branches/ csw/mgar/pkg/mkrdns/tags/ csw/mgar/pkg/mkrdns/trunk/ csw/mgar/pkg/mkrdns/trunk/Makefile csw/mgar/pkg/mkrdns/trunk/checksums csw/mgar/pkg/mkrdns/trunk/files/ csw/mgar/pkg/mkrdns/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/mkrdns/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/mkrdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/mkrdns/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mkrdns/trunk/Makefile 2009-12-23 23:20:56 UTC (rev 7724) @@ -0,0 +1,38 @@ +GARNAME = mkrdns +GARVERSION = 3.3 +REAL_VERSION = $(subst .,_,$(GARVERSION)) +CATEGORIES = utils + +DESCRIPTION = An automatic reverse DNS zone generator +define BLURB + Have you ever gotten tired of having to change both the forward and + reverse zone maps when adding, removing, or changing hosts in DNS? If + so, then mkrdns is for you! mkrdns automates the tedious procedure of + editing both forward and reverse zones when making changes to your zones + with likely no changes to your current configuration file. +endef + +MASTER_SITES = http://sites.google.com/a/kluge.net/mkrdns/ +DISTNAME = $(GARNAME)-$(REAL_VERSION) +DISTFILES = $(DISTNAME).gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\_\d+)*).gz + +# Regular download ends up with a file name including heaps of +# redirect-related query variables, we need sth. more plain +WGET_OPTS = -O $(PARTIALDIR)/$(DISTNAME).gz + +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +install-custom: + mkdir -p $(DESTDIR)$(mandir)/man8 + cp $(WORKDIR)/$(DISTNAME) $(WORKDIR)/mkrdns + pod2man --section=8 $(WORKDIR)/mkrdns > $(DESTDIR)$(mandir)/man8/mkrdns.8 + ginstall -m755 -D $(WORKDIR)/mkrdns $(DESTDIR)$(bindir)/mkrdns + ginstall -m644 -D $(FILEDIR)/changelog.CSW $(DOCDEST)/changelog.CSW + @$(MAKECOOKIE) Added: csw/mgar/pkg/mkrdns/trunk/checksums =================================================================== --- csw/mgar/pkg/mkrdns/trunk/checksums (rev 0) +++ csw/mgar/pkg/mkrdns/trunk/checksums 2009-12-23 23:20:56 UTC (rev 7724) @@ -0,0 +1 @@ +474ffb39d1eb615d0e9d8a7d52a27953 mkrdns-3_3.gz Added: csw/mgar/pkg/mkrdns/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mkrdns/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/mkrdns/trunk/files/changelog.CSW 2009-12-23 23:20:56 UTC (rev 7724) @@ -0,0 +1,5 @@ +mkrdns (3.3,REV=2009.12.23) + + * Initial release. + + -- Sebastian Kayser Wed, 23 Dec 2009 23:57:13 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Dec 24 00:39:22 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 23 Dec 2009 23:39:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7725] csw/mgar/pkg/netsnmp/tags Message-ID: Revision: 7725 http://gar.svn.sourceforge.net/gar/?rev=7725&view=rev Author: hson Date: 2009-12-23 23:39:22 +0000 (Wed, 23 Dec 2009) Log Message: ----------- netsnmp: 5.4.2.1 before working on 5.5 Modified Paths: -------------- csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1,REV=2009.12.23/Makefile Added Paths: ----------- csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1,REV=2009.12.23/ Modified: csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1,REV=2009.12.23/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2009-04-05 21:20:49 UTC (rev 4203) +++ csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1,REV=2009.12.23/Makefile 2009-12-23 23:39:22 UTC (rev 7725) @@ -2,9 +2,12 @@ GARVERSION = 5.4.2.1 CATEGORIES = apps -DESCRIPTION = Brief description +DESCRIPTION = A suite of applications used to implement SNMP define BLURB - Long description + Simple Network Management Protocol (SNMP) is a widely used protocol for monitoring + the health and welfare of network equipment (eg. routers), computer equipment and + even devices like UPSs. Net-SNMP is a suite of applications used to implement + SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. The suite includes: endef SF_PROJ = net-snmp @@ -14,16 +17,26 @@ DISTNAME = $(SF_PROJ)-$(GARVERSION) SPKG_SOURCEURL = http://www.net-snmp.org/ +SPKG_DESC_CSWnetsnmp-py = NetSNMP Python Bindings +PACKAGES = CSWnetsnmp CSWnetsnmp-py +CATALOGNAME_CSWnetsnmp = netsnmp +CATALOGNAME_CSWnetsnmp-py = netsnmp_py + PREREQUISITE_PKGS = CSWpysetuptools -REQUIRED_PKGS += CSWosslrt CSWtcpwrap CSWpython +REQUIRED_PKGS_CSWnetsnmp += CSWosslrt CSWtcpwrap CSWperl +REQUIRED_PKGS_CSWnetsnmp-py += CSWnetsnmp CSWpython +PKGFILES_CSWnetsnmp-py = $(libdir)/python.* # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=12694 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +#BUILD64 = 1 +#NO_ISAEXEC = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-snmp-version=1 CONFIGURE_ARGS += --with-sys-contact=unknown @@ -48,20 +61,22 @@ EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod +#TEST_TARGET = + include gar/category.mk post-install-isa-sparcv8: - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -) - @ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 - @ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 - @ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 - @ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 - @ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 + @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/old_libs_s.tar.gz |tar xf -) + @( if [ ! -r work/solaris8-sparc/install-isa-sparcv8/opt/csw/lib/libnetsnmp.so.10 ] ; then ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 ] ; then ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 ] ; then ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 ] ; then ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 ] ; then ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 ; fi ) post-install-isa-i386: - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_i.tar.gz |tar xf -) - @ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 - @ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 - @ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 - @ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 - @ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 + @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/old_libs_i.tar.gz |tar xf -) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 ] ; then ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 ] ; then ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 ] ; then ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 ] ; then ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 ] ; then ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 ; 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 Thu Dec 24 00:40:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Dec 2009 23:40:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7726] csw/mgar/pkg/pysvn/trunk Message-ID: Revision: 7726 http://gar.svn.sourceforge.net/gar/?rev=7726&view=rev Author: wahwah Date: 2009-12-23 23:40:15 +0000 (Wed, 23 Dec 2009) Log Message: ----------- checkpkg.d: analyzing .so dependencies of single packages passes the smoke test Modified Paths: -------------- csw/mgar/pkg/pysvn/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/pysvn/trunk/ Property changes on: csw/mgar/pkg/pysvn/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/pysvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysvn/trunk/Makefile 2009-12-23 23:39:22 UTC (rev 7725) +++ csw/mgar/pkg/pysvn/trunk/Makefile 2009-12-23 23:40:15 UTC (rev 7726) @@ -33,15 +33,15 @@ PATCHFILES += 0008-gid-in-two-more-places.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWexpat -REQUIRED_PKGS += CSWgcc3core -REQUIRED_PKGS += CSWgcc3corert -REQUIRED_PKGS += CSWgcc3g++ -REQUIRED_PKGS += CSWgcc3g++rt -REQUIRED_PKGS += CSWgcc4corert -REQUIRED_PKGS += CSWgcc4g++rt -REQUIRED_PKGS += CSWneon -REQUIRED_PKGS += CSWsvn +# REQUIRED_PKGS = CSWexpat +# REQUIRED_PKGS += CSWgcc3core +# REQUIRED_PKGS += CSWgcc3corert +# REQUIRED_PKGS += CSWgcc3g++ +# REQUIRED_PKGS += CSWgcc3g++rt +# REQUIRED_PKGS += CSWgcc4corert +# REQUIRED_PKGS += CSWgcc4g++rt +# REQUIRED_PKGS += CSWneon +# REQUIRED_PKGS += CSWsvn PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel CSWbash INCOMPATIBELE_PKGS = CSWpyxml 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 Dec 24 00:44:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Dec 2009 23:44:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7727] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7727 http://gar.svn.sourceforge.net/gar/?rev=7727&view=rev Author: wahwah Date: 2009-12-23 23:44:47 +0000 (Wed, 23 Dec 2009) Log Message: ----------- checkpkg.d: analyzing .so dependencies of single packages passes the smoke test (this time for real) Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Property Changed: ---------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-23 23:40:15 UTC (rev 7726) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-23 23:44:47 UTC (rev 7727) @@ -5,12 +5,198 @@ # A check for dependencies between shared libraries. import checkpkg +import os import os.path +import copy +import re +import subprocess +import logging +DUMP_BIN = "/usr/ccs/bin/dump" +NEEDED_SONAMES = "needed sonames" +RUNPATH = "runpath" + def main(): + logging.basicConfig(level=logging.DEBUG) options, args = checkpkg.GetOptions() - pkgpath = os.path.join(options.extractdir, options.pkgname) + checker = checkpkg.CheckpkgBase(options.extractdir, options.pkgname) + binaries = checker.ListBinaries() + ws_re = re.compile(r"\s+") + # if [[ "$goodarch" = "yes" ]] ; then + # # man ld.so.1 for more info on this hack + # export LD_NOAUXFLTR=1 + # + # listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/elflist + # # have to do this for ldd to work. arrg. + # if [ -s "$EXTRACTDIR/elflist" ] ; then + # chmod 0755 `cat $EXTRACTDIR/elflist` + # + # cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | + # sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist + # + # + # + # print libraries used are: + # cat $EXTRACTDIR/liblist + # print "cross-referencing with depend file (May take a while)" + # else + # print No dynamic libraries in the package + # fi + # fi + + env = copy.copy(os.environ) + env["LD_NOAUXFLTR"] = "1" + binaries_by_name = {} + # Assembling a data structure with the data about binaries. + # { + # : {NEEDED_SONAMES: [...], + # RUNPATH: [...]}, + # : ..., + # ... + # } + # + for binary in binaries: + binary_base_name = binary.split("/")[-1] + if binary_base_name not in binaries_by_name: + binaries_by_name[binary_base_name] = {} + binary_data = binaries_by_name[binary_base_name] + args = [DUMP_BIN, "-Lv", binary] + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = dump_proc.communicate() + ret = dump_proc.wait() + for line in stdout.splitlines(): + fields = re.split(ws_re, line) + logging.debug("%s says: %s", DUMP_BIN, fields) + if len(fields) < 3: + continue + if fields[1] == "NEEDED": + if NEEDED_SONAMES not in binary_data: + binary_data[NEEDED_SONAMES] = [] + binary_data[NEEDED_SONAMES].append(fields[2]) + elif fields[1] == "RUNPATH": + if RUNPATH not in binary_data: + binary_data[RUNPATH] = [] + binary_data[RUNPATH].extend(fields[2].split(":")) + # Adding the default runtime path search option. + binary_data[RUNPATH].append("/usr/lib") + print binaries_by_name + # Building indexes + runpath_by_needed_soname = {} + # {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], + # ... + # } + needed_sonames = set() + binaries_by_soname = {} + for binary_name, data in binaries_by_name.iteritems(): + for soname in data[NEEDED_SONAMES]: + needed_sonames.add(soname) + if soname not in runpath_by_needed_soname: + runpath_by_needed_soname[soname] = [] + runpath_by_needed_soname[soname].extend(data[RUNPATH]) + if soname not in binaries_by_soname: + binaries_by_soname[soname] = [] + binaries_by_soname[soname].append(binary_name) + + pkgmap = checkpkg.SystemPkgmap() + paths_by_soname = pkgmap.paths_by_soname + + logging.debug("Determining soname-file relationships.") + # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog + lines_by_soname = {} + for soname in needed_sonames: + if soname in paths_by_soname: + logging.debug("%s found", repr(soname)) + # Finding the first matching path + for runpath in runpath_by_needed_soname[soname]: + if runpath in paths_by_soname[soname]: + logging.debug("%s found in %s", runpath, paths_by_soname[soname]) + logging.debug("line found: %s", repr(paths_by_soname[soname][runpath])) + lines_by_soname[soname] = paths_by_soname[soname][runpath] + break + else: + logging.debug("%s not found in the soname list!", soname) + for soname in needed_sonames: + if soname in binaries: + print "%s is provided by the package itself" % soname + elif soname in lines_by_soname: + print ("%s is required by %s and provided by %s" + % (soname, + binaries_by_soname[soname], + repr(lines_by_soname[soname]))) + else: + print ("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname])) + + # for lib in `cat $EXTRACTDIR/liblist` ; do + # grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap + # if [[ $? -eq 0 ]] ; then + # echo $lib provided by package itself + # continue + # else + # grep "[/=]$lib[ =]" $SETLIBS + # if [[ $? -eq 0 ]]; then + # echo "$lib provided by package set being evaluated." + # continue + # fi + # fi + # + # libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | + # sed 's/^.* \([^ ]*\)$/\1/' |sort -u` + # + # if [[ -z "$libpkg" ]] ; then + # echo "$lib $pkgname" >> $SETLIBS.missing + # print Cannot find package providing $lib. Storing for delayed validation. + # else + # print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs + # fi + # done + # + # sort -u $EXTRACTDIR/libpkgs >$EXTRACTDIR/libpkgs.x + # mv $EXTRACTDIR/libpkgs.x $EXTRACTDIR/libpkgs + # + # diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs >/dev/null + # if [[ $? -ne 0 ]] ; then + # print SUGGESTION: you may want to add some or all of the following as depends: + # print ' (Feel free to ignore SUNW or SPRO packages)' + # diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs | fgrep '>' + # fi + # + # + # + # if [[ "$basedir" != "" ]] ; then + # print + # if [[ -f $EXTRACTDIR/elflist ]] ; then + # print "Checking relocation ability..." + # xargs strings < $EXTRACTDIR/elflist| grep /opt/csw + # if [[ $? -eq 0 ]] ; then + # errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them + # else + # print trivial check passed + # fi + # else + # echo No relocation check done for non-binary relocatable package. + # fi + # fi + # + # ... + # + # if [ -s $SETLIBS.missing ]; then + # print "Doing late evaluations of package library dependencies." + # while read ldep; do + # lib=`echo $ldep | nawk '{print $1}'` + # [ "$lib" = "libm.so.2" ] && continue + # pkg=`echo $ldep | nawk '{print $2}'` + # /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null + # if [ $? -ne 0 ]; then + # errmsg "Couldn't find a package providing $lib" + # else + # print "A package in the set being evaluated provides $lib" + # fi + # done < $SETLIBS.missing + # fi + + if __name__ == '__main__': - main() + main() Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-23 23:40:15 UTC (rev 7726) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-23 23:44:47 UTC (rev 7727) @@ -1,22 +1,125 @@ -# This is a checkpkg library, common for all checkpkg tests written in Python. +# $Id$ +# +# This is the checkpkg library, common for all checkpkg tests written in +# Python. import optparse +import os +import os.path +import logging +import subprocess +import cPickle +import re +SYSTEM_PKGMAP = "/var/sadm/install/contents" + class Error(Exception): pass + class ConfigurationError(Error): pass + +class PackageError(Error): + pass + + def GetOptions(): parser = optparse.OptionParser() parser.add_option("-e", dest="extractdir", help="The directory into which the package has been extracted") parser.add_option("-p", dest="pkgname", help="The pkgname, e.g. CSWfoo") + parser.add_option("-d", "--debug", dest="debug", + default=False, action="store_true", + help="Turn on debugging messages") (options, args) = parser.parse_args() if not options.extractdir: raise ConfigurationError("ERROR: -e option is missing.") if not options.pkgname: raise ConfigurationError("ERROR: -p option is missing.") return options, args + + +class CheckpkgBase(object): + + def __init__(self, extractdir, pkgname): + self.extractdir = extractdir + self.pkgname = pkgname + self.pkgpath = os.path.join(self.extractdir, self.pkgname) + + def ListBinaries(self): + # ######################################### + # # find all executables and dynamic libs,and list their filenames. + # listbinaries() { + # if [ ! -d $1 ] ; then + # print errmsg $1 not a directory + # rm -rf $EXTRACTDIR + # exit 1 + # fi + # + # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' + # } + find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" + if not os.path.isdir(self.pkgpath): + raise PackageError("%s does not exist or is not a directory" + % self.pkgpath) + find_proc = subprocess.Popen(find_tmpl % self.pkgpath, + shell=True, stdout=subprocess.PIPE) + stdout, stderr = find_proc.communicate() + ret = find_proc.wait() + if ret: + logging.error("The find command returned an error.") + return stdout.splitlines() + +class SystemPkgmap(object): + """A class to hold and manipulate the /var/sadm/install/contents file.""" + + PICKLE_NAME = "var-sadm-install-contents.pickle" + WS_RE = re.compile(r"\s+") + def __init__(self): + """There is no need to re-parse it each time. + + Read it slowly the first time and cache it for later.""" + self.checkpkg_dir = os.path.join(os.environ["HOME"], ".checkpkg") + self.pickle_path = os.path.join(self.checkpkg_dir, self.PICKLE_NAME) + if os.path.exists(self.pickle_path): + logging.debug("Unpickling %s, please wait.", self.pickle_path) + pickle_fd = open(self.pickle_path, "r") + self.paths_by_soname = cPickle.load(pickle_fd) + pickle_fd.close() + else: + # The original checkpkg code to port is in the comments. + # + # egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | + # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + stop_pkgs = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] + system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") + + stop_re = re.compile("(%s)" % "|".join(stop_pkgs)) + + # Creating a data structure: + # soname - {: , : , ...} + logging.debug("Building in-memory data structure for the %s file", + SYSTEM_PKGMAP) + paths_by_soname = {} + for line in system_pkgmap_fd: + if stop_re.search(line): + continue + fields = re.split(self.WS_RE, line) + pkgmap_entry_path = fields[0].split("=")[0] + pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) + if pkgmap_entry_base_name not in paths_by_soname: + paths_by_soname[pkgmap_entry_base_name] = {} + paths_by_soname[pkgmap_entry_base_name][pkgmap_entry_dir] = line + logging.debug("The data structure contains %s files", + len(paths_by_soname)) + self.paths_by_soname = paths_by_soname + if not os.path.exists(self.checkpkg_dir): + logging.debug("Creating %s", self.checkpkg_dir) + os.mkdir(self.checkpkg_dir) + logging.debug("Pickling to %s", self.pickle_path) + pickle_fd = open(self.pickle_path, "w") + cPickle.dump(self.paths_by_soname, pickle_fd) + pickle_fd.close() Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-23 23:44:47 UTC (rev 7727) @@ -0,0 +1,8 @@ +#!/opt/csw/bin/python2.6 + +import unittest + + + +if __name__ == '__main__': + unittest.main() Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Dec 24 00:53:20 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 23 Dec 2009 23:53:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7728] csw/mgar/pkg/netsnmp/tags Message-ID: Revision: 7728 http://gar.svn.sourceforge.net/gar/?rev=7728&view=rev Author: hson Date: 2009-12-23 23:53:20 +0000 (Wed, 23 Dec 2009) Log Message: ----------- netsnmp: Build fails with comma in dirname Added Paths: ----------- csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1/ Removed Paths: ------------- csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1,REV=2009.12.23/ 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 Dec 24 02:13:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 01:13:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7729] csw/mgar/gar/v2-checkpkg/bin Message-ID: Revision: 7729 http://gar.svn.sourceforge.net/gar/?rev=7729&view=rev Author: wahwah Date: 2009-12-24 01:13:45 +0000 (Thu, 24 Dec 2009) Log Message: ----------- checkpkg.d: checking multiple packages Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-23 23:53:20 UTC (rev 7728) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 01:13:45 UTC (rev 7729) @@ -35,11 +35,17 @@ if [[ -d "$EXTRACTDIR" ]] ; then rm -rf $EXTRACTDIR fi - if [[ "$TMPARCHIVE" != "" ]] ; then - [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE - fi + cleantmparchives } +cleantmparchives() { + for TMPARCHIVE in $tmparchives; do + if [[ "$TMPARCHIVE" != "" ]]; then + [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE + fi + done +} + cleanupset(){ if [ "`echo $SETINF*`" != "$SETINF*" ]; then rm $SETINF* @@ -61,6 +67,22 @@ exit 1 } +set_variables_for_individual_package_check() { + f=$1 + file $f |sed 's/^.*://' |grep gzip >/dev/null + if [ $? -eq 0 ] ; then + TMPARCHIVE=/tmp/`basename $f` + if [[ -f $TMPARCHIVE ]] ; then + print ERROR: $TMPARCHIVE already exists + + fi + gzcat $f >$TMPARCHIVE || exit 1 + f=$TMPARCHIVE + fi + pkgname=`nawk 'NR == 2 {print $1; exit;}' $f` + pkgnames="$pkgnames $pkgname" +} + if [[ "$1" == "-e" ]] ; then quit_on_warn=1; shift @@ -75,8 +97,16 @@ SETINF=/tmp/checkpkg.$$.`date +%Y%m%d%H%M%S` SETLIBS=$SETINF.libs SETDEPS=$SETINF.deps +pkgnames="" +tmparchives="" +EXTRACTDIR=/tmp/dissect.$$ +if [ -d $EXTRACTDIR ] ; then + print ERROR: $EXTRACTDIR already exists + exit 1 +fi + for f in "$@" do @@ -89,9 +119,6 @@ case $f in - cswutils-*) - : - ;; *) print Examining $f @@ -118,30 +145,13 @@ done esac -print Extracting files for more detailed inspection... +print Extracting all files for more detailed inspection... -file $f |sed 's/^.*://' |grep gzip >/dev/null -if [ $? -eq 0 ] ; then - TMPARCHIVE=/tmp/`basename $f` - if [[ -f $TMPARCHIVE ]] ; then - print ERROR: $TMPARCHIVE already exists - - fi - gzcat $f >$TMPARCHIVE || exit 1 - f=$TMPARCHIVE -fi +set_variables_for_individual_package_check "$f" -pkgname=`nawk 'NR == 2 {print $1; exit;}' $f` - -EXTRACTDIR=/tmp/dissect.$$ - -if [ -d $EXTRACTDIR ] ; then - print ERROR: $EXTRACTDIR already exists - exit 1 -fi - mkdir $EXTRACTDIR +# FIXME: This doesn't support multiple packages TMPFILE=$EXTRACTDIR/pkginfo @@ -311,7 +321,6 @@ print Extracing pkg for examination of files... pkgtrans $f $EXTRACTDIR $pkgname - ############################################################# # We now have the package expanded, in "directory" form, in # $EXTRACTDIR/$pkgname @@ -542,6 +551,15 @@ # checkpkg is. Each plugin file name should be an executable and begin with # "checkpkg-". +tmparchives="$tmparchives $TMPARCHIVE" +done + +# All packages have been extracted. + +# Now running all the plugin checks + +set_variables_for_individual_package_check "$f" + echo "Running the experimental plugin infrastructure." checkpkg_scriptname=`basename $0` checkpkg_basedir=${0%/${checkpkg_scriptname}} @@ -551,8 +569,8 @@ # echo plugin dir exists for plugin in "${plugindir}"/checkpkg-*; do if [[ -x "${plugin}" ]]; then - echo "Executing: '${plugin} -e \"${EXTRACTDIR}\" -p \"${pkgname}\"'" - ${plugin} -e "${EXTRACTDIR}" -p "${pkgname}" + echo "Executing: ${plugin} -e \"${EXTRACTDIR}\" ${pkgnames}" + ${plugin} -e "${EXTRACTDIR}" ${pkgnames} if [[ "$?" -ne 0 ]]; then errmsg "Plugin ${plugin} has returned an error." fi @@ -565,11 +583,13 @@ fi # End of plugin section -cleanup +# Not doing the cleanup now +# cleanup print "" -done +# Cleaning up after all packages +cleanup if [ -s $SETDEPS.missing ]; then print "Doing late evaluations of package dependencies." Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py 2009-12-23 23:53:20 UTC (rev 7728) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py 2009-12-24 01:13:45 UTC (rev 7729) @@ -6,11 +6,14 @@ def main(): options, args = checkpkg.GetOptions() - pkgpath = os.path.join(options.extractdir, options.pkgname) - if not os.path.isdir(pkgpath): - raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) - print ("Dummy plugin says the package %s is extracted to %s" - % (options.pkgname, options.extractdir)) + if not os.path.isdir(options.extractdir): + raise checkpkg.PackageError("The extract base directory doesn't exist: %s" % options.extractdir) + for pkgname in args: + pkgpath = os.path.join(options.extractdir, pkgname) + if not os.path.isdir(pkgpath): + raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) + print ("Dummy plugin says the package %s is extracted to %s" + % (pkgname, options.extractdir)) if __name__ == '__main__': Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-23 23:53:20 UTC (rev 7728) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 01:13:45 UTC (rev 7729) @@ -19,8 +19,16 @@ def main(): logging.basicConfig(level=logging.DEBUG) options, args = checkpkg.GetOptions() - checker = checkpkg.CheckpkgBase(options.extractdir, options.pkgname) - binaries = checker.ListBinaries() + pkgnames = args + checkers = [] + for pkgname in pkgnames: + checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) + checkers.append(checker) + binaries = [] + for checker in checkers: + binaries.extend(checker.ListBinaries()) + # Make them unique + binaries = set(binaries) ws_re = re.compile(r"\s+") # if [[ "$goodarch" = "yes" ]] ; then @@ -128,6 +136,9 @@ else: print ("%s is required by %s, but we don't know what provides it." % (soname, binaries_by_soname[soname])) + # TODO: extract package names from the pkgmap lines + # TODO: print per-package deps (requires the transition: pkgname -> soname -> + # pkgname) # for lib in `cat $EXTRACTDIR/liblist` ; do # grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-23 23:53:20 UTC (rev 7728) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 01:13:45 UTC (rev 7729) @@ -29,16 +29,12 @@ parser = optparse.OptionParser() parser.add_option("-e", dest="extractdir", help="The directory into which the package has been extracted") - parser.add_option("-p", dest="pkgname", - help="The pkgname, e.g. CSWfoo") parser.add_option("-d", "--debug", dest="debug", default=False, action="store_true", help="Turn on debugging messages") (options, args) = parser.parse_args() if not options.extractdir: raise ConfigurationError("ERROR: -e option is missing.") - if not options.pkgname: - raise ConfigurationError("ERROR: -p option is missing.") return options, args 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 Dec 24 02:26:58 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Dec 2009 01:26:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7730] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 7730 http://gar.svn.sourceforge.net/gar/?rev=7730&view=rev Author: bdwalton Date: 2009-12-24 01:26:58 +0000 (Thu, 24 Dec 2009) Log Message: ----------- drop rc2 patchlevel as 1.6.6 has just been released Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-12-24 01:13:45 UTC (rev 7729) +++ csw/mgar/pkg/git/trunk/Makefile 2009-12-24 01:26:58 UTC (rev 7730) @@ -1,6 +1,6 @@ GARNAME = git GARVERSION = 1.6.6 -PATCHLEVEL = rc2 +# PATCHLEVEL = rc2 CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) 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 Dec 24 10:51:16 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 09:51:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7731] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 7731 http://gar.svn.sourceforge.net/gar/?rev=7731&view=rev Author: wahwah Date: 2009-12-24 09:51:14 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mysql5: Providing a symlink for the backward compatibility of shared libraries, see http://www.opencsw.org/bugtrack/view.php?id=4098 Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-24 01:26:58 UTC (rev 7730) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-24 09:51:14 UTC (rev 7731) @@ -132,8 +132,8 @@ # MySQL-5.1.40 doesn't compile without setting EXTRA_INC. EXTRA_INC = /opt/csw/include EXTRA_LIB = /opt/csw/lib -EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) @@ -150,11 +150,15 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb CONFIGURE_ARGS += --with-comment +CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc +CONFIGURE_ARGS += --with-big-tables +CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TODO: Make the tests pass. They don't at the moment. -# TEST_SCRIPTS = +SKIPTEST ?= 1 +TEST_SCRIPTS = custom TEST_TARGETS = check @@ -173,9 +177,16 @@ CFLAGS := $(filter-out -I%,$(CFLAGS)) +test-custom: + alias sh=/usr/bin/bash; \ + cd $(WORKSRC)/mysql-test; \ + perl mysql-test-run.pl --mem --big-test --force \ + --skip-test=archive-big --skip-test=/gis/ + pre-configure-modulated: # To work around the libtool version mismatch problem. cd $(WORKSRC) && autoreconf --force --install --symlink + @$(MAKECOOKIE) post-merge: ginstall -m 755 -d $(PKGROOT)$(localstatedir) @@ -200,5 +211,10 @@ ln -s ../mysql5/bin/`basename $$f` \ $(PKGROOT)$(global_bindir)/`basename $$f`; \ done + # /opt/csw/mysql5/lib/sparc9/mysql -- by GAR, it's logical + # /opt/csw/mysql5/lib/mysql/sparcv9 -- expected by other packages + gln -s ../$(ISA_DEFAULT64)/mysql $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT64) + # For other applications to link against gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64 @$(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 Thu Dec 24 11:42:58 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 10:42:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7732] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 7732 http://gar.svn.sourceforge.net/gar/?rev=7732&view=rev Author: wahwah Date: 2009-12-24 10:42:58 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mysql5: updated PKGFILES_CSWmysql5rt to include symlinks Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-24 09:51:14 UTC (rev 7731) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-24 10:42:58 UTC (rev 7732) @@ -108,7 +108,8 @@ PKGFILES_CSWmysql5devel += $(prefix)/include.* PKGFILES_CSWmysql5devel += /opt/csw/include/mysql -PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* +PKGFILES_CSWmysql5rt = $(libdir) +PKGFILES_CSWmysql5rt += $(libdir)/.* PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* REQUIRED_PKGS_CSWmysql5bench = CSWmysql5 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 Dec 24 11:55:18 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 10:55:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7733] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7733 http://gar.svn.sourceforge.net/gar/?rev=7733&view=rev Author: wahwah Date: 2009-12-24 10:55:18 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Checking multiple packages works to some extent, basic text reporting works, need to improve text reporting and error code returning Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 10:42:58 UTC (rev 7732) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 10:55:18 UTC (rev 7733) @@ -25,9 +25,13 @@ checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) checkers.append(checker) binaries = [] + binaries_by_pkgname = {} for checker in checkers: - binaries.extend(checker.ListBinaries()) - # Make them unique + pkg_binary_paths = checker.ListBinaries() + binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] + binaries_by_pkgname[checker.pkgname] = binaries_base + binaries.extend(pkg_binary_paths) + # Make the binaries unique binaries = set(binaries) ws_re = re.compile(r"\s+") @@ -55,7 +59,7 @@ env = copy.copy(os.environ) env["LD_NOAUXFLTR"] = "1" - binaries_by_name = {} + needed_sonames_by_binary = {} # Assembling a data structure with the data about binaries. # { # : {NEEDED_SONAMES: [...], @@ -66,16 +70,17 @@ # for binary in binaries: binary_base_name = binary.split("/")[-1] - if binary_base_name not in binaries_by_name: - binaries_by_name[binary_base_name] = {} - binary_data = binaries_by_name[binary_base_name] + if binary_base_name not in needed_sonames_by_binary: + needed_sonames_by_binary[binary_base_name] = {} + binary_data = needed_sonames_by_binary[binary_base_name] args = [DUMP_BIN, "-Lv", binary] dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE) stdout, stderr = dump_proc.communicate() ret = dump_proc.wait() for line in stdout.splitlines(): fields = re.split(ws_re, line) - logging.debug("%s says: %s", DUMP_BIN, fields) + # TODO: Make it a unit test + # logging.debug("%s says: %s", DUMP_BIN, fields) if len(fields) < 3: continue if fields[1] == "NEEDED": @@ -88,7 +93,8 @@ binary_data[RUNPATH].extend(fields[2].split(":")) # Adding the default runtime path search option. binary_data[RUNPATH].append("/usr/lib") - print binaries_by_name + # TODO: make it a unit test + # print needed_sonames_by_binary # Building indexes runpath_by_needed_soname = {} @@ -97,7 +103,7 @@ # } needed_sonames = set() binaries_by_soname = {} - for binary_name, data in binaries_by_name.iteritems(): + for binary_name, data in needed_sonames_by_binary.iteritems(): for soname in data[NEEDED_SONAMES]: needed_sonames.add(soname) if soname not in runpath_by_needed_soname: @@ -115,28 +121,48 @@ lines_by_soname = {} for soname in needed_sonames: if soname in paths_by_soname: - logging.debug("%s found", repr(soname)) + # logging.debug("%s found", repr(soname)) # Finding the first matching path for runpath in runpath_by_needed_soname[soname]: if runpath in paths_by_soname[soname]: - logging.debug("%s found in %s", runpath, paths_by_soname[soname]) - logging.debug("line found: %s", repr(paths_by_soname[soname][runpath])) + # logging.debug("%s found in %s", runpath, paths_by_soname[soname]) + # logging.debug("line found: %s", repr(paths_by_soname[soname][runpath])) lines_by_soname[soname] = paths_by_soname[soname][runpath] break else: logging.debug("%s not found in the soname list!", soname) + pkgs_by_soname = {} + for soname, line in lines_by_soname.iteritems(): + # TODO: Find all the packages, not just the last field. + fields = re.split(ws_re, line.strip()) + # For now, we'll assume that the last field is the package. + pkgname = fields[-1] + pkgs_by_soname[soname] = pkgname for soname in needed_sonames: if soname in binaries: - print "%s is provided by the package itself" % soname + print "%s is provided by the package itself" % soname elif soname in lines_by_soname: print ("%s is required by %s and provided by %s" % (soname, binaries_by_soname[soname], - repr(lines_by_soname[soname]))) + repr(pkgs_by_soname[soname]))) else: - print ("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname])) - # TODO: extract package names from the pkgmap lines + print ("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname])) + dependent_pkgs = {} + for pkgname in binaries_by_pkgname: + # logging.debug("Reporting package %s", pkgname) + dependencies = set() + for binary in binaries_by_pkgname[pkgname]: + if binary in needed_sonames_by_binary: + for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: + dependencies.add(pkgs_by_soname[soname]) + else: + logging.warn("%s not found in needed_sonames_by_binary (%s)", + binary, needed_sonames_by_binary.keys()) + logging.info("%s depends on %s", pkgname, dependencies) + + # binaries_by_pkgname --> needed_sonames_by_binary --> pkgs_by_soname # TODO: print per-package deps (requires the transition: pkgname -> soname -> # pkgname) Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 10:42:58 UTC (rev 7732) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 10:55:18 UTC (rev 7733) @@ -35,7 +35,8 @@ (options, args) = parser.parse_args() if not options.extractdir: raise ConfigurationError("ERROR: -e option is missing.") - return options, args + # Using set() to make the arguments unique. + return options, set(args) class CheckpkgBase(object): 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 Dec 24 12:00:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 11:00:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7734] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 7734 http://gar.svn.sourceforge.net/gar/?rev=7734&view=rev Author: wahwah Date: 2009-12-24 11:00:24 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mysql5: Adding CSWosslrt as a dependency of CSWmysql5rt Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-24 10:55:18 UTC (rev 7733) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-24 11:00:24 UTC (rev 7734) @@ -117,6 +117,7 @@ REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl +REQUIRED_PKGS_CSWmysql5rt = CSWosslrt MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 24 12:15:12 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 11:15:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7735] csw/mgar/pkg/pysvn/trunk/Makefile Message-ID: Revision: 7735 http://gar.svn.sourceforge.net/gar/?rev=7735&view=rev Author: wahwah Date: 2009-12-24 11:15:12 +0000 (Thu, 24 Dec 2009) Log Message: ----------- pysvn: better dependencies, based on the new checkpkg output Modified Paths: -------------- csw/mgar/pkg/pysvn/trunk/Makefile Modified: csw/mgar/pkg/pysvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysvn/trunk/Makefile 2009-12-24 11:00:24 UTC (rev 7734) +++ csw/mgar/pkg/pysvn/trunk/Makefile 2009-12-24 11:15:12 UTC (rev 7735) @@ -33,15 +33,11 @@ PATCHFILES += 0008-gid-in-two-more-places.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# REQUIRED_PKGS = CSWexpat -# REQUIRED_PKGS += CSWgcc3core -# REQUIRED_PKGS += CSWgcc3corert -# REQUIRED_PKGS += CSWgcc3g++ -# REQUIRED_PKGS += CSWgcc3g++rt -# REQUIRED_PKGS += CSWgcc4corert -# REQUIRED_PKGS += CSWgcc4g++rt -# REQUIRED_PKGS += CSWneon -# REQUIRED_PKGS += CSWsvn +REQUIRED_PKGS = CSWexpat +REQUIRED_PKGS += CSWgcc4corert +REQUIRED_PKGS += CSWgcc4g++rt +REQUIRED_PKGS += CSWneon +REQUIRED_PKGS += CSWsvn PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel CSWbash INCOMPATIBELE_PKGS = CSWpyxml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 24 12:16:31 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 24 Dec 2009 11:16:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7736] csw/mgar/pkg Message-ID: Revision: 7736 http://gar.svn.sourceforge.net/gar/?rev=7736&view=rev Author: rthurner Date: 2009-12-24 11:16:30 +0000 (Thu, 24 Dec 2009) Log Message: ----------- genshi,pysqlite2 - remove python-rt dependency for python-2.6.4 release Modified Paths: -------------- csw/mgar/pkg/genshi/trunk/Makefile csw/mgar/pkg/pysqlite2/trunk/Makefile Modified: csw/mgar/pkg/genshi/trunk/Makefile =================================================================== --- csw/mgar/pkg/genshi/trunk/Makefile 2009-12-24 11:15:12 UTC (rev 7735) +++ csw/mgar/pkg/genshi/trunk/Makefile 2009-12-24 11:16:30 UTC (rev 7736) @@ -19,7 +19,7 @@ SPKG_CLASSES = none cswpycompile REQUIRED_PKGS += CSWcswclassutils -REQUIRED_PKGS_CSWgenshi = CSWpython-rt +REQUIRED_PKGS_CSWgenshi = CSWpython CATALOGNAME_CSWgenshi = genshi SPKG_DESC_CSWgenshi = $(DESCRIPTION) Modified: csw/mgar/pkg/pysqlite2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-12-24 11:15:12 UTC (rev 7735) +++ csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-12-24 11:16:30 UTC (rev 7736) @@ -1,5 +1,5 @@ GARNAME = pysqlite -GARVERSION = 2.5.5 +GARVERSION = 2.5.6 CATEGORIES = lang RELVER = $(shell echo $(GARVERSION) |gsed 's/\(^[0-9].*\)\.[0-9]*/\1/') @@ -13,7 +13,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWpysqlite2 -REQUIRED_PKGS_CSWpysqlite2 = CSWpython-rt CSWsqlite3rt +REQUIRED_PKGS_CSWpysqlite2 = CSWpython CSWsqlite3rt CATALOGNAME_CSWpysqlite2 = pysqlite2 SPKG_DESC_CSWpysqlite2 = SQLite3 support for Python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 24 12:39:18 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 24 Dec 2009 11:39:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7737] csw/mgar/pkg/genshi/trunk/Makefile Message-ID: Revision: 7737 http://gar.svn.sourceforge.net/gar/?rev=7737&view=rev Author: rthurner Date: 2009-12-24 11:39:18 +0000 (Thu, 24 Dec 2009) Log Message: ----------- genshi - remove now unnecessary dependency to classutils Modified Paths: -------------- csw/mgar/pkg/genshi/trunk/Makefile Modified: csw/mgar/pkg/genshi/trunk/Makefile =================================================================== --- csw/mgar/pkg/genshi/trunk/Makefile 2009-12-24 11:16:30 UTC (rev 7736) +++ csw/mgar/pkg/genshi/trunk/Makefile 2009-12-24 11:39:18 UTC (rev 7737) @@ -17,7 +17,6 @@ EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' SPKG_CLASSES = none cswpycompile -REQUIRED_PKGS += CSWcswclassutils REQUIRED_PKGS_CSWgenshi = CSWpython CATALOGNAME_CSWgenshi = genshi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 24 12:51:54 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 24 Dec 2009 11:51:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7738] csw/mgar/pkg/pysqlite2/trunk Message-ID: Revision: 7738 http://gar.svn.sourceforge.net/gar/?rev=7738&view=rev Author: rthurner Date: 2009-12-24 11:51:53 +0000 (Thu, 24 Dec 2009) Log Message: ----------- pysqlite2 - upgrade to google distribution site, also checksum upgrade Modified Paths: -------------- csw/mgar/pkg/pysqlite2/trunk/Makefile csw/mgar/pkg/pysqlite2/trunk/checksums Modified: csw/mgar/pkg/pysqlite2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-12-24 11:39:18 UTC (rev 7737) +++ csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-12-24 11:51:53 UTC (rev 7738) @@ -9,7 +9,7 @@ SQLite support for Python endef -MASTER_SITES = http://oss.itsystementwicklung.de/download/pysqlite/$(RELVER)/$(GARVERSION)/ +MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWpysqlite2 @@ -20,7 +20,6 @@ EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' SPKG_CLASSES = none cswpycompile -REQUIRED_PKGS += CSWcswclassutils # We define upstream file regex so we can be notifed of # new upstream software release Modified: csw/mgar/pkg/pysqlite2/trunk/checksums =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/checksums 2009-12-24 11:39:18 UTC (rev 7737) +++ csw/mgar/pkg/pysqlite2/trunk/checksums 2009-12-24 11:51:53 UTC (rev 7738) @@ -1 +1 @@ -4f9fcd12a4860160b1f332066c64ee58 download/pysqlite-2.5.5.tar.gz +1b2f338c8d6db971e34edb799a92e2ee pysqlite-2.5.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 24 13:32:36 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 24 Dec 2009 12:32:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7739] csw/mgar/gar Message-ID: Revision: 7739 http://gar.svn.sourceforge.net/gar/?rev=7739&view=rev Author: rthurner Date: 2009-12-24 12:32:36 +0000 (Thu, 24 Dec 2009) Log Message: ----------- kde - upgrade to the current 3.5 version Modified Paths: -------------- csw/mgar/gar/v1/categories/kde/category.mk csw/mgar/gar/v2/categories/kde/category.mk Modified: csw/mgar/gar/v1/categories/kde/category.mk =================================================================== --- csw/mgar/gar/v1/categories/kde/category.mk 2009-12-24 11:51:53 UTC (rev 7738) +++ csw/mgar/gar/v1/categories/kde/category.mk 2009-12-24 12:32:36 UTC (rev 7739) @@ -1,7 +1,7 @@ # KDE KDE_ROOT = http://download.kde.org -KDE_VERSION = 3.5.2 +KDE_VERSION = 3.5.10 KDE_DIST = stable KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ Modified: csw/mgar/gar/v2/categories/kde/category.mk =================================================================== --- csw/mgar/gar/v2/categories/kde/category.mk 2009-12-24 11:51:53 UTC (rev 7738) +++ csw/mgar/gar/v2/categories/kde/category.mk 2009-12-24 12:32:36 UTC (rev 7739) @@ -1,7 +1,7 @@ # KDE KDE_ROOT = http://download.kde.org -KDE_VERSION = 3.5.2 +KDE_VERSION = 3.5.10 KDE_DIST = stable KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 24 15:01:29 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 24 Dec 2009 14:01:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7740] csw/mgar/pkg/apr/trunk/Makefile Message-ID: Revision: 7740 http://gar.svn.sourceforge.net/gar/?rev=7740&view=rev Author: rthurner Date: 2009-12-24 14:01:28 +0000 (Thu, 24 Dec 2009) Log Message: ----------- apr - now ipv6 is installed, all tests succeed Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2009-12-24 12:32:36 UTC (rev 7739) +++ csw/mgar/pkg/apr/trunk/Makefile 2009-12-24 14:01:28 UTC (rev 7740) @@ -22,9 +22,7 @@ CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-other-child -# ipv6 tests fail -# TEST_TARGET = check -TEST_TARGET = +TEST_TARGET = check include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 24 16:41:02 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 15:41:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7741] csw/mgar/gar/v2-checkpkg/bin Message-ID: Revision: 7741 http://gar.svn.sourceforge.net/gar/?rev=7741&view=rev Author: wahwah Date: 2009-12-24 15:41:02 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Dependency reporting done, error code returning done. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 14:01:28 UTC (rev 7740) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 15:41:02 UTC (rev 7741) @@ -83,6 +83,11 @@ pkgnames="$pkgnames $pkgname" } +if [[ "$1" == "-d" ]] ; then + DEBUG=1 + shift +fi + if [[ "$1" == "-e" ]] ; then quit_on_warn=1; shift @@ -422,7 +427,7 @@ #cat $EXTRACTDIR/elflist| xargs ldd 2>/dev/null |fgrep '.so' | # sed 's:^.*=>[^/]*::' | nawk '{print $1}' |sort -u >$EXTRACTDIR/liblist - cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | + cat $EXTRACTDIR/elflist| xargs /usr/ccs/bin/dump -Lv |nawk '$2=="NEEDED"{print $3}' | sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist @@ -564,13 +569,16 @@ checkpkg_scriptname=`basename $0` checkpkg_basedir=${0%/${checkpkg_scriptname}} plugindir=${checkpkg_basedir}/checkpkg.d +if [[ "${DEBUG}" != "" ]]; then + extra_options="--debug" +fi echo "plugindir: '$plugindir'" if [[ -d "$plugindir" ]]; then # echo plugin dir exists for plugin in "${plugindir}"/checkpkg-*; do if [[ -x "${plugin}" ]]; then - echo "Executing: ${plugin} -e \"${EXTRACTDIR}\" ${pkgnames}" - ${plugin} -e "${EXTRACTDIR}" ${pkgnames} + echo "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" + ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} if [[ "$?" -ne 0 ]]; then errmsg "Plugin ${plugin} has returned an error." fi @@ -581,11 +589,10 @@ else echo plugin dir does not exist fi +# echo "Profiling." +# python -m cProfile gar/bin/checkpkg.d/checkpkg-libs.py --debug -e "${EXTRACTDIR}" ${pkgnames} # End of plugin section -# Not doing the cleanup now -# cleanup - print "" # Cleaning up after all packages Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 14:01:28 UTC (rev 7740) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 15:41:02 UTC (rev 7741) @@ -11,14 +11,20 @@ import re import subprocess import logging +import sys DUMP_BIN = "/usr/ccs/bin/dump" NEEDED_SONAMES = "needed sonames" RUNPATH = "runpath" +TYPICAL_DEPENDENCIES = set(["CSWcommon", "CSWcswclassutils"]) def main(): - logging.basicConfig(level=logging.DEBUG) options, args = checkpkg.GetOptions() + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + result_ok = True pkgnames = args checkers = [] for pkgname in pkgnames: @@ -31,39 +37,18 @@ binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] binaries_by_pkgname[checker.pkgname] = binaries_base binaries.extend(pkg_binary_paths) - # Make the binaries unique + # Making the binaries unique binaries = set(binaries) ws_re = re.compile(r"\s+") - # if [[ "$goodarch" = "yes" ]] ; then - # # man ld.so.1 for more info on this hack - # export LD_NOAUXFLTR=1 - # - # listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/elflist - # # have to do this for ldd to work. arrg. - # if [ -s "$EXTRACTDIR/elflist" ] ; then - # chmod 0755 `cat $EXTRACTDIR/elflist` - # - # cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | - # sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist - # - # - # - # print libraries used are: - # cat $EXTRACTDIR/liblist - # print "cross-referencing with depend file (May take a while)" - # else - # print No dynamic libraries in the package - # fi - # fi - + # man ld.so.1 for more info on this hack env = copy.copy(os.environ) env["LD_NOAUXFLTR"] = "1" needed_sonames_by_binary = {} # Assembling a data structure with the data about binaries. # { - # : {NEEDED_SONAMES: [...], - # RUNPATH: [...]}, + # : { NEEDED_SONAMES: [...], + # RUNPATH: [...]}, # : ..., # ... # } @@ -74,7 +59,7 @@ needed_sonames_by_binary[binary_base_name] = {} binary_data = needed_sonames_by_binary[binary_base_name] args = [DUMP_BIN, "-Lv", binary] - dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) stdout, stderr = dump_proc.communicate() ret = dump_proc.wait() for line in stdout.splitlines(): @@ -114,23 +99,19 @@ binaries_by_soname[soname].append(binary_name) pkgmap = checkpkg.SystemPkgmap() - paths_by_soname = pkgmap.paths_by_soname - - logging.debug("Determining soname-file relationships.") + logging.debug("Determining the soname-package relationships.") # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog lines_by_soname = {} for soname in needed_sonames: - if soname in paths_by_soname: - # logging.debug("%s found", repr(soname)) - # Finding the first matching path + try: for runpath in runpath_by_needed_soname[soname]: - if runpath in paths_by_soname[soname]: - # logging.debug("%s found in %s", runpath, paths_by_soname[soname]) - # logging.debug("line found: %s", repr(paths_by_soname[soname][runpath])) - lines_by_soname[soname] = paths_by_soname[soname][runpath] + if runpath in pkgmap.GetPkgmapLineByBasename(soname): + # logging.debug("%s found in %s", runpath, pkgmap.GetPkgmapLineByBasename(soname)) + # logging.debug("line found: %s", repr(pkgmap.GetPkgmapLineByBasename(soname)[runpath])) + lines_by_soname[soname] = pkgmap.GetPkgmapLineByBasename(soname)[runpath] break - else: - logging.debug("%s not found in the soname list!", soname) + except KeyError, e: + logging.debug("KeyError: %s", soname, e) pkgs_by_soname = {} for soname, line in lines_by_soname.iteritems(): # TODO: Find all the packages, not just the last field. @@ -138,8 +119,10 @@ # For now, we'll assume that the last field is the package. pkgname = fields[-1] pkgs_by_soname[soname] = pkgname + + # A shared object dependency/provisioning report, plus checking. for soname in needed_sonames: - if soname in binaries: + if soname in needed_sonames_by_binary: print "%s is provided by the package itself" % soname elif soname in lines_by_soname: print ("%s is required by %s and provided by %s" @@ -149,91 +132,49 @@ else: print ("%s is required by %s, but we don't know what provides it." % (soname, binaries_by_soname[soname])) + result_ok = False + dependent_pkgs = {} - for pkgname in binaries_by_pkgname: + for checker in checkers: + orphan_sonames = set() + pkgname = checker.pkgname # logging.debug("Reporting package %s", pkgname) - dependencies = set() + declared_dependencies = checker.GetDependencies() + so_dependencies = set() for binary in binaries_by_pkgname[pkgname]: if binary in needed_sonames_by_binary: for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: - dependencies.add(pkgs_by_soname[soname]) + if soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) + else: + orphan_sonames.add(soname) else: logging.warn("%s not found in needed_sonames_by_binary (%s)", binary, needed_sonames_by_binary.keys()) - logging.info("%s depends on %s", pkgname, dependencies) + declared_dependencies_set = set(declared_dependencies) + print "You can consider including the following packages in the dependencies:" + for dep_pkgname in sorted(so_dependencies.difference(declared_dependencies_set)): + print " ", dep_pkgname, + if dep_pkgname.startswith("SUNW"): + print "(it's safe to ignore this one)", + print + + surplus_dependencies = declared_dependencies_set.difference(so_dependencies) + surplus_dependencies = surplus_dependencies.difference(TYPICAL_DEPENDENCIES) + if surplus_dependencies: + print "The following packages might be unnecessary dependencies:" + for dep_pkgname in surplus_dependencies: + print " ", dep_pkgname + if orphan_sonames: + print "The following sonames don't belong to any package:" + for soname in sorted(orphan_sonames): + print " ", soname - # binaries_by_pkgname --> needed_sonames_by_binary --> pkgs_by_soname - # TODO: print per-package deps (requires the transition: pkgname -> soname -> - # pkgname) + if result_ok: + sys.exit(0) + else: + sys.exit(1) - # for lib in `cat $EXTRACTDIR/liblist` ; do - # grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap - # if [[ $? -eq 0 ]] ; then - # echo $lib provided by package itself - # continue - # else - # grep "[/=]$lib[ =]" $SETLIBS - # if [[ $? -eq 0 ]]; then - # echo "$lib provided by package set being evaluated." - # continue - # fi - # fi - # - # libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | - # sed 's/^.* \([^ ]*\)$/\1/' |sort -u` - # - # if [[ -z "$libpkg" ]] ; then - # echo "$lib $pkgname" >> $SETLIBS.missing - # print Cannot find package providing $lib. Storing for delayed validation. - # else - # print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs - # fi - # done - # - # sort -u $EXTRACTDIR/libpkgs >$EXTRACTDIR/libpkgs.x - # mv $EXTRACTDIR/libpkgs.x $EXTRACTDIR/libpkgs - # - # diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs >/dev/null - # if [[ $? -ne 0 ]] ; then - # print SUGGESTION: you may want to add some or all of the following as depends: - # print ' (Feel free to ignore SUNW or SPRO packages)' - # diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs | fgrep '>' - # fi - # - # - # - # if [[ "$basedir" != "" ]] ; then - # print - # if [[ -f $EXTRACTDIR/elflist ]] ; then - # print "Checking relocation ability..." - # xargs strings < $EXTRACTDIR/elflist| grep /opt/csw - # if [[ $? -eq 0 ]] ; then - # errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them - # else - # print trivial check passed - # fi - # else - # echo No relocation check done for non-binary relocatable package. - # fi - # fi - # - # ... - # - # if [ -s $SETLIBS.missing ]; then - # print "Doing late evaluations of package library dependencies." - # while read ldep; do - # lib=`echo $ldep | nawk '{print $1}'` - # [ "$lib" = "libm.so.2" ] && continue - # pkg=`echo $ldep | nawk '{print $2}'` - # /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null - # if [ $? -ne 0 ]; then - # errmsg "Couldn't find a package providing $lib" - # else - # print "A package in the set being evaluated provides $lib" - # fi - # done < $SETLIBS.missing - # fi - if __name__ == '__main__': main() Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 14:01:28 UTC (rev 7740) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 15:41:02 UTC (rev 7741) @@ -12,6 +12,7 @@ import re SYSTEM_PKGMAP = "/var/sadm/install/contents" +WS_RE = re.compile(r"\s+") class Error(Exception): pass @@ -40,6 +41,9 @@ class CheckpkgBase(object): + """This class has functionality overlapping with DirectoryFormatPackage + from the opencsw.py library. The classes should be merged. + """ def __init__(self, extractdir, pkgname): self.extractdir = extractdir @@ -50,73 +54,92 @@ # ######################################### # # find all executables and dynamic libs,and list their filenames. # listbinaries() { - # if [ ! -d $1 ] ; then - # print errmsg $1 not a directory - # rm -rf $EXTRACTDIR - # exit 1 - # fi + # if [ ! -d $1 ] ; then + # print errmsg $1 not a directory + # rm -rf $EXTRACTDIR + # exit 1 + # fi # - # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' + # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' # } find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" if not os.path.isdir(self.pkgpath): - raise PackageError("%s does not exist or is not a directory" - % self.pkgpath) + raise PackageError("%s does not exist or is not a directory" + % self.pkgpath) find_proc = subprocess.Popen(find_tmpl % self.pkgpath, shell=True, stdout=subprocess.PIPE) stdout, stderr = find_proc.communicate() ret = find_proc.wait() if ret: - logging.error("The find command returned an error.") + logging.error("The find command returned an error.") return stdout.splitlines() + def GetDependencies(self): + fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") + depends = {} + for line in fd: + fields = re.split(WS_RE, line) + if fields[0] == "P": + depends[fields[1]] = " ".join(fields[1:]) + fd.close() + return depends + + + class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file.""" PICKLE_NAME = "var-sadm-install-contents.pickle" - WS_RE = re.compile(r"\s+") + STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] + CHECKPKG_DIR = ".checkpkg" + def __init__(self): """There is no need to re-parse it each time. Read it slowly the first time and cache it for later.""" - self.checkpkg_dir = os.path.join(os.environ["HOME"], ".checkpkg") + self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) self.pickle_path = os.path.join(self.checkpkg_dir, self.PICKLE_NAME) if os.path.exists(self.pickle_path): - logging.debug("Unpickling %s, please wait.", self.pickle_path) - pickle_fd = open(self.pickle_path, "r") - self.paths_by_soname = cPickle.load(pickle_fd) - pickle_fd.close() + logging.info("Unpickling %s, this can take up to 30s.", self.pickle_path) + pickle_fd = open(self.pickle_path, "r") + self.pkmap_lines_by_basename = cPickle.load(pickle_fd) + pickle_fd.close() else: # The original checkpkg code to port is in the comments. # # egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - stop_pkgs = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") - stop_re = re.compile("(%s)" % "|".join(stop_pkgs)) + stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) # Creating a data structure: # soname - {: , : , ...} logging.debug("Building in-memory data structure for the %s file", SYSTEM_PKGMAP) - paths_by_soname = {} + pkmap_lines_by_basename = {} for line in system_pkgmap_fd: if stop_re.search(line): continue - fields = re.split(self.WS_RE, line) + fields = re.split(WS_RE, line) pkgmap_entry_path = fields[0].split("=")[0] pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - if pkgmap_entry_base_name not in paths_by_soname: - paths_by_soname[pkgmap_entry_base_name] = {} - paths_by_soname[pkgmap_entry_base_name][pkgmap_entry_dir] = line + if pkgmap_entry_base_name not in pkmap_lines_by_basename: + pkmap_lines_by_basename[pkgmap_entry_base_name] = {} + pkmap_lines_by_basename[pkgmap_entry_base_name][pkgmap_entry_dir] = line logging.debug("The data structure contains %s files", - len(paths_by_soname)) - self.paths_by_soname = paths_by_soname + len(pkmap_lines_by_basename)) + self.pkmap_lines_by_basename = pkmap_lines_by_basename if not os.path.exists(self.checkpkg_dir): - logging.debug("Creating %s", self.checkpkg_dir) - os.mkdir(self.checkpkg_dir) + logging.debug("Creating %s", self.checkpkg_dir) + os.mkdir(self.checkpkg_dir) logging.debug("Pickling to %s", self.pickle_path) pickle_fd = open(self.pickle_path, "w") - cPickle.dump(self.paths_by_soname, pickle_fd) + cPickle.dump(self.pkmap_lines_by_basename, pickle_fd) pickle_fd.close() + + def GetPkgmapLineByBasename(self, filename): + if filename in self.pkmap_lines_by_basename: + return self.pkmap_lines_by_basename[filename] + else: + raise KeyError, "%s not found in self.pkmap_lines_by_basename" % filename This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 24 17:36:20 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 24 Dec 2009 16:36:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7742] csw/mgar/pkg/qt4/trunk Message-ID: Revision: 7742 http://gar.svn.sourceforge.net/gar/?rev=7742&view=rev Author: rthurner Date: 2009-12-24 16:36:19 +0000 (Thu, 24 Dec 2009) Log Message: ----------- qt4 - upgrade to gar-v2, first try. also upgrade to qt-4.6.0 Modified Paths: -------------- csw/mgar/pkg/qt4/trunk/Makefile csw/mgar/pkg/qt4/trunk/checksums Modified: csw/mgar/pkg/qt4/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4/trunk/Makefile 2009-12-24 15:41:02 UTC (rev 7741) +++ csw/mgar/pkg/qt4/trunk/Makefile 2009-12-24 16:36:19 UTC (rev 7742) @@ -1,33 +1,37 @@ GARNAME = qt4 -GARVERSION = 4.3.3 +GARVERSION = 4.6.0 CATEGORIES = lib DESCRIPTION = TrollTech C++ application framework define BLURB - Qt is a comprehensive cross-platform C++ application framework. Qt 4.3 - introduces new features and many improvements over the 3.x series. See - http://doc.trolltech.com/4.3/qt4-intro.html for details. + Qt is a comprehensive cross-platform C++ application framework. Qt 4 + introduces new features and many improvements over the 3.x series. endef -MASTER_SITES = ftp://ftp.trolltech.com/qt/source/ -DISTFILES = qt-x11-opensource-src-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWqt4,depend prototype-sparc prototype-i386) -DISTFILES += $(call admfiles,CSWqt4-devel,depend prototype-sparc prototype-i386) -DISTFILES += $(call admfiles,CSWqt4-docs,prototype) +MASTER_SITES = http://get.qt.nokia.com/qt/source/ +DISTFILES = qt-everywhere-opensource-src-$(GARVERSION).tar.gz +#DISTFILES += $(call admfiles,CSWqt4,depend prototype-sparc prototype-i386) +#DISTFILES += $(call admfiles,CSWqt4-devel,depend prototype-sparc prototype-i386) +#DISTFILES += $(call admfiles,CSWqt4-docs,prototype) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = qt-x11-opensource-src-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = qt-everywhere-opensource-src-(\d+(?:\.\d+)*).tar.gz -ifndef DO64 -PLATFORM=solaris-cc -else -PLATFORM=solaris-cc-64 -endif +# The PACKAGES variable tell GAR which packages to build +#PACKAGES = CSWqt4 CSWqt4-devel -WORKSRC = $(WORKDIR)/qt-x11-opensource-src-$(GARVERSION) +WORKSRC = $(WORKDIR)/qt-everywhere-opensource-src-$(GARVERSION) +REQUIRED_PKGS_CSWqt4 = CSWfconfig CSWftype2 CSWggettext CSWglib2 CSWjpeg CSWlibxrender CSWpng CSWtiff CSWzlib +#REQUIRED_PKGS_CSWqt4-devel = CSWqt4 -PREREQUISITE_PKGS = CSWpkgconfig CSWfconfig CSWlibdbusdev +#ifndef DO64 +#PLATFORM=solaris-cc +#else +#PLATFORM=solaris-cc-64 +#endif +#PREREQUISITE_PKGS = CSWpkgconfig CSWfconfig CSWlibdbusdev + CONFIGURE_ARGS = -prefix $(prefix) \ -bindir $(bindir) \ -libdir $(libdir) \ @@ -41,13 +45,13 @@ -demosdir $(sharedstatedir)/qt4/demos \ -I$(includedir) \ -L$(libdir) \ - -platform $(PLATFORM) \ -confirm-license \ + -opensource \ -verbose # SKIPTEST = 1 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) +#INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) SRC_CLEAN_TARGET = confclean Modified: csw/mgar/pkg/qt4/trunk/checksums =================================================================== --- csw/mgar/pkg/qt4/trunk/checksums 2009-12-24 15:41:02 UTC (rev 7741) +++ csw/mgar/pkg/qt4/trunk/checksums 2009-12-24 16:36:19 UTC (rev 7742) @@ -1,11 +1 @@ -19678fe35170559cd6a6fa531c57799c download/qt-x11-opensource-src-4.3.3.tar.gz -1971c2c7513b65cd7a8d33b9a637a908 download/CSWqt4.gspec -abca6ced15fc6cc1f47ca35ebe1af99b download/CSWqt4.depend -46107c5b0ec8d00a3a19008f251e98f3 download/CSWqt4.prototype-sparc -bc95d6a21e682b5b410919a192dd4648 download/CSWqt4.prototype-i386 -c7ea9cb16a10cd68abf79b0e678fd6e1 download/CSWqt4-devel.gspec -11a7ff5c7eed0535b6862f87652543c6 download/CSWqt4-devel.depend -bd96ed7a6599ea24019d3ad5289d1f45 download/CSWqt4-devel.prototype-sparc -9c5efb8ab82e7c54a74d15e80497d999 download/CSWqt4-devel.prototype-i386 -a4448803a657c547f6423d6c54f78540 download/CSWqt4-docs.gspec -8124363ef956332860628abab54504d4 download/CSWqt4-docs.prototype +2a7b5126f2450d8525af355fc4c12ad6 qt-everywhere-opensource-src-4.6.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 24 18:16:17 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 17:16:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7743] csw/mgar/gar/v2-checkpkg/bin Message-ID: Revision: 7743 http://gar.svn.sourceforge.net/gar/?rev=7743&view=rev Author: wahwah Date: 2009-12-24 17:16:17 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: sqlite3 backend for the system-wide pkgmap cache, much faster Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 16:36:19 UTC (rev 7742) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 17:16:17 UTC (rev 7743) @@ -26,7 +26,6 @@ LOCAL_ARCH=`uname -p` - # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -67,6 +66,12 @@ exit 1 } +debugmsg() { + if [[ "${DEBUG}" != "" ]]; then + print "DEBUG: $*" > /dev/fd/2 + fi +} + set_variables_for_individual_package_check() { f=$1 file $f |sed 's/^.*://' |grep gzip >/dev/null @@ -566,33 +571,38 @@ set_variables_for_individual_package_check "$f" echo "Running the experimental plugin infrastructure." +test_suite_ok=1 checkpkg_scriptname=`basename $0` checkpkg_basedir=${0%/${checkpkg_scriptname}} plugindir=${checkpkg_basedir}/checkpkg.d if [[ "${DEBUG}" != "" ]]; then extra_options="--debug" fi -echo "plugindir: '$plugindir'" +debugmsg "plugindir: '$plugindir'" if [[ -d "$plugindir" ]]; then # echo plugin dir exists for plugin in "${plugindir}"/checkpkg-*; do if [[ -x "${plugin}" ]]; then - echo "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" + debugmsg "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} if [[ "$?" -ne 0 ]]; then - errmsg "Plugin ${plugin} has returned an error." + print "TEST: ${plugin} [FAIL]" + test_suite_ok=0 + else + print "TEST: ${plugin} [OK]" fi else - echo "'${plugin}' is not executable" + debugmsg "'${plugin}' is not executable" fi done else - echo plugin dir does not exist + debugmsg "plugin dir does not exist" fi -# echo "Profiling." -# python -m cProfile gar/bin/checkpkg.d/checkpkg-libs.py --debug -e "${EXTRACTDIR}" ${pkgnames} -# End of plugin section +if [[ ${test_suite_ok} -ne 1 ]]; then + errmsg "One or more tests have failed." +fi + print "" # Cleaning up after all packages Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py 2009-12-24 16:36:19 UTC (rev 7742) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py 2009-12-24 17:16:17 UTC (rev 7743) @@ -3,6 +3,7 @@ import checkpkg import os.path +import logging def main(): options, args = checkpkg.GetOptions() @@ -12,8 +13,8 @@ pkgpath = os.path.join(options.extractdir, pkgname) if not os.path.isdir(pkgpath): raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) - print ("Dummy plugin says the package %s is extracted to %s" - % (pkgname, options.extractdir)) + logging.debug("Dummy plugin says the package %s is extracted to %s", + pkgname, options.extractdir) if __name__ == '__main__': Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 16:36:19 UTC (rev 7742) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 17:16:17 UTC (rev 7743) @@ -121,18 +121,21 @@ pkgs_by_soname[soname] = pkgname # A shared object dependency/provisioning report, plus checking. - for soname in needed_sonames: - if soname in needed_sonames_by_binary: - print "%s is provided by the package itself" % soname - elif soname in lines_by_soname: - print ("%s is required by %s and provided by %s" - % (soname, - binaries_by_soname[soname], - repr(pkgs_by_soname[soname]))) - else: - print ("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname])) - result_ok = False + if needed_sonames: + print "Analysis of sonames needed by the package set:" + for soname in needed_sonames: + if soname in needed_sonames_by_binary: + print "%s is provided by the package itself" % soname + elif soname in lines_by_soname: + print ("%s is required by %s and provided by %s" + % (soname, + binaries_by_soname[soname], + repr(pkgs_by_soname[soname]))) + else: + print ("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname])) + result_ok = False + print dependent_pkgs = {} for checker in checkers: @@ -152,12 +155,12 @@ logging.warn("%s not found in needed_sonames_by_binary (%s)", binary, needed_sonames_by_binary.keys()) declared_dependencies_set = set(declared_dependencies) - print "You can consider including the following packages in the dependencies:" - for dep_pkgname in sorted(so_dependencies.difference(declared_dependencies_set)): - print " ", dep_pkgname, - if dep_pkgname.startswith("SUNW"): - print "(it's safe to ignore this one)", - print + missing_deps = so_dependencies.difference(declared_dependencies_set) + if missing_deps: + print "SUGGESTION: you may want to add some or all of the following as depends:" + print " (Feel free to ignore SUNW or SPRO packages)" + for dep_pkgname in sorted(missing_deps): + print ">", dep_pkgname surplus_dependencies = declared_dependencies_set.difference(so_dependencies) surplus_dependencies = surplus_dependencies.difference(TYPICAL_DEPENDENCIES) Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 16:36:19 UTC (rev 7742) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 17:16:17 UTC (rev 7743) @@ -10,6 +10,7 @@ import subprocess import cPickle import re +import sqlite3 SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") @@ -89,26 +90,38 @@ class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file.""" - PICKLE_NAME = "var-sadm-install-contents.pickle" STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] CHECKPKG_DIR = ".checkpkg" + SQLITE3_DBNAME = "var-sadm-install-contents-cache" def __init__(self): """There is no need to re-parse it each time. Read it slowly the first time and cache it for later.""" self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) - self.pickle_path = os.path.join(self.checkpkg_dir, self.PICKLE_NAME) - if os.path.exists(self.pickle_path): - logging.info("Unpickling %s, this can take up to 30s.", self.pickle_path) - pickle_fd = open(self.pickle_path, "r") - self.pkmap_lines_by_basename = cPickle.load(pickle_fd) - pickle_fd.close() + self.db_path = os.path.join(self.checkpkg_dir, self.SQLITE3_DBNAME) + if os.path.exists(self.db_path): + logging.debug("Connecting to the %s database.", self.db_path) + self.conn = sqlite3.connect(self.db_path) else: - # The original checkpkg code to port is in the comments. - # + logging.info("Building a cache of /var/sadm/install/contents.") + if not os.path.exists(self.checkpkg_dir): + logging.debug("Creating %s", self.checkpkg_dir) + os.mkdir(self.checkpkg_dir) + self.conn = sqlite3.connect(self.db_path) + c = self.conn.cursor() + c.execute(""" + CREATE TABLE systempkgmap ( + id INTEGER PRIMARY KEY, + basename TEXT, + path TEXT, + line TEXT + ); + """) + # egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) @@ -117,29 +130,23 @@ # soname - {: , : , ...} logging.debug("Building in-memory data structure for the %s file", SYSTEM_PKGMAP) - pkmap_lines_by_basename = {} for line in system_pkgmap_fd: if stop_re.search(line): continue fields = re.split(WS_RE, line) pkgmap_entry_path = fields[0].split("=")[0] pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - if pkgmap_entry_base_name not in pkmap_lines_by_basename: - pkmap_lines_by_basename[pkgmap_entry_base_name] = {} - pkmap_lines_by_basename[pkgmap_entry_base_name][pkgmap_entry_dir] = line - logging.debug("The data structure contains %s files", - len(pkmap_lines_by_basename)) - self.pkmap_lines_by_basename = pkmap_lines_by_basename - if not os.path.exists(self.checkpkg_dir): - logging.debug("Creating %s", self.checkpkg_dir) - os.mkdir(self.checkpkg_dir) - logging.debug("Pickling to %s", self.pickle_path) - pickle_fd = open(self.pickle_path, "w") - cPickle.dump(self.pkmap_lines_by_basename, pickle_fd) - pickle_fd.close() + sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" + c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line)) + logging.info("Creating an index.") + sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" + self.conn.execute(sql) def GetPkgmapLineByBasename(self, filename): - if filename in self.pkmap_lines_by_basename: - return self.pkmap_lines_by_basename[filename] - else: - raise KeyError, "%s not found in self.pkmap_lines_by_basename" % filename + sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" + c = self.conn.cursor() + c.execute(sql, [filename]) + lines = {} + for row in c: + lines[row[0]] = row[1] + return lines 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 Dec 24 18:18:42 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 17:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7744] csw/mgar/gar/v2-checkpkg/bin/checkpkg Message-ID: Revision: 7744 http://gar.svn.sourceforge.net/gar/?rev=7744&view=rev Author: wahwah Date: 2009-12-24 17:18:41 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: sqlite3 backend for the system-wide pkgmap cache, much faster Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 17:16:17 UTC (rev 7743) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 17:18:41 UTC (rev 7744) @@ -499,47 +499,6 @@ fi done -egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - - - -for lib in `cat $EXTRACTDIR/liblist` ; do - grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap - if [[ $? -eq 0 ]] ; then - echo $lib provided by package itself - continue - else - grep "[/=]$lib[ =]" $SETLIBS - if [[ $? -eq 0 ]]; then - echo "$lib provided by package set being evaluated." - continue - fi - fi - - libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | - sed 's/^.* \([^ ]*\)$/\1/' |sort -u` - - if [[ -z "$libpkg" ]] ; then - echo "$lib $pkgname" >> $SETLIBS.missing - print Cannot find package providing $lib. Storing for delayed validation. - else - print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs - fi -done - -sort -u $EXTRACTDIR/libpkgs >$EXTRACTDIR/libpkgs.x -mv $EXTRACTDIR/libpkgs.x $EXTRACTDIR/libpkgs - -diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs >/dev/null -if [[ $? -ne 0 ]] ; then - print SUGGESTION: you may want to add some or all of the following as depends: - print ' (Feel free to ignore SUNW or SPRO packages)' - diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs | fgrep '>' -fi - - - if [[ "$basedir" != "" ]] ; then print if [[ -f $EXTRACTDIR/elflist ]] ; then @@ -622,19 +581,4 @@ done < $SETDEPS.missing fi -if [ -s $SETLIBS.missing ]; then - print "Doing late evaluations of package library dependencies." - while read ldep; do - lib=`echo $ldep | nawk '{print $1}'` - [ "$lib" = "libm.so.2" ] && continue - pkg=`echo $ldep | nawk '{print $2}'` - /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null - if [ $? -ne 0 ]; then - errmsg "Couldn't find a package providing $lib" - else - print "A package in the set being evaluated provides $lib" - fi - done < $SETLIBS.missing -fi - cleanupset 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 Dec 24 18:29:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 17:29:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7745] csw/mgar/gar/v2-checkpkg/bin/checkpkg Message-ID: Revision: 7745 http://gar.svn.sourceforge.net/gar/?rev=7745&view=rev Author: wahwah Date: 2009-12-24 17:29:41 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: delayed log file display from plugins Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 17:18:41 UTC (rev 7744) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 17:29:41 UTC (rev 7745) @@ -538,12 +538,16 @@ extra_options="--debug" fi debugmsg "plugindir: '$plugindir'" +log_files="" if [[ -d "$plugindir" ]]; then # echo plugin dir exists for plugin in "${plugindir}"/checkpkg-*; do if [[ -x "${plugin}" ]]; then debugmsg "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" - ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} + plugin_base_name=`basename ${plugin}` + plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" + log_files="${log_files} ${plugin_log}" + ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then print "TEST: ${plugin} [FAIL]" test_suite_ok=0 @@ -558,8 +562,22 @@ debugmsg "plugin dir does not exist" fi +echo +for log_file in ${log_files}; do + if [[ -s "${log_file}" ]]; then + echo "LOG START: ${log_file}" + echo + cat "${log_file}" + echo + echo "LOG END: ${log_file}" + fi +done +echo + if [[ ${test_suite_ok} -ne 1 ]]; then errmsg "One or more tests have failed." +else + print "All tests were successful." fi print "" 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 Dec 24 18:53:03 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 17:53:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7746] csw/mgar/gar/v2-migrateconf/ Message-ID: Revision: 7746 http://gar.svn.sourceforge.net/gar/?rev=7746&view=rev Author: wahwah Date: 2009-12-24 17:53:02 +0000 (Thu, 24 Dec 2009) Log Message: ----------- Deleting an old branch (v2-migrateconf). Removed Paths: ------------- csw/mgar/gar/v2-migrateconf/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Dec 25 02:03:50 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 25 Dec 2009 01:03:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7747] csw/mgar/pkg/wireshark/trunk/Makefile Message-ID: Revision: 7747 http://gar.svn.sourceforge.net/gar/?rev=7747&view=rev Author: hson Date: 2009-12-25 01:03:49 +0000 (Fri, 25 Dec 2009) Log Message: ----------- wireshark: Changes to get it to build Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2009-12-24 17:53:02 UTC (rev 7746) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2009-12-25 01:03:49 UTC (rev 7747) @@ -20,22 +20,25 @@ #SED = /opt/csw/bin/gsed #EXTRA_COMMON_EXPORTS = SED -#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 -EXTRA_INC += /opt/csw/include/gtk-2.0 -EXTRA_INC += /opt/csw/lib/gtk-2.0/include -EXTRA_INC += /opt/csw/include/glib-2.0 -EXTRA_INC += /opt/csw/lib/glib-2.0/include -EXTRA_INC += /opt/csw/include/cairo -EXTRA_INC += /opt/csw/include/pango-1.0 -EXTRA_INC += /opt/csw/include/atk-1.0 +#EXTRA_INC += /opt/csw/include/gtk-2.0 +#EXTRA_INC += /opt/csw/lib/gtk-2.0/include +#EXTRA_INC += /opt/csw/include/glib-2.0 +#EXTRA_INC += /opt/csw/lib/glib-2.0/include +#EXTRA_INC += /opt/csw/include/cairo +#EXTRA_INC += /opt/csw/include/pango-1.0 +#EXTRA_INC += /opt/csw/include/atk-1.0 -EXTRA_LINKER_FLAGS = -lgtk-x11-2.0 -lX11 /usr/openwin/lib/libXext.so +#EXTRA_LINKER_FLAGS = -lgtk-x11-2.0 -lX11 /usr/openwin/lib/libXext.so +EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Dec 25 13:21:37 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 25 Dec 2009 12:21:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7748] csw/mgar/pkg/wireshark/trunk/Makefile Message-ID: Revision: 7748 http://gar.svn.sourceforge.net/gar/?rev=7748&view=rev Author: hson Date: 2009-12-25 12:21:36 +0000 (Fri, 25 Dec 2009) Log Message: ----------- wireshark: Add some package dependencies Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2009-12-25 01:03:49 UTC (rev 7747) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2009-12-25 12:21:36 UTC (rev 7748) @@ -12,6 +12,10 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +REQUIRED_PKGS += CSWgcrypt CSWgeoip CSWggettextrt CSWglib2 CSWgnutls +REQUIRED_PKGS += CSWgpgerr CSWgtk2 CSWkrb5lib CSWlibpcap CSWlibxext +REQUIRED_PKGS += CSWlua CSWpango CSWpcrert CSWzlib + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 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 Dec 26 00:23:04 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 25 Dec 2009 23:23:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7749] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 7749 http://gar.svn.sourceforge.net/gar/?rev=7749&view=rev Author: chninkel Date: 2009-12-25 23:23:03 +0000 (Fri, 25 Dec 2009) Log Message: ----------- cyrus_imapd: fixed berkeleydb problem at compile time Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-12-25 12:21:36 UTC (rev 7748) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-12-25 23:23:03 UTC (rev 7749) @@ -102,6 +102,7 @@ CONFIGURE_ARGS += --with-cyrus-prefix=$(prefix) CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/cyrus +CONFIGURE_ARGS += --with-bdb=db-4.2 CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb42/lib CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb42/include CONFIGURE_ARGS += --with-openssl=$(prefix) Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-12-25 12:21:36 UTC (rev 7748) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-12-25 23:23:03 UTC (rev 7749) @@ -13,14 +13,14 @@ b4c99489eacf0fb7befeef5e3098a5c1 cyrus-imapd-2.3.7-nobarenewlinescheck.patch 6127a7b62ec4679a54985f6a2d915e52 cyrus-imapd-acceptinvalidfrom.patch fdb3416ec41f3a56d1594ca25a6dcd7d cyrus.conf -5fd9ad3890fa606394ff28d7f761bc5c cyrus_imapd.changelog.CSW -75e91c95ff7fa59482d20058036a6f5b cyrus_imapd_utils.changelog.CSW +20ed8433b045ef9c55a5c4e05a228ce7 cyrus_imapd.changelog.CSW +51011023b9b2474a6d5d7aefae54b812 cyrus_imapd_utils.changelog.CSW 5375c25c8bc325a90553d0be87a64a04 et_c.awk d1d86e61463a1dfefccbadedb11a8604 et_h.awk 79211aee56db01e15566ced1ba4078da i.services 908dbf764d3ccd541c4de881ac81a6ae imapd.conf 14bb6e8c6d6914351f80df293982e88a install-upgrade -f5b73bbd54935e6c082b6a64e2668b78 pm_cyrus.changelog.CSW +9178809b3f1f7698725346d56c37049a pm_cyrus.changelog.CSW 149ac6b6d82ef9ef4bb1b314f1a1cac4 r.services dce627f9a464ae4efe8a66c8dbd358d5 restore_allowplaintext_default.patch 6dfee20f7c02139350caf9f75199e587 services Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-12-25 12:21:36 UTC (rev 7748) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-12-25 23:23:03 UTC (rev 7749) @@ -1,4 +1,4 @@ -cyrus_imapd (2.3.16,REV=2009.12.23) unstable +cyrus_imapd (2.3.16,REV=2009.12.26) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-12-25 12:21:36 UTC (rev 7748) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-12-25 23:23:03 UTC (rev 7749) @@ -1,4 +1,4 @@ -cyrus_imapd_utils (2.3.16,REV=2009.12.23) unstable +cyrus_imapd_utils (2.3.16,REV=2009.12.26) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-12-25 12:21:36 UTC (rev 7748) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-12-25 23:23:03 UTC (rev 7749) @@ -1,4 +1,4 @@ -pm_cyrus (2.3.16,REV=2009.12.23) unstable +pm_cyrus (2.3.16,REV=2009.12.26) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Dec 26 03:01:07 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 26 Dec 2009 02:01:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7750] csw/mgar/pkg/libgsf/trunk Message-ID: Revision: 7750 http://gar.svn.sourceforge.net/gar/?rev=7750&view=rev Author: hson Date: 2009-12-26 02:01:07 +0000 (Sat, 26 Dec 2009) Log Message: ----------- libgsf: Added second fixme script, remove some unused stuff Modified Paths: -------------- csw/mgar/pkg/libgsf/trunk/Makefile csw/mgar/pkg/libgsf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libgsf/trunk/files/fixme2.sh Modified: csw/mgar/pkg/libgsf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsf/trunk/Makefile 2009-12-25 23:23:03 UTC (rev 7749) +++ csw/mgar/pkg/libgsf/trunk/Makefile 2009-12-26 02:01:07 UTC (rev 7750) @@ -21,9 +21,6 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -#NPATH = /opt/csw/gnu:$(PATH) - CONFIGURE_ARGS = $(DIRPATHS) #CONFIGURE_ARGS = "PATH=$(NPATH)" $(DIRPATHS) #CONFIGURE_ARGS += --enable-gtk-doc=no @@ -31,6 +28,8 @@ TEST_TARGET = check +EXTRA_LD_OPTIONS = -L../gsf/.libs -L../../gsf/.libs + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) @@ -38,6 +37,7 @@ post-configure-$(MODULATION): @(echo "~~~ Fixing Libtool ~~~") @$(FILEDIR)/fixme.sh $(WORKSRC) +# @$(FILEDIR)/fixme2.sh $(WORKSRC) $(DONADA) post-install-isa-sparcv8: Modified: csw/mgar/pkg/libgsf/trunk/checksums =================================================================== --- csw/mgar/pkg/libgsf/trunk/checksums 2009-12-25 23:23:03 UTC (rev 7749) +++ csw/mgar/pkg/libgsf/trunk/checksums 2009-12-26 02:01:07 UTC (rev 7750) @@ -1 +1,2 @@ 7d6fa1c26ebb58dcf2128c3b9c7d1a2a download/libgsf-1.14.11.tar.gz +34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh Added: csw/mgar/pkg/libgsf/trunk/files/fixme2.sh =================================================================== --- csw/mgar/pkg/libgsf/trunk/files/fixme2.sh (rev 0) +++ csw/mgar/pkg/libgsf/trunk/files/fixme2.sh 2009-12-26 02:01:07 UTC (rev 7750) @@ -0,0 +1,29 @@ +#!/bin/bash +#################################################### +# +# fixme2.sh +# Intended to patch libtool so relink isn't +# performend during install +# +# Loosely based on Mike Watters fixme.sh +# +# Author: Roger Hakansson hson at opencsw.org +# Initial Version: 0.1 +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed 's/test "$mode" != relink && rpath/rpath/' ${lt} > ${lt}.new + gmv ${lt}.new ${lt} + gchmod +x ${lt} +done Property changes on: csw/mgar/pkg/libgsf/trunk/files/fixme2.sh ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Dec 26 11:01:27 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 26 Dec 2009 10:01:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7751] csw/mgar/pkg/ntop/trunk Message-ID: Revision: 7751 http://gar.svn.sourceforge.net/gar/?rev=7751&view=rev Author: hson Date: 2009-12-26 10:01:26 +0000 (Sat, 26 Dec 2009) Log Message: ----------- ntop: Update to 3.3.10 plus some patches to get closer to a build Modified Paths: -------------- csw/mgar/pkg/ntop/trunk/Makefile csw/mgar/pkg/ntop/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ntop/trunk/files/configure.in.diff csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff Modified: csw/mgar/pkg/ntop/trunk/Makefile =================================================================== --- csw/mgar/pkg/ntop/trunk/Makefile 2009-12-26 02:01:07 UTC (rev 7750) +++ csw/mgar/pkg/ntop/trunk/Makefile 2009-12-26 10:01:26 UTC (rev 7751) @@ -1,5 +1,5 @@ GARNAME = ntop -GARVERSION = 3.3.9 +GARVERSION = 3.3.10 CATEGORIES = net DESCRIPTION = A network traffic usage monitor. @@ -15,7 +15,8 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# PATCHFILES = intdef.diff +PATCHFILES = configure.in.diff +PATCHFILES += configureextra_opencsw.diff # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=17233 @@ -23,6 +24,18 @@ UFILES_REGEX = (\d+(?:\.\d+)*) CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-pcap-lib=/opt/csw/lib +CONFIGURE_ARGS += --with-pcap-include=/opt/csw/include +CONFIGURE_ARGS += --with-gdbm-lib=/opt/csw/lib +CONFIGURE_ARGS += --with-gdbm-include=/opt/csw/include +CONFIGURE_ARGS += --with-zlib-lib=/opt/csw/lib +CONFIGURE_ARGS += --with-zlib-include=/opt/csw/include +CONFIGURE_ARGS += --with-ossl-lib=/opt/csw/lib +CONFIGURE_ARGS += --with-ossl-include=/opt/csw/include include gar/category.mk +pre-configure-modulated: + ( cd $(WORKSRC) ; ./autogen.sh --noconfig) + @$(MAKECOOKIE) + Modified: csw/mgar/pkg/ntop/trunk/checksums =================================================================== --- csw/mgar/pkg/ntop/trunk/checksums 2009-12-26 02:01:07 UTC (rev 7750) +++ csw/mgar/pkg/ntop/trunk/checksums 2009-12-26 10:01:26 UTC (rev 7751) @@ -1 +1,3 @@ -0c22038e0f2aa003110437b5a5d5a6a5 download/ntop-3.3.9.tar.gz +1615818e06d4a503b6a52426e88aaed4 configure.in.diff +257b92864fc22a475e23191c60dd100c configureextra_opencsw.diff +6e2ffa90d5f935c8f03d88a5dd19a866 ntop-3.3.10.tar.gz Added: csw/mgar/pkg/ntop/trunk/files/configure.in.diff =================================================================== --- csw/mgar/pkg/ntop/trunk/files/configure.in.diff (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/configure.in.diff 2009-12-26 10:01:26 UTC (rev 7751) @@ -0,0 +1,44 @@ +--- ntop-3.3.10.old/configure.in 2009-05-06 16:55:22.000000000 +0200 ++++ ntop-3.3.10/configure.in 2009-12-24 02:57:08.602866458 +0100 +@@ -274,6 +274,15 @@ + [ --with-pcap-root=DIR LBNL pcap located in DIR], + PCAP_ROOT="$withval", + PCAP_ROOT=) ++AC_ARG_WITH( pcap-lib, ++ [ --with-pcap-lib=DIR or libpcap located in DIR], ++ PCAP_LIB="$withval", ++ PCAP_LIB=) ++AC_ARG_WITH( pcap-include, ++ [ --with-pcap-include=DIR or pcap.h located in DIR], ++ PCAP_INCLUDE="$withval", ++ PCAP_INCLUDE=) ++ + AC_ARG_WITH( gdbm-root, + [ --with-gdbm-root=DIR gdbm located in DIR], + GDBM_DIRECTORY="$withval", +@@ -670,6 +679,7 @@ + INCS="${INCS} -I/usr/include/pcap" + AC_MSG_RESULT([found in $PCAP_ROOT]) + else ++ NTOP_APPENDS([${PCAP_INCLUDE}], [${PCAP_LIB}], [pcap]) + AC_CHECK_LIB(pcap, pcap_lookupdev, , [ + AC_MSG_RESULT([ *** FATAL ERROR *** ]) + AC_MSG_RESULT([ It looks that you don't have the libpcap distribution installed.]) +@@ -1659,7 +1669,7 @@ + wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz + fi + +-tar xvfz $LUA_VERSION.tar.gz ++gtar xvfz $LUA_VERSION.tar.gz + cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp + cat /tmp/lua.temp > $LUA_VERSION/src/Makefile + #rm -f /tmp/lua.temp +@@ -1968,7 +1978,7 @@ + else + wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz + fi +-tar xvfz GeoIP.tar.gz ++gtar xvfz GeoIP.tar.gz + GEO_DIR=`find $PWD -type d -name "GeoIP-*"` + cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd .. + # OSX Fix Added: csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff =================================================================== --- csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff 2009-12-26 10:01:26 UTC (rev 7751) @@ -0,0 +1,51 @@ +diff -ru ntop-3.3.10.old/configureextra/SOLARIS10 ntop-3.3.10/configureextra/SOLARIS10 +--- ntop-3.3.10.old/configureextra/SOLARIS10 2007-05-03 23:31:40.000000000 +0200 ++++ ntop-3.3.10/configureextra/SOLARIS10 2009-12-24 02:31:19.464874160 +0100 +@@ -5,9 +5,9 @@ + # + + echo " Setting Solaris 10 specific flag values" +-LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}" ++LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib ${LDFLAGS}" + LIBS="-lnsl -lsocket ${LIBS}" +-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include" ++CPPFLAGS="${CPPFLAGS} -I/opt/csw/include" + + . configureextra/functions + +@@ -28,4 +28,4 @@ + echo "- ln -s libpcap.so.0.X.Y libpcap.so" + echo "- rm libpcap.a" + echo "" +-echo "*************************************************" +\ No newline at end of file ++echo "*************************************************" +diff -ru ntop-3.3.10.old/configureextra/SOLARIS8 ntop-3.3.10/configureextra/SOLARIS8 +--- ntop-3.3.10.old/configureextra/SOLARIS8 2005-09-29 10:42:23.000000000 +0200 ++++ ntop-3.3.10/configureextra/SOLARIS8 2009-12-24 02:33:36.592681360 +0100 +@@ -1,8 +1,9 @@ + #!/bin/sh + + echo " Setting Solaris 8 specific flag values" +-LDFLAGS="-L/usr/local/lib" ++LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib ${LDFLAGS}" + LIBS="-lnsl -lsocket ${LIBS}" ++CPPFLAGS="${CPPFLAGS} -I/opt/csw/include" + + . configureextra/functions + +diff -ru ntop-3.3.10.old/configureextra/SOLARIS9 ntop-3.3.10/configureextra/SOLARIS9 +--- ntop-3.3.10.old/configureextra/SOLARIS9 2003-12-02 13:03:47.000000000 +0100 ++++ ntop-3.3.10/configureextra/SOLARIS9 2009-12-24 02:33:21.611018077 +0100 +@@ -1,9 +1,9 @@ + #!/bin/sh + + echo " Setting Solaris 9 specific flag values" +-LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}" ++LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib ${LDFLAGS}" + LIBS="-lnsl -lsocket ${LIBS}" +-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include" ++CPPFLAGS="${CPPFLAGS} -I/opt/csw/include" + + . configureextra/functions + 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 Dec 26 22:18:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 26 Dec 2009 21:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7752] csw/mgar/pkg/libgcrypt/trunk Message-ID: Revision: 7752 http://gar.svn.sourceforge.net/gar/?rev=7752&view=rev Author: dmichelsen Date: 2009-12-26 21:18:41 +0000 (Sat, 26 Dec 2009) Log Message: ----------- libgcrypt: Update to 1.4.5 and dynamic gspec Modified Paths: -------------- csw/mgar/pkg/libgcrypt/trunk/Makefile csw/mgar/pkg/libgcrypt/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libgcrypt/trunk/files/CSWgcrypt.gspec Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/Makefile 2009-12-26 10:01:26 UTC (rev 7751) +++ csw/mgar/pkg/libgcrypt/trunk/Makefile 2009-12-26 21:18:41 UTC (rev 7752) @@ -1,5 +1,5 @@ GARNAME = libgcrypt -GARVERSION = 1.4.4 +GARVERSION = 1.4.5 CATEGORIES = lib DESCRIPTION = GNU libgcrypt @@ -9,10 +9,12 @@ MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libgcrypt/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWgcrypt,) -SPKG_SOURCEURL = http://www.gnupg.org/download/ +PACKAGES = CSWgcrypt +CATALOGNAME = llibgcrypt +SPKG_SOURCEURL = http://www.gnupg.org/related_software/libraries.en.html#lib-libgcrypt + REQUIRED_PKGS = CSWgpgerr BUILD64 = 1 Modified: csw/mgar/pkg/libgcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/checksums 2009-12-26 10:01:26 UTC (rev 7751) +++ csw/mgar/pkg/libgcrypt/trunk/checksums 2009-12-26 21:18:41 UTC (rev 7752) @@ -1,2 +1 @@ -34105aa927e23c217741966496b97e67 download/libgcrypt-1.4.4.tar.bz2 -94730391b2ab2e9b63227d133dc2547b download/CSWgcrypt.gspec +cc2017ad09b4543f8b3b5e9a53cfd89d libgcrypt-1.4.5.tar.bz2 Deleted: csw/mgar/pkg/libgcrypt/trunk/files/CSWgcrypt.gspec =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/files/CSWgcrypt.gspec 2009-12-26 10:01:26 UTC (rev 7751) +++ csw/mgar/pkg/libgcrypt/trunk/files/CSWgcrypt.gspec 2009-12-26 21:18:41 UTC (rev 7752) @@ -1,4 +0,0 @@ -%var bitname libgcrypt -%var pkgname CSWgcrypt -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING 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 Dec 27 15:23:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Dec 2009 14:23:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7753] csw/mgar/gar/v2-checkpkg/bin Message-ID: Revision: 7753 http://gar.svn.sourceforge.net/gar/?rev=7753&view=rev Author: wahwah Date: 2009-12-27 14:23:13 +0000 (Sun, 27 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Handling self-provided dependencies, added more tests and test data Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py csw/mgar/gar/v2-checkpkg/bin/mkpackage Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51rt.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-26 21:18:41 UTC (rev 7752) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-27 14:23:13 UTC (rev 7753) @@ -14,11 +14,11 @@ import sys DUMP_BIN = "/usr/ccs/bin/dump" -NEEDED_SONAMES = "needed sonames" RUNPATH = "runpath" -TYPICAL_DEPENDENCIES = set(["CSWcommon", "CSWcswclassutils"]) +SONAME = "soname" def main(): + errors = [] options, args = checkpkg.GetOptions() if options.debug: logging.basicConfig(level=logging.DEBUG) @@ -32,22 +32,32 @@ checkers.append(checker) binaries = [] binaries_by_pkgname = {} + sonames_by_pkgname = {} + pkg_by_any_filename = {} for checker in checkers: pkg_binary_paths = checker.ListBinaries() binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] binaries_by_pkgname[checker.pkgname] = binaries_base binaries.extend(pkg_binary_paths) + for f in checker.GetAllFilenames(): + pkg_by_any_filename[f] = checker.pkgname # Making the binaries unique binaries = set(binaries) ws_re = re.compile(r"\s+") + # TODO: map from binaries_by_pkgname to sonames_by_pkgname + # + # Essentially, we must look at libfoo.so.1.2.3 and map it to libfoo.so.1, + # whatever soname it has + # man ld.so.1 for more info on this hack env = copy.copy(os.environ) env["LD_NOAUXFLTR"] = "1" needed_sonames_by_binary = {} + filenames_by_soname = {} # Assembling a data structure with the data about binaries. # { - # : { NEEDED_SONAMES: [...], + # : { checkpkg.NEEDED_SONAMES: [...], # RUNPATH: [...]}, # : ..., # ... @@ -69,15 +79,19 @@ if len(fields) < 3: continue if fields[1] == "NEEDED": - if NEEDED_SONAMES not in binary_data: - binary_data[NEEDED_SONAMES] = [] - binary_data[NEEDED_SONAMES].append(fields[2]) + if checkpkg.NEEDED_SONAMES not in binary_data: + binary_data[checkpkg.NEEDED_SONAMES] = [] + binary_data[checkpkg.NEEDED_SONAMES].append(fields[2]) elif fields[1] == "RUNPATH": if RUNPATH not in binary_data: binary_data[RUNPATH] = [] binary_data[RUNPATH].extend(fields[2].split(":")) # Adding the default runtime path search option. binary_data[RUNPATH].append("/usr/lib") + elif fields[1] == "SONAME": + binary_data[SONAME] = fields[2] + if SONAME in binary_data: + filenames_by_soname[binary_data[SONAME]] = binary_base_name # TODO: make it a unit test # print needed_sonames_by_binary @@ -89,7 +103,7 @@ needed_sonames = set() binaries_by_soname = {} for binary_name, data in needed_sonames_by_binary.iteritems(): - for soname in data[NEEDED_SONAMES]: + for soname in data[checkpkg.NEEDED_SONAMES]: needed_sonames.add(soname) if soname not in runpath_by_needed_soname: runpath_by_needed_soname[soname] = [] @@ -104,79 +118,102 @@ lines_by_soname = {} for soname in needed_sonames: try: + # This is the critical part of the algorithm: it iterates over the + # runpath and finds the first matching one. + # + # TODO: Expand $ISALIST to whatever the 'isalist' command outputs for + # better matching. for runpath in runpath_by_needed_soname[soname]: - if runpath in pkgmap.GetPkgmapLineByBasename(soname): - # logging.debug("%s found in %s", runpath, pkgmap.GetPkgmapLineByBasename(soname)) - # logging.debug("line found: %s", repr(pkgmap.GetPkgmapLineByBasename(soname)[runpath])) - lines_by_soname[soname] = pkgmap.GetPkgmapLineByBasename(soname)[runpath] + soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + if runpath in soname_runpath_data: + lines_by_soname[soname] = soname_runpath_data[runpath] break except KeyError, e: - logging.debug("KeyError: %s", soname, e) - pkgs_by_soname = {} + logging.debug("couldn't find %s in the needed sonames list: %s", + soname, e) + pkgs_by_filename = {} for soname, line in lines_by_soname.iteritems(): # TODO: Find all the packages, not just the last field. fields = re.split(ws_re, line.strip()) # For now, we'll assume that the last field is the package. pkgname = fields[-1] - pkgs_by_soname[soname] = pkgname + pkgs_by_filename[soname] = pkgname # A shared object dependency/provisioning report, plus checking. if needed_sonames: print "Analysis of sonames needed by the package set:" for soname in needed_sonames: - if soname in needed_sonames_by_binary: + if soname in filenames_by_soname: print "%s is provided by the package itself" % soname elif soname in lines_by_soname: print ("%s is required by %s and provided by %s" % (soname, binaries_by_soname[soname], - repr(pkgs_by_soname[soname]))) + repr(pkgs_by_filename[soname]))) else: print ("%s is required by %s, but we don't know what provides it." % (soname, binaries_by_soname[soname])) - result_ok = False + errors.append(checkpkg.Error("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname]))) print + # Data needed for this section: + # - pkgname + # - declared dependencies + # - binaries_by_pkgname + # - needed_sonames_by_binary + # - pkgs_by_filename dependent_pkgs = {} for checker in checkers: orphan_sonames = set() pkgname = checker.pkgname - # logging.debug("Reporting package %s", pkgname) + print "%s:" % pkgname declared_dependencies = checker.GetDependencies() - so_dependencies = set() - for binary in binaries_by_pkgname[pkgname]: - if binary in needed_sonames_by_binary: - for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: - if soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) - else: - logging.warn("%s not found in needed_sonames_by_binary (%s)", - binary, needed_sonames_by_binary.keys()) - declared_dependencies_set = set(declared_dependencies) - missing_deps = so_dependencies.difference(declared_dependencies_set) + missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( + pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_filename, + filenames_by_soname, + pkg_by_any_filename) + + save_testing_data = True + if save_testing_data: + test_fd = open("/var/tmp/checkpkg-dep-testing-data-%s.py" % pkgname, "w") + sanitized_pkgname = pkgname.replace("-", "_") + print >>test_fd, "# Testing data for %s" % pkgname + print >>test_fd, "DATA_PKGNAME =" % sanitized_pkgname, repr(pkgname) + print >>test_fd, "DATA_DECLARED_DEPENDENCIES =" % sanitized_pkgname, repr(declared_dependencies) + print >>test_fd, "DATA_BINARIES_BY_PKGNAME =" % sanitized_pkgname, repr(binaries_by_pkgname) + print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =" % sanitized_pkgname, repr(needed_sonames_by_binary) + print >>test_fd, "DATA_PKGS_BY_FILENAME =" % sanitized_pkgname, repr(pkgs_by_filename) + print >>test_fd, "DATA_FILENAMES_BY_SONAME =" % sanitized_pkgname, repr(filenames_by_soname) + print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =" % sanitized_pkgname, repr(pkg_by_any_filename) + test_fd.close() + if missing_deps: print "SUGGESTION: you may want to add some or all of the following as depends:" print " (Feel free to ignore SUNW or SPRO packages)" for dep_pkgname in sorted(missing_deps): print ">", dep_pkgname - - surplus_dependencies = declared_dependencies_set.difference(so_dependencies) - surplus_dependencies = surplus_dependencies.difference(TYPICAL_DEPENDENCIES) - if surplus_dependencies: + if surplus_deps: print "The following packages might be unnecessary dependencies:" - for dep_pkgname in surplus_dependencies: - print " ", dep_pkgname + for dep_pkgname in surplus_deps: + print "? ", dep_pkgname if orphan_sonames: print "The following sonames don't belong to any package:" for soname in sorted(orphan_sonames): - print " ", soname + errors.append(checkpkg.Error("The following soname does't belong to " + "any package: %s" % soname)) + print "! ", soname - if result_ok: + if errors: + for error in errors: + logging.error(error) + sys.exit(1) + else: sys.exit(0) - else: - sys.exit(1) if __name__ == '__main__': Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-26 21:18:41 UTC (rev 7752) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-27 14:23:13 UTC (rev 7753) @@ -14,6 +14,9 @@ SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") +NEEDED_SONAMES = "needed sonames" +# Don't report these as unnecessary. +TYPICAL_DEPENDENCIES = set(["CSWcommon", "CSWcswclassutils", "CSWisaexec"]) class Error(Exception): pass @@ -51,6 +54,11 @@ self.pkgname = pkgname self.pkgpath = os.path.join(self.extractdir, self.pkgname) + def CheckPkgpathExists(self): + if not os.path.isdir(self.pkgpath): + raise PackageError("%s does not exist or is not a directory" + % self.pkgpath) + def ListBinaries(self): # ######################################### # # find all executables and dynamic libs,and list their filenames. @@ -63,10 +71,8 @@ # # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' # } + self.CheckPkgpathExists() find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" - if not os.path.isdir(self.pkgpath): - raise PackageError("%s does not exist or is not a directory" - % self.pkgpath) find_proc = subprocess.Popen(find_tmpl % self.pkgpath, shell=True, stdout=subprocess.PIPE) stdout, stderr = find_proc.communicate() @@ -75,6 +81,13 @@ logging.error("The find command returned an error.") return stdout.splitlines() + def GetAllFilenames(self): + self.CheckPkgpathExists() + file_basenames = [] + for root, dirs, files in os.walk(self.pkgpath): + file_basenames.extend(files) + return file_basenames + def GetDependencies(self): fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") depends = {} @@ -150,3 +163,69 @@ for row in c: lines[row[0]] = row[1] return lines + +def SharedObjectDependencies(pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + so_dependencies = set() + orphan_sonames = set() + self_provided = set() + for binary in binaries_by_pkgname[pkgname]: + if binary in needed_sonames_by_binary: + for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: + if soname in filenames_by_soname: + filename = filenames_by_soname[soname] + pkg = pkg_by_any_filename[filename] + self_provided.add(soname) + so_dependencies.add(pkg) + elif soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) + else: + orphan_sonames.add(soname) + else: + logging.warn("%s not found in needed_sonames_by_binary (%s)", + binary, needed_sonames_by_binary.keys()) + return so_dependencies, self_provided, orphan_sonames + + +def AnalyzeDependencies(pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + """ + missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies(...) + """ + so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( + pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename) + guessed_deps = set() + patterns = ( + (r".*\.py", u"CSWpython"), + (r".*\.pl", u"CSWperl"), + (r".*\.rb", u"CSWruby"), + ) + for pattern, dep_pkgname in patterns: + # If any file name matches, add the dep, go to the next pattern/pkg + # combination. + tmp_re = re.compile("^%s$" % pattern) + for f in pkg_by_any_filename: + if re.match(tmp_re, f): + if pkgname == pkg_by_any_filename[f]: + guessed_deps.add(dep_pkgname) + break + auto_dependencies = so_dependencies.union(guessed_deps) + declared_dependencies_set = set(declared_dependencies) + missing_deps = auto_dependencies.difference(declared_dependencies_set) + surplus_deps = declared_dependencies_set.difference(auto_dependencies) + surplus_deps = surplus_deps.difference(TYPICAL_DEPENDENCIES) + return missing_deps, surplus_deps, orphan_sonames Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-26 21:18:41 UTC (rev 7752) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-27 14:23:13 UTC (rev 7753) @@ -1,8 +1,83 @@ #!/opt/csw/bin/python2.6 +# $Id$ import unittest +import checkpkg +import checkpkg_test_data_CSWmysql51rt as d1 +import checkpkg_test_data_CSWmysql51client as d2 +import checkpkg_test_data_CSWmysql51 as d3 +class DependenciesUnitTest_1(unittest.TestCase): + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d1.DATA_PKGNAME, + d1.DATA_DECLARED_DEPENDENCIES, + d1.DATA_BINARIES_BY_PKGNAME, + d1.DATA_NEEDED_SONAMES_BY_BINARY, + d1.DATA_PKGS_BY_FILENAME, + d1.DATA_FILENAMES_BY_SONAME, + d1.DATA_PKG_BY_ANY_FILENAME, + ) + def testSurplusDeps(self): + # set(['CSWmysql51rt', 'CSWosslrt', 'CSWncurses', 'CSWzlib']) + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + # expected = set([u'SUNWlmsx', u'SUNWlibCx', u'CSWosslrt', u'SUNWcsl', u'SUNWcslx']) + self.assertEquals(set([u'SUNWlibC', u'SUNWcsl', u'SUNWlibms']), self.missing_deps) + + +class DependenciesUnitTest_2(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d2.DATA_PKGNAME, + d2.DATA_DECLARED_DEPENDENCIES, + d2.DATA_BINARIES_BY_PKGNAME, + d2.DATA_NEEDED_SONAMES_BY_BINARY, + d2.DATA_PKGS_BY_FILENAME, + d2.DATA_FILENAMES_BY_SONAME, + d2.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + self.assertEquals(set([u'SUNWlibC', u'SUNWcsl', u'SUNWlibms']), self.missing_deps) + + +class DependenciesUnitTest_3(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d3.DATA_PKGNAME, + d3.DATA_DECLARED_DEPENDENCIES, + d3.DATA_BINARIES_BY_PKGNAME, + d3.DATA_NEEDED_SONAMES_BY_BINARY, + d3.DATA_PKGS_BY_FILENAME, + d3.DATA_FILENAMES_BY_SONAME, + d3.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([u'CSWmysql51client']), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set(['CSWmysql51rt', u'SUNWcsl', u'SUNWlibms', u'SUNWlibC']) + self.assertEquals(expected, self.missing_deps) + + if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51.py 2009-12-27 14:23:13 UTC (rev 7753) @@ -0,0 +1,9 @@ +# Testing data for CSWmysql51 +# $Id$ +DATA_PKGNAME = 'CSWmysql51' +DATA_DECLARED_DEPENDENCIES = {'CSWcswclassutils': 'CSWcswclassutils cswclassutils - CSW class action utilities ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWmysql51client': 'CSWmysql51client mysql51client - MySQL 5.1 client binaries ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWzlib': 'CSWzlib zlib - Zlib Data Compression Library ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} +DATA_BINARIES_BY_PKGNAME = {'CSWmysql51': ['mysqlslap', 'resolve_stack_dump', 'mysql_tzinfo_to_sql', 'resolveip', 'mysql_waitpid', 'my_print_defaults', 'mysql_upgrade', 'innochecksum', 'myisam_ftdump', 'myisamchk', 'mysqltest', 'resolve_stack_dump', 'mysql_waitpid', 'resolveip', 'my_print_defaults', 'mysqlslap', 'myisamchk', 'innochecksum', 'mysqltest', 'myisam_ftdump', 'mysql_upgrade', 'mysql_tzinfo_to_sql', 'mysqlmanager', 'mysqld', 'mysqlmanager', 'mysqld'], 'CSWmysql51rt': ['libmysqlclient_r.so.16.0.0', 'ha_example.so.0.0.0', 'ha_innodb_plugin.so.0.0.0', 'libmysqlclient.so.16.0.0', 'libmysqlclient_r.so.16.0.0', 'ha_example.so.0.0.0', 'ha_innodb_plugin.so.0.0.0', 'libmysqlclient.so.16.0.0'], 'CSWmysql51test': ['my_safe_process'], 'CSWmysql51client': ['myisampack', 'mysql_client_test', 'mysql', 'mysqlimport', 'mysqladmin', 'mysqldump', 'mysqlbinlog', 'mysqlcheck', 'mysqlshow', 'replace', 'myisamlog', 'perror', 'myisampack', 'mysqldump', 'perror', 'mysqlcheck', 'mysql', 're place', 'mysqladmin', 'mysqlimport', 'mysqlbinlog', 'mysql_client_test', 'mysqlshow', 'myisamlog'], 'CSWmysql51bench': [], 'CSWmysql51devel': []} +DATA_NEEDED_SONAMES_BY_BINARY = {'ha_example.so.0.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'soname': 'ha_example.so.0', 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'li bc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1']}, 'mysql_waitpid': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'replace': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw /mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'myisamchk': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc. so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqldump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'mysql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/op t/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libncursesw.so.5', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libncursesw.so.5', ' libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'myisam_ftdump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'myisamlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISA LIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqlimport': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed soname s': ['libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'mysqlcheck': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'mysqlmanager': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'ne eded sonames': ['libpthread.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqladmin': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/ mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqlshow': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/op t/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'libmysqlclient.so.16.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'soname': 'libmysqlclient.so.16', 'needed sonam es': ['librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1']}, 'mysql_upgrade': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt .so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'innochecksum': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqlbinlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libs sl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'myisampack': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'my_safe_process': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studi o/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'my_print_defaults': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so .1']}, 'mysql_tzinfo_to_sql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', ' libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqld': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libz.so.1', 'libdl.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libmtmalloc.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'lib nsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libz.so.1', 'libdl.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libmtmalloc.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqlslap': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmy sqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'ha_innodb_plugin.so.0.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'soname': 'ha_innodb_plugin.so.0', 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1']}, 'perror': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'libmysqlclient_r.so.16.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', ' /opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'soname': 'libmysqlclient_r.so.16', 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8']}, 'mysqltest': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/s parcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'resolve_stack_dump': {'runpath': ['/opt/csw/ lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'resolveip': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['li bz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysql_client_test': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libmysqlclient_r.so.16', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libmysqlclient_r.so.16', 'libpthread.so.1', 'librt.so.1', ' libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}} +DATA_PKGS_BY_FILENAME = {'libresolv.so.2': u'SUNWcsl', 'libthread.so.1': u'SUNWcsl', 'libmtmalloc.so.1': u'SUNWcsl', 'libnsl.so.1': u'SUNWcsl', 'libCstd.so.1': u'SUNWlibC', 'libCrun.so.1': u'SUNWlibC', 'libssl.so.0.9.8': u'CSWosslrt', 'librt.so.1': u'SUNWcsl', 'libz.so.1': u'CSWzlib', 'libncursesw.so.5': u'CSWncurses', 'libsocket.so.1': u'SUNWcsl', 'libm.so.1': u'SUNWlibms', 'libpthread.so.1': u'SUNWcsl', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libdl.so.1': u'SUNWcsl', 'libc.so.1': u'SUNWcsl'} +DATA_FILENAMES_BY_SONAME = {'ha_example.so.0': 'ha_example.so.0.0.0', 'libmysqlclient_r.so.16': 'libmysqlclient_r.so.16.0.0', 'libmysqlclient.so.16': 'libmysqlclient.so.16.0.0', 'ha_innodb_plugin.so.0': 'ha_innodb_plugin.so.0.0.0'} @@ 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 idogan23 at users.sourceforge.net Sun Dec 27 15:58:34 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 27 Dec 2009 14:58:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7754] csw/mgar/pkg/ldns/trunk Message-ID: Revision: 7754 http://gar.svn.sourceforge.net/gar/?rev=7754&view=rev Author: idogan23 Date: 2009-12-27 14:58:33 +0000 (Sun, 27 Dec 2009) Log Message: ----------- ldns: bump version to 1.6.3 Modified Paths: -------------- csw/mgar/pkg/ldns/trunk/Makefile csw/mgar/pkg/ldns/trunk/checksums Modified: csw/mgar/pkg/ldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile 2009-12-27 14:23:13 UTC (rev 7753) +++ csw/mgar/pkg/ldns/trunk/Makefile 2009-12-27 14:58:33 UTC (rev 7754) @@ -1,5 +1,5 @@ GARNAME = ldns -GARVERSION = 1.6.1 +GARVERSION = 1.6.3 CATEGORIES = lib DESCRIPTION = A library for programs conforming to DNS RFCs and drafts Modified: csw/mgar/pkg/ldns/trunk/checksums =================================================================== --- csw/mgar/pkg/ldns/trunk/checksums 2009-12-27 14:23:13 UTC (rev 7753) +++ csw/mgar/pkg/ldns/trunk/checksums 2009-12-27 14:58:33 UTC (rev 7754) @@ -1,2 +1,2 @@ -b5516aacfa819947cbfb6d0c34f0c546 download/CSWldns.doxyparse.diff -a44dafecdcc49aaea5d20ae15bc738c0 download/ldns-1.6.1.tar.gz +b5516aacfa819947cbfb6d0c34f0c546 CSWldns.doxyparse.diff +4234fc56f087d852b2f6d1e6ccd9b7da ldns-1.6.3.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 Sun Dec 27 18:41:15 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 27 Dec 2009 17:41:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7755] csw/mgar/pkg/cpan/Mail-Tools/trunk/ Message-ID: Revision: 7755 http://gar.svn.sourceforge.net/gar/?rev=7755&view=rev Author: idogan23 Date: 2009-12-27 17:41:15 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Mail-Tools: switched to mGar v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Mail-Tools/trunk/ Property changes on: csw/mgar/pkg/cpan/Mail-Tools/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Dec 27 18:46:05 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 27 Dec 2009 17:46:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7756] csw/mgar/pkg/cpan/Mail-Tools/trunk Message-ID: Revision: 7756 http://gar.svn.sourceforge.net/gar/?rev=7756&view=rev Author: idogan23 Date: 2009-12-27 17:46:05 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Mail-Tools: bump version to 2.05 Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile csw/mgar/pkg/cpan/Mail-Tools/trunk/checksums Modified: csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile 2009-12-27 17:41:15 UTC (rev 7755) +++ csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile 2009-12-27 17:46:05 UTC (rev 7756) @@ -1,5 +1,5 @@ GARNAME = MailTools -GARVERSION = 2.04 +GARVERSION = 2.05 CATEGORIES = cpan AUTHOR = MARKOV Modified: csw/mgar/pkg/cpan/Mail-Tools/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Mail-Tools/trunk/checksums 2009-12-27 17:41:15 UTC (rev 7755) +++ csw/mgar/pkg/cpan/Mail-Tools/trunk/checksums 2009-12-27 17:46:05 UTC (rev 7756) @@ -1,3 +1,3 @@ -b25a30ea397a053d8859a08747e5d2e8 download/CSWpmmailtools.gspec -738cde725b5cfcfc3a0608cd5b359acc download/CSWpmmailtools.prototype -d21ea4f375d1e5f3da6b0a4e8ba1e2c6 download/MailTools-2.04.tar.gz +b25a30ea397a053d8859a08747e5d2e8 CSWpmmailtools.gspec +738cde725b5cfcfc3a0608cd5b359acc CSWpmmailtools.prototype +86a51c5a81a55e555c7a84dfdf6ab270 MailTools-2.05.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 Sun Dec 27 19:50:18 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 27 Dec 2009 18:50:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7757] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 7757 http://gar.svn.sourceforge.net/gar/?rev=7757&view=rev Author: idogan23 Date: 2009-12-27 18:50:18 +0000 (Sun, 27 Dec 2009) Log Message: ----------- unbound: bump version to 1.4.1 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 2009-12-27 17:46:05 UTC (rev 7756) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-12-27 18:50:18 UTC (rev 7757) @@ -1,5 +1,5 @@ GARNAME = unbound -GARVERSION = 1.3.4 +GARVERSION = 1.4.1 CATEGORIES = server DESCRIPTION = A validating, recursive, and caching DNS resolver Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2009-12-27 17:46:05 UTC (rev 7756) +++ csw/mgar/pkg/unbound/trunk/checksums 2009-12-27 18:50:18 UTC (rev 7757) @@ -1,3 +1,3 @@ -75867432e238f5afd48dfe5d138097e9 download/cswunbound -601effee1051487655f66790762b66fd download/cswusergroup -d1eb5efed0c36c10dbaf3f805ff3a4bd download/unbound-1.3.4.tar.gz +75867432e238f5afd48dfe5d138097e9 cswunbound +601effee1051487655f66790762b66fd cswusergroup +1e03ef9618e4bca02005bd99bc6af75c unbound-1.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 27 21:41:24 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Dec 2009 20:41:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7758] csw/mgar/pkg Message-ID: Revision: 7758 http://gar.svn.sourceforge.net/gar/?rev=7758&view=rev Author: wbonnet Date: 2009-12-27 20:41:23 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/lutefisk/ csw/mgar/pkg/lutefisk/branches/ csw/mgar/pkg/lutefisk/tags/ csw/mgar/pkg/lutefisk/trunk/ csw/mgar/pkg/lutefisk/trunk/Makefile csw/mgar/pkg/lutefisk/trunk/checksums csw/mgar/pkg/lutefisk/trunk/files/ csw/mgar/pkg/lutefisk/trunk/files/license csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_tilbehor Property changes on: csw/mgar/pkg/lutefisk/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/lutefisk/trunk/Makefile =================================================================== --- csw/mgar/pkg/lutefisk/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lutefisk/trunk/Makefile 2009-12-27 20:41:23 UTC (rev 7758) @@ -0,0 +1,55 @@ +GARNAME = lutefisk +GARVERSION = 0.1 +CATEGORIES = utils + +DESCRIPTION = provides statistics about +define BLURB + Lutefisk is a reporting tool used to send upstream information about the usage of packages. Lutefisk is made of two scripts, smor and tilbehor, each script is a hook called by the package management tools, like pkgutil. + Smor is the package statistics tool. The following informations are sent upstream when a package is downloaded. Package name, arch, OS version both for package and machine running the package tool and source used (current, stable, etc.). + Tilbehor is the mirror statistics tool. The following informations are sent upstream when a package is downloaded. Base URL of the mirror used, arch, OS version of the machine running the package tool and source used (current, stable, etc.). + The use of this tools is completly anonymous. Only the day of the installation taken in account. Especially no time are recorded, and no personal information (such as IP adress) are stored. +endef + +MASTER_SITES = + +DISTFILES = lutefisk_med_tilbehor lutefisk_med_smor license + +# We define upstream file regex so we can be notifed of new upstream software release +# UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +PACKAGES = CSWlutefisktilbehor CSWlutefisksmor +ARCHALL = 1 +LICENSE = license + +CATALOGNAME_CSWlutefisktilbehor = lutefisktilbehor +CATALOGNAME_CSWlutefisksmor = lutefisksmor + +# Defines package description +SPKG_DESC_CSWlutefisksmor = Lutefisk med smor $(DESCRIPTION) packages use +SPKG_DESC_CSWlutefisktilbehor = Lutefisk med tilbehor $(DESCRIPTION) mirrors use + +# Defines dependencies +REQUIRED_PKGS_CSWlutefisktilbehor = CSWwget CSWgawk +REQUIRED_PKGS_CSWlutefisksmor = CSWwget CSWgawk CSWgsed + +# Defines package content +PKGFILES_CSWlutefisktilbehor = .*/lutefisk_med_tilbehor +# PKGFILES_CSWlutefisksmor = .*/lutefisk_med_smor + +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)/etc/opt/csw/pkg-hooks/postfetch.d/ + @gcp $(FILEDIR)/lutefisk_med_tilbehor $(DESTDIR)/etc/opt/csw/pkg-hooks/postfetch.d/ + @gcp $(FILEDIR)/lutefisk_med_smor $(DESTDIR)/etc/opt/csw/pkg-hooks/postfetch.d/ Added: csw/mgar/pkg/lutefisk/trunk/checksums =================================================================== --- csw/mgar/pkg/lutefisk/trunk/checksums (rev 0) +++ csw/mgar/pkg/lutefisk/trunk/checksums 2009-12-27 20:41:23 UTC (rev 7758) @@ -0,0 +1,3 @@ +2d3c4c77372ffd3bc0c077db001e21d6 license +bdd0326be5c948db0266f980cd89c4cb lutefisk_med_smor +c08752237fb6a0c435fc3a868b7ad2da lutefisk_med_tilbehor Added: csw/mgar/pkg/lutefisk/trunk/files/license =================================================================== --- csw/mgar/pkg/lutefisk/trunk/files/license (rev 0) +++ csw/mgar/pkg/lutefisk/trunk/files/license 2009-12-27 20:41:23 UTC (rev 7758) @@ -0,0 +1,22 @@ +The contents of this file are subject to the COMMON DEVELOPMENT AND +DISTRIBUTION LICENSE (CDDL) (the "License"); you may not use this +file except in compliance with the License. + +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +for the specific language governing rights and limitations under the +License. + +Alternatively, the contents of this file may be used under the terms of +either the GNU General Public License Version 3 or later (the "GPL"), +in which case the provisions of the GPL are applicable instead +of those above. If you wish to allow use of your version of this file only +under the terms of either the GPL, and not to allow others to +use your version of this file under the terms of the CDDL, indicate your +decision by deleting the provisions above and replace them with the notice +and other provisions required by the GPL. If you do not delete +the provisions above, a recipient may use your version of this file under +the terms of any one of the CDDL, or the GPL. + +Copyright 2009 OpenCSW (http://www.opencsw.org). All rights reserved. +Use is subject to license terms. Property changes on: csw/mgar/pkg/lutefisk/trunk/files/license ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor =================================================================== --- csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor (rev 0) +++ csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor 2009-12-27 20:41:23 UTC (rev 7758) @@ -0,0 +1,38 @@ +#!/bin/sh +# +# The contents of this file are subject to the COMMON DEVELOPMENT AND +# DISTRIBUTION LICENSE (CDDL) (the "License"); you may not use this +# file except in compliance with the License. +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPL"), +# in which case the provisions of the GPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL, and not to allow others to +# use your version of this file under the terms of the CDDL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the CDDL, or the GPL. + +# Copyright 2009 OpenCSW (http://www.opencsw.org). All rights reserved. +# Use is subject to license terms. +# +# +# Contributors list : +# +# William Bonnet wbonnet at opencsw.org +# + +packageTemp=`echo $1 | tr / \ | gawk '{ print $NF }` +packageName=`echo ${packageTemp} | tr - \ | gawk '{ print $1 }` +packageOsVersion=`echo ${packageTemp} | tr - \ | gawk '{ print $3 }' | gsed -e s/SunOS//` +packageArch=`echo ${packageTemp} | tr - \ | gawk '{ print $4 }` +targetOsVersion=`uname -r | gsed -e s/SunOS//` + +wget "http://www-mockup.opencsw.org/tools/statistics/packageSurvey.php?packageName=${packageName}&packageArch=${packageArch}&packageOsVersion=${packageOsVersion}&targetOsVersion=${targetOsVersion}" -O /dev/null Property changes on: csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_tilbehor =================================================================== --- csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_tilbehor (rev 0) +++ csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_tilbehor 2009-12-27 20:41:23 UTC (rev 7758) @@ -0,0 +1,37 @@ +#!/bin/sh +# +# The contents of this file are subject to the COMMON DEVELOPMENT AND +# DISTRIBUTION LICENSE (CDDL) (the "License"); you may not use this +# file except in compliance with the License. +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPL"), +# in which case the provisions of the GPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL, and not to allow others to +# use your version of this file under the terms of the CDDL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the CDDL, or the GPL. + +# Copyright 2009 OpenCSW (http://www.opencsw.org). All rights reserved. +# Use is subject to license terms. +# +# +# Contributors list : +# +# William Bonnet wbonnet at opencsw.org +# + +mirrorName=`echo $1 | gawk -F/ '{ a = "" ; for (i=1; i <= NF - 5; i++) a = a $i "/" ; i = NF -4 ; a = a $i ; print a }'` +mirrorOsVersion=`echo $1 | tr / \ | gawk '{ i = NF -1 ; print $i }` +mirrorArch=`echo $1 | tr / \ | gawk '{ i = NF - 2 ; print $i }` +mirrorSource=`echo $1 | tr / \ | gawk '{ i = NF - 3 ; print $i }` + +wget "http://www-mockup.opencsw.org/tools/statistics/mirrorSurvey.php?mirrorName=${mirrorName}&mirrorArch=${mirrorArch}&mirrorOsVersion=${mirrorOsVersion}&mirrorSource=${mirrorSource}" -O /dev/null Property changes on: csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_tilbehor ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 27 22:17:00 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Dec 2009 21:17:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7759] csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor Message-ID: Revision: 7759 http://gar.svn.sourceforge.net/gar/?rev=7759&view=rev Author: wbonnet Date: 2009-12-27 21:17:00 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Add source to package stats Modified Paths: -------------- csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor Modified: csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor =================================================================== --- csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor 2009-12-27 20:41:23 UTC (rev 7758) +++ csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor 2009-12-27 21:17:00 UTC (rev 7759) @@ -34,5 +34,6 @@ packageOsVersion=`echo ${packageTemp} | tr - \ | gawk '{ print $3 }' | gsed -e s/SunOS//` packageArch=`echo ${packageTemp} | tr - \ | gawk '{ print $4 }` targetOsVersion=`uname -r | gsed -e s/SunOS//` +packageSource=`echo $1 | tr / \ | gawk '{ i = NF - 3 ; print $i }` -wget "http://www-mockup.opencsw.org/tools/statistics/packageSurvey.php?packageName=${packageName}&packageArch=${packageArch}&packageOsVersion=${packageOsVersion}&targetOsVersion=${targetOsVersion}" -O /dev/null +wget "http://www-mockup.opencsw.org/tools/statistics/packageSurvey.php?packageName=${packageName}&packageArch=${packageArch}&packageOsVersion=${packageOsVersion}&targetOsVersion=${targetOsVersion}&packageSource=${packageSource}" -O /dev/null This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 27 22:23:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Dec 2009 21:23:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7760] csw/mgar/pkg/lutefisk/trunk/checksums Message-ID: Revision: 7760 http://gar.svn.sourceforge.net/gar/?rev=7760&view=rev Author: wbonnet Date: 2009-12-27 21:23:13 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Update checksums Modified Paths: -------------- csw/mgar/pkg/lutefisk/trunk/checksums Modified: csw/mgar/pkg/lutefisk/trunk/checksums =================================================================== --- csw/mgar/pkg/lutefisk/trunk/checksums 2009-12-27 21:17:00 UTC (rev 7759) +++ csw/mgar/pkg/lutefisk/trunk/checksums 2009-12-27 21:23:13 UTC (rev 7760) @@ -1,3 +1,3 @@ 2d3c4c77372ffd3bc0c077db001e21d6 license -bdd0326be5c948db0266f980cd89c4cb lutefisk_med_smor +7bf2ec2be3df056be6db7a9e1ad127cd lutefisk_med_smor c08752237fb6a0c435fc3a868b7ad2da lutefisk_med_tilbehor This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 27 22:29:08 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Dec 2009 21:29:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7761] csw/mgar/pkg/lutefisk/trunk/Makefile Message-ID: Revision: 7761 http://gar.svn.sourceforge.net/gar/?rev=7761&view=rev Author: wbonnet Date: 2009-12-27 21:29:08 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Fix description Modified Paths: -------------- csw/mgar/pkg/lutefisk/trunk/Makefile Modified: csw/mgar/pkg/lutefisk/trunk/Makefile =================================================================== --- csw/mgar/pkg/lutefisk/trunk/Makefile 2009-12-27 21:23:13 UTC (rev 7760) +++ csw/mgar/pkg/lutefisk/trunk/Makefile 2009-12-27 21:29:08 UTC (rev 7761) @@ -29,8 +29,8 @@ CATALOGNAME_CSWlutefisksmor = lutefisksmor # Defines package description -SPKG_DESC_CSWlutefisksmor = Lutefisk med smor $(DESCRIPTION) packages use -SPKG_DESC_CSWlutefisktilbehor = Lutefisk med tilbehor $(DESCRIPTION) mirrors use +SPKG_DESC_CSWlutefisksmor = Lutefisk med smor $(DESCRIPTION) OpenCSW packages use +SPKG_DESC_CSWlutefisktilbehor = Lutefisk med tilbehor $(DESCRIPTION) OpenCSW mirrors use # Defines dependencies REQUIRED_PKGS_CSWlutefisktilbehor = CSWwget CSWgawk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Dec 28 00:04:42 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 27 Dec 2009 23:04:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7762] csw/mgar/pkg Message-ID: Revision: 7762 http://gar.svn.sourceforge.net/gar/?rev=7762&view=rev Author: hson Date: 2009-12-27 23:04:42 +0000 (Sun, 27 Dec 2009) Log Message: ----------- pxlib: Initial commit Added Paths: ----------- csw/mgar/pkg/pxlib/ csw/mgar/pkg/pxlib/branches/ csw/mgar/pkg/pxlib/tags/ csw/mgar/pkg/pxlib/trunk/ csw/mgar/pkg/pxlib/trunk/Makefile csw/mgar/pkg/pxlib/trunk/files/ Property changes on: csw/mgar/pkg/pxlib/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pxlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/pxlib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pxlib/trunk/Makefile 2009-12-27 23:04:42 UTC (rev 7762) @@ -0,0 +1,26 @@ +GARNAME = pxlib +GARVERSION = 0.6.3 +CATEGORIES = lib + +DESCRIPTION = Library to read and write Paradox databases +define BLURB + pxlib is a simply and still small C library to read and write Paradox DB + files. It supports all versions starting from 3.0. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +SPKG_SOURCEURL = http://pxlib.sourceforge.net + +LICENSE = COPYING + +#REQUIRED_PKGS += CSWggettextrt + +UPSTREAM_MASTER_SITES = http://sourceforge.net/projects/pxlib/files +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 28 00:27:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Dec 2009 23:27:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7763] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7763 http://gar.svn.sourceforge.net/gar/?rev=7763&view=rev Author: wahwah Date: 2009-12-27 23:27:30 +0000 (Sun, 27 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: More unit tests, dep guessing by name (for -devel packages) Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51devel.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-27 23:04:42 UTC (rev 7762) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-27 23:27:30 UTC (rev 7763) @@ -3,6 +3,10 @@ # $Id$ # # A check for dependencies between shared libraries. +# +# This is currently more of a prototype than a mature program, but it has some +# unit tests and it appears to be working. The main problem is that it's not +# divided into smaller testable sections. import checkpkg import os @@ -39,17 +43,12 @@ binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] binaries_by_pkgname[checker.pkgname] = binaries_base binaries.extend(pkg_binary_paths) - for f in checker.GetAllFilenames(): - pkg_by_any_filename[f] = checker.pkgname + for filename in checker.GetAllFilenames(): + pkg_by_any_filename[filename] = checker.pkgname # Making the binaries unique binaries = set(binaries) ws_re = re.compile(r"\s+") - # TODO: map from binaries_by_pkgname to sonames_by_pkgname - # - # Essentially, we must look at libfoo.so.1.2.3 and map it to libfoo.so.1, - # whatever soname it has - # man ld.so.1 for more info on this hack env = copy.copy(os.environ) env["LD_NOAUXFLTR"] = "1" @@ -124,7 +123,7 @@ # TODO: Expand $ISALIST to whatever the 'isalist' command outputs for # better matching. for runpath in runpath_by_needed_soname[soname]: - soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) if runpath in soname_runpath_data: lines_by_soname[soname] = soname_runpath_data[runpath] break @@ -140,6 +139,7 @@ pkgs_by_filename[soname] = pkgname # A shared object dependency/provisioning report, plus checking. + # TODO: Rewrite this using cheetah if needed_sonames: print "Analysis of sonames needed by the package set:" for soname in needed_sonames: @@ -157,12 +157,6 @@ % (soname, binaries_by_soname[soname]))) print - # Data needed for this section: - # - pkgname - # - declared dependencies - # - binaries_by_pkgname - # - needed_sonames_by_binary - # - pkgs_by_filename dependent_pkgs = {} for checker in checkers: orphan_sonames = set() @@ -178,20 +172,22 @@ filenames_by_soname, pkg_by_any_filename) - save_testing_data = True - if save_testing_data: - test_fd = open("/var/tmp/checkpkg-dep-testing-data-%s.py" % pkgname, "w") + if options.debug: + data_file_name = "/var/tmp/checkpkg-dep-testing-data-%s.py" % pkgname + logging.warn("Saving test data to %s." % repr(data_file_name)) + test_fd = open(data_file_name, "w") sanitized_pkgname = pkgname.replace("-", "_") print >>test_fd, "# Testing data for %s" % pkgname - print >>test_fd, "DATA_PKGNAME =" % sanitized_pkgname, repr(pkgname) - print >>test_fd, "DATA_DECLARED_DEPENDENCIES =" % sanitized_pkgname, repr(declared_dependencies) - print >>test_fd, "DATA_BINARIES_BY_PKGNAME =" % sanitized_pkgname, repr(binaries_by_pkgname) - print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =" % sanitized_pkgname, repr(needed_sonames_by_binary) - print >>test_fd, "DATA_PKGS_BY_FILENAME =" % sanitized_pkgname, repr(pkgs_by_filename) - print >>test_fd, "DATA_FILENAMES_BY_SONAME =" % sanitized_pkgname, repr(filenames_by_soname) - print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =" % sanitized_pkgname, repr(pkg_by_any_filename) + print >>test_fd, "DATA_PKGNAME =", repr(pkgname) + print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) + print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) + print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) + print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) + print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) + print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) test_fd.close() + # TODO: Rewrite this using cheetah templates. if missing_deps: print "SUGGESTION: you may want to add some or all of the following as depends:" print " (Feel free to ignore SUNW or SPRO packages)" @@ -207,6 +203,7 @@ errors.append(checkpkg.Error("The following soname does't belong to " "any package: %s" % soname)) print "! ", soname + print if errors: for error in errors: @@ -218,3 +215,5 @@ if __name__ == '__main__': main() + +# vim:set sw=2 ts=2 sts=2 expandtab: Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-27 23:04:42 UTC (rev 7762) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-27 23:27:30 UTC (rev 7763) @@ -18,6 +18,7 @@ # Don't report these as unnecessary. TYPICAL_DEPENDENCIES = set(["CSWcommon", "CSWcswclassutils", "CSWisaexec"]) + class Error(Exception): pass @@ -85,7 +86,7 @@ self.CheckPkgpathExists() file_basenames = [] for root, dirs, files in os.walk(self.pkgpath): - file_basenames.extend(files) + file_basenames.extend(files) return file_basenames def GetDependencies(self): @@ -99,7 +100,6 @@ return depends - class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file.""" @@ -191,6 +191,46 @@ return so_dependencies, self_provided, orphan_sonames +def GuessDepsByFilename(pkgname, pkg_by_any_filename): + """Guesses dependencies based on filename regexes.""" + guessed_deps = set() + patterns = ( + (r".*\.py", u"CSWpython"), + (r".*\.pl", u"CSWperl"), + (r".*\.rb", u"CSWruby"), + ) + for pattern, dep_pkgname in patterns: + # If any file name matches, add the dep, go to the next pattern/pkg + # combination. + pattern_re = re.compile("^%s$" % pattern) + for filename in pkg_by_any_filename: + if (re.match(pattern_re, filename) + and + pkgname == pkg_by_any_filename[filename]): + guessed_deps.add(dep_pkgname) + break + return guessed_deps + + +def GuessDepsByPkgname(pkgname, pkg_by_any_filename): + # More guessed dependencies: If one package is a substring of another, it + # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. + # However, the rt (runtime) packages should not want to depend on the main + # package. + guessed_deps = set() + all_other_pkgs = set(pkg_by_any_filename.values()) + for other_pkg in all_other_pkgs: + other_pkg = unicode(other_pkg) + if pkgname == other_pkg: + continue + if pkgname.startswith(other_pkg): + endings = ["devel", "test", "bench", "dev"] + for ending in endings: + if pkgname.endswith(ending): + guessed_deps.add(other_pkg) + return guessed_deps + + def AnalyzeDependencies(pkgname, declared_dependencies, binaries_by_pkgname, @@ -198,34 +238,45 @@ pkgs_by_soname, filenames_by_soname, pkg_by_any_filename): - """ - missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies(...) - """ - so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( - pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename) - guessed_deps = set() - patterns = ( - (r".*\.py", u"CSWpython"), - (r".*\.pl", u"CSWperl"), - (r".*\.rb", u"CSWruby"), - ) - for pattern, dep_pkgname in patterns: - # If any file name matches, add the dep, go to the next pattern/pkg - # combination. - tmp_re = re.compile("^%s$" % pattern) - for f in pkg_by_any_filename: - if re.match(tmp_re, f): - if pkgname == pkg_by_any_filename[f]: - guessed_deps.add(dep_pkgname) - break - auto_dependencies = so_dependencies.union(guessed_deps) - declared_dependencies_set = set(declared_dependencies) - missing_deps = auto_dependencies.difference(declared_dependencies_set) - surplus_deps = declared_dependencies_set.difference(auto_dependencies) - surplus_deps = surplus_deps.difference(TYPICAL_DEPENDENCIES) - return missing_deps, surplus_deps, orphan_sonames + """Gathers and merges dependency results from other functions. + + declared_dependencies: Dependencies that the package in question claims to + have. + + binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names + (without paths) + + needed_sonames_by_binary: A dictionary mapping binary file name to + a dictionary containing: "needed sonames", + "soname", "rpath". Based on examining the binary + files within the packages. + + pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the + contents of the system wide pkgmap + (/var/sadm/install/contents) + + filenames_by_soname: A dictionary mapping shared library sonames to filenames, + based on files within packages + + pkg_by_any_filename: Mapping from file names to packages names, based on the + contents of the packages under examination. + """ + declared_dependencies_set = set(declared_dependencies) + + so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( + pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename) + auto_dependencies = reduce(lambda x, y: x.union(y), + [ + so_dependencies, + GuessDepsByFilename(pkgname, pkg_by_any_filename), + GuessDepsByPkgname(pkgname, pkg_by_any_filename), + ]) + missing_deps = auto_dependencies.difference(declared_dependencies_set) + surplus_deps = declared_dependencies_set.difference(auto_dependencies) + surplus_deps = surplus_deps.difference(TYPICAL_DEPENDENCIES) + return missing_deps, surplus_deps, orphan_sonames Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-27 23:04:42 UTC (rev 7762) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-27 23:27:30 UTC (rev 7763) @@ -6,6 +6,7 @@ import checkpkg_test_data_CSWmysql51rt as d1 import checkpkg_test_data_CSWmysql51client as d2 import checkpkg_test_data_CSWmysql51 as d3 +import checkpkg_test_data_CSWmysql51devel as d4 class DependenciesUnitTest_1(unittest.TestCase): @@ -21,15 +22,14 @@ ) def testSurplusDeps(self): - # set(['CSWmysql51rt', 'CSWosslrt', 'CSWncurses', 'CSWzlib']) self.assertEquals(set([]), self.surplus_deps) def testOrphanSonames(self): self.assertEquals(set([]), self.orphan_sonames) def testMissingDeps(self): - # expected = set([u'SUNWlmsx', u'SUNWlibCx', u'CSWosslrt', u'SUNWcsl', u'SUNWcslx']) - self.assertEquals(set([u'SUNWlibC', u'SUNWcsl', u'SUNWlibms']), self.missing_deps) + expected = set([u'SUNWcsl', u'SUNWlibms', u'SUNWlibC']) + self.assertEquals(expected, self.missing_deps) class DependenciesUnitTest_2(unittest.TestCase): @@ -52,7 +52,8 @@ self.assertEquals(set([]), self.orphan_sonames) def testMissingDeps(self): - self.assertEquals(set([u'SUNWlibC', u'SUNWcsl', u'SUNWlibms']), self.missing_deps) + expected = set([u'SUNWlibC', u'SUNWcsl', u'SUNWlibms']) + self.assertEquals(expected, self.missing_deps) class DependenciesUnitTest_3(unittest.TestCase): @@ -79,5 +80,91 @@ self.assertEquals(expected, self.missing_deps) +class DependenciesUnitTest_4(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d4.DATA_PKGNAME, + d4.DATA_DECLARED_DEPENDENCIES, + d4.DATA_BINARIES_BY_PKGNAME, + d4.DATA_NEEDED_SONAMES_BY_BINARY, + d4.DATA_PKGS_BY_FILENAME, + d4.DATA_FILENAMES_BY_SONAME, + d4.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class GuessDepsUnitTest(unittest.TestCase): + + def testGuessDepsByFilename1(self): + expected = set([u"CSWpython"]) + pkgname = u"CSWfoo" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) + + def testGuessDepsByFilename2(self): + expected = set([]) + pkgname = u"CSWfoo" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWbar", + } + self.assertEqual(expected, + checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname1(self): + expected = set([u"CSWfoo"]) + pkgname = u"CSWfoo-devel" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/bin/barfoo": u"CSWfoobar", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname2(self): + expected = set([]) + pkgname = u"CSWzfoo-devel" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/bin/barfoo": u"CSWfoobar", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname3(self): + self.assertEqual(set([u"CSWmysql51"]), + checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", + d4.DATA_PKG_BY_ANY_FILENAME)) + + def testGuessDepsByPkgname4(self): + data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', + 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) + data2 = dict(((x, x) for x in data1)) + self.assertEqual(set([u"CSWmysql51"]), checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) + + def testGuessDepsByPkgname4(self): + data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', + 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) + data2 = dict(((x, x) for x in data1)) + self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) + + if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51devel.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51devel.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51devel.py 2009-12-27 23:27:30 UTC (rev 7763) @@ -0,0 +1,9 @@ +# Testing data for CSWmysql51devel +# $Id$ +DATA_PKGNAME = 'CSWmysql51devel' +DATA_DECLARED_DEPENDENCIES = {'CSWmysql51': 'CSWmysql51 mysql51 - Multithreaded SQL database ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages '} +DATA_BINARIES_BY_PKGNAME = {'CSWmysql51': ['mysqlslap', 'resolve_stack_dump', 'mysql_tzinfo_to_sql', 'resolveip', 'mysql_waitpid', 'my_print_defaults', 'mysql_upgrade', 'innochecksum', 'myisam_ftdump', 'myisamchk', 'mysqltest', 'resolve_stack_dump', 'mysql_waitpid', 'resolveip', 'my_print_defaults', 'mysqlslap', 'myisamchk', 'innochecksum', 'mysqltest', 'myisam_ftdump', 'mysql_upgrade', 'mysql_tzinfo_to_sql', 'mysqlmanager', 'mysqld', 'mysqlmanager', 'mysqld'], 'CSWmysql51rt': ['libmysqlclient_r.so.16.0.0', 'ha_example.so.0.0.0', 'ha_innodb_plugin.so.0.0.0', 'libmysqlclient.so.16.0.0', 'libmysqlclient_r.so.16.0.0', 'ha_example.so.0.0.0', 'ha_innodb_plugin.so.0.0.0', 'libmysqlclient.so.16.0.0'], 'CSWmysql51test': ['my_safe_process'], 'CSWmysql51client': ['myisampack', 'mysql_client_test', 'mysql', 'mysqlimport', 'mysqladmin', 'mysqldump', 'mysqlbinlog', 'mysqlcheck', 'mysqlshow', 'replace', 'myisamlog', 'perror', 'myisampack', 'mysqldump', 'perror', 'mysqlcheck', 'mysql', 're place', 'mysqladmin', 'mysqlimport', 'mysqlbinlog', 'mysql_client_test', 'mysqlshow', 'myisamlog'], 'CSWmysql51bench': [], 'CSWmysql51devel': []} +DATA_NEEDED_SONAMES_BY_BINARY = {'ha_example.so.0.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'soname': 'ha_example.so.0', 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'li bc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1']}, 'mysql_waitpid': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'replace': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw /mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'myisamchk': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc. so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqldump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'mysql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/op t/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libncursesw.so.5', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libncursesw.so.5', ' libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'myisam_ftdump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'myisamlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISA LIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqlimport': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed soname s': ['libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'mysqlcheck': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'mysqlmanager': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'ne eded sonames': ['libpthread.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqladmin': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/ mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqlshow': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/op t/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'libmysqlclient.so.16.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'soname': 'libmysqlclient.so.16', 'needed sonam es': ['librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1']}, 'mysql_upgrade': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt .so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'innochecksum': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqlbinlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libs sl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'myisampack': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'my_safe_process': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studi o/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'my_print_defaults': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so .1']}, 'mysql_tzinfo_to_sql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', ' libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqld': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libz.so.1', 'libdl.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libmtmalloc.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'lib nsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libz.so.1', 'libdl.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libmtmalloc.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqlslap': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmy sqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'ha_innodb_plugin.so.0.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'soname': 'ha_innodb_plugin.so.0', 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1']}, 'perror': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'libmysqlclient_r.so.16.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', ' /opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'soname': 'libmysqlclient_r.so.16', 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8']}, 'mysqltest': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/s parcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'resolve_stack_dump': {'runpath': ['/opt/csw/ lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'resolveip': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['li bz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysql_client_test': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libmysqlclient_r.so.16', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libmysqlclient_r.so.16', 'libpthread.so.1', 'librt.so.1', ' libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}} +DATA_PKGS_BY_FILENAME = {'libresolv.so.2': u'SUNWcsl', 'libthread.so.1': u'SUNWcsl', 'libmtmalloc.so.1': u'SUNWcsl', 'libnsl.so.1': u'SUNWcsl', 'libCstd.so.1': u'SUNWlibC', 'libCrun.so.1': u'SUNWlibC', 'libssl.so.0.9.8': u'CSWosslrt', 'librt.so.1': u'SUNWcsl', 'libz.so.1': u'CSWzlib', 'libncursesw.so.5': u'CSWncurses', 'libsocket.so.1': u'SUNWcsl', 'libm.so.1': u'SUNWlibms', 'libpthread.so.1': u'SUNWcsl', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libdl.so.1': u'SUNWcsl', 'libc.so.1': u'SUNWcsl'} +DATA_FILENAMES_BY_SONAME = {'ha_example.so.0': 'ha_example.so.0.0.0', 'libmysqlclient_r.so.16': 'libmysqlclient_r.so.16.0.0', 'libmysqlclient.so.16': 'libmysqlclient.so.16.0.0', 'ha_innodb_plugin.so.0': 'ha_innodb_plugin.so.0.0.0'} @@ 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 wahwah at users.sourceforge.net Mon Dec 28 00:29:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Dec 2009 23:29:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7764] csw/mgar/pkg/mysql5/trunk Message-ID: Revision: 7764 http://gar.svn.sourceforge.net/gar/?rev=7764&view=rev Author: wahwah Date: 2009-12-27 23:29:27 +0000 (Sun, 27 Dec 2009) Log Message: ----------- mysql5: use mysql51 for the package base name of MySQL 5.1 Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile csw/mgar/pkg/mysql5/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.postinstall csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.preinstall csw/mgar/pkg/mysql5/trunk/files/cswmysql51 Removed Paths: ------------- csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall csw/mgar/pkg/mysql5/trunk/files/cswmysql5 Property Changed: ---------------- csw/mgar/pkg/mysql5/trunk/ Property changes on: csw/mgar/pkg/mysql5/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-git + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-27 23:27:30 UTC (rev 7763) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-27 23:29:27 UTC (rev 7764) @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = mysql5 +GARNAME = mysql51 BASE_VERSION = 5.1 PATCHLEVEL = 40 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) @@ -20,10 +20,10 @@ (Structured Query Language) database server. endef -# Change prefix to /opt/csw/mysql5 -prefix = /opt/csw/mysql5 -localstatedir = /var/opt/csw/mysql5 -sysconfdir = /etc/opt/csw/mysql5 +# Change prefix to /opt/csw/$(GARNAME) +prefix = /opt/csw/$(GARNAME) +localstatedir = /var/opt/csw/$(GARNAME) +sysconfdir = /etc/opt/csw/$(GARNAME) # Where to put the init script global_sysconfdir = /etc/opt/csw @@ -32,111 +32,120 @@ INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION) -PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel -PACKAGES += CSWmysql5rt CSWmysql5test +PACKAGES = CSW$(GARNAME) CSW$(GARNAME)bench CSW$(GARNAME)client CSW$(GARNAME)devel +PACKAGES += CSW$(GARNAME)rt CSW$(GARNAME)test 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 -SPKG_DESC_CSWmysql5 = Multithreaded SQL database -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking -SPKG_DESC_CSWmysql5client = MySQL 5 client binaries -SPKG_DESC_CSWmysql5devel = MySQL 5 header files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files -SPKG_DESC_CSWmysql5test = MySQL 5 testing files +SPKG_DESC_CSW$(GARNAME) = Multithreaded SQL database +SPKG_DESC_CSW$(GARNAME)bench = MySQL $(BASE_VERSION) benchmarking +SPKG_DESC_CSW$(GARNAME)client = MySQL $(BASE_VERSION) client binaries +SPKG_DESC_CSW$(GARNAME)devel = MySQL $(BASE_VERSION) header files +SPKG_DESC_CSW$(GARNAME)rt = MySQL $(BASE_VERSION) runtime files +SPKG_DESC_CSW$(GARNAME)test = MySQL $(BASE_VERSION) testing files -CATALOGNAME_CSWmysql5 = $(GARNAME) -CATALOGNAME_CSWmysql5bench = $(GARNAME)bench -CATALOGNAME_CSWmysql5client = $(GARNAME)client -CATALOGNAME_CSWmysql5devel = $(GARNAME)devel -CATALOGNAME_CSWmysql5rt = $(GARNAME)rt -CATALOGNAME_CSWmysql5test = $(GARNAME)test +CATALOGNAME_CSW$(GARNAME) = $(GARNAME) +CATALOGNAME_CSW$(GARNAME)bench = $(GARNAME)bench +CATALOGNAME_CSW$(GARNAME)client = $(GARNAME)client +CATALOGNAME_CSW$(GARNAME)devel = $(GARNAME)devel +CATALOGNAME_CSW$(GARNAME)rt = $(GARNAME)rt +CATALOGNAME_CSW$(GARNAME)test = $(GARNAME)test -INCOMPATIBLE_PKGS_CSWmysql5bench = CSWmysql4bench -INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client -INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 -INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel -INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test - # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. -CSWmysql5client_programs = myisamlog -CSWmysql5client_programs += myisampack -CSWmysql5client_programs += mysql -CSWmysql5client_programs += mysqlaccess -CSWmysql5client_programs += mysqladmin -CSWmysql5client_programs += mysqlbin -CSWmysql5client_programs += mysqlbinlog -CSWmysql5client_programs += mysqlcheck -CSWmysql5client_programs += mysql_client_test -CSWmysql5client_programs += mysqldump -CSWmysql5client_programs += mysqlhotcopy -CSWmysql5client_programs += mysqlimport -CSWmysql5client_programs += mysqlshow -CSWmysql5client_programs += mysql_zap -CSWmysql5client_programs += perror -CSWmysql5client_programs += replace +CSW$(GARNAME)client_programs = myisamlog +CSW$(GARNAME)client_programs += myisampack +CSW$(GARNAME)client_programs += mysql +CSW$(GARNAME)client_programs += mysqlaccess +CSW$(GARNAME)client_programs += mysqladmin +CSW$(GARNAME)client_programs += mysqlbin +CSW$(GARNAME)client_programs += mysqlbinlog +CSW$(GARNAME)client_programs += mysqlcheck +CSW$(GARNAME)client_programs += mysql_client_test +CSW$(GARNAME)client_programs += mysqldump +CSW$(GARNAME)client_programs += mysqlhotcopy +CSW$(GARNAME)client_programs += mysqlimport +CSW$(GARNAME)client_programs += mysqlshow +CSW$(GARNAME)client_programs += mysql_zap +CSW$(GARNAME)client_programs += perror +CSW$(GARNAME)client_programs += replace # Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared # library not found. EXTRA_LIB was tried too, but did not work, as the -R path # ended up with having two $ISALIST tokens. # # Without this setting it looks for: -# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 +# /opt/csw/$(GARNAME)/lib/amd64/libmysqlclient.so.15 # The library is at: -# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +# /opt/csw/$(GARNAME)/lib/amd64/mysql/libmysqlclient.so.15 EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql -CSWmysql5devel_programs += mysql_config +CSW$(GARNAME)devel_programs += mysql_config # Enable 64 bits build BUILD64 = 1 -PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* -PKGFILES_CSWmysql5client = $(bindir) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 -PKGFILES_CSWmysql5devel += $(prefix)/include.* -PKGFILES_CSWmysql5devel += /opt/csw/include/mysql +PKGFILES_CSW$(GARNAME)bench = $(prefix)/sql-bench.* +PKGFILES_CSW$(GARNAME)client = $(bindir) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSW$(GARNAME)devel += $(prefix)/include.* +PKGFILES_CSW$(GARNAME)devel += /opt/csw/include/mysql -PKGFILES_CSWmysql5rt = $(libdir) -PKGFILES_CSWmysql5rt += $(libdir)/.* -PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* +PKGFILES_CSW$(GARNAME)rt = $(libdir) +PKGFILES_CSW$(GARNAME)rt += $(libdir)/.* +PKGFILES_CSW$(GARNAME)test = $(prefix)/mysql-test.* -REQUIRED_PKGS_CSWmysql5bench = CSWmysql5 -REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt -REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt -REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 -REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl -REQUIRED_PKGS_CSWmysql5rt = CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME) = CSW$(GARNAME)client +REQUIRED_PKGS_CSW$(GARNAME) += CSW$(GARNAME)rt +REQUIRED_PKGS_CSW$(GARNAME) += CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME) += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)rt = CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME)rt += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)bench = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)bench += CSWperl +REQUIRED_PKGS_CSW$(GARNAME)client = CSW$(GARNAME)rt +REQUIRED_PKGS_CSW$(GARNAME)client += CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME)client += CSWncurses +REQUIRED_PKGS_CSW$(GARNAME)client += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)devel = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)test = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)test += CSWperl MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz -DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog -DISTFILES += CSWmysql5.preinstall -DISTFILES += CSWmysql5.postinstall +DISTFILES += csw$(GARNAME) quick_start-csw README.CSW ChangeLog +DISTFILES += CSW$(GARNAME).preinstall +DISTFILES += CSW$(GARNAME).postinstall DISTFILES += cswusergroup UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWncurses CSWzlib +# TODO: Do the proper prerequsite pkgs. PREREQUISITE_PKGS = $(REQUIRED_PKGS) # MySQL-5.1.40 doesn't compile without setting EXTRA_INC. EXTRA_INC = /opt/csw/include EXTRA_LIB = /opt/csw/lib -# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# The following EXTRA_CFLAGS are necessary to compile on Solaris 8. Otherwise +# the following problem occurs: +# +# "handler/i_s.cc", line 159: Error: The function "localtime_r" must have a +# prototype. +EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ + # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler @@ -164,7 +173,7 @@ TEST_TARGETS = check -USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup +USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup PROTOTYPE_MODIFIERS = dbdir PROTOTYPE_FILES_dbdir = $(localstatedir) @@ -180,13 +189,17 @@ CFLAGS := $(filter-out -I%,$(CFLAGS)) test-custom: - alias sh=/usr/bin/bash; \ - cd $(WORKSRC)/mysql-test; \ + alias sh=/usr/bin/bash; \ + cd $(WORKSRC)/mysql-test; \ perl mysql-test-run.pl --mem --big-test --force \ --skip-test=archive-big --skip-test=/gis/ pre-configure-modulated: - # To work around the libtool version mismatch problem. + # To work around the following libtool version mismatch problem: + # libtool: Version mismatch error. This is libtool 2.2.6, but the + # libtool: definition of this LT_INIT comes from libtool 2.2.6b. + # libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6 + # http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html cd $(WORKSRC) && autoreconf --force --install --symlink @$(MAKECOOKIE) @@ -196,27 +209,30 @@ ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc - ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ + ln -sf ../../../$(GARNAME)/share/mysql/doc/README.CSW \ $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswmysql5 $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/csw$(GARNAME) $(PKGROOT)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql - ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 + ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) # A symlink for mysql5 include files ginstall -m 755 -d $(PKGROOT)/opt/csw/include - ln -s ../mysql5/include/mysql $(PKGROOT)/opt/csw/include/mysql + # I believe this is broken: + ln -s ../$(GARNAME)/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries ginstall -m 755 -d $(PKGROOT)$(global_bindir) for f in $(PKGROOT)$(bindir)/*; do \ - ln -s ../mysql5/bin/`basename $$f` \ + ln -s ../$(GARNAME)/bin/`basename $$f` \ $(PKGROOT)$(global_bindir)/`basename $$f`; \ done - # /opt/csw/mysql5/lib/sparc9/mysql -- by GAR, it's logical - # /opt/csw/mysql5/lib/mysql/sparcv9 -- expected by other packages + # /opt/csw/$(GARNAME)/lib/sparc9/mysql -- by GAR, it's logical + # /opt/csw/$(GARNAME)/lib/mysql/sparcv9 -- expected by other packages gln -s ../$(ISA_DEFAULT64)/mysql $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT64) # For other applications to link against gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64 + gln -s . $(PKGROOT)$(libdir)/$(ISA_DEFAULT) + gln -s . $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT) @$(MAKECOOKIE) Modified: csw/mgar/pkg/mysql5/trunk/checksums =================================================================== --- csw/mgar/pkg/mysql5/trunk/checksums 2009-12-27 23:27:30 UTC (rev 7763) +++ csw/mgar/pkg/mysql5/trunk/checksums 2009-12-27 23:29:27 UTC (rev 7764) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -558bd157ae37f9d109c6ad02a8f5b049 CSWmysql5.postinstall -a02c82ada9e610d6c6375856161575ec CSWmysql5.preinstall +c8c2ef6365a9bd9b71fac6198d3eeef8 CSWmysql51.postinstall +a652ccff001c328178f4b0ed9bfebbd6 CSWmysql51.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW -45f5ca05ed0c61f21951bd2a7122c036 cswmysql5 +0974c28c048437612c6a0ace93460d3b cswmysql51 67228e1f096fe08a94f4267439a4ec36 cswusergroup 32e7373c16271606007374396e6742ad mysql-5.1.40.tar.gz 60bc6bed72839668ef6496fd31a01ad3 quick_start-csw Deleted: csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall 2009-12-27 23:27:30 UTC (rev 7763) +++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall 2009-12-27 23:29:27 UTC (rev 7764) @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -MYSQLDATADIR=/var/opt/csw/mysql5 -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/trunk/files/CSWmysql5.preinstall =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall 2009-12-27 23:27:30 UTC (rev 7763) +++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall 2009-12-27 23:29:27 UTC (rev 7764) @@ -1,40 +0,0 @@ -#!/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 Copied: csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.postinstall (from rev 7746, csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.postinstall (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.postinstall 2009-12-27 23:29:27 UTC (rev 7764) @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $Id$ +# + +MYSQLDATADIR=/var/opt/csw/mysql5 +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/trunk/files/CSWmysql51.preinstall (from rev 7746, csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.preinstall 2009-12-27 23:29:27 UTC (rev 7764) @@ -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/trunk/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/cswmysql5 2009-12-27 23:27:30 UTC (rev 7763) +++ csw/mgar/pkg/mysql5/trunk/files/cswmysql5 2009-12-27 23:29:27 UTC (rev 7764) @@ -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/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 -MYSQLHOME=/opt/csw/mysql5 -MYSQL_VAR=/var/opt/csw/mysql5 -MYSQLD_DATADIR=$MYSQL_VAR -MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid -CONFFILE=$MYSQL_VAR/my.cnf - -# -# Source configuration -[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc -[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc - -# To get started quickly, copy a sample configuration file from -# $MYSQLHOME/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 [ 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/mysql5/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 Copied: csw/mgar/pkg/mysql5/trunk/files/cswmysql51 (from rev 7746, csw/mgar/pkg/mysql5/trunk/files/cswmysql5) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/cswmysql51 (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/cswmysql51 2009-12-27 23:29:27 UTC (rev 7764) @@ -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/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 +MYSQLHOME=/opt/csw/mysql5 +MYSQL_VAR=/var/opt/csw/mysql5 +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +CONFFILE=$MYSQL_VAR/my.cnf + +# +# Source configuration +[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc +[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc + +# To get started quickly, copy a sample configuration file from +# $MYSQLHOME/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 [ 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/mysql5/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 hson at users.sourceforge.net Mon Dec 28 04:16:06 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 28 Dec 2009 03:16:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7765] csw/mgar/pkg Message-ID: Revision: 7765 http://gar.svn.sourceforge.net/gar/?rev=7765&view=rev Author: hson Date: 2009-12-28 03:16:06 +0000 (Mon, 28 Dec 2009) Log Message: ----------- gobject-introspection: Initial commit Added Paths: ----------- csw/mgar/pkg/gobject-introspection/ csw/mgar/pkg/gobject-introspection/branches/ csw/mgar/pkg/gobject-introspection/tags/ csw/mgar/pkg/gobject-introspection/trunk/ csw/mgar/pkg/gobject-introspection/trunk/Makefile csw/mgar/pkg/gobject-introspection/trunk/checksums csw/mgar/pkg/gobject-introspection/trunk/files/ Property changes on: csw/mgar/pkg/gobject-introspection/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/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2009-12-28 03:16:06 UTC (rev 7765) @@ -0,0 +1,51 @@ +GARNAME = gobject-introspection +GARVERSION = 0.6.7 +CATEGORIES = gnome + +DESCRIPTION = Package for extending API for GObject based libraries +define BLURB + GObject-introspection is a package which will collect and extend the API + metadata for GObject based libraries. The main motivation of this work is to + centralize all introspection information required to write a language binding. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +#PACKAGES = CSWgobjectintrospection CSWgobjectintrospectiondevel CSWjsonglibdoc +#CATALOGNAME_CSWgobjectintrospection = gobject_introspection +#CATALOGNAME_CSWgobjectintrospectiondevel = gobject_introspection_devel +#CATALOGNAME_CSWgobjectintrospectiondoc = gobject_introspection_doc + +PREREQUISITE_PKGS += CSWbison CSWlibffi + +REQUIRED_PKGS += CSWgcc4corert + +UFILES_REGEX = $(GARNAME)-(\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 + +NO_ISAEXEC = 1 +NOISALIST = 1 +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +SHELL = /opt/csw/bin/bash + +#PKGFILES_CSWgobjectintrospectiondevel = $(PKGFILES_DEVEL) +#PKGFILES_CSWgobjectintrospectiondoc = $(sharedstatedir)/gtk-doc/.* + +#ARCHALL_CSWgobjectintrospectiondoc = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +#PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gobject-introspection/trunk/checksums =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/checksums (rev 0) +++ csw/mgar/pkg/gobject-introspection/trunk/checksums 2009-12-28 03:16:06 UTC (rev 7765) @@ -0,0 +1 @@ +41205c14cbd86632806578448e29bd30 gobject-introspection-0.6.7.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Dec 28 04:20:56 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 28 Dec 2009 03:20:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7766] csw/mgar/pkg Message-ID: Revision: 7766 http://gar.svn.sourceforge.net/gar/?rev=7766&view=rev Author: hson Date: 2009-12-28 03:20:55 +0000 (Mon, 28 Dec 2009) Log Message: ----------- json-glib: Initial commit Added Paths: ----------- csw/mgar/pkg/json-glib/ csw/mgar/pkg/json-glib/branches/ csw/mgar/pkg/json-glib/tags/ csw/mgar/pkg/json-glib/trunk/ csw/mgar/pkg/json-glib/trunk/Makefile csw/mgar/pkg/json-glib/trunk/checksums csw/mgar/pkg/json-glib/trunk/files/ Property changes on: csw/mgar/pkg/json-glib/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/json-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/json-glib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/json-glib/trunk/Makefile 2009-12-28 03:20:55 UTC (rev 7766) @@ -0,0 +1,69 @@ +GARNAME = json-glib +GARVERSION = 0.9.2 +CATEGORIES = gnome + +DESCRIPTION = Library providing serialization and deserialization support for the JSON format +define BLURB + JSON-GLib is a C library based on GLib and released under the terms of the + GNU Lesser General Public License version 2.1. It provides a parser and a + generator GObject classes and various wrappers for the complex data types + employed by JSON, such as arrays and objects. + + JSON-GLib uses GLib native data types and the generic value container GValue + for ease of development. It also provides integration with the GObject + classes for direct serialization into, and deserialization from, JSON data + streams. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +PACKAGES = CSWjsonglib CSWjsonglibdevel CSWjsonglibdoc +CATALOGNAME_CSWjsonglib = json_glib +CATALOGNAME_CSWjsonglibdevel = json_glib_devel +CATALOGNAME_CSWjsonglibdoc = json_glib_doc + +SPKG_DESC_CSWjsonglib += Library providing serialization and deserialization support for the JSON format +SPKG_DESC_CSWjsonglibdevel += Library providing serialization and deserialization support for the JSON format develiper package +SPKG_DESC_CSWjsonglibdoc += Library providing serialization and deserialization support for the JSON format documentation + +#PREREQUISITE_PKGS += CSWlibxcbdevel CSWlibpthreadstubs CSWlibxaudevel +#PREREQUISITE_PKGS += CSWxproto CSWrenderproto CSWkbproto CSWpython-devel + +#REQUIRED_PKGS += CSWbonobo2 CSWgconf2 CSWggettextrt CSWglib2 CSWgnomekeyring +#REQUIRED_PKGS += CSWgnomevfs2 CSWgtk2 CSWlibart CSWlibatk CSWlibbonoboui +#REQUIRED_PKGS += CSWlibcairo CSWlibglade2 CSWlibgnome CSWlibgnomecanvas +#REQUIRED_PKGS += CSWlibgnomeui CSWlibgoffice CSWlibgsf CSWlibpopt CSWlibxml2 +#REQUIRED_PKGS += CSWorbit2 CSWpango CSWperl CSWzlib +REQUIRED_PKGS_CSWjsonglib += CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWjsonglibdevel += CSWjsonglib +REQUIRED_PKGS_CSWjsonglibdoc += CSWjsonglib + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://live.gnome.org/JsonGlib + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +NO_ISAEXEC = 1 +NOISALIST = 1 +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +SHELL = /opt/csw/bin/bash + +PKGFILES_CSWjsonglibdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWjsonglibdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWjsonglibdoc = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +#PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/json-glib/trunk/checksums =================================================================== --- csw/mgar/pkg/json-glib/trunk/checksums (rev 0) +++ csw/mgar/pkg/json-glib/trunk/checksums 2009-12-28 03:20:55 UTC (rev 7766) @@ -0,0 +1 @@ +0865f0f97697f4c7f218309615bb0d0d json-glib-0.9.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 28 05:03:28 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 28 Dec 2009 04:03:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7767] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 7767 http://gar.svn.sourceforge.net/gar/?rev=7767&view=rev Author: rthurner Date: 2009-12-28 04:03:24 +0000 (Mon, 28 Dec 2009) Log Message: ----------- postgres - upgrade to 8.4.2, checksums as well Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-28 03:20:55 UTC (rev 7766) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-28 04:03:24 UTC (rev 7767) @@ -4,7 +4,7 @@ GARNAME = postgresql BASE_VERSION = 8.4 -PATCHLEVEL = 1 +PATCHLEVEL = 2 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2009-12-28 03:20:55 UTC (rev 7766) +++ csw/mgar/pkg/postgresql/trunk/checksums 2009-12-28 04:03:24 UTC (rev 7767) @@ -1,5 +1,5 @@ -6e4e2a7755acf94bc83200a308e21ef3 README-CSW.txt -e6f5d88d673c79e3948bf0fde2ba282f cswpostgres.tmpl -9e1e49d76fee70cb8e2d49304695ec89 cswusergroup.tmpl -f2015af17bacbbfe140daf0d1067f9c9 postgresql-8.4.1.tar.bz2 -8237c74666058f607f5418e3b57c74a9 postgresql.conf.tmpl +d738227e2f1f742d2f2d4ab56496c5c6 download/postgresql-8.4.2.tar.bz2 +e6f5d88d673c79e3948bf0fde2ba282f download/cswpostgres.tmpl +9e1e49d76fee70cb8e2d49304695ec89 download/cswusergroup.tmpl +8237c74666058f607f5418e3b57c74a9 download/postgresql.conf.tmpl +6e4e2a7755acf94bc83200a308e21ef3 download/README-CSW.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 28 06:28:35 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 28 Dec 2009 05:28:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7768] csw/mgar/pkg Message-ID: Revision: 7768 http://gar.svn.sourceforge.net/gar/?rev=7768&view=rev Author: rthurner Date: 2009-12-28 05:28:34 +0000 (Mon, 28 Dec 2009) Log Message: ----------- xz - first checkin. does not compile yet on solaris Added Paths: ----------- csw/mgar/pkg/xz/ csw/mgar/pkg/xz/branches/ csw/mgar/pkg/xz/tags/ csw/mgar/pkg/xz/trunk/ csw/mgar/pkg/xz/trunk/Makefile csw/mgar/pkg/xz/trunk/checksums csw/mgar/pkg/xz/trunk/files/ Property changes on: csw/mgar/pkg/xz/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/xz/trunk/Makefile =================================================================== --- csw/mgar/pkg/xz/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xz/trunk/Makefile 2009-12-28 05:28:34 UTC (rev 7768) @@ -0,0 +1,32 @@ +GARNAME = xz +GARVERSION = 4.999.9beta +CATEGORIES = utils + +DESCRIPTION = XZ Utils is free data compression software with high compression ratio +define BLURB + XZ Utils is free general-purpose data compression software with high compression + ratio. XZ Utils were written for POSIX-like systems (GNU/Linux, *BSDs, etc.), but + also work on some not-so-POSIX systems like Windows. XZ is based on the LZMA2 + algorithm. The implementation is much more heavywight than lzip. +endef + +MASTER_SITES = http://tukaani.org/xz/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +#REQUIRED_PKGS = CSWgcc3core CSWgcc3corert CSWgcc4corert CSWggettextrt +REQUIRED_PKGS = CSWgcc4corert CSWggettextrt + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) + +# not able to figure out which target runs the tests in "tests" +TEST_TARGET = + +include gar/category.mk Added: csw/mgar/pkg/xz/trunk/checksums =================================================================== --- csw/mgar/pkg/xz/trunk/checksums (rev 0) +++ csw/mgar/pkg/xz/trunk/checksums 2009-12-28 05:28:34 UTC (rev 7768) @@ -0,0 +1 @@ +f2073579b6da2fe35d453adee1aaf1b2 xz-4.999.9beta.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 28 06:29:29 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 28 Dec 2009 05:29:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7769] csw/mgar/pkg Message-ID: Revision: 7769 http://gar.svn.sourceforge.net/gar/?rev=7769&view=rev Author: rthurner Date: 2009-12-28 05:29:29 +0000 (Mon, 28 Dec 2009) Log Message: ----------- pxz - first check in. does not extract with gar, as download is in xz format. Added Paths: ----------- csw/mgar/pkg/pxz/ csw/mgar/pkg/pxz/branches/ csw/mgar/pkg/pxz/tags/ csw/mgar/pkg/pxz/trunk/ csw/mgar/pkg/pxz/trunk/Makefile csw/mgar/pkg/pxz/trunk/checksums csw/mgar/pkg/pxz/trunk/files/ Property changes on: csw/mgar/pkg/pxz/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/pxz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pxz/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pxz/trunk/Makefile 2009-12-28 05:29:29 UTC (rev 7769) @@ -0,0 +1,25 @@ +GARNAME = pxz +GARVERSION = 4.999.9beta.20091201git +CATEGORIES = utils + +DESCRIPTION = pxz is a lossless data compressor based on the LZMA algorithm. +define BLURB + Parallel XZ is a compression utility that takes advantage of running LZMA compression + of different parts of an input file on multiple cores and processors simultaneously. + Its primary goal is to utilize all resources to speed up compression time with minimal + possible influence on compression ratio. +endef + +MASTER_SITES = http://jnovy.fedorapeople.org/pxz/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.xz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/pxz/trunk/checksums =================================================================== --- csw/mgar/pkg/pxz/trunk/checksums (rev 0) +++ csw/mgar/pkg/pxz/trunk/checksums 2009-12-28 05:29:29 UTC (rev 7769) @@ -0,0 +1 @@ +4ae3926185978f5c95c9414dc4634451 pxz-4.999.9beta.20091201git.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 28 06:30:41 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 28 Dec 2009 05:30:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7770] csw/mgar/pkg Message-ID: Revision: 7770 http://gar.svn.sourceforge.net/gar/?rev=7770&view=rev Author: rthurner Date: 2009-12-28 05:30:41 +0000 (Mon, 28 Dec 2009) Log Message: ----------- plzip - first check in. does not yet compile on solaris as a header file is claimed missing. Added Paths: ----------- csw/mgar/pkg/plzip/ csw/mgar/pkg/plzip/branches/ csw/mgar/pkg/plzip/tags/ csw/mgar/pkg/plzip/trunk/ csw/mgar/pkg/plzip/trunk/Makefile csw/mgar/pkg/plzip/trunk/checksums csw/mgar/pkg/plzip/trunk/files/ Property changes on: csw/mgar/pkg/plzip/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/plzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/plzip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/plzip/trunk/Makefile 2009-12-28 05:30:41 UTC (rev 7770) @@ -0,0 +1,28 @@ +GARNAME = plzip +GARVERSION = 0.1 +CATEGORIES = utils + +DESCRIPTION = plzip is a lossless data compressor based on the LZMA algorithm. +define BLURB + Lzip is a lossless data compressor based on the LZMA algorithm, with very safe + integrity checking and a user interface similar to the one of gzip or bzip2. Lzip + decompresses almost as fast as gzip and compresses better than bzip2, which makes + it well suited for software distribution and data archiving. + Currently only compression is performed in parallel. Parallel decompression is + planned to be implemented soon. +endef + +MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/plzip/trunk/checksums =================================================================== --- csw/mgar/pkg/plzip/trunk/checksums (rev 0) +++ csw/mgar/pkg/plzip/trunk/checksums 2009-12-28 05:30:41 UTC (rev 7770) @@ -0,0 +1 @@ +8e736e5d24ca40046a2c52a5b4bebb62 plzip-0.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 Mon Dec 28 09:36:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 08:36:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7771] csw/mgar/pkg/libevent/tags/libevent-1.4.12, REV=2009. 11.04/ Message-ID: Revision: 7771 http://gar.svn.sourceforge.net/gar/?rev=7771&view=rev Author: dmichelsen Date: 2009-12-28 08:36:51 +0000 (Mon, 28 Dec 2009) Log Message: ----------- Tag released version 1.4.12,REV=2009.11.04 Added Paths: ----------- csw/mgar/pkg/libevent/tags/libevent-1.4.12,REV=2009.11.04/ 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 Dec 28 09:39:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 08:39:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7772] csw/mgar/pkg/libevent/trunk Message-ID: Revision: 7772 http://gar.svn.sourceforge.net/gar/?rev=7772&view=rev Author: dmichelsen Date: 2009-12-28 08:39:20 +0000 (Mon, 28 Dec 2009) Log Message: ----------- libevent: Update to 1.4.13 Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/Makefile csw/mgar/pkg/libevent/trunk/checksums Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2009-12-28 08:36:51 UTC (rev 7771) +++ csw/mgar/pkg/libevent/trunk/Makefile 2009-12-28 08:39:20 UTC (rev 7772) @@ -1,15 +1,15 @@ GARNAME = libevent -GARVERSION = 1.4.12 +GARVERSION = 1.4.13 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 1.1a 1.4.12 +MODULATIONS_GARVERSION = 1.1a 1.4.13 SKIP_MODULATIONS = isa-sparcv9-garversion-1.1a SKIP_MODULATIONS += isa-amd64-garversion-1.1a DISTVERSION-1.1a = 1.1a -DISTVERSION-1.4.12 = 1.4.12-stable +DISTVERSION-1.4.13 = 1.4.13-stable DESCRIPTION = Event notification library define BLURB @@ -53,9 +53,9 @@ MERGE_SCRIPTS_isa-extra-garversion-1.1a = copy-relocated-only MERGE_DIRS_isa-extra-garversion-1.1a = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-1.4.12 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-1.4.12 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.4.12 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-1.4.13 = copy-all +MERGE_SCRIPTS_isa-extra-garversion-1.4.13 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.4.13 = $(libdir) PKGFILES_CSWlibevent-devel = $(PKGFILES_DEVEL) PKGFILES_CSWlibevent-devel += $(bindir)/.* Modified: csw/mgar/pkg/libevent/trunk/checksums =================================================================== --- csw/mgar/pkg/libevent/trunk/checksums 2009-12-28 08:36:51 UTC (rev 7771) +++ csw/mgar/pkg/libevent/trunk/checksums 2009-12-28 08:39:20 UTC (rev 7772) @@ -1,2 +1,2 @@ 6cc776458ecaf9247550863702a44d7c libevent-1.1a.tar.gz -77b0d8b9885496871bb083165b35ba11 libevent-1.4.12-stable.tar.gz +0b3ea18c634072d12b3c1ee734263664 libevent-1.4.13-stable.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 Dec 28 09:44:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 08:44:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7773] csw/mgar/pkg/memcached/tags/memcached-1.4.3, REV=2009 .11.24/ Message-ID: Revision: 7773 http://gar.svn.sourceforge.net/gar/?rev=7773&view=rev Author: dmichelsen Date: 2009-12-28 08:44:07 +0000 (Mon, 28 Dec 2009) Log Message: ----------- memcached: Tag memcached-1.4.3,REV=2009.11.24 Added Paths: ----------- csw/mgar/pkg/memcached/tags/memcached-1.4.3,REV=2009.11.24/ 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 Dec 28 09:55:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 08:55:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7774] csw/mgar/pkg/memcached/trunk Message-ID: Revision: 7774 http://gar.svn.sourceforge.net/gar/?rev=7774&view=rev Author: dmichelsen Date: 2009-12-28 08:55:16 +0000 (Mon, 28 Dec 2009) Log Message: ----------- memcached: Update to 1.4.4 Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile csw/mgar/pkg/memcached/trunk/checksums Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2009-12-28 08:44:07 UTC (rev 7773) +++ csw/mgar/pkg/memcached/trunk/Makefile 2009-12-28 08:55:16 UTC (rev 7774) @@ -1,5 +1,5 @@ GARNAME = memcached -GARVERSION = 1.4.3 +GARVERSION = 1.4.4 CATEGORIES = net DESCRIPTION = Distributed memory object caching system Modified: csw/mgar/pkg/memcached/trunk/checksums =================================================================== --- csw/mgar/pkg/memcached/trunk/checksums 2009-12-28 08:44:07 UTC (rev 7773) +++ csw/mgar/pkg/memcached/trunk/checksums 2009-12-28 08:55:16 UTC (rev 7774) @@ -1 +1 @@ -83c6cc6bad9612536b5acbbbddab3eb3 memcached-1.4.3.tar.gz +5ca5b24de347e97ac1f48f3785b4178a memcached-1.4.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 28 13:50:00 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Dec 2009 12:50:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7775] csw/mgar/pkg Message-ID: Revision: 7775 http://gar.svn.sourceforge.net/gar/?rev=7775&view=rev Author: wahwah Date: 2009-12-28 12:49:59 +0000 (Mon, 28 Dec 2009) Log Message: ----------- mox: initial commit Modified Paths: -------------- csw/mgar/pkg/mox/trunk/Makefile csw/mgar/pkg/mox/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mox/ Modified: csw/mgar/pkg/mox/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-28 08:55:16 UTC (rev 7774) +++ csw/mgar/pkg/mox/trunk/Makefile 2009-12-28 12:49:59 UTC (rev 7775) @@ -2,184 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = mox +GARVERSION = 0.5.0 +CATEGORIES = python +DESCRIPTION = a mock object framework for Python define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://code.google.com/p/pymox/ +MASTER_SITES = http://pymox.googlecode.com/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## +TEST_SCRIPTS = # Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/mox/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-12-28 08:55:16 UTC (rev 7774) +++ csw/mgar/pkg/mox/trunk/checksums 2009-12-28 12:49:59 UTC (rev 7775) @@ -0,0 +1 @@ +4203ea4f03c7dcec0a1ceb1290a8b615 mox-0.5.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 28 13:52:55 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Dec 2009 12:52:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7776] csw/mgar/pkg/mox/trunk/Makefile Message-ID: Revision: 7776 http://gar.svn.sourceforge.net/gar/?rev=7776&view=rev Author: wahwah Date: 2009-12-28 12:52:46 +0000 (Mon, 28 Dec 2009) Log Message: ----------- mox: ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/mox/trunk/Makefile Modified: csw/mgar/pkg/mox/trunk/Makefile =================================================================== --- csw/mgar/pkg/mox/trunk/Makefile 2009-12-28 12:49:59 UTC (rev 7775) +++ csw/mgar/pkg/mox/trunk/Makefile 2009-12-28 12:52:46 UTC (rev 7776) @@ -6,6 +6,7 @@ GARVERSION = 0.5.0 CATEGORIES = python DESCRIPTION = a mock object framework for Python +ARCHALL = 1 define BLURB endef SPKG_SOURCEURL = http://code.google.com/p/pymox/ 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 Dec 28 14:12:00 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 28 Dec 2009 13:12:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7777] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 7777 http://gar.svn.sourceforge.net/gar/?rev=7777&view=rev Author: bonivart Date: 2009-12-28 13:11:46 +0000 (Mon, 28 Dec 2009) Log Message: ----------- spamassassin: update to rc1 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-28 12:52:46 UTC (rev 7776) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-28 13:11:46 UTC (rev 7777) @@ -11,9 +11,9 @@ endef #MASTER_SITES = http://apache.jumper.nu/spamassassin/source/ -MASTER_SITES = http://people.apache.org/~wtogami/devel/ +MASTER_SITES = http://people.apache.org/~wtogami/devel/3.3.0-rc1/ #DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz -DISTFILES = $(SPKG_NAME)-$(GARVERSION)-beta1.tar.gz +DISTFILES = $(SPKG_NAME)-$(GARVERSION)-rc1.tar.gz DISTFILES += COPYING REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha1 @@ -68,13 +68,11 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" - @echo "LICENSE = $(WORKSRC)/LICENSE" - @ls -l $(WORKSRC)/LICENSE @rm -rf $(DESTDIR) - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME) - @ginstall -d $(DESTDIR)$(sysconfdir)/CSWspamassassin - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME) + @ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/CSWspamassassin + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/CSWspamassassin.cswspamd $(DESTDIR)/etc/opt/csw/init.d/cswspamd @ginstall -m 644 $(FILEDIR)/CSWspamassassin.cswusergroup $(DESTDIR)$(sysconfdir)/CSWspamassassin/cswusergroup @cp $(FILEDIR)/CSWspamassassin.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-28 12:52:46 UTC (rev 7776) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-28 13:11:46 UTC (rev 7777) @@ -1,2 +1,2 @@ 3b83ef96387f14655fc854ddc3c6bd57 COPYING -530fb1bd28977271f30b348bc2b68db1 Mail-SpamAssassin-3.3.0-beta1.tar.gz +e5f1498a02b79ead743504e1f4f0fa89 Mail-SpamAssassin-3.3.0-rc1.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 Dec 28 14:16:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 13:16:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7778] csw/mgar/pkg/unrar/tags/unrar-3.9.6, REV=2009.11.05/ Message-ID: Revision: 7778 http://gar.svn.sourceforge.net/gar/?rev=7778&view=rev Author: dmichelsen Date: 2009-12-28 13:16:26 +0000 (Mon, 28 Dec 2009) Log Message: ----------- unrar: Tag unrar-3.9.6,REV=2009.11.05 Added Paths: ----------- csw/mgar/pkg/unrar/tags/unrar-3.9.6,REV=2009.11.05/ 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 Dec 28 14:20:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 13:20:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7779] csw/mgar/pkg/unrar/trunk Message-ID: Revision: 7779 http://gar.svn.sourceforge.net/gar/?rev=7779&view=rev Author: dmichelsen Date: 2009-12-28 13:20:17 +0000 (Mon, 28 Dec 2009) Log Message: ----------- unrar: Update to 3.9.7 Modified Paths: -------------- csw/mgar/pkg/unrar/trunk/Makefile csw/mgar/pkg/unrar/trunk/checksums Modified: csw/mgar/pkg/unrar/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrar/trunk/Makefile 2009-12-28 13:16:26 UTC (rev 7778) +++ csw/mgar/pkg/unrar/trunk/Makefile 2009-12-28 13:20:17 UTC (rev 7779) @@ -1,5 +1,5 @@ GARNAME = unrar -GARVERSION = 3.9.6 +GARVERSION = 3.9.7 CATEGORIES = utils DESCRIPTION = RAR archive extractor Modified: csw/mgar/pkg/unrar/trunk/checksums =================================================================== --- csw/mgar/pkg/unrar/trunk/checksums 2009-12-28 13:16:26 UTC (rev 7778) +++ csw/mgar/pkg/unrar/trunk/checksums 2009-12-28 13:20:17 UTC (rev 7779) @@ -1,2 +1,2 @@ 594b777453751ee331ef241160f31499 unrar.1 -07d7c5dd3d3b778fc1870a981c43a3d3 unrarsrc-3.9.6.tar.gz +3222f3e6a8c1b79b4f60086d2af3727a unrarsrc-3.9.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 28 15:07:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Dec 2009 14:07:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7780] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7780 http://gar.svn.sourceforge.net/gar/?rev=7780&view=rev Author: wahwah Date: 2009-12-28 14:07:39 +0000 (Mon, 28 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: expanding $ISALIST, not reporting itself as a dependency Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-28 13:20:17 UTC (rev 7779) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-28 14:07:39 UTC (rev 7780) @@ -21,6 +21,17 @@ RUNPATH = "runpath" SONAME = "soname" +def GetIsalist(): + args = ["isalist"] + isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = isalist_proc.communicate() + ret = isalist_proc.wait() + if ret: + logging.error("Calling isalist has failed.") + isalist = re.split(r"\s+", stdout.strip()) + return isalist + + def main(): errors = [] options, args = checkpkg.GetOptions() @@ -67,6 +78,10 @@ if binary_base_name not in needed_sonames_by_binary: needed_sonames_by_binary[binary_base_name] = {} binary_data = needed_sonames_by_binary[binary_base_name] + if checkpkg.NEEDED_SONAMES not in binary_data: + binary_data[checkpkg.NEEDED_SONAMES] = [] + if RUNPATH not in binary_data: + binary_data[RUNPATH] = [] args = [DUMP_BIN, "-Lv", binary] dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) stdout, stderr = dump_proc.communicate() @@ -78,12 +93,8 @@ if len(fields) < 3: continue if fields[1] == "NEEDED": - if checkpkg.NEEDED_SONAMES not in binary_data: - binary_data[checkpkg.NEEDED_SONAMES] = [] binary_data[checkpkg.NEEDED_SONAMES].append(fields[2]) elif fields[1] == "RUNPATH": - if RUNPATH not in binary_data: - binary_data[RUNPATH] = [] binary_data[RUNPATH].extend(fields[2].split(":")) # Adding the default runtime path search option. binary_data[RUNPATH].append("/usr/lib") @@ -93,7 +104,8 @@ filenames_by_soname[binary_data[SONAME]] = binary_base_name # TODO: make it a unit test # print needed_sonames_by_binary - + isalist = GetIsalist() + # Building indexes runpath_by_needed_soname = {} # {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], @@ -108,28 +120,14 @@ runpath_by_needed_soname[soname] = [] runpath_by_needed_soname[soname].extend(data[RUNPATH]) if soname not in binaries_by_soname: - binaries_by_soname[soname] = [] - binaries_by_soname[soname].append(binary_name) + binaries_by_soname[soname] = set() + binaries_by_soname[soname].add(binary_name) pkgmap = checkpkg.SystemPkgmap() logging.debug("Determining the soname-package relationships.") # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog - lines_by_soname = {} - for soname in needed_sonames: - try: - # This is the critical part of the algorithm: it iterates over the - # runpath and finds the first matching one. - # - # TODO: Expand $ISALIST to whatever the 'isalist' command outputs for - # better matching. - for runpath in runpath_by_needed_soname[soname]: - soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) - if runpath in soname_runpath_data: - lines_by_soname[soname] = soname_runpath_data[runpath] - break - except KeyError, e: - logging.debug("couldn't find %s in the needed sonames list: %s", - soname, e) + lines_by_soname = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) pkgs_by_filename = {} for soname, line in lines_by_soname.iteritems(): # TODO: Find all the packages, not just the last field. @@ -172,7 +170,7 @@ filenames_by_soname, pkg_by_any_filename) - if options.debug: + if options.debug or True: data_file_name = "/var/tmp/checkpkg-dep-testing-data-%s.py" % pkgname logging.warn("Saving test data to %s." % repr(data_file_name)) test_fd = open(data_file_name, "w") @@ -185,6 +183,7 @@ print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) + print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) test_fd.close() # TODO: Rewrite this using cheetah templates. Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-28 13:20:17 UTC (rev 7779) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-28 14:07:39 UTC (rev 7780) @@ -111,6 +111,7 @@ """There is no need to re-parse it each time. Read it slowly the first time and cache it for later.""" + self.cache = {} self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) self.db_path = os.path.join(self.checkpkg_dir, self.SQLITE3_DBNAME) if os.path.exists(self.db_path): @@ -156,12 +157,15 @@ self.conn.execute(sql) def GetPkgmapLineByBasename(self, filename): + if filename in self.cache: + return self.cache[filename] sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" c = self.conn.cursor() c.execute(sql, [filename]) lines = {} for row in c: lines[row[0]] = row[1] + self.cache[filename] = lines return lines def SharedObjectDependencies(pkgname, @@ -277,6 +281,37 @@ GuessDepsByPkgname(pkgname, pkg_by_any_filename), ]) missing_deps = auto_dependencies.difference(declared_dependencies_set) + # Don't report itself as a suggested dependency. + missing_deps = missing_deps.difference(set([pkgname])) surplus_deps = declared_dependencies_set.difference(auto_dependencies) surplus_deps = surplus_deps.difference(TYPICAL_DEPENDENCIES) return missing_deps, surplus_deps, orphan_sonames + + +def ExpandRunpath(runpath, isalist): + if '$ISALIST' in runpath: + runpath_expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] + else: + runpath_expanded_list = [runpath] + return runpath_expanded_list + + +def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): + lines_by_soname = {} + for soname in needed_sonames: + # This is the critical part of the algorithm: it iterates over the + # runpath and finds the first matching one. + runpath_found = False + for runpath in runpath_by_needed_soname[soname]: + runpath_list = ExpandRunpath(runpath, isalist) + soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + for runpath_expanded in runpath_list: + if runpath_expanded in soname_runpath_data: + lines_by_soname[soname] = soname_runpath_data[runpath_expanded] + runpath_found = True + # This break only goes out of the inner loop, + # need another one below to finish the outer loop. + break + if runpath_found: + break + return lines_by_soname Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-28 13:20:17 UTC (rev 7779) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-28 14:07:39 UTC (rev 7780) @@ -2,11 +2,13 @@ # $Id$ import unittest +import mox import checkpkg import checkpkg_test_data_CSWmysql51rt as d1 import checkpkg_test_data_CSWmysql51client as d2 import checkpkg_test_data_CSWmysql51 as d3 import checkpkg_test_data_CSWmysql51devel as d4 +import checkpkg_test_data_CSWlibpq_84 as d5 class DependenciesUnitTest_1(unittest.TestCase): @@ -104,6 +106,31 @@ self.assertEquals(expected, self.missing_deps) +class DependenciesUnitTest_5(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d5.DATA_PKGNAME, + d5.DATA_DECLARED_DEPENDENCIES, + d5.DATA_BINARIES_BY_PKGNAME, + d5.DATA_NEEDED_SONAMES_BY_BINARY, + d5.DATA_PKGS_BY_FILENAME, + d5.DATA_FILENAMES_BY_SONAME, + d5.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + # This tends to report itself... + expected = set([u'SUNWgss', u'SUNWcsl', u'SUNWlibms']) + self.assertEquals(expected, self.missing_deps) + + class GuessDepsUnitTest(unittest.TestCase): def testGuessDepsByFilename1(self): @@ -166,5 +193,52 @@ self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) +class GetLinesBySonameUnitTest(unittest.TestCase): + + def setUp(self): + self.pkgmap_mocker = mox.Mox() + + def testExpandRunpath(self): + isalist = ["foo", "bar"] + runpath = "/opt/csw/lib/$ISALIST" + expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"] + self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) + + def test_1(self): + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"} + # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def test_2(self): + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"} + # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + if __name__ == '__main__': - unittest.main() + unittest.main() Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py 2009-12-28 14:07:39 UTC (rev 7780) @@ -0,0 +1,10 @@ +# Testing data for CSWlibpq-84 +# $Id$ +DATA_PKGNAME = 'CSWlibpq-84' +DATA_DECLARED_DEPENDENCIES = {'CSWlibxml2': 'CSWlibxml2 libxml2 - XML Parser Library ', 'CSWkrb5lib': 'CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries ', 'CSWlibxslt': 'CSWlibxslt libxslt - XSLT engine runtime package ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWzlib': 'CSWzlib zlib - Zlib Data Compression Library ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} +DATA_BINARIES_BY_PKGNAME = {'CSWpostgresql-84-doc': [], 'CSWpostgresql': [], 'CSWpostgresql-84': ['vacuumdb', 'clusterdb', 'vacuumlo', 'initdb', 'reindexdb', 'createdb', 'pg_dump', 'pg_resetxlog', 'pg_config', 'pg_ctl', 'createlang', 'pg_standby', 'oid2name', 'droplang', 'dropdb', 'pgbench', 'createuser', 'pg_controldata', 'postgres', 'pg_dumpall', 'psql', 'dropuser', 'pg_restore', 'ecpg', 'oid2name', 'pg_ctl', 'droplang', 'pg_controldata', 'postgres', 'pg_dump', 'dropuser', 'dropdb', 'initdb', 'vacuumdb', 'pg_config', 'pg_resetxlog', 'createlang', 'createdb', 'vacuumlo', 'pg_standby', 'pgbench', 'reindexdb', 'pg_restore', 'clusterdb', 'ecpg', 'createuser', 'psql', 'pg_dumpall', 'pg_regress', 'pg_regress'], 'CSWpostgresql-84-dev': [], 'CSWlibpq-84': ['fuzzystrmatch.so', 'utf8_and_iso8859.so', 'seg.so', 'utf8_and_gbk.so', 'utf8_and_euc_jis_2004.so', 'cyrillic_and_mic.so', 'btree_gist.so', 'utf8_and_euc_jp.so', 'utf8_and_big5.so', 'cube.so', 'citext.so', 'insert_username.so', 'tsearch2.so', 'pg_stat_statements.so', 'utf8_and_ascii.so', 'lo.so', 'pgxml.so', 'utf8_and_euc_kr.so', 'dict_int.so', 'sslinfo.so', 'btree_gin.so', 'test_parser.so', 'euc_tw_and_big5.so', 'pgcrypto.so', 'latin2_and_win1250.so', 'auto_explain.so', 'tablefunc.so', 'dict_xsyn.so', 'latin_and_mic.so', 'dict_snowball.so', 'euc_jis_2004_and_shift_jis_2004.so', 'chkpass.so', 'utf8_and_shift_jis_2004.so', 'refint.so', 'pgstattuple.so', 'pg_trgm.so', 'utf8_and_uhc.so', 'pgrowlocks.so', 'utf8_and_cyrillic.so', 'pg_freespacemap.so', 'ltree.so', 'libpgtypes.so.3.1', 'libpq.so.5.2', '_int.so', 'utf8_and_win.so', 'pg_buffercache.so', 'euc_jp_and_sjis.so', 'utf8_and_johab.so', 'isn.so', 'timetravel.so', 'earthdistance.so', 'plpgsql.so', 'euc_kr_and_mic.so', 'dblink.so', 'hstore.so', 'pageinspect.so', 'libecpg.so.6.1', 'adminpack.so', 'utf8_and_euc_cn.so', 'utf8_and_sjis.so', 'euc_cn_and_mic.so', 'utf8_and_euc_tw.so', 'autoinc.so', 'libecpg_compat.so.3.1', 'test_parser.so', 'utf8_and_gbk.s o', 'utf8_and_euc_tw.so', 'ltree.so', 'timetravel.so', 'euc_cn_and_mic.so', 'utf8_and_euc_cn.so', 'pgrowlocks.so', 'latin_and_mic.so', 'dict_snowball.so', 'cube.so', 'utf8_and_euc_jis_2004.so', 'utf8_and_shift_jis_2004.so', 'libpgtypes.so.3.1', 'dict_xsyn.so', 'utf8_and_gb18030.so', 'tablefunc.so', 'citext.so', 'isn.so', 'fuzzystrmatch.so', 'pg_freespacemap.so', 'sslinfo.so', 'pg_buffercache.so', 'utf8_and_johab.so', 'euc_jp_and_sjis.so', 'libecpg_compat.so.3.1', 'auto_explain.so', 'btree_gin.so', 'euc_kr_and_mic.so', 'chkpass.so', 'utf8_and_big5.so', 'utf8_and_iso8859_1.so', 'tsearch2.so', 'pg_trgm.so', 'utf8_and_ascii.so', 'btree_gist.so', 'utf8_and_sjis.so', 'euc_jis_2004_and_shift_jis_2004.so', 'utf8_and_win.so', '_int.so', 'libecpg.so.6.1', 'utf8_and_uhc.so', 'pageinspect.so', 'utf8_and_euc_kr.so', 'utf8_and_iso8859.so', 'moddatetime.so', 'pg_stat_statements.so', 'utf8_and_cyrillic.so', 'euc_tw_and_big5.so', 'ascii_and_mic.so', 'libpq.so.5.2', 'cyrillic_and_mic.so', 'db link.so', 'hstore.so', 'plpgsql.so', 'pgxml.so', 'pgcrypto.so', 'lo.so', 'pgstattuple.so', 'autoinc.so', 'dict_int.so', 'earthdistance.so', 'adminpack.so', 'seg.so', 'utf8_and_euc_jp.so', 'latin2_and_win1250.so', 'refint.so', 'insert_username.so', 'ascii_and_mic.so', 'utf8_and_gb18030.so', 'utf8_and_iso8859_1.so', 'moddatetime.so']} +DATA_NEEDED_SONAMES_BY_BINARY = {'ascii_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pgxml.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libxslt.so.1', 'libxml2.so.2']}, 'pg_restore': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'dropdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/l ib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_freespacemap.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/ lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'tsearch2.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'libecpg.so.6.1': {'soname': 'libecpg.so.6', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpgtypes.so.3', 'libpq.so.5', 'libm.so.1', 'libpgtypes.so.3', 'libpq.so.5', 'libm.so.1']}, 'initdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/6 4', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_euc_tw.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/ $ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'ltree.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'postgres': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'li bpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'btree_gist.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'moddatetime.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/ postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'hstore.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'dict_xsyn.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'citext.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/ csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pgbench': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0 .9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_johab.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'cube.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libm.so.1', 'libm.so.1']}, 'pgcrypto.so': {'runpath': ['/opt/csw/lib/$ ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libcrypto.so.0.9.8', 'libz.so.1', 'libcrypto.so.0.9.8', 'libz.so.1']}, 'pg_stat_statements.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'pg_dumpall': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8 .4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'earthdistance.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/p ostgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'auto_explain.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'cyrillic_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'lo.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/post gresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'dict_int.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'adminpack.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/us r/lib'], 'needed sonames': []}, 'euc_tw_and_big5.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_ascii.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'tablefunc.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/po stgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'dict_snowball.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'libecpg_compat.so.3.1': {'soname': 'libecpg_compat.so.3', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libecpg.so.6', 'libpgtypes.so.3', 'libpq.so.5', 'libm.so.1', 'libecpg.so.6', 'libpgtypes.so.3', 'libpq.so.5', 'libm.so.1']}, 'u tf8_and_gbk.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pgrowlocks.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'createdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_buffercache.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'insert_username.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'euc_kr_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'droplang': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIS T', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'latin_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonam es': []}, 'euc_jis_2004_and_shift_jis_2004.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'utf8_and_euc_kr.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_shift_jis_2004.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISAL IST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'pg_trgm.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'autoinc.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'isn.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/ lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'euc_jp_and_sjis.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_big5.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'libpq.so.5.2': {'soname': 'libpq.so.5', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALI ST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libnsl.so.1', 'libsocket.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libnsl.so.1', 'libsocket.so.1']}, 'pg_regress': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb 5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_sjis.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'pgstattuple.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'chkpass.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'ecpg': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'dropuser': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket. so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_iso8859_1.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, '_int.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgres ql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'reindexdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'btree_gin.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'utf8_and_iso8859.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pageinspect.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/l ib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'latin2_and_win1250.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'createuser': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1' , 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'createlang': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm. so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_uhc.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'utf8_and_gb18030.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_win.so': {'runpath': ['/ opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'test_parser.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'psql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgres ql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_standby': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/l ib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_controldata': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcry pto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'refint.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'euc_cn_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib /postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'clusterdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'dblink.so': {'runpath': ['/o pt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libpq.so.5']}, 'vacuumdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1' , 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_resetxlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl .so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'oid2name': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt. so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'vacuumlo': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_config': {'runpath': ['/opt/csw/l ib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_euc_jis_2004.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/c sw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'seg.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'pg_ctl': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['lib pq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_euc_jp.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'libpgtypes.so.3.1': {'soname': 'libpgtypes.so.3', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/po stgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libm.so.1', 'libm.so.1']}, 'utf8_and_cyrillic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'timetravel.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_euc_cn.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'plpgsql.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pg_dump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/l ib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'fuzzystrmatch.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []} , 'sslinfo.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8']}} +DATA_PKGS_BY_FILENAME = {'libxslt.so.1': u'CSWlibxslt', 'libgss.so.1': u'SUNWgss', 'libpam.so.1': u'SUNWcsl', 'libnsl.so.1': u'SUNWcsl', 'libreadline.so.6': u'CSWreadline', 'libssl.so.0.9.8': u'CSWosslrt', 'librt.so.1': u'SUNWcsl', 'libz.so.1': u'CSWzlib', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libm.so.1': u'SUNWlibms', 'libxml2.so.2': u'CSWlibxml2', 'libc.so.1': u'SUNWcsl', 'libgssapi_krb5.so.2': u'CSWkrb5lib', 'libsocket.so.1': u'SUNWcsl', 'libdl.so.1': u'SUNWcsl'} +DATA_FILENAMES_BY_SONAME = {'libpgtypes.so.3': 'libpgtypes.so.3.1', 'libpq.so.5': 'libpq.so.5.2', 'libecpg.so.6': 'libecpg.so.6.1', 'libecpg_compat.so.3': 'libecpg_compat.so.3.1'} @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 28 15:09:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 14:09:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7781] csw/mgar/pkg/texinfo/trunk Message-ID: Revision: 7781 http://gar.svn.sourceforge.net/gar/?rev=7781&view=rev Author: dmichelsen Date: 2009-12-28 14:09:26 +0000 (Mon, 28 Dec 2009) Log Message: ----------- texinfo: Make postinstall sparse-root aware Modified Paths: -------------- csw/mgar/pkg/texinfo/trunk/checksums csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall Modified: csw/mgar/pkg/texinfo/trunk/checksums =================================================================== --- csw/mgar/pkg/texinfo/trunk/checksums 2009-12-28 14:07:39 UTC (rev 7780) +++ csw/mgar/pkg/texinfo/trunk/checksums 2009-12-28 14:09:26 UTC (rev 7781) @@ -1,3 +1,3 @@ -e125eda2f15f31ec8d4b0d34be449aae CSWtexinfo.postinstall +cedd1943a435e39a6d147680e0693bd1 CSWtexinfo.postinstall f5860ae7b0ff06605975c93e2f59fc07 mkdirentries 71ba711519209b5fb583fed2b3d86fcb texinfo-4.13a.tar.gz Modified: csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall =================================================================== --- csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall 2009-12-28 14:07:39 UTC (rev 7780) +++ csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall 2009-12-28 14:09:26 UTC (rev 7781) @@ -2,11 +2,18 @@ BASE=${PKG_INSTALL_ROOT}/opt/csw -echo "Registering existing texinfo-files..." +# Does it exist and is writable or can at least be created? +# This must be tested as we may be inside a sparse zone without +# write access to $BASE. +if test -f ${BASE}/share/info/dir -a -w ${BASE}/share/info/dir || \ + touch ${BASE}/share/info/dir 2>/dev/null; then -FILES=`ls $BASE/share/info/*.info $BASE/share/info/*.info-*` + echo "Registering existing texinfo-files..." + FILES=`ls ${BASE}/share/info/*.info ${BASE}/share/info/*.info-*` + for i in $FILES; do + ${BASE}/bin/install-info $i ${BASE}/share/info/dir 2> /dev/null + done +else + echo "Skip registering pages as ${BASE}/share/info/dir is not writable" +fi -for i in $FILES; do - /opt/csw/bin/install-info $i $BASE/share/info/dir 2> /dev/null -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 Mon Dec 28 15:18:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Dec 2009 14:18:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7782] csw/mgar/pkg/mox/trunk/Makefile Message-ID: Revision: 7782 http://gar.svn.sourceforge.net/gar/?rev=7782&view=rev Author: wahwah Date: 2009-12-28 14:18:44 +0000 (Mon, 28 Dec 2009) Log Message: ----------- mox: Changing the catalog name to py_mox and pkgname to CSWpy-mox Modified Paths: -------------- csw/mgar/pkg/mox/trunk/Makefile Modified: csw/mgar/pkg/mox/trunk/Makefile =================================================================== --- csw/mgar/pkg/mox/trunk/Makefile 2009-12-28 14:09:26 UTC (rev 7781) +++ csw/mgar/pkg/mox/trunk/Makefile 2009-12-28 14:18:44 UTC (rev 7782) @@ -11,6 +11,8 @@ endef SPKG_SOURCEURL = http://code.google.com/p/pymox/ MASTER_SITES = http://pymox.googlecode.com/files/ +PACKAGES = CSWpy-mox +CATALOGNAME_CSWpy-mox = py_mox DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz TEST_SCRIPTS = 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 Dec 28 20:47:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Dec 2009 19:47:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7783] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw Message-ID: Revision: 7783 http://gar.svn.sourceforge.net/gar/?rev=7783&view=rev Author: wahwah Date: 2009-12-28 19:47:28 +0000 (Mon, 28 Dec 2009) Log Message: ----------- mysql5: Added symlinks to allow other programs to find the shared libraries. http://www.opencsw.org/bugtrack/view.php?id=4098 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-git + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2009-12-28 19:47:28 UTC (rev 7783) @@ -2,14 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = mysql5 +PROJ_NAME = mysql +GARNAME = $(PROJ_NAME)5 BASE_VERSION = 5.1 PATCHLEVEL = 40 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server # Useful when making a series of builds on the same day -GARFLAVOR = DBG +GARFLAVOR ?= DBG DISTNAME = mysql-$(GARVERSION) SPKG_SOURCEURL = http://www.mysql.com/ @@ -20,137 +21,152 @@ (Structured Query Language) database server. endef -bindir_install = $(prefix)/bin/$(GARNAME)/$(BASE_VERSION) -datadir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) -docdir=$(prefix)/share/doc/$(GARNAME)/$(BASE_VERSION) -includedir=$(prefix)/include/$(GARNAME)/$(BASE_VERSION) -infodir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/info -libdir_install =$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) -libexecdir_install =$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) -lispdir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/emacs/site-lisp -localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION) -mandir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/man -sbindir_install = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) -sharedstatedir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) -sourcedir=$(prefix)/src/$(GARNAME)/$(BASE_VERSION) -sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION) +bindir_install = $(prefix)/libexec/$(PROJ_NAME)/$(BASE_VERSION)/bin +datadir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION) +docdir = $(prefix)/share/doc/$(PROJ_NAME)/$(BASE_VERSION) +includedir = $(prefix)/include/$(PROJ_NAME)/$(BASE_VERSION) +infodir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION)/info +libdir_install = $(prefix)/lib/$(PROJ_NAME)/$(BASE_VERSION) +libexecdir_install = $(prefix)/libexec/$(PROJ_NAME)/$(BASE_VERSION) +lispdir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION)/emacs/site-lisp +localstatedir = /var$(prefix)/$(PROJ_NAME)/$(BASE_VERSION) +mandir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION)/man +sbindir_install = $(prefix)/sbin/$(PROJ_NAME)/$(BASE_VERSION) +sharedstatedir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION) +sourcedir = $(prefix)/src/$(PROJ_NAME)/$(BASE_VERSION) +sysconfdir = /etc$(prefix)/$(PROJ_NAME)/$(BASE_VERSION) # Where to put the init script -global_sysconfdir = /etc$(prefix) +global_sysconfdir = /etc/opt/csw # Where to link the binaries -global_bindir = /opt$(prefix) +global_bindir = /opt/csw/bin -INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION) +INITSMF = $(global_sysconfdir)/init\.d/csw$(GARNAME) -PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel -PACKAGES += CSWmysql5rt CSWmysql5test +PACKAGES = CSW$(GARNAME) CSW$(GARNAME)bench CSW$(GARNAME)client CSW$(GARNAME)devel +PACKAGES += CSW$(GARNAME)rt CSW$(GARNAME)test 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 -SPKG_DESC_CSWmysql5 = Multithreaded SQL database -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking -SPKG_DESC_CSWmysql5client = MySQL 5 client binaries -SPKG_DESC_CSWmysql5devel = MySQL 5 header files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files -SPKG_DESC_CSWmysql5test = MySQL 5 testing files +SPKG_DESC_CSW$(GARNAME) = Multithreaded SQL database +SPKG_DESC_CSW$(GARNAME)bench = MySQL $(BASE_VERSION) benchmarking +SPKG_DESC_CSW$(GARNAME)client = MySQL $(BASE_VERSION) client binaries +SPKG_DESC_CSW$(GARNAME)devel = MySQL $(BASE_VERSION) header files +SPKG_DESC_CSW$(GARNAME)rt = MySQL $(BASE_VERSION) runtime files +SPKG_DESC_CSW$(GARNAME)test = MySQL $(BASE_VERSION) testing files +CATALOGNAME_CSW$(GARNAME) = $(GARNAME) +CATALOGNAME_CSW$(GARNAME)bench = $(GARNAME)bench +CATALOGNAME_CSW$(GARNAME)client = $(GARNAME)client +CATALOGNAME_CSW$(GARNAME)devel = $(GARNAME)devel +CATALOGNAME_CSW$(GARNAME)rt = $(GARNAME)rt +CATALOGNAME_CSW$(GARNAME)test = $(GARNAME)test -CATALOGNAME_CSWmysql5 = $(GARNAME) -CATALOGNAME_CSWmysql5bench = $(GARNAME)bench -CATALOGNAME_CSWmysql5client = $(GARNAME)client -CATALOGNAME_CSWmysql5devel = $(GARNAME)devel -CATALOGNAME_CSWmysql5rt = $(GARNAME)rt -CATALOGNAME_CSWmysql5test = $(GARNAME)test -INCOMPATIBLE_PKGS_CSWmysql5bench = CSWmysql4bench -INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client -INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 -INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel -INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test +ARCHALL_CSWmysql5bench = 1 # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. -CSWmysql5client_programs = myisamlog -CSWmysql5client_programs += myisampack -CSWmysql5client_programs += mysql -CSWmysql5client_programs += mysqlaccess -CSWmysql5client_programs += mysqladmin -CSWmysql5client_programs += mysqlbin -CSWmysql5client_programs += mysqlbinlog -CSWmysql5client_programs += mysqlcheck -CSWmysql5client_programs += mysql_client_test -CSWmysql5client_programs += mysqldump -CSWmysql5client_programs += mysqlhotcopy -CSWmysql5client_programs += mysqlimport -CSWmysql5client_programs += mysqlshow -CSWmysql5client_programs += mysql_zap -CSWmysql5client_programs += perror -CSWmysql5client_programs += replace +CSW$(GARNAME)client_programs = myisamlog +CSW$(GARNAME)client_programs += myisampack +CSW$(GARNAME)client_programs += mysql +CSW$(GARNAME)client_programs += mysqlaccess +CSW$(GARNAME)client_programs += mysqladmin +CSW$(GARNAME)client_programs += mysqlbin +CSW$(GARNAME)client_programs += mysqlbinlog +CSW$(GARNAME)client_programs += mysqlcheck +CSW$(GARNAME)client_programs += mysql_client_test +CSW$(GARNAME)client_programs += mysqldump +CSW$(GARNAME)client_programs += mysqlhotcopy +CSW$(GARNAME)client_programs += mysqlimport +CSW$(GARNAME)client_programs += mysqlshow +CSW$(GARNAME)client_programs += mysql_zap +CSW$(GARNAME)client_programs += perror +CSW$(GARNAME)client_programs += replace # Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared # library not found. EXTRA_LIB was tried too, but did not work, as the -R path # ended up with having two $ISALIST tokens. # # Without this setting it looks for: -# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 +# /opt/csw/$(GARNAME)/lib/amd64/libmysqlclient.so.15 # The library is at: -# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +# /opt/csw/$(GARNAME)/lib/amd64/mysql/libmysqlclient.so.15 EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql -CSWmysql5devel_programs += mysql_config +CSW$(GARNAME)devel_programs += mysql_config # Enable 64 bits build BUILD64 = 1 -PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* -PKGFILES_CSWmysql5client = $(bindir) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 -PKGFILES_CSWmysql5devel += $(prefix)/include.* -PKGFILES_CSWmysql5devel += /opt/csw/include/mysql +PKGFILES_CSW$(GARNAME)bench = $(prefix)/sql-bench.* +PKGFILES_CSW$(GARNAME)client = $(bindir) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSW$(GARNAME)devel += $(prefix)/include.* +PKGFILES_CSW$(GARNAME)devel += /opt/csw/include/mysql -PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* -PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* +PKGFILES_CSW$(GARNAME)rt = $(libdir) +PKGFILES_CSW$(GARNAME)rt += $(libdir)/.* +PKGFILES_CSW$(GARNAME)test = $(prefix)/mysql-test.* -REQUIRED_PKGS_CSWmysql5bench = CSWmysql5 -REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt -REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt -REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 -REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl +REQUIRED_PKGS_CSW$(GARNAME) = CSW$(GARNAME)client +REQUIRED_PKGS_CSW$(GARNAME) += CSW$(GARNAME)rt +REQUIRED_PKGS_CSW$(GARNAME) += CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME) += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)rt = CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME)rt += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)bench = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)bench += CSWperl +REQUIRED_PKGS_CSW$(GARNAME)client = CSW$(GARNAME)rt +REQUIRED_PKGS_CSW$(GARNAME)client += CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME)client += CSWncurses +REQUIRED_PKGS_CSW$(GARNAME)client += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)devel = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)test = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)test += CSWperl MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz -DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog -DISTFILES += CSWmysql5.preinstall -DISTFILES += CSWmysql5.postinstall +DISTFILES += csw$(GARNAME) quick_start-csw README.CSW ChangeLog +DISTFILES += CSW$(GARNAME).preinstall +DISTFILES += CSW$(GARNAME).postinstall DISTFILES += cswusergroup UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWncurses CSWzlib +# TODO: Do the proper prerequsite pkgs. PREREQUISITE_PKGS = $(REQUIRED_PKGS) # MySQL-5.1.40 doesn't compile without setting EXTRA_INC. EXTRA_INC = /opt/csw/include EXTRA_LIB = /opt/csw/lib + +# The following EXTRA_CFLAGS are necessary to compile on Solaris 8. Otherwise +# the following problem occurs: +# +# "handler/i_s.cc", line 159: Error: The function "localtime_r" must have a +# prototype. EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler +# Why not have a docs package? # CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile +CONFIGURE_ARGS += --with-charset=utf8 CONFIGURE_ARGS += --with-extra-charsets=all CONFIGURE_ARGS += --with-low-memory CONFIGURE_ARGS += --with-pthread @@ -159,15 +175,19 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb CONFIGURE_ARGS += --with-comment +CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc +CONFIGURE_ARGS += --with-big-tables +CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TODO: Make the tests pass. They don't at the moment. -TEST_SCRIPTS = +SKIPTEST ?= 1 +TEST_SCRIPTS = custom TEST_TARGETS = check -USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup +USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup PROTOTYPE_MODIFIERS = dbdir PROTOTYPE_FILES_dbdir = $(localstatedir) @@ -182,6 +202,21 @@ CFLAGS := $(filter-out -I%,$(CFLAGS)) +test-custom: + alias sh=/usr/bin/bash; \ + cd $(WORKSRC)/mysql-test; \ + perl mysql-test-run.pl --mem --big-test --force \ + --skip-test=archive-big --skip-test=/gis/ + +pre-configure-modulated: + # To work around the following libtool version mismatch problem: + # libtool: Version mismatch error. This is libtool 2.2.6, but the + # libtool: definition of this LT_INIT comes from libtool 2.2.6b. + # libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6 + # http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html + cd $(WORKSRC) && autoreconf --force --install --symlink + @$(MAKECOOKIE) + post-merge: ginstall -m 755 -d $(PKGROOT)$(localstatedir) ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc @@ -191,18 +226,26 @@ # ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ # $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswmysql5 $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/csw$(GARNAME) $(PKGROOT)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql - ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 + ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) ## A symlink for mysql5 include files ## ginstall -m 755 -d $(PKGROOT)/opt/csw/include ## ln -s ../mysql5/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries ginstall -m 755 -d $(PKGROOT)$(global_bindir) for f in $(PKGROOT)$(bindir)/*; do \ - ln -s mysql/$(BASE_VERSION)/`basename $$f` $(PKGROOT)$(global_bindir)/`basename $$f`; \ + ln -s ../..$(bindir)/`basename $$f` \ + $(PKGROOT)$(global_bindir)/`basename $$f`; \ done + # /opt/csw/$(GARNAME)/lib/sparc9/mysql -- by GAR, it's logical + # /opt/csw/$(GARNAME)/lib/mysql/sparcv9 -- expected by other packages + gln -s ../$(ISA_DEFAULT64)/mysql $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT64) + # For other applications to link against gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64 + gln -s . $(PKGROOT)$(libdir)/$(ISA_DEFAULT) + gln -s . $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 28 20:53:25 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Dec 2009 19:53:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7784] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 7784 http://gar.svn.sourceforge.net/gar/?rev=7784&view=rev Author: wahwah Date: 2009-12-28 19:53:25 +0000 (Mon, 28 Dec 2009) Log Message: ----------- mysql5: Added symlinks to allow other programs to find the shared libraries. http://www.opencsw.org/bugtrack/view.php?id=4098 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/ Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-12-28 19:47:28 UTC (rev 7783) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-12-28 19:53:25 UTC (rev 7784) @@ -2,13 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = mysql5 -MYSQL_MINOR_VERSION = 0 -MYSQL_PATCHLEVEL = 87 -GARVERSION = 5.$(MYSQL_MINOR_VERSION).$(MYSQL_PATCHLEVEL) +PROJ_NAME = mysql +GARNAME = $(PROJ_NAME)5 +BASE_VERSION = 5.0 +PATCHLEVEL = 87 +GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server +# Useful when making a series of builds on the same day +# GARFLAVOR ?= DBG + DISTNAME = mysql-$(GARVERSION) +SPKG_SOURCEURL = http://www.mysql.com/ DESCRIPTION = Multithreaded SQL database server define BLURB @@ -16,108 +21,126 @@ (Structured Query Language) database server. endef -# Change prefix to /opt/csw/mysql5 -prefix = /opt/csw/mysql5 -sysconfdir = /etc/opt/csw/mysql5 -localstatedir = /var/opt/csw/mysql5 +# Change prefix to /opt/csw/$(GARNAME) +prefix = /opt/csw/$(GARNAME) +localstatedir = /var/opt/csw/$(GARNAME) +sysconfdir = /etc/opt/csw/$(GARNAME) + +# Where to put the init script global_sysconfdir = /etc/opt/csw +# Where to link the binaries global_bindir = /opt/csw/bin -INITSMF = $(global_sysconfdir)/init\.d/cswmysql5 +INITSMF = $(global_sysconfdir)/init\.d/csw$(GARNAME) +PACKAGES = CSW$(GARNAME) CSW$(GARNAME)bench CSW$(GARNAME)client CSW$(GARNAME)devel +PACKAGES += CSW$(GARNAME)rt CSW$(GARNAME)test + 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 -PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel -PACKAGES += CSWmysql5rt CSWmysql5test +SPKG_DESC_CSW$(GARNAME) = Multithreaded SQL database +SPKG_DESC_CSW$(GARNAME)bench = MySQL $(BASE_VERSION) benchmarking +SPKG_DESC_CSW$(GARNAME)client = MySQL $(BASE_VERSION) client binaries +SPKG_DESC_CSW$(GARNAME)devel = MySQL $(BASE_VERSION) header files +SPKG_DESC_CSW$(GARNAME)rt = MySQL $(BASE_VERSION) runtime files +SPKG_DESC_CSW$(GARNAME)test = MySQL $(BASE_VERSION) testing files -CATALOGNAME_CSWmysql5 = $(GARNAME) -CATALOGNAME_CSWmysql5bench = $(GARNAME)bench -CATALOGNAME_CSWmysql5client = $(GARNAME)client -CATALOGNAME_CSWmysql5devel = $(GARNAME)devel -CATALOGNAME_CSWmysql5rt = $(GARNAME)rt -CATALOGNAME_CSWmysql5test = $(GARNAME)test +CATALOGNAME_CSW$(GARNAME) = $(GARNAME) +CATALOGNAME_CSW$(GARNAME)bench = $(GARNAME)bench +CATALOGNAME_CSW$(GARNAME)client = $(GARNAME)client +CATALOGNAME_CSW$(GARNAME)devel = $(GARNAME)devel +CATALOGNAME_CSW$(GARNAME)rt = $(GARNAME)rt +CATALOGNAME_CSW$(GARNAME)test = $(GARNAME)test -SPKG_DESC_CSWmysql5 = Multithreaded SQL database -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking -SPKG_DESC_CSWmysql5client = MySQL 5 client binaries -SPKG_DESC_CSWmysql5devel = MySQL 5 header files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files -SPKG_DESC_CSWmysql5test = MySQL 5 testing files ARCHALL_CSWmysql5bench = 1 # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. -CSWmysql5client_programs = myisamlog -CSWmysql5client_programs += myisampack -CSWmysql5client_programs += mysql -CSWmysql5client_programs += mysqlaccess -CSWmysql5client_programs += mysqladmin -CSWmysql5client_programs += mysqlbin -CSWmysql5client_programs += mysqlbinlog -CSWmysql5client_programs += mysqlcheck -CSWmysql5client_programs += mysql_client_test -CSWmysql5client_programs += mysqldump -CSWmysql5client_programs += mysqlhotcopy -CSWmysql5client_programs += mysqlimport -CSWmysql5client_programs += mysqlshow -CSWmysql5client_programs += mysql_zap -CSWmysql5client_programs += perror -CSWmysql5client_programs += replace +CSW$(GARNAME)client_programs = myisamlog +CSW$(GARNAME)client_programs += myisampack +CSW$(GARNAME)client_programs += mysql +CSW$(GARNAME)client_programs += mysqlaccess +CSW$(GARNAME)client_programs += mysqladmin +CSW$(GARNAME)client_programs += mysqlbin +CSW$(GARNAME)client_programs += mysqlbinlog +CSW$(GARNAME)client_programs += mysqlcheck +CSW$(GARNAME)client_programs += mysql_client_test +CSW$(GARNAME)client_programs += mysqldump +CSW$(GARNAME)client_programs += mysqlhotcopy +CSW$(GARNAME)client_programs += mysqlimport +CSW$(GARNAME)client_programs += mysqlshow +CSW$(GARNAME)client_programs += mysql_zap +CSW$(GARNAME)client_programs += perror +CSW$(GARNAME)client_programs += replace -CSWmysql5devel_programs += mysql_config +# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared +# library not found. EXTRA_LIB was tried too, but did not work, as the -R path +# ended up with having two $ISALIST tokens. +# +# Without this setting it looks for: +# /opt/csw/$(GARNAME)/lib/amd64/libmysqlclient.so.15 +# The library is at: +# /opt/csw/$(GARNAME)/lib/amd64/mysql/libmysqlclient.so.15 +EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql -PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* -PKGFILES_CSWmysql5client = $(bindir) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 -PKGFILES_CSWmysql5devel += $(prefix)/include.* -PKGFILES_CSWmysql5devel += /opt/csw/include/mysql +CSW$(GARNAME)devel_programs += mysql_config -PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* -PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* +# Enable 64 bits build +BUILD64 = 1 -REQUIRED_PKGS_CSWmysql5bench = CSWmysql5 -REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt -REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt -REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 -REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl +PKGFILES_CSW$(GARNAME)bench = $(prefix)/sql-bench.* +PKGFILES_CSW$(GARNAME)client = $(bindir) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSW$(GARNAME)devel += $(prefix)/include.* +PKGFILES_CSW$(GARNAME)devel += /opt/csw/include/mysql -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.$(MYSQL_MINOR_VERSION)/ +PKGFILES_CSW$(GARNAME)rt = $(libdir) +PKGFILES_CSW$(GARNAME)rt += $(libdir)/.* +PKGFILES_CSW$(GARNAME)test = $(prefix)/mysql-test.* + +REQUIRED_PKGS_CSW$(GARNAME) = CSW$(GARNAME)client +REQUIRED_PKGS_CSW$(GARNAME) += CSW$(GARNAME)rt +# REQUIRED_PKGS_CSW$(GARNAME) += CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME) += CSWzlib +# REQUIRED_PKGS_CSW$(GARNAME)rt = CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME)rt += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)bench = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)bench += CSWperl +REQUIRED_PKGS_CSW$(GARNAME)client = CSW$(GARNAME)rt +# REQUIRED_PKGS_CSW$(GARNAME)client += CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME)client += CSWncurses +REQUIRED_PKGS_CSW$(GARNAME)client += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)devel = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)test = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)test += CSWperl + +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz -DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog -DISTFILES += CSWmysql5.preinstall -DISTFILES += CSWmysql5.postinstall +DISTFILES += csw$(GARNAME) quick_start-csw README.CSW ChangeLog +DISTFILES += CSW$(GARNAME).preinstall +DISTFILES += CSW$(GARNAME).postinstall DISTFILES += cswusergroup UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWncurses CSWzlib +# TODO: Do the proper prerequsite pkgs. PREREQUISITE_PKGS = $(REQUIRED_PKGS) EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared -# library not found. EXTRA_LIB was tried too, but did not work, as the -R path -# ended up with having two $ISALIST tokens. -# -# Without this setting it looks for: -# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 -# The library is at: -# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 -EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql - # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler @@ -130,50 +153,66 @@ CONFIGURE_ARGS += --with-zlib-dir=/opt/csw CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb +CONFIGURE_ARGS_DBG = --with-debug +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TODO: Make the tests pass. They don't at the moment. TEST_SCRIPTS = -# Enable 64 bits build -BUILD64 = 1 -USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup +USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup -PROTOTYPE_MODIFIERS = ownmysql -PROTOTYPE_FILES_ownmysql = /var/opt/csw/mysql5 -PROTOTYPE_USER_ownmysql = mysql -PROTOTYPE_GROUP_ownmysql = mysql -PROTOTYPE_PERMS_ownmysql = 0700 -PROTOTYPE_CLASS_ownmysql = ugfiles +PROTOTYPE_MODIFIERS = dbdir +PROTOTYPE_FILES_dbdir = $(localstatedir) +PROTOTYPE_USER_dbdir = mysql +PROTOTYPE_GROUP_dbdir = mysql +PROTOTYPE_PERMS_dbdir = 0700 +PROTOTYPE_CLASS_dbdir = ugfiles SPKG_CLASSES = none ugfiles include gar/category.mk +CFLAGS := $(filter-out -I%,$(CFLAGS)) + pre-configure-modulated: - # To work around the libtool version mismatch problem. + # To work around the following libtool version mismatch problem: + # libtool: Version mismatch error. This is libtool 2.2.6, but the + # libtool: definition of this LT_INIT comes from libtool 2.2.6b. + # libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6 + # http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html cd $(WORKSRC) && autoreconf --force --install --symlink + @$(MAKECOOKIE) -post-install-modulated: - ginstall -m 755 -d $(DESTDIR)$(localstatedir) - ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc - ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ - $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW - ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql - ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 +post-merge: + ginstall -m 755 -d $(PKGROOT)$(localstatedir) + ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc + ln -sf ../../../$(GARNAME)/share/mysql/doc/README.CSW \ + $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW + ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/csw$(GARNAME) $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql + ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) # A symlink for mysql5 include files - ginstall -m 755 -d $(DESTDIR)/opt/csw/include - ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql + ginstall -m 755 -d $(PKGROOT)/opt/csw/include + ln -s ../$(GARNAME)/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries - ginstall -m 755 -d $(DESTDIR)$(global_bindir) - for f in $(DESTDIR)$(bindir)/*; do \ - ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + ginstall -m 755 -d $(PKGROOT)$(global_bindir) + for f in $(PKGROOT)$(bindir)/*; do \ + ln -s ../$(GARNAME)/bin/`basename $$f` \ + $(PKGROOT)$(global_bindir)/`basename $$f`; \ done + # /opt/csw/$(GARNAME)/lib/sparc9/mysql -- by GAR, it's logical + # /opt/csw/$(GARNAME)/lib/mysql/sparcv9 -- expected by other packages + gln -s ../$(ISA_DEFAULT64)/mysql $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT64) + # For other applications to link against + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64 + gln -s . $(PKGROOT)$(libdir)/$(ISA_DEFAULT) + gln -s . $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 29 09:05:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Dec 2009 08:05:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7785] csw/mgar/pkg/sysstat/tags/sysstat-20091024, REV=2009. 10.25/ Message-ID: Revision: 7785 http://gar.svn.sourceforge.net/gar/?rev=7785&view=rev Author: dmichelsen Date: 2009-12-29 08:05:51 +0000 (Tue, 29 Dec 2009) Log Message: ----------- sysstat: Tag sysstag-20091024,REV=2009.10.25 Added Paths: ----------- csw/mgar/pkg/sysstat/tags/sysstat-20091024,REV=2009.10.25/ 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 Dec 29 10:44:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Dec 2009 09:44:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7786] csw/mgar/pkg/sysstat/trunk Message-ID: Revision: 7786 http://gar.svn.sourceforge.net/gar/?rev=7786&view=rev Author: dmichelsen Date: 2009-12-29 09:44:04 +0000 (Tue, 29 Dec 2009) Log Message: ----------- sysstat: Update to 20091228a and force ncurses on this release Modified Paths: -------------- csw/mgar/pkg/sysstat/trunk/Makefile csw/mgar/pkg/sysstat/trunk/checksums Modified: csw/mgar/pkg/sysstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysstat/trunk/Makefile 2009-12-29 08:05:51 UTC (rev 7785) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2009-12-29 09:44:04 UTC (rev 7786) @@ -1,5 +1,5 @@ GARNAME = sysstat -GARVERSION = 20091024 +GARVERSION = 20091228a CATEGORIES = utils DESCRIPTION = Key system statistics at a glance @@ -26,6 +26,8 @@ SPKG_SOURCEURL = http://www.maier-komor.de/sysstat.html +LICENSE = LICENSE + PATCHFILES = patch-onlyisaexec-sysstatd.diff CONFIGURE_SCRIPTS = custom @@ -75,15 +77,15 @@ @( echo "OS = SunOS"; \ echo "INSTALL = /usr/sbin/install"; \ echo "CC = ${CC}"; \ - echo "C_CFLAGS = ${CFLAGS} -xc99=no_lib -I$(includedir)/ncurses -DUSECURSES -DSOLARIS=$(SOLARIS)"; \ - echo "D_CFLAGS = ${CFLAGS} -xc99=no_lib -I$(includedir)/ncurses -DUSECURSES -DSOLARIS=$(SOLARIS)"; \ + echo "C_CFLAGS = ${CFLAGS} -xc99=no_lib -I$(includedir)/ncurses -I$(includedir) -DSOLARIS=$(SOLARIS)"; \ + echo "D_CFLAGS = ${CFLAGS} -xc99=no_lib -I$(includedir)/ncurses -I$(includedir) -DSOLARIS=$(SOLARIS)"; \ echo "CDIR = app"; \ echo "DDIR = daemon"; \ echo 'C_LIBS += $(LDFLAGS) -lncurses -lsocket -lnsl'; \ echo 'LIBS = '; \ echo "PREFIX = ${DESTDIR}${prefix}"; \ echo "ISAEXEC = ${bindir}/isaexec"; \ - echo "MKDEP = ${CC} -xM1 ${CFLAGS} -I$(includedir)/ncurses"; \ + echo "MKDEP = ${CC} -xM1 ${CFLAGS} -I$(includedir)/ncurses -I$(includedir)"; \ echo "modules: $(MKRULES_MODULES)"; \ echo "install: $(MKRULES_INSTALL)"; \ ) > $@ Modified: csw/mgar/pkg/sysstat/trunk/checksums =================================================================== --- csw/mgar/pkg/sysstat/trunk/checksums 2009-12-29 08:05:51 UTC (rev 7785) +++ csw/mgar/pkg/sysstat/trunk/checksums 2009-12-29 09:44:04 UTC (rev 7786) @@ -1,2 +1,2 @@ 7a7f0f67bb68484b56375d4a922fb63f patch-onlyisaexec-sysstatd.diff -747dc25cec5c888b1dacf78730d726c0 sysstat-20091024.tgz +c723b839df3aaad9ea19b0d3a1a3aef0 sysstat-20091228a.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Dec 29 12:32:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Dec 2009 11:32:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7787] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7787 http://gar.svn.sourceforge.net/gar/?rev=7787&view=rev Author: wahwah Date: 2009-12-29 11:32:30 +0000 (Tue, 29 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Moving testdata to a subdirectory Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/__init__.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51rt.py Removed Paths: ------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51rt.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-29 09:44:04 UTC (rev 7786) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-29 11:32:30 UTC (rev 7787) @@ -4,11 +4,11 @@ import unittest import mox import checkpkg -import checkpkg_test_data_CSWmysql51rt as d1 -import checkpkg_test_data_CSWmysql51client as d2 -import checkpkg_test_data_CSWmysql51 as d3 -import checkpkg_test_data_CSWmysql51devel as d4 -import checkpkg_test_data_CSWlibpq_84 as d5 +import testdata.checkpkg_test_data_CSWmysql51rt as d1 +import testdata.checkpkg_test_data_CSWmysql51client as d2 +import testdata.checkpkg_test_data_CSWmysql51 as d3 +import testdata.checkpkg_test_data_CSWmysql51devel as d4 +import testdata.checkpkg_test_data_CSWlibpq_84 as d5 class DependenciesUnitTest_1(unittest.TestCase): Deleted: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py 2009-12-29 09:44:04 UTC (rev 7786) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py 2009-12-29 11:32:30 UTC (rev 7787) @@ -1,10 +0,0 @@ -# Testing data for CSWlibpq-84 -# $Id$ -DATA_PKGNAME = 'CSWlibpq-84' -DATA_DECLARED_DEPENDENCIES = {'CSWlibxml2': 'CSWlibxml2 libxml2 - XML Parser Library ', 'CSWkrb5lib': 'CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries ', 'CSWlibxslt': 'CSWlibxslt libxslt - XSLT engine runtime package ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWzlib': 'CSWzlib zlib - Zlib Data Compression Library ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} -DATA_BINARIES_BY_PKGNAME = {'CSWpostgresql-84-doc': [], 'CSWpostgresql': [], 'CSWpostgresql-84': ['vacuumdb', 'clusterdb', 'vacuumlo', 'initdb', 'reindexdb', 'createdb', 'pg_dump', 'pg_resetxlog', 'pg_config', 'pg_ctl', 'createlang', 'pg_standby', 'oid2name', 'droplang', 'dropdb', 'pgbench', 'createuser', 'pg_controldata', 'postgres', 'pg_dumpall', 'psql', 'dropuser', 'pg_restore', 'ecpg', 'oid2name', 'pg_ctl', 'droplang', 'pg_controldata', 'postgres', 'pg_dump', 'dropuser', 'dropdb', 'initdb', 'vacuumdb', 'pg_config', 'pg_resetxlog', 'createlang', 'createdb', 'vacuumlo', 'pg_standby', 'pgbench', 'reindexdb', 'pg_restore', 'clusterdb', 'ecpg', 'createuser', 'psql', 'pg_dumpall', 'pg_regress', 'pg_regress'], 'CSWpostgresql-84-dev': [], 'CSWlibpq-84': ['fuzzystrmatch.so', 'utf8_and_iso8859.so', 'seg.so', 'utf8_and_gbk.so', 'utf8_and_euc_jis_2004.so', 'cyrillic_and_mic.so', 'btree_gist.so', 'utf8_and_euc_jp.so', 'utf8_and_big5.so', 'cube.so', 'citext.so', 'insert_username.so', 'tsearch2.so', 'pg_stat_statements.so', 'utf8_and_ascii.so', 'lo.so', 'pgxml.so', 'utf8_and_euc_kr.so', 'dict_int.so', 'sslinfo.so', 'btree_gin.so', 'test_parser.so', 'euc_tw_and_big5.so', 'pgcrypto.so', 'latin2_and_win1250.so', 'auto_explain.so', 'tablefunc.so', 'dict_xsyn.so', 'latin_and_mic.so', 'dict_snowball.so', 'euc_jis_2004_and_shift_jis_2004.so', 'chkpass.so', 'utf8_and_shift_jis_2004.so', 'refint.so', 'pgstattuple.so', 'pg_trgm.so', 'utf8_and_uhc.so', 'pgrowlocks.so', 'utf8_and_cyrillic.so', 'pg_freespacemap.so', 'ltree.so', 'libpgtypes.so.3.1', 'libpq.so.5.2', '_int.so', 'utf8_and_win.so', 'pg_buffercache.so', 'euc_jp_and_sjis.so', 'utf8_and_johab.so', 'isn.so', 'timetravel.so', 'earthdistance.so', 'plpgsql.so', 'euc_kr_and_mic.so', 'dblink.so', 'hstore.so', 'pageinspect.so', 'libecpg.so.6.1', 'adminpack.so', 'utf8_and_euc_cn.so', 'utf8_and_sjis.so', 'euc_cn_and_mic.so', 'utf8_and_euc_tw.so', 'autoinc.so', 'libecpg_compat.so.3.1', 'test_parser.so', 'utf8_and_gbk.s o', 'utf8_and_euc_tw.so', 'ltree.so', 'timetravel.so', 'euc_cn_and_mic.so', 'utf8_and_euc_cn.so', 'pgrowlocks.so', 'latin_and_mic.so', 'dict_snowball.so', 'cube.so', 'utf8_and_euc_jis_2004.so', 'utf8_and_shift_jis_2004.so', 'libpgtypes.so.3.1', 'dict_xsyn.so', 'utf8_and_gb18030.so', 'tablefunc.so', 'citext.so', 'isn.so', 'fuzzystrmatch.so', 'pg_freespacemap.so', 'sslinfo.so', 'pg_buffercache.so', 'utf8_and_johab.so', 'euc_jp_and_sjis.so', 'libecpg_compat.so.3.1', 'auto_explain.so', 'btree_gin.so', 'euc_kr_and_mic.so', 'chkpass.so', 'utf8_and_big5.so', 'utf8_and_iso8859_1.so', 'tsearch2.so', 'pg_trgm.so', 'utf8_and_ascii.so', 'btree_gist.so', 'utf8_and_sjis.so', 'euc_jis_2004_and_shift_jis_2004.so', 'utf8_and_win.so', '_int.so', 'libecpg.so.6.1', 'utf8_and_uhc.so', 'pageinspect.so', 'utf8_and_euc_kr.so', 'utf8_and_iso8859.so', 'moddatetime.so', 'pg_stat_statements.so', 'utf8_and_cyrillic.so', 'euc_tw_and_big5.so', 'ascii_and_mic.so', 'libpq.so.5.2', 'cyrillic_and_mic.so', 'db link.so', 'hstore.so', 'plpgsql.so', 'pgxml.so', 'pgcrypto.so', 'lo.so', 'pgstattuple.so', 'autoinc.so', 'dict_int.so', 'earthdistance.so', 'adminpack.so', 'seg.so', 'utf8_and_euc_jp.so', 'latin2_and_win1250.so', 'refint.so', 'insert_username.so', 'ascii_and_mic.so', 'utf8_and_gb18030.so', 'utf8_and_iso8859_1.so', 'moddatetime.so']} -DATA_NEEDED_SONAMES_BY_BINARY = {'ascii_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pgxml.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libxslt.so.1', 'libxml2.so.2']}, 'pg_restore': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'dropdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/l ib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_freespacemap.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/ lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'tsearch2.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'libecpg.so.6.1': {'soname': 'libecpg.so.6', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpgtypes.so.3', 'libpq.so.5', 'libm.so.1', 'libpgtypes.so.3', 'libpq.so.5', 'libm.so.1']}, 'initdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/6 4', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_euc_tw.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/ $ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'ltree.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'postgres': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'li bpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'btree_gist.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'moddatetime.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/ postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'hstore.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'dict_xsyn.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'citext.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/ csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pgbench': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0 .9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_johab.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'cube.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libm.so.1', 'libm.so.1']}, 'pgcrypto.so': {'runpath': ['/opt/csw/lib/$ ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libcrypto.so.0.9.8', 'libz.so.1', 'libcrypto.so.0.9.8', 'libz.so.1']}, 'pg_stat_statements.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'pg_dumpall': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8 .4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'earthdistance.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/p ostgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'auto_explain.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'cyrillic_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'lo.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/post gresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'dict_int.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'adminpack.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/us r/lib'], 'needed sonames': []}, 'euc_tw_and_big5.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_ascii.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'tablefunc.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/po stgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'dict_snowball.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'libecpg_compat.so.3.1': {'soname': 'libecpg_compat.so.3', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libecpg.so.6', 'libpgtypes.so.3', 'libpq.so.5', 'libm.so.1', 'libecpg.so.6', 'libpgtypes.so.3', 'libpq.so.5', 'libm.so.1']}, 'u tf8_and_gbk.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pgrowlocks.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'createdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_buffercache.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'insert_username.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'euc_kr_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'droplang': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIS T', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'latin_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonam es': []}, 'euc_jis_2004_and_shift_jis_2004.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'utf8_and_euc_kr.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_shift_jis_2004.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISAL IST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'pg_trgm.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'autoinc.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'isn.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/ lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'euc_jp_and_sjis.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_big5.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'libpq.so.5.2': {'soname': 'libpq.so.5', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALI ST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libnsl.so.1', 'libsocket.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libnsl.so.1', 'libsocket.so.1']}, 'pg_regress': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb 5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_sjis.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'pgstattuple.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'chkpass.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'ecpg': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'dropuser': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket. so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_iso8859_1.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, '_int.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgres ql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'reindexdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'btree_gin.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'utf8_and_iso8859.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pageinspect.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/l ib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'latin2_and_win1250.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'createuser': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1' , 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'createlang': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm. so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_uhc.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'utf8_and_gb18030.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_win.so': {'runpath': ['/ opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'test_parser.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'psql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgres ql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_standby': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/l ib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_controldata': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcry pto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'refint.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'euc_cn_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib /postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'clusterdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'dblink.so': {'runpath': ['/o pt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libpq.so.5']}, 'vacuumdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1' , 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_resetxlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl .so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'oid2name': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt. so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'vacuumlo': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_config': {'runpath': ['/opt/csw/l ib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_euc_jis_2004.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/c sw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'seg.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'pg_ctl': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['lib pq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_euc_jp.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'libpgtypes.so.3.1': {'soname': 'libpgtypes.so.3', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/po stgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libm.so.1', 'libm.so.1']}, 'utf8_and_cyrillic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'timetravel.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_euc_cn.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'plpgsql.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pg_dump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/l ib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'fuzzystrmatch.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []} , 'sslinfo.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8']}} -DATA_PKGS_BY_FILENAME = {'libxslt.so.1': u'CSWlibxslt', 'libgss.so.1': u'SUNWgss', 'libpam.so.1': u'SUNWcsl', 'libnsl.so.1': u'SUNWcsl', 'libreadline.so.6': u'CSWreadline', 'libssl.so.0.9.8': u'CSWosslrt', 'librt.so.1': u'SUNWcsl', 'libz.so.1': u'CSWzlib', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libm.so.1': u'SUNWlibms', 'libxml2.so.2': u'CSWlibxml2', 'libc.so.1': u'SUNWcsl', 'libgssapi_krb5.so.2': u'CSWkrb5lib', 'libsocket.so.1': u'SUNWcsl', 'libdl.so.1': u'SUNWcsl'} -DATA_FILENAMES_BY_SONAME = {'libpgtypes.so.3': 'libpgtypes.so.3.1', 'libpq.so.5': 'libpq.so.5.2', 'libecpg.so.6': 'libecpg.so.6.1', 'libecpg_compat.so.3': 'libecpg_compat.so.3.1'} @@ 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 wahwah at users.sourceforge.net Tue Dec 29 23:59:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Dec 2009 22:59:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7788] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7788 http://gar.svn.sourceforge.net/gar/?rev=7788&view=rev Author: wahwah Date: 2009-12-29 22:59:44 +0000 (Tue, 29 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Implemented 64-bit symlink emulation (/opt/csw/lib/64 --> amd64), added skipping libm.so.2 Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql5client_8x.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/dump_output_1.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-29 11:32:30 UTC (rev 7787) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-29 22:59:44 UTC (rev 7788) @@ -16,10 +16,9 @@ import subprocess import logging import sys +import textwrap DUMP_BIN = "/usr/ccs/bin/dump" -RUNPATH = "runpath" -SONAME = "soname" def GetIsalist(): args = ["isalist"] @@ -68,60 +67,29 @@ # Assembling a data structure with the data about binaries. # { # : { checkpkg.NEEDED_SONAMES: [...], - # RUNPATH: [...]}, + # checkpkg.RUNPATH: [...]}, # : ..., # ... # } # for binary in binaries: binary_base_name = binary.split("/")[-1] - if binary_base_name not in needed_sonames_by_binary: - needed_sonames_by_binary[binary_base_name] = {} - binary_data = needed_sonames_by_binary[binary_base_name] - if checkpkg.NEEDED_SONAMES not in binary_data: - binary_data[checkpkg.NEEDED_SONAMES] = [] - if RUNPATH not in binary_data: - binary_data[RUNPATH] = [] args = [DUMP_BIN, "-Lv", binary] dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) stdout, stderr = dump_proc.communicate() ret = dump_proc.wait() - for line in stdout.splitlines(): - fields = re.split(ws_re, line) - # TODO: Make it a unit test - # logging.debug("%s says: %s", DUMP_BIN, fields) - if len(fields) < 3: - continue - if fields[1] == "NEEDED": - binary_data[checkpkg.NEEDED_SONAMES].append(fields[2]) - elif fields[1] == "RUNPATH": - binary_data[RUNPATH].extend(fields[2].split(":")) - # Adding the default runtime path search option. - binary_data[RUNPATH].append("/usr/lib") - elif fields[1] == "SONAME": - binary_data[SONAME] = fields[2] - if SONAME in binary_data: - filenames_by_soname[binary_data[SONAME]] = binary_base_name - # TODO: make it a unit test - # print needed_sonames_by_binary + binary_data = checkpkg.ParseDumpOutput(stdout) + needed_sonames_by_binary[binary_base_name] = binary_data + if checkpkg.SONAME in binary_data: + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name isalist = GetIsalist() - # Building indexes - runpath_by_needed_soname = {} - # {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], - # ... - # } - needed_sonames = set() - binaries_by_soname = {} - for binary_name, data in needed_sonames_by_binary.iteritems(): - for soname in data[checkpkg.NEEDED_SONAMES]: - needed_sonames.add(soname) - if soname not in runpath_by_needed_soname: - runpath_by_needed_soname[soname] = [] - runpath_by_needed_soname[soname].extend(data[RUNPATH]) - if soname not in binaries_by_soname: - binaries_by_soname[soname] = set() - binaries_by_soname[soname].add(binary_name) + # Building indexes by soname to simplify further processing + # These are indexes "by soname". + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + needed_sonames_by_binary) pkgmap = checkpkg.SystemPkgmap() logging.debug("Determining the soname-package relationships.") @@ -137,17 +105,20 @@ pkgs_by_filename[soname] = pkgname # A shared object dependency/provisioning report, plus checking. - # TODO: Rewrite this using cheetah + # TODO: Rewrite this using cheetah templates if needed_sonames: print "Analysis of sonames needed by the package set:" for soname in needed_sonames: + logging.debug("Analyzing: %s", soname) if soname in filenames_by_soname: print "%s is provided by the package itself" % soname elif soname in lines_by_soname: - print ("%s is required by %s and provided by %s" + print ("%s is provided by %s and required by:" % (soname, - binaries_by_soname[soname], repr(pkgs_by_filename[soname]))) + filename_lines = textwrap.wrap(" ".join(sorted(binaries_by_soname[soname])), 75) + for line in filename_lines: + print " ", line else: print ("%s is required by %s, but we don't know what provides it." % (soname, binaries_by_soname[soname])) @@ -159,49 +130,61 @@ for checker in checkers: orphan_sonames = set() pkgname = checker.pkgname - print "%s:" % pkgname declared_dependencies = checker.GetDependencies() - missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( - pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_filename, - filenames_by_soname, - pkg_by_any_filename) - - if options.debug or True: - data_file_name = "/var/tmp/checkpkg-dep-testing-data-%s.py" % pkgname + if options.debug: + sanitized_pkgname = pkgname.replace("-", "_") + data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname logging.warn("Saving test data to %s." % repr(data_file_name)) test_fd = open(data_file_name, "w") - sanitized_pkgname = pkgname.replace("-", "_") print >>test_fd, "# Testing data for %s" % pkgname + print >>test_fd, "# $Id$" print >>test_fd, "DATA_PKGNAME =", repr(pkgname) print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) + + print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) + print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) + print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) + print >>test_fd, "DATA_ISALIST =", repr(isalist) test_fd.close() + missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( + pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_filename, + filenames_by_soname, + pkg_by_any_filename) + # TODO: Rewrite this using cheetah templates. + print "%s:" % pkgname + msg_printed = False if missing_deps: print "SUGGESTION: you may want to add some or all of the following as depends:" print " (Feel free to ignore SUNW or SPRO packages)" for dep_pkgname in sorted(missing_deps): print ">", dep_pkgname + msg_printed = True if surplus_deps: print "The following packages might be unnecessary dependencies:" for dep_pkgname in surplus_deps: print "? ", dep_pkgname + msg_printed = True if orphan_sonames: print "The following sonames don't belong to any package:" for soname in sorted(orphan_sonames): errors.append(checkpkg.Error("The following soname does't belong to " "any package: %s" % soname)) print "! ", soname + msg_printed = True + if not msg_printed: + print "+ Dependencies of %s look good." % pkgname print if errors: Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-29 11:32:30 UTC (rev 7787) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-29 22:59:44 UTC (rev 7788) @@ -8,17 +8,24 @@ import os.path import logging import subprocess -import cPickle import re import sqlite3 +import socket SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") NEEDED_SONAMES = "needed sonames" -# Don't report these as unnecessary. -TYPICAL_DEPENDENCIES = set(["CSWcommon", "CSWcswclassutils", "CSWisaexec"]) +RUNPATH = "runpath" +SONAME = "soname" +DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) +DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", + u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms"]) +# This shared library is present on Solaris 10 on amd64, but it's missing on +# Solaris 8 on i386. It's okay if it's missing. +ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) + class Error(Exception): pass @@ -61,6 +68,10 @@ % self.pkgpath) def ListBinaries(self): + """Shells out to list all the binaries from a given package. + + Original checkpkg code: + # ######################################### # # find all executables and dynamic libs,and list their filenames. # listbinaries() { @@ -72,6 +83,7 @@ # # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' # } + """ self.CheckPkgpathExists() find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" find_proc = subprocess.Popen(find_tmpl % self.pkgpath, @@ -101,11 +113,14 @@ class SystemPkgmap(object): - """A class to hold and manipulate the /var/sadm/install/contents file.""" + """A class to hold and manipulate the /var/sadm/install/contents file. + + TODO: Implement timestamp checking and refreshing the cache. + """ STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] CHECKPKG_DIR = ".checkpkg" - SQLITE3_DBNAME = "var-sadm-install-contents-cache" + SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" def __init__(self): """There is no need to re-parse it each time. @@ -113,12 +128,15 @@ Read it slowly the first time and cache it for later.""" self.cache = {} self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) - self.db_path = os.path.join(self.checkpkg_dir, self.SQLITE3_DBNAME) + self.fqdn = socket.getfqdn() + self.db_path = os.path.join(self.checkpkg_dir, + self.SQLITE3_DBNAME_TMPL % self.fqdn) if os.path.exists(self.db_path): logging.debug("Connecting to the %s database.", self.db_path) self.conn = sqlite3.connect(self.db_path) else: - logging.info("Building a cache of /var/sadm/install/contents.") + print "Building a cache of /var/sadm/install/contents." + print "The cache will be kept in %s." % self.db_path if not os.path.exists(self.checkpkg_dir): logging.debug("Creating %s", self.checkpkg_dir) os.mkdir(self.checkpkg_dir) @@ -133,6 +151,8 @@ ); """) + # Original bit of code from checkpkg: + # # egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog @@ -142,7 +162,7 @@ # Creating a data structure: # soname - {: , : , ...} - logging.debug("Building in-memory data structure for the %s file", + logging.debug("Building sqlite3 cache db of the %s file", SYSTEM_PKGMAP) for line in system_pkgmap_fd: if stop_re.search(line): @@ -151,20 +171,22 @@ pkgmap_entry_path = fields[0].split("=")[0] pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" - c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line)) - logging.info("Creating an index.") + c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) + print "Creating a database index." sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" self.conn.execute(sql) def GetPkgmapLineByBasename(self, filename): if filename in self.cache: - return self.cache[filename] + return self.cache[filename] sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" c = self.conn.cursor() c.execute(sql, [filename]) lines = {} for row in c: lines[row[0]] = row[1] + if len(lines) == 0: + logging.debug("Cache doesn't contain filename %s", filename) self.cache[filename] = lines return lines @@ -178,20 +200,46 @@ orphan_sonames = set() self_provided = set() for binary in binaries_by_pkgname[pkgname]: - if binary in needed_sonames_by_binary: - for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: - if soname in filenames_by_soname: - filename = filenames_by_soname[soname] - pkg = pkg_by_any_filename[filename] - self_provided.add(soname) - so_dependencies.add(pkg) - elif soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) + # tmp_so_dependencies, tmp_self_provided, tmp_orphan_sonames = DependenciesOfABinary( + # binary, binaries_by_pkgname, needed_sonames_by_binary, + # pkgs_by_soname, filenames_by_soname, pkg_by_any_filename) + # so_dependencies.union(tmp_so_dependencies) + # orphan_sonames.union(tmp_orphan_sonames) + # self_provided.union(tmp_self_provided) + needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] + # DependenciesOfABinary(binary, needed_sonames, filenames_by_soname, pkgs_by_soname) + for soname in needed_sonames: + if soname in filenames_by_soname: + filename = filenames_by_soname[soname] + pkg = pkg_by_any_filename[filename] + self_provided.add(soname) + so_dependencies.add(pkg) + elif soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) + else: + orphan_sonames.add(soname) + return so_dependencies, self_provided, orphan_sonames + + +def DependenciesOfABinary(binary, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + so_dependencies = set() + orphan_sonames = set() + self_provided = set() + for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: + if soname in filenames_by_soname: + filename = filenames_by_soname[soname] + pkg = pkg_by_any_filename[filename] + self_provided.add(soname) + so_dependencies.add(pkg) + elif soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) else: - logging.warn("%s not found in needed_sonames_by_binary (%s)", - binary, needed_sonames_by_binary.keys()) + orphan_sonames.add(soname) return so_dependencies, self_provided, orphan_sonames @@ -283,20 +331,39 @@ missing_deps = auto_dependencies.difference(declared_dependencies_set) # Don't report itself as a suggested dependency. missing_deps = missing_deps.difference(set([pkgname])) + missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) surplus_deps = declared_dependencies_set.difference(auto_dependencies) - surplus_deps = surplus_deps.difference(TYPICAL_DEPENDENCIES) + surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) + orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) return missing_deps, surplus_deps, orphan_sonames def ExpandRunpath(runpath, isalist): + # Emulating $ISALIST expansion if '$ISALIST' in runpath: - runpath_expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] + expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] else: - runpath_expanded_list = [runpath] - return runpath_expanded_list + expanded_list = [runpath] + return expanded_list +def Emulate64BitSymlinks(runpath_list): + """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink + Since we don't know the architecture, we'll adding both amd64 and sparcv9. + It should be safe. + """ + symlinked_list = [] + for runpath in runpath_list: + if runpath.endswith("/64"): + symlinked_list.append("%s/amd64" % runpath[:-3]) + symlinked_list.append("%s/sparcv9" % runpath[:-3]) + else: + symlinked_list.append(runpath) + return symlinked_list + + def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): + """Works out which system pkgmap lines correspond to given sonames.""" lines_by_soname = {} for soname in needed_sonames: # This is the critical part of the algorithm: it iterates over the @@ -304,7 +371,10 @@ runpath_found = False for runpath in runpath_by_needed_soname[soname]: runpath_list = ExpandRunpath(runpath, isalist) + runpath_list = Emulate64BitSymlinks(runpath_list) soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + logging.debug("%s: will be looking for %s in %s" % + (soname, runpath_list, soname_runpath_data.keys())) for runpath_expanded in runpath_list: if runpath_expanded in soname_runpath_data: lines_by_soname[soname] = soname_runpath_data[runpath_expanded] @@ -313,5 +383,49 @@ # need another one below to finish the outer loop. break if runpath_found: - break + break return lines_by_soname + + +def BuildIndexesBySoname(needed_sonames_by_binary): + """Builds data structures indexed by soname. + + Building indexes + {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], + ... + } + """ + needed_sonames = set() + binaries_by_soname = {} + runpath_by_needed_soname = {} + for binary_name, data in needed_sonames_by_binary.iteritems(): + for soname in data[NEEDED_SONAMES]: + needed_sonames.add(soname) + if soname not in runpath_by_needed_soname: + runpath_by_needed_soname[soname] = [] + runpath_by_needed_soname[soname].extend(data[RUNPATH]) + if soname not in binaries_by_soname: + binaries_by_soname[soname] = set() + binaries_by_soname[soname].add(binary_name) + return needed_sonames, binaries_by_soname, runpath_by_needed_soname + + +def ParseDumpOutput(dump_output): + binary_data = {RUNPATH: [], + NEEDED_SONAMES: []} + for line in dump_output.splitlines(): + fields = re.split(WS_RE, line) + # TODO: Make it a unit test + # logging.debug("%s says: %s", DUMP_BIN, fields) + if len(fields) < 3: + continue + if fields[1] == "NEEDED": + binary_data[NEEDED_SONAMES].append(fields[2]) + elif fields[1] == "RUNPATH": + binary_data[RUNPATH].extend(fields[2].split(":")) + # Adding the default runtime path search option. + binary_data[RUNPATH].append("/usr/lib/$ISALIST") + binary_data[RUNPATH].append("/usr/lib") + elif fields[1] == "SONAME": + binary_data[SONAME] = fields[2] + return binary_data Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-29 11:32:30 UTC (rev 7787) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-29 22:59:44 UTC (rev 7788) @@ -9,7 +9,24 @@ import testdata.checkpkg_test_data_CSWmysql51 as d3 import testdata.checkpkg_test_data_CSWmysql51devel as d4 import testdata.checkpkg_test_data_CSWlibpq_84 as d5 +import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 +import testdata.dump_output_1 as dump_1 +"""A set of unit tests for the library checking code. + +A bunch of lines to test in the interactive Python shell. + +import sys +sys.path.append("gar/bin/checkpkg.d") +import checkpkg +import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 + +checkpkg.SharedObjectDependencies("CSWmysql5client", d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, d6.DATA_PKG_BY_ANY_FILENAME) + +sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x +SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; +""" + class DependenciesUnitTest_1(unittest.TestCase): def setUp(self): @@ -30,7 +47,7 @@ self.assertEquals(set([]), self.orphan_sonames) def testMissingDeps(self): - expected = set([u'SUNWcsl', u'SUNWlibms', u'SUNWlibC']) + expected = set([]) self.assertEquals(expected, self.missing_deps) @@ -54,7 +71,7 @@ self.assertEquals(set([]), self.orphan_sonames) def testMissingDeps(self): - expected = set([u'SUNWlibC', u'SUNWcsl', u'SUNWlibms']) + expected = set([]) self.assertEquals(expected, self.missing_deps) @@ -78,7 +95,7 @@ self.assertEquals(set([]), self.orphan_sonames) def testMissingDeps(self): - expected = set(['CSWmysql51rt', u'SUNWcsl', u'SUNWlibms', u'SUNWlibC']) + expected = set(['CSWmysql51rt']) self.assertEquals(expected, self.missing_deps) @@ -127,10 +144,36 @@ def testMissingDeps(self): # This tends to report itself... - expected = set([u'SUNWgss', u'SUNWcsl', u'SUNWlibms']) + expected = set([u'SUNWgss']) self.assertEquals(expected, self.missing_deps) +class DependenciesUnitTest_6(unittest.TestCase): + + def setUp(self): + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( + d6.DATA_PKGNAME, + d6.DATA_DECLARED_DEPENDENCIES, + d6.DATA_BINARIES_BY_PKGNAME, + d6.DATA_NEEDED_SONAMES_BY_BINARY, + d6.DATA_PKGS_BY_FILENAME, + d6.DATA_FILENAMES_BY_SONAME, + d6.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + class GuessDepsUnitTest(unittest.TestCase): def testGuessDepsByFilename1(self): @@ -195,16 +238,30 @@ class GetLinesBySonameUnitTest(unittest.TestCase): + class PkgmapStub(object): + + def __init__(self, cache): + self.cache = cache + + def GetPkgmapLineByBasename(self, soname): + return self.cache[soname] + def setUp(self): self.pkgmap_mocker = mox.Mox() - def testExpandRunpath(self): + def testExpandRunpath_1(self): isalist = ["foo", "bar"] runpath = "/opt/csw/lib/$ISALIST" expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"] self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) - def test_1(self): + def testExpandRunpath_2(self): + isalist = ["foo", "bar"] + runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql" + expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] + self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) + + def testGetLinesBySoname(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) pkgmap.GetPkgmapLineByBasename("foo") @@ -221,24 +278,135 @@ self.pkgmap_mocker.VerifyAll() self.assertEqual(expected, result) - def test_2(self): + def testGetLinesBySoname_3(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) pkgmap.GetPkgmapLineByBasename("foo") - lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} + lines1 = { + "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"} # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) self.pkgmap_mocker.ReplayAll() pkgmap.GetPkgmapLineByBasename("foo") needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} + runpath_by_needed_soname = { + "foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + result = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) self.pkgmap_mocker.VerifyAll() self.assertEqual(expected, result) + def testGetLinesBySoname_4(self): + """A more complex test, four ISAs.""" + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = { + "/opt/csw/lib/isa-value-1": + "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/mysql5/lib/isa-value-2": + "/opt/csw/mysql5/lib/isa-value-2/foo.so.1 foo", + "/opt/csw/mysql5/lib/isa-value-1": + "/opt/csw/mysql5/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": + "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": + "/usr/lib/foo.so.1 foo"} + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = { + "foo.so.1": ["/opt/csw/mysql5/lib/$ISALIST/mysql", + "/opt/csw/lib/$ISALIST", + "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + def testGetLinesBySoname_5(self): + """Based on CSWmysql5client on build8x.""" + soname = u'libm.so.1' + expected = {u'libm.so.1': u'/usr/lib/libm.so.1 f none 0755 root bin ' + u'99844 3884 1050525375 SUNWlibms\n'} + + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + def testGetLinesBySoname_6(self): + """Based on CSWmysql5client on build8x.""" + soname = u'libz.so.1' + expected = {u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' + u's none CSWzlib\n'} + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + def testGetLinesBySoname_7(self): + """A test for 64-bit symlink expansion.""" + soname = u'libncursesw.so.5' + # To test the 64-bit symlink expansion + expected = {u'libncursesw.so.5': u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 s none CSWncurses\n'} + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + +class ParseDumpOutputUnitTest(unittest.TestCase): + + def test_1(self): + expected = { + 'soname': 'libmysqlclient.so.15', + 'runpath': ['/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/mysql5/lib/$ISALIST', + '/opt/csw/mysql5/lib', + '/opt/csw/mysql5/lib/$ISALIST/mysql', + # These two are artificially appended + '/usr/lib/$ISALIST', + '/usr/lib'], + 'needed sonames': ['librt.so.1', + 'libresolv.so.2', + 'libc.so.1', + 'libgen.so.1', + 'libsocket.so.1', + 'libnsl.so.1', + 'libm.so.1', + 'libz.so.1']} + self.assertEqual(expected, + checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) + + if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql5client_8x.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql5client_8x.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql5client_8x.py 2009-12-29 22:59:44 UTC (rev 7788) @@ -0,0 +1,13 @@ +# Testing data for CSWmysql5client +# $Id$ +DATA_PKGNAME = 'CSWmysql5client' +DATA_DECLARED_DEPENDENCIES = {'CSWzlib': 'CSWzlib zlib - Zlib Data Compression Library ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWmysql5rt': 'CSWmysql5rt mysql5rt - MySQL 5.0 runtime files ', 'CSWncurses': 'CSWncurses ncurses - A free software emulation of curses ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages '} +DATA_BINARIES_BY_PKGNAME = {'CSWmysql5test': [], 'CSWmysql5rt': ['libmysqlclient.so.15.0.0', 'libmysqlclient.so.15.0.0'], 'CSWmysql5client': ['mysqlimport', 'perror', 'mysqldump', 'mysqlbinlog', 'mysql', 'mysqlcheck', 'mysql_client_test', 'mysqladmin', 'mysqlshow', 'myisampack', 'myisamlog', 'replace', 'mysql_client_test', 'mysqlcheck', 'mysqladmin', 'mysqlimport', 'myisampack', 'mysqlshow', 'myisamlog', 'mysqlbinlog', 'replace', 'perror', 'mysqldump', 'mysql'], 'CSWmysql5bench': [], 'CSWmysql5devel': [], 'CSWmysql5': ['my_print_defaults', 'comp_err', 'mysqltestmanager-pwgen', 'innochecksum', 'resolveip', 'mysql_waitpid', 'mysqltestmanagerc', 'mysql_upgrade', 'myisam_ftdump', 'myisamchk', 'resolve_stack_dump', 'mysqltest', 'mysql_tzinfo_to_sql', 'resolve_stack_dump', 'mysqltestmanagerc', 'innochecksum', 'mysqltestmanager-pwgen', 'myisam_ftdump', 'my_print_defaults', 'mysql_upgrade', 'mysql_tzinfo_to_sql', 'resolveip', 'comp_err', 'mysql_waitpid', 'mysqltest', 'myisamchk', 'm ysqlmanager', 'mysqld', 'mysqld', 'mysqlmanager']} +DATA_NEEDED_SONAMES_BY_BINARY = {'mysql_waitpid': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'comp_err': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libthread.so.1']}, 'replace': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so. 1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'libmysqlclient.so.15.0.0': {'soname': 'libmysqlclient.so.15', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1']}, 'myisamchk': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libthread.so.1']}, 'mysqldump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIS T', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/opt/csw/mysql5/lib/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libthread.so.1']}, 'mysql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/amd64', '/opt/studio/SOS11/SUNWspro/lib/amd64', '/usr/ccs/lib/64', '/lib/64', '/usr/lib/64', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libncursesw.so.5', 'libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'myisam_ftdump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'myisamlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqlimport': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libns l.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}, 'mysqlcheck': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}, 'mysqlmanager': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/amd64', '/opt/studio/SOS11/SUNWspro/lib/amd64', '/usr/ccs/lib/64', '/lib/64', '/usr/lib/64', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libz.so.1', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqlad min': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/opt/csw/mysql5/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqlshow': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}, 'mysqltestmanager-pwgen': {'run path': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/opt/csw/mysql5/lib/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libthread.so.1']}, 'mysql_upgrade': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}, 'innochecksum': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'n eeded sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqlbinlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/opt/csw/mysql5/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'my_print_defaults': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'li bpthread.so.1', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libthread.so.1']}, 'mysqld': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/amd64', '/opt/studio/SOS11/SUNWspro/lib/amd64', '/usr/ccs/lib/64', '/lib/64', '/usr/lib/64', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['librt.so.1', 'libz.so.1', 'libdl.so.1', 'libpthread.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'myisampack': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl .so.1', 'libm.so.1', 'libthread.so.1']}, 'mysql_tzinfo_to_sql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'perror': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqltestmanagerc': {'runpath': ['/op t/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}, 'mysqltest': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}, 'resolve_stack_dump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'resolveip': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libthread.so.1']}, 'mysql_client_test': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}} +DATA_PKGS_BY_FILENAME = {'libresolv.so.2': u'SUNWcsl', 'libthread.so.1': u'SUNWcsl', 'libgen.so.1': u'SUNWcsl', 'libnsl.so.1': u'SUNWcsl', 'libmysqlclient.so.15': u'CSWmysql5rt', 'libCstd.so.1': u'SUNWlibC', 'libCrun.so.1': u'SUNWlibC', 'librt.so.1': u'SUNWcsl', 'libz.so.1': u'CSWzlib', 'libncursesw.so.5': u'CSWncurses', 'libsocket.so.1': u'SUNWcsl', 'libm.so.1': u'SUNWlibms', 'libpthread.so.1': u'SUNWcsl', 'libc.so.1': u'SUNWcsl', 'libdl.so.1': u'SUNWcsl'} +DATA_FILENAMES_BY_SONAME = {'libmysqlclient.so.15': 'libmysqlclient.so.15.0.0'} @@ 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 wahwah at users.sourceforge.net Wed Dec 30 00:04:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Dec 2009 23:04:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7789] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Message-ID: Revision: 7789 http://gar.svn.sourceforge.net/gar/?rev=7789&view=rev Author: wahwah Date: 2009-12-29 23:04:59 +0000 (Tue, 29 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Removed unused code Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-29 22:59:44 UTC (rev 7788) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-29 23:04:59 UTC (rev 7789) @@ -196,18 +196,16 @@ pkgs_by_soname, filenames_by_soname, pkg_by_any_filename): + """This is one of the more obscure and more important pieces of code. + + I tried to make it simpler, but given that the operations here involve + whole sets of packages, it's not easy. + """ so_dependencies = set() orphan_sonames = set() self_provided = set() for binary in binaries_by_pkgname[pkgname]: - # tmp_so_dependencies, tmp_self_provided, tmp_orphan_sonames = DependenciesOfABinary( - # binary, binaries_by_pkgname, needed_sonames_by_binary, - # pkgs_by_soname, filenames_by_soname, pkg_by_any_filename) - # so_dependencies.union(tmp_so_dependencies) - # orphan_sonames.union(tmp_orphan_sonames) - # self_provided.union(tmp_self_provided) needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] - # DependenciesOfABinary(binary, needed_sonames, filenames_by_soname, pkgs_by_soname) for soname in needed_sonames: if soname in filenames_by_soname: filename = filenames_by_soname[soname] @@ -221,28 +219,6 @@ return so_dependencies, self_provided, orphan_sonames -def DependenciesOfABinary(binary, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - so_dependencies = set() - orphan_sonames = set() - self_provided = set() - for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: - if soname in filenames_by_soname: - filename = filenames_by_soname[soname] - pkg = pkg_by_any_filename[filename] - self_provided.add(soname) - so_dependencies.add(pkg) - elif soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) - return so_dependencies, self_provided, orphan_sonames - - def GuessDepsByFilename(pkgname, pkg_by_any_filename): """Guesses dependencies based on filename regexes.""" guessed_deps = set() 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 Dec 30 01:26:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 00:26:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7790] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 7790 http://gar.svn.sourceforge.net/gar/?rev=7790&view=rev Author: wahwah Date: 2009-12-30 00:26:26 +0000 (Wed, 30 Dec 2009) Log Message: ----------- syslog_ng: Enable TCP wrappers, removed an unnecessary dependency on CSWgcc4corert Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/syslog_ng/trunk/ Property changes on: csw/mgar/pkg/syslog_ng/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-12-29 23:04:59 UTC (rev 7789) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-12-30 00:26:26 UTC (rev 7790) @@ -29,8 +29,8 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic-linking CONFIGURE_ARGS += --enable-spoof-source=no +CONFIGURE_ARGS += --enable-tcp-wrapper -REQUIRED_PKGS = CSWgcc4corert REQUIRED_PKGS += CSWeventlog REQUIRED_PKGS += CSWosslrt REQUIRED_PKGS += CSWzlib @@ -48,6 +48,10 @@ GARCOMPILER = GNU TEST_SCRIPTS = +# The configure script finds -lwrap but doesn't actually use it. +# We need to be more pushy. +EXTRA_LDFLAGS = -L/opt/csw/lib -lwrap -lsocket + post-install-modulated: ginstall -d $(DESTDIR)/etc/opt/csw ginstall -m 444 $(WORKDIR)/$(GARNAME).conf.CSW \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 30 01:32:38 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 00:32:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7791] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7791 http://gar.svn.sourceforge.net/gar/?rev=7791&view=rev Author: wahwah Date: 2009-12-30 00:32:38 +0000 (Wed, 30 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Cosmetic changes Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-30 00:26:26 UTC (rev 7790) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-30 00:32:38 UTC (rev 7791) @@ -32,14 +32,14 @@ def main(): + result_ok = True errors = [] options, args = checkpkg.GetOptions() + pkgnames = args if options.debug: logging.basicConfig(level=logging.DEBUG) else: logging.basicConfig(level=logging.INFO) - result_ok = True - pkgnames = args checkers = [] for pkgname in pkgnames: checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) @@ -96,6 +96,8 @@ # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog lines_by_soname = checkpkg.GetLinesBySoname( pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + + # Creating a map from files to packages. pkgs_by_filename = {} for soname, line in lines_by_soname.iteritems(): # TODO: Find all the packages, not just the last field. @@ -105,6 +107,12 @@ pkgs_by_filename[soname] = pkgname # A shared object dependency/provisioning report, plus checking. + # + # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), + # it has a different purpose: it reports the relationships between shared + # libraries, binaries using them and packages providing them. Ideally, the + # same bit of code with do checking and reporting. + # # TODO: Rewrite this using cheetah templates if needed_sonames: print "Analysis of sonames needed by the package set:" @@ -116,19 +124,23 @@ print ("%s is provided by %s and required by:" % (soname, repr(pkgs_by_filename[soname]))) - filename_lines = textwrap.wrap(" ".join(sorted(binaries_by_soname[soname])), 75) - for line in filename_lines: + filename_lines = " ".join(sorted(binaries_by_soname[soname])) + for line in textwrap.wrap(filename_lines, 70): print " ", line else: print ("%s is required by %s, but we don't know what provides it." % (soname, binaries_by_soname[soname])) - errors.append(checkpkg.Error("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname]))) + if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: + print "However, it's a whitelisted soname." + else: + errors.append( + checkpkg.Error("%s is required by %s, but " + "we don't know what provides it." + % (soname, binaries_by_soname[soname]))) print dependent_pkgs = {} for checker in checkers: - orphan_sonames = set() pkgname = checker.pkgname declared_dependencies = checker.GetDependencies() if options.debug: @@ -138,19 +150,17 @@ test_fd = open(data_file_name, "w") print >>test_fd, "# Testing data for %s" % pkgname print >>test_fd, "# $Id$" - print >>test_fd, "DATA_PKGNAME =", repr(pkgname) - print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) - - - print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) + print >>test_fd, "DATA_PKGNAME =", repr(pkgname) + print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) + print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) - print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) - print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) - print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) - print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) - print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) - print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) - print >>test_fd, "DATA_ISALIST =", repr(isalist) + print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) + print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) + print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) + print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) + print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) + print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) + print >>test_fd, "DATA_ISALIST =", repr(isalist) test_fd.close() missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-30 00:26:26 UTC (rev 7790) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-30 00:32:38 UTC (rev 7791) @@ -21,7 +21,10 @@ import checkpkg import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 -checkpkg.SharedObjectDependencies("CSWmysql5client", d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, d6.DATA_PKG_BY_ANY_FILENAME) +checkpkg.SharedObjectDependencies("CSWmysql5client", +d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, +d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, +d6.DATA_PKG_BY_ANY_FILENAME) sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; @@ -369,7 +372,10 @@ """A test for 64-bit symlink expansion.""" soname = u'libncursesw.so.5' # To test the 64-bit symlink expansion - expected = {u'libncursesw.so.5': u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 s none CSWncurses\n'} + expected = { + u'libncursesw.so.5': + u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' + u's none CSWncurses\n'} pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) (needed_sonames, binaries_by_soname, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 30 10:48:25 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 09:48:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7792] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7792 http://gar.svn.sourceforge.net/gar/?rev=7792&view=rev Author: wahwah Date: 2009-12-30 09:48:25 +0000 (Wed, 30 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Better symlink emulation Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-30 00:32:38 UTC (rev 7791) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-30 09:48:25 UTC (rev 7792) @@ -330,9 +330,9 @@ """ symlinked_list = [] for runpath in runpath_list: - if runpath.endswith("/64"): - symlinked_list.append("%s/amd64" % runpath[:-3]) - symlinked_list.append("%s/sparcv9" % runpath[:-3]) + if "/64" in runpath: + symlinked_list.append(runpath.replace("/64", "/amd64")) + symlinked_list.append(runpath.replace("/64", "/sparcv9")) else: symlinked_list.append(runpath) return symlinked_list Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-30 00:32:38 UTC (rev 7791) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-30 09:48:25 UTC (rev 7792) @@ -264,6 +264,17 @@ expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) + def testEmulate64BitSymlinks_1(self): + runpath_list = ["/opt/csw/mysql5/lib/foo/mysql/64"] + expected = "/opt/csw/mysql5/lib/foo/mysql/amd64" + self.assertTrue(expected in checkpkg.Emulate64BitSymlinks(runpath_list)) + + def testEmulate64BitSymlinks_2(self): + runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] + expected = "/opt/csw/mysql5/lib/amd64/mysql/foo" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + def testGetLinesBySoname(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) 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 Dec 30 11:15:49 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 10:15:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7793] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7793 http://gar.svn.sourceforge.net/gar/?rev=7793&view=rev Author: wahwah Date: 2009-12-30 10:15:48 +0000 (Wed, 30 Dec 2009) Log Message: ----------- mysql5: Don't try to create /opt/csw/bin/{amd64,sparcv9} 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 2009-12-30 09:48:25 UTC (rev 7792) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-12-30 10:15:48 UTC (rev 7793) @@ -204,6 +204,8 @@ # Create symlinks to binaries ginstall -m 755 -d $(PKGROOT)$(global_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 ../$(GARNAME)/bin/`basename $$f` \ $(PKGROOT)$(global_bindir)/`basename $$f`; \ 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 Dec 30 17:29:56 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 16:29:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7794] csw/mgar/pkg/template/trunk Message-ID: Revision: 7794 http://gar.svn.sourceforge.net/gar/?rev=7794&view=rev Author: wahwah Date: 2009-12-30 16:29:56 +0000 (Wed, 30 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Adding SPKG_TMPDIR configuration option, making checkpkg use the CHECKPKG_TMPDIR env variable to set the tmp dir. Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/template/trunk/ Property changes on: csw/mgar/pkg/template/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-30 10:15:48 UTC (rev 7793) +++ csw/mgar/pkg/template/trunk/Makefile 2009-12-30 16:29:56 UTC (rev 7794) @@ -2,184 +2,49 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = oracle +GARVERSION = 10.2.0 +CATEGORIES = apps define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +DISTFILES = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = oracle +TEST_SCRIPTS = -#include gar/category.mk +prefix = /opt/oracle + +PACKAGES = GOOGoracle +CATALOGNAME_GOOGoracle = oracle +SPKG_DESC_GOOGoracle = The Oracle database + +REQUIRED_PKGS = CSWggettextrt CSWlibxext CSWunixodbc + +PROTOTYPE_FILTER = awk '$$$$3 ~/\/extjob$$$$/ \ + { $$$$4 = 3755; $$$$5 = "nobody"; $$$$6 = "nobody" } \ + { print }' + +ORACLE_HOME = $(prefix)/product/$(GARVERSION)/Db_1 + +include gar/category.mk + +install-oracle: + ginstall -m 755 -d $(DESTDIR)$(prefix) + @$(MAKECOOKIE) + +post-merge: + # This takes a really long time. + gtar -cf - -C $(prefix) . | gtar -xpf - -C $(PKGROOT)$(prefix) + # echo foo > $(PKGROOT)$(prefix)/bar + grm -f $(PKGROOT)$(ORACLE_HOME)/inventory/Templates/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod + grm -f $(PKGROOT)$(ORACLE_HOME)/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod + # Removing one shared library, because: + # ERROR: Couldn't find a package providing libEntrust.so + grm -f $(PKGROOT)$(ORACLE_HOME)/lib32/libnnzentr10.so + # ERROR: Couldn't find a package providing libc.so.6 + grm -f $(PKGROOT)$(ORACLE_HOME)/lib/libcxa.so.3 + grm -f $(PKGROOT)$(ORACLE_HOME)/bin/rtsora32 + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 30 17:58:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 16:58:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7795] csw/mgar/gar/v2 Message-ID: Revision: 7795 http://gar.svn.sourceforge.net/gar/?rev=7795&view=rev Author: wahwah Date: 2009-12-30 16:58:09 +0000 (Wed, 30 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Adding SPKG_TMPDIR configuration option, making checkpkg use the CHECKPKG_TMPDIR env variable to set the tmp dir. Modified Paths: -------------- csw/mgar/gar/v2/bin/mkpackage csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk csw/mgar/gar/v2-checkpkg/bin/checkpkg csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2/bin/mkpackage =================================================================== --- csw/mgar/gar/v2/bin/mkpackage 2009-12-30 16:29:56 UTC (rev 7794) +++ csw/mgar/gar/v2/bin/mkpackage 2009-12-30 16:58:09 UTC (rev 7795) @@ -908,7 +908,7 @@ my $compress = $config{usebzip} ? 'bzip2 -9 -f %s' - : 'gzip -9 -f %s'; + : 'pigz --fast -f %s'; vexec( sprintf( $compress, $tmppkg ), "Failed to compress $tmppkg" ); $tmppkg .= $config{usebzip} ? ".bz2" : ".gz"; Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-12-30 16:29:56 UTC (rev 7794) +++ csw/mgar/gar/v2/gar.mk 2009-12-30 16:58:09 UTC (rev 7795) @@ -850,7 +850,7 @@ # Update inter-package depends makedepend: - @for gspec in `gfind $(CURDIR) -type f -name '*.gspec' | ggrep files`; do \ + $(_DBG)for gspec in `gfind $(CURDIR) -type f -name '*.gspec' | ggrep files`; do \ pkgname=`basename $$gspec .gspec` ; \ pkgfiles=`dirname $$gspec` ; \ pkgdir=`dirname $$pkgfiles` ; \ Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-12-30 16:29:56 UTC (rev 7794) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-12-30 16:58:09 UTC (rev 7795) @@ -154,6 +154,7 @@ SPKG_PKGROOT ?= $(PKGROOT) SPKG_PKGBASE ?= $(PKGROOT) SPKG_WORKDIR ?= $(CURDIR)/$(WORKDIR) +SPKG_TMPDIR ?= /tmp SPKG_DEPEND_DB = $(GARDIR)/csw/depend.db @@ -709,8 +710,10 @@ # The dynamic pkginfo is only generated for dynamic gspec-files package-%: $(WORKDIR)/%.gspec $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) @echo " ==> Processing $*.gspec" - $(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ + $(_DBG)( $(call _PKG_ENV,$*) mkpackage \ + --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ + --tmpdir $(SPKG_TMPDIR) \ --destdir $(SPKG_EXPORT) \ --workdir $(SPKG_WORKDIR) \ --pkgbase $(SPKG_PKGBASE) \ @@ -726,7 +729,7 @@ # pkgcheck - check if the package is compliant # pkgcheck: $(foreach SPEC,$(_PKG_SPECS),package-$(SPEC)) - $(_DBG)( LC_ALL=C $(GARBIN)/checkpkg $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;) + $(_DBG)( LC_ALL=C $(GARBIN)/checkpkg $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage --tmpdir $(SPKG_TMPDIR) -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;) @$(MAKECOOKIE) pkgcheck-p: Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-30 16:29:56 UTC (rev 7794) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-30 16:58:09 UTC (rev 7795) @@ -25,6 +25,11 @@ PATH=$PATH:/usr/sbin LOCAL_ARCH=`uname -p` +if [[ -z "${CHECKPKG_TMPDIR}" ]]; then + readonly CHECKPKG_TMPDIR="/var/tmp" +else + readonly CHECKPKG_TMPDIR +fi # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -76,7 +81,7 @@ f=$1 file $f |sed 's/^.*://' |grep gzip >/dev/null if [ $? -eq 0 ] ; then - TMPARCHIVE=/tmp/`basename $f` + TMPARCHIVE=$CHECKPKG_TMPDIR/`basename $f` if [[ -f $TMPARCHIVE ]] ; then print ERROR: $TMPARCHIVE already exists @@ -104,13 +109,13 @@ fi # a unique filename for the list of package deps and libs we see in a 'set' -SETINF=/tmp/checkpkg.$$.`date +%Y%m%d%H%M%S` +SETINF=$CHECKPKG_TMPDIR/checkpkg.$$.`date +%Y%m%d%H%M%S` SETLIBS=$SETINF.libs SETDEPS=$SETINF.deps pkgnames="" tmparchives="" -EXTRACTDIR=/tmp/dissect.$$ +EXTRACTDIR=$CHECKPKG_TMPDIR/dissect.$$ if [ -d $EXTRACTDIR ] ; then print ERROR: $EXTRACTDIR already exists Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-30 16:29:56 UTC (rev 7794) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-30 16:58:09 UTC (rev 7795) @@ -402,6 +402,8 @@ # Adding the default runtime path search option. binary_data[RUNPATH].append("/usr/lib/$ISALIST") binary_data[RUNPATH].append("/usr/lib") + binary_data[RUNPATH].append("/lib/$ISALIST") + binary_data[RUNPATH].append("/lib") elif fields[1] == "SONAME": binary_data[SONAME] = fields[2] return binary_data 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 Dec 30 20:20:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 19:20:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7796] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7796 http://gar.svn.sourceforge.net/gar/?rev=7796&view=rev Author: wahwah Date: 2009-12-30 19:20:41 +0000 (Wed, 30 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Setting the default RUNPATH even when the field is not there in the binary; added a test for it. Reporting the list of binaries with missing sonames. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/dump_output_2.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-30 16:58:09 UTC (rev 7795) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-30 19:20:41 UTC (rev 7796) @@ -26,7 +26,7 @@ stdout, stderr = isalist_proc.communicate() ret = isalist_proc.wait() if ret: - logging.error("Calling isalist has failed.") + logging.error("Calling isalist has failed.") isalist = re.split(r"\s+", stdout.strip()) return isalist @@ -80,10 +80,16 @@ ret = dump_proc.wait() binary_data = checkpkg.ParseDumpOutput(stdout) needed_sonames_by_binary[binary_base_name] = binary_data - if checkpkg.SONAME in binary_data: - filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + if checkpkg.SONAME not in binary_data: + logging.info("The %s shared library doesn't provide a SONAME.", + binary_base_name) + # The shared library doesn't tell its SONAME. We're guessing it's the + # same as the base file name. + binary_data[checkpkg.SONAME] = binary_base_name + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + isalist = GetIsalist() - + # Building indexes by soname to simplify further processing # These are indexes "by soname". (needed_sonames, @@ -116,6 +122,7 @@ # TODO: Rewrite this using cheetah templates if needed_sonames: print "Analysis of sonames needed by the package set:" + binaries_with_missing_sonames = set([]) for soname in needed_sonames: logging.debug("Analyzing: %s", soname) if soname in filenames_by_soname: @@ -126,17 +133,24 @@ repr(pkgs_by_filename[soname]))) filename_lines = " ".join(sorted(binaries_by_soname[soname])) for line in textwrap.wrap(filename_lines, 70): - print " ", line + print " ", line else: print ("%s is required by %s, but we don't know what provides it." % (soname, binaries_by_soname[soname])) + for binary in binaries_by_soname[soname]: + binaries_with_missing_sonames.add(binary) if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: - print "However, it's a whitelisted soname." + print "However, it's a whitelisted soname." else: errors.append( checkpkg.Error("%s is required by %s, but " "we don't know what provides it." % (soname, binaries_by_soname[soname]))) + if binaries_with_missing_sonames: + print "The following are binaries with missing sonames:" + binary_lines = " ".join(sorted(binaries_with_missing_sonames)) + for line in textwrap.wrap(binary_lines, 70): + print " ", line print dependent_pkgs = {} @@ -194,7 +208,7 @@ print "! ", soname msg_printed = True if not msg_printed: - print "+ Dependencies of %s look good." % pkgname + print "+ Dependencies of %s look good." % pkgname print if errors: Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-30 16:58:09 UTC (rev 7795) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-30 19:20:41 UTC (rev 7796) @@ -399,11 +399,11 @@ binary_data[NEEDED_SONAMES].append(fields[2]) elif fields[1] == "RUNPATH": binary_data[RUNPATH].extend(fields[2].split(":")) - # Adding the default runtime path search option. - binary_data[RUNPATH].append("/usr/lib/$ISALIST") - binary_data[RUNPATH].append("/usr/lib") - binary_data[RUNPATH].append("/lib/$ISALIST") - binary_data[RUNPATH].append("/lib") elif fields[1] == "SONAME": binary_data[SONAME] = fields[2] + # Adding the default runtime path search option. + binary_data[RUNPATH].append("/usr/lib/$ISALIST") + binary_data[RUNPATH].append("/usr/lib") + binary_data[RUNPATH].append("/lib/$ISALIST") + binary_data[RUNPATH].append("/lib") return binary_data Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-30 16:58:09 UTC (rev 7795) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-30 19:20:41 UTC (rev 7796) @@ -11,6 +11,7 @@ import testdata.checkpkg_test_data_CSWlibpq_84 as d5 import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 import testdata.dump_output_1 as dump_1 +import testdata.dump_output_2 as dump_2 """A set of unit tests for the library checking code. @@ -410,9 +411,11 @@ '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', - # These two are artificially appended + # These four are artificially appended '/usr/lib/$ISALIST', - '/usr/lib'], + '/usr/lib', + '/lib/$ISALIST', + '/lib'], 'needed sonames': ['librt.so.1', 'libresolv.so.2', 'libc.so.1', @@ -424,6 +427,12 @@ self.assertEqual(expected, checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) + def test_2(self): + expected_runpath = ['/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'] + self.assertEqual( + expected_runpath, + checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) + if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/dump_output_2.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/dump_output_2.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/dump_output_2.py 2009-12-30 19:20:41 UTC (rev 7796) @@ -0,0 +1,34 @@ +DATA_DUMP_OUTPUT = """work/pkgroot/opt/oracle/product/10.2.0/Db_1/opmn/bin/ons: + + **** DYNAMIC SECTION INFORMATION **** +.dynamic: +[INDEX] Tag Value +[1] NEEDED libpthread.so.1 +[2] NEEDED librt.so.1 +[3] NEEDED libnsl.so.1 +[4] NEEDED libxnet.so.1 +[5] NEEDED libdl.so.1 +[6] NEEDED libm.so.1 +[7] NEEDED libc.so.1 +[8] INIT 0xd6088 +[9] FINI 0xd6094 +[10] HASH 0x100e8 +[11] STRTAB 0x19274 +[12] STRSZ 0x4a24 +[13] SYMTAB 0x13174 +[14] SYMENT 0x10 +[15] CHECKSUM 0x20d5 +[16] VERNEED 0x1dc98 +[17] VERNEEDNUM 0x6 +[18] PLTSZ 0x7f8 +[19] PLTREL 0x7 +[20] JMPREL 0x1dd9c +[21] RELA 0x1dd78 +[22] RELASZ 0x81c +[23] RELAENT 0xc +[24] DEBUG 0 +[25] FEATURE_1 PARINIT +[26] FLAGS 0 +[27] FLAGS_1 0 +[28] PLTGOT 0xf6f64 +""" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Dec 30 23:00:25 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 30 Dec 2009 22:00:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7797] csw/mgar/pkg Message-ID: Revision: 7797 http://gar.svn.sourceforge.net/gar/?rev=7797&view=rev Author: rthurner Date: 2009-12-30 22:00:25 +0000 (Wed, 30 Dec 2009) Log Message: ----------- lzlib - lzma library for usage in lzip, plzip. does not compile yet Added Paths: ----------- csw/mgar/pkg/lzlib/ csw/mgar/pkg/lzlib/branches/ csw/mgar/pkg/lzlib/tags/ csw/mgar/pkg/lzlib/trunk/ csw/mgar/pkg/lzlib/trunk/Makefile csw/mgar/pkg/lzlib/trunk/checksums csw/mgar/pkg/lzlib/trunk/files/ Property changes on: csw/mgar/pkg/lzlib/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/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2009-12-30 22:00:25 UTC (rev 7797) @@ -0,0 +1,25 @@ +GARNAME = lzlib +GARVERSION = 0.8-rc1 +CATEGORIES = lib + +DESCRIPTION = lzlib is a lossless data compression library based on the LZMA algorithm. +define BLURB + The lzlib compression library provides in-memory LZMA compression and + decompression functions, including integrity checking of the uncompressed + data. The compressed data format used by the library is the lzip format. +endef + +MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/lzlib/trunk/checksums =================================================================== --- csw/mgar/pkg/lzlib/trunk/checksums (rev 0) +++ csw/mgar/pkg/lzlib/trunk/checksums 2009-12-30 22:00:25 UTC (rev 7797) @@ -0,0 +1 @@ +cdb51b3a9fb9b01a7582a5ad797377ca lzlib-0.8-rc1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 31 01:54:50 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 31 Dec 2009 00:54:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7798] csw/mgar/pkg/template/trunk/Makefile Message-ID: Revision: 7798 http://gar.svn.sourceforge.net/gar/?rev=7798&view=rev Author: wahwah Date: 2009-12-31 00:54:50 +0000 (Thu, 31 Dec 2009) Log Message: ----------- oracle: Removing shared libraries with missing deps. Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-30 22:00:25 UTC (rev 7797) +++ csw/mgar/pkg/template/trunk/Makefile 2009-12-31 00:54:50 UTC (rev 7798) @@ -17,11 +17,12 @@ prefix = /opt/oracle -PACKAGES = GOOGoracle -CATALOGNAME_GOOGoracle = oracle -SPKG_DESC_GOOGoracle = The Oracle database +PACKAGES = CSWoracle +CATALOGNAME_CSWoracle = oracle +SPKG_DESC_CSWoracle = The Oracle database -REQUIRED_PKGS = CSWggettextrt CSWlibxext CSWunixodbc +REQUIRED_PKGS = +# Maybe CSWunixodbc, but how would it know how to locate the shared library? PROTOTYPE_FILTER = awk '$$$$3 ~/\/extjob$$$$/ \ { $$$$4 = 3755; $$$$5 = "nobody"; $$$$6 = "nobody" } \ @@ -39,12 +40,24 @@ # This takes a really long time. gtar -cf - -C $(prefix) . | gtar -xpf - -C $(PKGROOT)$(prefix) # echo foo > $(PKGROOT)$(prefix)/bar - grm -f $(PKGROOT)$(ORACLE_HOME)/inventory/Templates/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod - grm -f $(PKGROOT)$(ORACLE_HOME)/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod - # Removing one shared library, because: - # ERROR: Couldn't find a package providing libEntrust.so - grm -f $(PKGROOT)$(ORACLE_HOME)/lib32/libnnzentr10.so - # ERROR: Couldn't find a package providing libc.so.6 - grm -f $(PKGROOT)$(ORACLE_HOME)/lib/libcxa.so.3 - grm -f $(PKGROOT)$(ORACLE_HOME)/bin/rtsora32 + grm -fv $(PKGROOT)$(ORACLE_HOME)/inventory/Templates/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod + grm -fv $(PKGROOT)$(ORACLE_HOME)/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod + # Removing shared libraries, because they depend on other shared + # libraries that aren't there. + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/libnnzentr10.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libcxa.so.3 + grm -fv $(PKGROOT)$(ORACLE_HOME)/bin/rtsora32 + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/hsdb_inf.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/hsdb_inf.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/hsdb_syb.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/hsdb_syb.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jre/1.4.2/lib/sparcv9/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jre/1.4.2/lib/sparc/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jdk/jre/lib/sparcv9/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jdk/jre/lib/sparc/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libcoresh10.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/libsqora.so.10.1 + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libsqora.so.10.1 + grm -fv $(PKGROOT)$(ORACLE_HOME)/ctx/lib/libxml4c.so.54.0 + grm -fv $(PKGROOT)$(ORACLE_HOME)/ctx/lib/xmllib.so @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 31 02:28:03 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 31 Dec 2009 01:28:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7799] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 7799 http://gar.svn.sourceforge.net/gar/?rev=7799&view=rev Author: wahwah Date: 2009-12-31 01:28:03 +0000 (Thu, 31 Dec 2009) Log Message: ----------- sqlite3: Adding readline support Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/sqlite3/trunk/ Property changes on: csw/mgar/pkg/sqlite3/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-12-31 00:54:50 UTC (rev 7798) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-12-31 01:28:03 UTC (rev 7799) @@ -33,15 +33,20 @@ PKGFILES_CSWsqlite3 = $(bindir)/.* PKGFILES_CSWsqlite3devel = $(PKGFILES_DEVEL) -REQUIRED_PKGS_CSWsqlite3 = CSWsqlite3rt +REQUIRED_PKGS_CSWsqlite3 = CSWsqlite3rt +REQUIRED_PKGS_CSWsqlite3 += CSWreadline +REQUIRED_PKGS_CSWsqlite3 += CSWncurses REQUIRED_PKGS_CSWsqlite3devel = CSWsqlite3 +PREREQUISITE_PKGS = CSWreadline CSWncurses + BUILD64 = 1 NO_ISAEXEC = 1 # Make configure options CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-threadsafe --disable-debug +CONFIGURE_ARGS += --enable-threadsafe --disable-debug +CONFIGURE_ARGS += --with-readline-inc="-I/opt/csw/include/readline" TEST_SCRIPTS = 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 Dec 31 11:48:38 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 31 Dec 2009 10:48:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7800] csw/mgar/pkg/cpan/Net-DNS/trunk Message-ID: Revision: 7800 http://gar.svn.sourceforge.net/gar/?rev=7800&view=rev Author: bonivart Date: 2009-12-31 10:48:37 +0000 (Thu, 31 Dec 2009) Log Message: ----------- netdns: update to 0.66 Modified Paths: -------------- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile csw/mgar/pkg/cpan/Net-DNS/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Net-DNS/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Net-DNS/trunk/files/CSWpmnetdns.gspec Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2009-12-31 01:28:03 UTC (rev 7799) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2009-12-31 10:48:37 UTC (rev 7800) @@ -1,5 +1,5 @@ GARNAME = Net-DNS -GARVERSION = 0.65 +GARVERSION = 0.66 CATEGORIES = cpan AUTHOR = OLAF @@ -10,8 +10,11 @@ beyond the capabilities of gethostbyname and gethostbyaddr. endef -DISTFILES += $(call admfiles,CSWpmnetdns,) +PACKAGES = CSWpmnetdns +CATALOGNAME = pm_netdns +DISTFILES += COPYING + REQUIRED_PKGS = CSWpmdigesthmac CSWpmnetip DEPENDS += cpan/Net-IP Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/checksums 2009-12-31 01:28:03 UTC (rev 7799) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/checksums 2009-12-31 10:48:37 UTC (rev 7800) @@ -1,2 +1,2 @@ -ec522b0bede886bfe23f1610d74954fe download/CSWpmnetdns.gspec -54e5a12a20de39b954a93723927ac789 download/Net-DNS-0.65.tar.gz +1d067f31702657103c7a55874014546c COPYING +1635d876324e3c2f6e277d5778bfe94c Net-DNS-0.66.tar.gz Added: csw/mgar/pkg/cpan/Net-DNS/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/files/COPYING 2009-12-31 10:48:37 UTC (rev 7800) @@ -0,0 +1,10 @@ +Copyright (c) 1997-2002 Michael Fuhr. + +Portions Copyright (c) 2002-2004 Chris Reinhardt. + +Portions Copyright (c) 2005 Olaf Kolkman (RIPE NCC) + +Portions Copyright (c) 2005 Olaf Kolkman (NLnet Labs) + +All rights reserved. This program is free software; you may redistribute +it and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Net-DNS/trunk/files/CSWpmnetdns.gspec =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/files/CSWpmnetdns.gspec 2009-12-31 01:28:03 UTC (rev 7799) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/files/CSWpmnetdns.gspec 2009-12-31 10:48:37 UTC (rev 7800) @@ -1,15 +0,0 @@ -%var bitname pm_netdns -%var pkgname CSWpmnetdns -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright - -Copyright (c) 1997-2002 Michael Fuhr. - -Portions Copyright (c) 2002-2004 Chris Reinhardt. - -Portions Copyright (c) 2005 Olaf Kolkman (RIPE NCC) - -Portions Copyright (c) 2005 Olaf Kolkman (NLnet Labs) - -All rights reserved. This program 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 Thu Dec 31 12:10:52 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Dec 2009 11:10:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7801] csw/mgar/pkg/neon/tags/neon-0.29.1, REV=2009.12.17/ Message-ID: Revision: 7801 http://gar.svn.sourceforge.net/gar/?rev=7801&view=rev Author: dmichelsen Date: 2009-12-31 11:10:52 +0000 (Thu, 31 Dec 2009) Log Message: ----------- neon: Tag neon-0.29.1,REV=2009.12.17 Added Paths: ----------- csw/mgar/pkg/neon/tags/neon-0.29.1,REV=2009.12.17/ 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 Dec 31 12:14:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Dec 2009 11:14:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7802] csw/mgar/pkg/neon/trunk Message-ID: Revision: 7802 http://gar.svn.sourceforge.net/gar/?rev=7802&view=rev Author: dmichelsen Date: 2009-12-31 11:14:14 +0000 (Thu, 31 Dec 2009) Log Message: ----------- neon: Update to 0.29.2 Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile csw/mgar/pkg/neon/trunk/checksums Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2009-12-31 11:10:52 UTC (rev 7801) +++ csw/mgar/pkg/neon/trunk/Makefile 2009-12-31 11:14:14 UTC (rev 7802) @@ -1,9 +1,9 @@ GARNAME = neon -GARVERSION = 0.29.1 +GARVERSION = 0.29.2 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 0.26.4 0.29.1 +MODULATIONS_GARVERSION = 0.26.4 0.29.2 DESCRIPTION = Neon HTTP and WebDAV client library define BLURB @@ -51,9 +51,9 @@ MERGE_SCRIPTS_isa-default64-garversion-0.26.4 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.29.1 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-0.29.1 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.29.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-0.29.2 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-0.29.2 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.29.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) PKGFILES_CSWneon-devel += $(docdir)/.* Modified: csw/mgar/pkg/neon/trunk/checksums =================================================================== --- csw/mgar/pkg/neon/trunk/checksums 2009-12-31 11:10:52 UTC (rev 7801) +++ csw/mgar/pkg/neon/trunk/checksums 2009-12-31 11:14:14 UTC (rev 7802) @@ -1,3 +1,3 @@ 4ef5552e8930ef82b1f56c2712f8ed1e COPYING 2d11fff51ffa856fc6b5d4bd801d6cc4 neon-0.26.4.tar.gz -eb4eac0499cb6fced6e3b11e4b720ebb neon-0.29.1.tar.gz +bf475710d1116cece210e8b1ae708d69 neon-0.29.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 31 14:53:54 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 31 Dec 2009 13:53:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7803] csw/mgar/gar/v2/bin/mkpackage Message-ID: Revision: 7803 http://gar.svn.sourceforge.net/gar/?rev=7803&view=rev Author: wahwah Date: 2009-12-31 13:53:54 +0000 (Thu, 31 Dec 2009) Log Message: ----------- mGAR v2: Reverting r7795, using gzip (not pigz) Modified Paths: -------------- csw/mgar/gar/v2/bin/mkpackage Modified: csw/mgar/gar/v2/bin/mkpackage =================================================================== --- csw/mgar/gar/v2/bin/mkpackage 2009-12-31 11:14:14 UTC (rev 7802) +++ csw/mgar/gar/v2/bin/mkpackage 2009-12-31 13:53:54 UTC (rev 7803) @@ -908,7 +908,7 @@ my $compress = $config{usebzip} ? 'bzip2 -9 -f %s' - : 'pigz --fast -f %s'; + : 'gzip -9 -f %s'; vexec( sprintf( $compress, $tmppkg ), "Failed to compress $tmppkg" ); $tmppkg .= $config{usebzip} ? ".bz2" : ".gz"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 31 17:49:02 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 31 Dec 2009 16:49:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7804] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 7804 http://gar.svn.sourceforge.net/gar/?rev=7804&view=rev Author: rthurner Date: 2009-12-31 16:49:02 +0000 (Thu, 31 Dec 2009) Log Message: ----------- sqlite3 - upgrade to 3.6.21 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-12-31 13:53:54 UTC (rev 7803) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-12-31 16:49:02 UTC (rev 7804) @@ -1,5 +1,5 @@ GARNAME = sqlite3 -GARVERSION = 3.6.20 +GARVERSION = 3.6.21 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2009-12-31 13:53:54 UTC (rev 7803) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2009-12-31 16:49:02 UTC (rev 7804) @@ -1,4 +1,4 @@ 22bb7b924e2ecb13997abcf15966f674 COPYING 80d638505872be7ffa238d43f0e268b2 gar-base.diff 1a2be927ceacfa534501b9f4675bce83 shell.c.diff -0faf8fc8ccff5297513c6532b2b4ce23 sqlite-3.6.20.tar.gz +03a8498828866b407c61c0aaf8ebe66c sqlite-3.6.21.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 Dec 1 00:14:49 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 30 Nov 2009 23:14:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7512] csw/mgar/pkg/bind/trunk/files/CSWbindchroot. postinstall Message-ID: Revision: 7512 http://gar.svn.sourceforge.net/gar/?rev=7512&view=rev Author: bonivart Date: 2009-11-30 23:14:49 +0000 (Mon, 30 Nov 2009) Log Message: ----------- bind: fix for device files on sparcs Modified Paths: -------------- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall Modified: csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 20:05:20 UTC (rev 7511) +++ csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 23:14:49 UTC (rev 7512) @@ -7,8 +7,13 @@ for i in $DEVICELIST do - DEV=`ls -l /dev/$i | awk '{print $11}'` - DEVICE=`ls -l /dev/$DEV` + DEV=`ls -l /dev/$i | cut -c1` + if [ "$DEV" = "c" ]; then + DEVICE=`ls -l /dev/$i` + else + DEV=`ls -l /dev/$i | awk '{print $11}'` + DEVICE=`ls -l /dev/$DEV` + fi MAJOR=`echo $DEVICE | awk '{print $5}' | awk -F',' '{print $1}'` MINOR=`echo $DEVICE | awk '{print $6}'` echo "Creating device $i ($MAJOR,$MINOR)" 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 Dec 1 10:24:10 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 01 Dec 2009 09:24:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7513] csw/mgar/pkg/bind/trunk/checksums Message-ID: Revision: 7513 http://gar.svn.sourceforge.net/gar/?rev=7513&view=rev Author: bonivart Date: 2009-12-01 09:24:09 +0000 (Tue, 01 Dec 2009) Log Message: ----------- bind: fix checksums Modified Paths: -------------- csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2009-11-30 23:14:49 UTC (rev 7512) +++ csw/mgar/pkg/bind/trunk/checksums 2009-12-01 09:24:09 UTC (rev 7513) @@ -1,2 +1,2 @@ -4e64ed13da0d0e18aa770d6279df834a CSWbindchroot.postinstall +77345b27d2d3f23101e62bd4facb8ad8 CSWbindchroot.postinstall 435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 1 11:03:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:03:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7514] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 7514 http://gar.svn.sourceforge.net/gar/?rev=7514&view=rev Author: dmichelsen Date: 2009-12-01 10:03:50 +0000 (Tue, 01 Dec 2009) Log Message: ----------- mGAR v2: Do not pass include flags to the C/C++ compiler, but only to the preprocessor Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-12-01 09:24:09 UTC (rev 7513) +++ csw/mgar/gar/v2/gar.conf.mk 2009-12-01 10:03:50 UTC (rev 7514) @@ -499,8 +499,8 @@ CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) CXX = $($(GARCOMPILER)_CXX) -CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE_FLAGS)) -CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS) $(INCLUDE_FLAGS)) +CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS) +CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS) CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(_CATEGORY_CPPFLAGS) $(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS)) LDFLAGS ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(_CATEGORY_LDFLAGS) $(EXTRA_LDFLAGS) $(LINKER_FLAGS)) ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(_CATEGORY_ASFLAGS) $(EXTRA_ASFLAGS)) 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 Dec 1 11:05:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:05:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7515] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 7515 http://gar.svn.sourceforge.net/gar/?rev=7515&view=rev Author: dmichelsen Date: 2009-12-01 10:05:48 +0000 (Tue, 01 Dec 2009) Log Message: ----------- mGAR v2: Fix typo Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-12-01 10:03:50 UTC (rev 7514) +++ csw/mgar/gar/v2/gar.conf.mk 2009-12-01 10:05:48 UTC (rev 7515) @@ -499,8 +499,8 @@ CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) CXX = $($(GARCOMPILER)_CXX) -CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS) -CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS) +CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS)) +CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS)) CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(_CATEGORY_CPPFLAGS) $(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS)) LDFLAGS ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(_CATEGORY_LDFLAGS) $(EXTRA_LDFLAGS) $(LINKER_FLAGS)) ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(_CATEGORY_ASFLAGS) $(EXTRA_ASFLAGS)) 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 Dec 1 11:35:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:35:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7516] csw/mgar/pkg/sqlite3/tags/sqlite3-3.6.19, REV=2009.10 .29/ Message-ID: Revision: 7516 http://gar.svn.sourceforge.net/gar/?rev=7516&view=rev Author: dmichelsen Date: 2009-12-01 10:35:11 +0000 (Tue, 01 Dec 2009) Log Message: ----------- Tag release to current Added Paths: ----------- csw/mgar/pkg/sqlite3/tags/sqlite3-3.6.19,REV=2009.10.29/ 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 Dec 1 11:35:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:35:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7517] csw/mgar/pkg/hdf5/tags/hdf5-1.8.3, REV=2009.11.03/ Message-ID: Revision: 7517 http://gar.svn.sourceforge.net/gar/?rev=7517&view=rev Author: dmichelsen Date: 2009-12-01 10:35:51 +0000 (Tue, 01 Dec 2009) Log Message: ----------- hdf5: Tag release to current Added Paths: ----------- csw/mgar/pkg/hdf5/tags/hdf5-1.8.3,REV=2009.11.03/ 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 Dec 1 11:36:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:36:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7518] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 7518 http://gar.svn.sourceforge.net/gar/?rev=7518&view=rev Author: dmichelsen Date: 2009-12-01 10:36:23 +0000 (Tue, 01 Dec 2009) Log Message: ----------- sqlite3: Update to 3.6.20 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-12-01 10:35:51 UTC (rev 7517) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-12-01 10:36:23 UTC (rev 7518) @@ -1,5 +1,5 @@ GARNAME = sqlite3 -GARVERSION = 3.6.19 +GARVERSION = 3.6.20 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2009-12-01 10:35:51 UTC (rev 7517) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2009-12-01 10:36:23 UTC (rev 7518) @@ -1,4 +1,4 @@ 22bb7b924e2ecb13997abcf15966f674 COPYING 80d638505872be7ffa238d43f0e268b2 gar-base.diff 1a2be927ceacfa534501b9f4675bce83 shell.c.diff -aa03cc24a52851bb204fc1e489e195e8 sqlite-3.6.19.tar.gz +0faf8fc8ccff5297513c6532b2b4ce23 sqlite-3.6.20.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 Dec 1 11:36:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:36:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7519] csw/mgar/pkg/hdf5/trunk Message-ID: Revision: 7519 http://gar.svn.sourceforge.net/gar/?rev=7519&view=rev Author: dmichelsen Date: 2009-12-01 10:36:38 +0000 (Tue, 01 Dec 2009) Log Message: ----------- hdf5: Update to 1.6.10 and 1.8.4 Modified Paths: -------------- csw/mgar/pkg/hdf5/trunk/Makefile csw/mgar/pkg/hdf5/trunk/checksums Modified: csw/mgar/pkg/hdf5/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5/trunk/Makefile 2009-12-01 10:36:23 UTC (rev 7518) +++ csw/mgar/pkg/hdf5/trunk/Makefile 2009-12-01 10:36:38 UTC (rev 7519) @@ -1,12 +1,12 @@ GARNAME = hdf5 -GARVERSION = 1.8.3 +GARVERSION = 1.8.4 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 1.6.9 1.8.3 +MODULATIONS_GARVERSION = 1.6.10 1.8.4 -SKIP_MODULATIONS = isa-sparcv9-garversion-1.6.9 -SKIP_MODULATIONS += isa-amd64-garversion-1.6.9 +SKIP_MODULATIONS = isa-sparcv9-garversion-1.6.10 +SKIP_MODULATIONS += isa-amd64-garversion-1.6.10 DESCRIPTION = Event notification library define BLURB @@ -44,14 +44,14 @@ TEST_TARGET = check -MERGE_SCRIPTS_isa-default-garversion-1.6.9 = copy-only -MERGE_DIRS_isa-default-garversion-1.6.9 = $(libdir) -MERGE_SCRIPTS_isa-extra-garversion-1.6.9 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.6.9 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-1.6.10 = copy-only +MERGE_DIRS_isa-default-garversion-1.6.10 = $(libdir) +MERGE_SCRIPTS_isa-extra-garversion-1.6.10 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.6.10 = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-1.8.3 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-1.8.3 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.8.3 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-1.8.4 = copy-all +MERGE_SCRIPTS_isa-extra-garversion-1.8.4 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.8.4 = $(libdir) PKGFILES_CSWhdf5rt = $(PKGFILES_RT) Modified: csw/mgar/pkg/hdf5/trunk/checksums =================================================================== --- csw/mgar/pkg/hdf5/trunk/checksums 2009-12-01 10:36:23 UTC (rev 7518) +++ csw/mgar/pkg/hdf5/trunk/checksums 2009-12-01 10:36:38 UTC (rev 7519) @@ -1,2 +1,2 @@ -751eb3317a47e7c58978e1c3a13a93fc hdf5-1.6.9.tar.gz -5ce228d860bf9e797ca40ab1a823c380 hdf5-1.8.3.tar.gz +6e207a95d22e9e9ffdfaecdd580cd1b3 hdf5-1.6.10.tar.gz +971cc81ef10f50d2bb63cd6879fca7bc hdf5-1.8.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 Tue Dec 1 11:51:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:51:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7520] csw/mgar/pkg/cpan Message-ID: Revision: 7520 http://gar.svn.sourceforge.net/gar/?rev=7520&view=rev Author: dmichelsen Date: 2009-12-01 10:51:37 +0000 (Tue, 01 Dec 2009) Log Message: ----------- Mail-SPF: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Mail-SPF/ csw/mgar/pkg/cpan/Mail-SPF/branches/ csw/mgar/pkg/cpan/Mail-SPF/tags/ csw/mgar/pkg/cpan/Mail-SPF/trunk/ csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile csw/mgar/pkg/cpan/Mail-SPF/trunk/checksums csw/mgar/pkg/cpan/Mail-SPF/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Mail-SPF/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2009-12-01 10:51:37 UTC (rev 7520) @@ -0,0 +1,20 @@ +GARNAME = Mail-SPF +GARVERSION = 2.007 +CATEGORIES = cpan +AUTHOR = JMEHNLE + +DISTNAME = $(GARNAME)-v$(GARVERSION) +MODDIST = $(DISTNAME).tar.gz + +DESCRIPTION = Perl extension for Sender Policy Framework +define BLURB +endef + +PACKAGES = CSWpmmailspf +CATALOGNAME = pm_mailspf + +ARCHALL = 1 + +EXTRA_PAX_ARGS = '-s,spfquery,spfquery-cpan,p' + +include gar/category.mk Added: csw/mgar/pkg/cpan/Mail-SPF/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Mail-SPF/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Mail-SPF/trunk/checksums 2009-12-01 10:51:37 UTC (rev 7520) @@ -0,0 +1 @@ +67dccdc91e3264679a0e17d493d3cc30 Mail-SPF-v2.007.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 Dec 1 11:54:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 10:54:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7521] csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile Message-ID: Revision: 7521 http://gar.svn.sourceforge.net/gar/?rev=7521&view=rev Author: dmichelsen Date: 2009-12-01 10:54:13 +0000 (Tue, 01 Dec 2009) Log Message: ----------- cpan/Mail-SPF: Rename spfd Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile Modified: csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2009-12-01 10:51:37 UTC (rev 7520) +++ csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2009-12-01 10:54:13 UTC (rev 7521) @@ -16,5 +16,6 @@ ARCHALL = 1 EXTRA_PAX_ARGS = '-s,spfquery,spfquery-cpan,p' +EXTRA_PAX_ARGS += '-s,spfd,spfd-cpan,p' 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 Dec 1 14:26:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 13:26:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7522] csw/mgar/pkg/libmpeg2/trunk/Makefile Message-ID: Revision: 7522 http://gar.svn.sourceforge.net/gar/?rev=7522&view=rev Author: dmichelsen Date: 2009-12-01 13:26:58 +0000 (Tue, 01 Dec 2009) Log Message: ----------- libmpeg2: Add missing dependency Modified Paths: -------------- csw/mgar/pkg/libmpeg2/trunk/Makefile Modified: csw/mgar/pkg/libmpeg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-12-01 10:54:13 UTC (rev 7521) +++ csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-12-01 13:26:58 UTC (rev 7522) @@ -22,7 +22,7 @@ SPKG_DESC_CSWlibmpeg2 = A free MPEG-2 video stream library SPKG_DESC_CSWmpeg2dec = A free MPEG-2 video stream decoder -REQUIRED_PKGS_CSWmpeg2dec = CSWlibmpeg2 +REQUIRED_PKGS_CSWmpeg2dec = CSWlibmpeg2 CSWlibsdl SPKG_SOURCEURL = http://libmpeg2.sourceforge.net 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 Dec 1 14:53:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 13:53:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7523] csw/mgar/pkg/libmpeg2/trunk/Makefile Message-ID: Revision: 7523 http://gar.svn.sourceforge.net/gar/?rev=7523&view=rev Author: dmichelsen Date: 2009-12-01 13:53:33 +0000 (Tue, 01 Dec 2009) Log Message: ----------- libmpeg2: Make separate packages for Solaris 10 to make use of newer X11 builtin features Modified Paths: -------------- csw/mgar/pkg/libmpeg2/trunk/Makefile Modified: csw/mgar/pkg/libmpeg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-12-01 13:26:58 UTC (rev 7522) +++ csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-12-01 13:53:33 UTC (rev 7523) @@ -26,16 +26,27 @@ SPKG_SOURCEURL = http://libmpeg2.sourceforge.net -# This stupid configure script adds '-fast' overwriting -xarch and -# especially activating 64 bit. +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + +# This stupid configure script adds '-fast' overwriting -xarch ande especially activating 64 bit. BUILD_ARGS = MPEG2DEC_CFLAGS= OPT_CFLAGS= -BUILD64 = 1 +BUILD64_platform-solaris8-sparc = 1 +BUILD64_platform-solaris10-sparc = 1 +BUILD64_platform-solaris10-i386 = 1 +BUILD64 = $(BUILD64_platform-$(PLATFORM)) + NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -# Do this only for sparcv8 and i386, otherwise make sure to compile on vis/mmx-enable ISA -CONFIGURE_ARGS += --disable-accel-detect +CONFIGURE_ARGS_garosrel-5.8 = --x-includes=/usr/openwin/include +CONFIGURE_ARGS_garosrel-5.8 += --x-libraries=/usr/openwin/lib +CONFIGURE_ARGS_garosrel-5.10 = --x-includes=/usr/X11/include +CONFIGURE_ARGS_garosrel-5.10 += --x-libraries=/usr/X11/lib + +CONFIGURE_ARGS += $(CONFIGURE_ARGS_garosrel-$(GAROSREL)) + MERGE_DIRS_isa-extra = $(libdir) PKGFILES_CSWmpeg2dec = $(bindir)/.* 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 Dec 1 15:06:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 14:06:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7524] csw/mgar/pkg/hdf5/trunk/Makefile Message-ID: Revision: 7524 http://gar.svn.sourceforge.net/gar/?rev=7524&view=rev Author: dmichelsen Date: 2009-12-01 14:06:12 +0000 (Tue, 01 Dec 2009) Log Message: ----------- hdf5: Add dependency to CSWzlib Modified Paths: -------------- csw/mgar/pkg/hdf5/trunk/Makefile Modified: csw/mgar/pkg/hdf5/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5/trunk/Makefile 2009-12-01 13:53:33 UTC (rev 7523) +++ csw/mgar/pkg/hdf5/trunk/Makefile 2009-12-01 14:06:12 UTC (rev 7524) @@ -25,7 +25,8 @@ PACKAGES = CSWhdf5rt CSWhdf5 -REQUIRED_PKGS_CSWhdf5 = CSWhdf5rt +REQUIRED_PKGS_CSWhdf5 = CSWhdf5rt CSWzlib +REQUIRED_PKGS_CSWhdf5rt = CSWzlib CATALOGNAME_CSWhdf5 = hdf5 CATALOGNAME_CSWhdf5rt = hdf5_rt 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 Dec 1 16:45:42 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 01 Dec 2009 15:45:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7525] csw/mgar/pkg/bind/trunk/files/CSWbindchroot. postinstall Message-ID: Revision: 7525 http://gar.svn.sourceforge.net/gar/?rev=7525&view=rev Author: bonivart Date: 2009-12-01 15:45:42 +0000 (Tue, 01 Dec 2009) Log Message: ----------- bind: fix chroot postinstall Modified Paths: -------------- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall Modified: csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-12-01 14:06:12 UTC (rev 7524) +++ csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-12-01 15:45:42 UTC (rev 7525) @@ -17,7 +17,7 @@ MAJOR=`echo $DEVICE | awk '{print $5}' | awk -F',' '{print $1}'` MINOR=`echo $DEVICE | awk '{print $6}'` echo "Creating device $i ($MAJOR,$MINOR)" - mknod $ROOTDIR/dev/$i c $MAJOR $MINOR + [ ! -c $ROOTDIR/dev/$i ] && mknod $ROOTDIR/dev/$i c $MAJOR $MINOR done # Copy config from /etc/opt/csw 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 Dec 1 17:00:20 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 01 Dec 2009 16:00:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7526] csw/mgar/pkg/bind/trunk/checksums Message-ID: Revision: 7526 http://gar.svn.sourceforge.net/gar/?rev=7526&view=rev Author: bonivart Date: 2009-12-01 16:00:20 +0000 (Tue, 01 Dec 2009) Log Message: ----------- bind: forgot checksums again! Modified Paths: -------------- csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2009-12-01 15:45:42 UTC (rev 7525) +++ csw/mgar/pkg/bind/trunk/checksums 2009-12-01 16:00:20 UTC (rev 7526) @@ -1,2 +1,2 @@ -77345b27d2d3f23101e62bd4facb8ad8 CSWbindchroot.postinstall +dbbc839888d11d22aad3ccb65942d2e5 CSWbindchroot.postinstall 435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.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 Dec 1 19:29:07 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 01 Dec 2009 18:29:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7527] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 7527 http://gar.svn.sourceforge.net/gar/?rev=7527&view=rev Author: bonivart Date: 2009-12-01 18:29:07 +0000 (Tue, 01 Dec 2009) Log Message: ----------- dhcp: update to 4.1.1 beta 3, update GAR stuff (found a bug?) Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-01 16:00:20 UTC (rev 7526) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-01 18:29:07 UTC (rev 7527) @@ -1,5 +1,5 @@ GARNAME = dhcp -GARVERSION = 4.1.1b2 +GARVERSION = 4.1.1b3 CATEGORIES = net DESCRIPTION = ISC DHCP reference implementation @@ -13,21 +13,24 @@ MASTER_SITES = http://ftp.isc.org/isc/dhcp/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +LICENSE = LICENSE + PACKAGES = CSWdhcp CSWdhcpdevel -CATALOGNAME_CSWdhcpdevel = dhcp_devel + +REQUIRED_PKGS_CSWdhcp = CSWosslrt SPKG_DESC_CSWdhcp = ISC DHCP reference implementation -LICENSE = LICENSE -REQUIRED_PKGS_CSWdhcp = CSWcswclassutils CSWosslrt REQUIRED_PKGS_CSWdhcpdevel = CSWdhcp +CATALOGNAME_CSWdhcpdevel = dhcp_devel +ARCHALL_CSWdhcpdevel = 1 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) +UFILES_REGEX = ($(GARNAME)-\d+(?:\.\d+)*).tar.gz GARCOMPILER = GNU TEST_TARGET = check -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw CONFIGURE_ARGS += --localstatedir=/var/opt/csw/dhcp @@ -39,15 +42,18 @@ INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /\/dhcpd.leases.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' +#PROTOTYPE_FILTER = awk ' \ +# $$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } \ +# $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ +# $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ +# $$$$3 ~ /\/dhcpd.leases.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ +# { print }' +INITSMF_CSWdhcp = /etc/opt/csw/init.d/cswdhcpd +SAMPLECONF_CSWdhcp = /etc/opt/csw/dhcpd.conf /etc/opt/csw/dhclient.conf /var/opt/csw/dhcp/db/dhcpd.leases + SPKG_SOURCEURL = https://www.isc.org/software/dhcp -SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf +#SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf include gar/category.mk @@ -58,11 +64,12 @@ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @cp $(FILEDIR)/CSWdhcp.cswdhcpd $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd @chmod 755 $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd - @( cd $(DESTDIR)/etc/opt/csw ; \ - mv dhcpd.conf dhcpd.conf.CSW ; \ - mv dhclient.conf dhclient.conf.CSW ) +# @( cd $(DESTDIR)/etc/opt/csw ; \ +# mv dhcpd.conf dhcpd.conf.CSW ; \ +# mv dhclient.conf dhclient.conf.CSW ) @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(FILEDIR)/CSWdhcp.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/db - @touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases.CSW +# @touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases.CSW + @touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases @$(MAKECOOKIE) Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2009-12-01 16:00:20 UTC (rev 7526) +++ csw/mgar/pkg/dhcp/trunk/checksums 2009-12-01 18:29:07 UTC (rev 7527) @@ -1 +1 @@ -b85b23edc74514712139b860f74bc650 download/dhcp-4.1.1b2.tar.gz +085da9c98f3d4ec285b319fcdda6d552 dhcp-4.1.1b3.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 Dec 1 21:24:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Dec 2009 20:24:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7528] csw/mgar/pkg/libschroedinger/trunk/Makefile Message-ID: Revision: 7528 http://gar.svn.sourceforge.net/gar/?rev=7528&view=rev Author: dmichelsen Date: 2009-12-01 20:24:04 +0000 (Tue, 01 Dec 2009) Log Message: ----------- libschroedinger: Split off devel package Modified Paths: -------------- csw/mgar/pkg/libschroedinger/trunk/Makefile Modified: csw/mgar/pkg/libschroedinger/trunk/Makefile =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/Makefile 2009-12-01 18:29:07 UTC (rev 7527) +++ csw/mgar/pkg/libschroedinger/trunk/Makefile 2009-12-01 20:24:04 UTC (rev 7528) @@ -19,12 +19,23 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWliboil +SPKG_SOURCEURL = http://diracvideo.org/ +PACKAGES = CSWlibschro CSWlibschrodevel + +SPKG_DESC_CSWlibschro = $(DESCRIPTION) +SPKG_DESC_CSWlibschrodevel = libschroedinger developer files + +REQUIRED_PKGS_CSWlibschro = CSWliboil +REQUIRED_PKGS_CSWlibschrodevel = CSWlibschro + BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +PKGFILES_CSWlibschrodevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibschrodevel += $(sharedstatedir)/gtk-doc/.* + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 1 22:56:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 01 Dec 2009 21:56:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7529] csw/mgar/pkg/x11 Message-ID: Revision: 7529 http://gar.svn.sourceforge.net/gar/?rev=7529&view=rev Author: wbonnet Date: 2009-12-01 21:56:44 +0000 (Tue, 01 Dec 2009) Log Message: ----------- Upgrade to 7.5RC Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxi/trunk/Makefile csw/mgar/pkg/x11/lib/libxi/trunk/checksums csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums csw/mgar/pkg/x11/libwindowswm/trunk/Makefile csw/mgar/pkg/x11/libwindowswm/trunk/checksums csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/lib/libxi/trunk/files/XExtInt.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XGetCPtr.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIAllowEvents.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIDefineCursor.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGetDevFocus.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGrabDevice.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIHierarchy.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIPassiveGrab.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIProperties.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryDevice.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryPointer.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryVersion.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XISelEv.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XISelectEvent.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XISetDevFocus.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XIWarpPointer.c.diff csw/mgar/pkg/x11/lib/libxi/trunk/files/XSetCPtr.c.diff Modified: csw/mgar/pkg/x11/lib/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-12-01 21:56:44 UTC (rev 7529) @@ -32,4 +32,23 @@ PKGFILES_CSWlibxidevel = $(PKGFILES_DEVEL) +PATCHFILES = XGetCPtr.c.diff +PATCHFILES += XSetCPtr.c.diff +PATCHFILES += XExtInt.c.diff +PATCHFILES += XIAllowEvents.c.diff +PATCHFILES += XIGrabDevice.c.diff +PATCHFILES += XIQueryDevice.c.diff +PATCHFILES += XIQueryVersion.c.diff +PATCHFILES += XISetDevFocus.c.diff +PATCHFILES += XIGetDevFocus.c.diff +PATCHFILES += XIPassiveGrab.c.diff +PATCHFILES += XIProperties.c.diff +PATCHFILES += XISelEv.c.diff +PATCHFILES += XIWarpPointer.c.diff +PATCHFILES += XIHierarchy.c.diff +PATCHFILES += XIDefineCursor.c.diff +PATCHFILES += XIQueryPointer.c.diff + +EXTRA_CFLAGS = -D__solaris__ + include gar/category.mk Modified: csw/mgar/pkg/x11/lib/libxi/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-12-01 21:56:44 UTC (rev 7529) @@ -1 +1,17 @@ +d95bdf63f185d137a6c8f2e05d293298 XExtInt.c.diff +27309cebc8303847fab98a8e420da406 XGetCPtr.c.diff +6a5891b82318eb5e0d15d9102a44b4bc XIAllowEvents.c.diff +da48611d1f64a9072cab0afeb8267b1d XIDefineCursor.c.diff +619aa946e0795ee3f29c0478a84dd620 XIGetDevFocus.c.diff +fcb606dd69e87c852b84332634182d17 XIGrabDevice.c.diff +9bc00af97e2ce1fdce5835fd6a0d958f XIHierarchy.c.diff +8ad06ba31a36b0f4f296a940acc4d9e0 XIPassiveGrab.c.diff +f7eca3ea1289267b7e5b949c266045c6 XIProperties.c.diff +7fe2b8efb13fef03d68d52dd06dcc3d1 XIQueryDevice.c.diff +f425a7ebe13aff5382b64cafbc11bcad XIQueryPointer.c.diff +336cb168b33dca2bf3bf0fe49f51ef55 XIQueryVersion.c.diff +4a032e1634db5afbaafd49372930bb18 XISelEv.c.diff +59275ffc08d5c8d8aa0c838929f1c7ba XISetDevFocus.c.diff +90a67e6b1ca050cd9c7e47d9d486cf6d XIWarpPointer.c.diff +f3dfe2f596b169a7c8f6a13265633cc1 XSetCPtr.c.diff 8df4ece9bd1efb02c28acb2b6f485e09 libXi-1.3.tar.bz2 Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XExtInt.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XExtInt.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XExtInt.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XExtInt.c 2009-11-29 19:00:14.775150130 +0100 ++++ libXi-1.3/src/XExtInt.c 2009-11-29 19:00:50.822247645 +0100 +@@ -53,7 +53,11 @@ + #define NEED_EVENTS + #define NEED_REPLIES + #include ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XGetCPtr.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XGetCPtr.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XGetCPtr.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XGetCPtr.c.orig 2009-11-29 18:30:33.259326221 +0100 ++++ libXi-1.3/src/XGetCPtr.c 2009-11-29 18:33:08.647183904 +0100 +@@ -30,7 +30,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIAllowEvents.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIAllowEvents.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIAllowEvents.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIAllowEvents.c 2009-11-29 19:05:36.738683637 +0100 ++++ libXi-1.3/src/XIAllowEvents.c 2009-11-29 19:06:23.727032463 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIDefineCursor.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIDefineCursor.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIDefineCursor.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIDefineCursor.c 2009-11-29 20:03:33.432148265 +0100 ++++ libXi-1.3/src/XIDefineCursor.c 2009-11-29 20:04:31.660299927 +0100 +@@ -29,7 +29,11 @@ + * XIDefineCursor - Change the cursor of an extension input device. + * + */ ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGetDevFocus.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGetDevFocus.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGetDevFocus.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIGetDevFocus.c 2009-11-29 19:17:55.985236561 +0100 ++++ libXi-1.3/src/XIGetDevFocus.c 2009-11-29 19:19:03.913035021 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGrabDevice.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGrabDevice.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIGrabDevice.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIGrabDevice.c 2009-11-29 19:07:57.401317320 +0100 ++++ libXi-1.3/src/XIGrabDevice.c 2009-11-29 19:09:24.260835640 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIHierarchy.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIHierarchy.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIHierarchy.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIHierarchy.c 2009-11-29 19:56:17.122299253 +0100 ++++ libXi-1.3/src/XIHierarchy.c 2009-11-29 19:57:12.933049711 +0100 +@@ -30,7 +30,11 @@ + * device is attached to which master, etc. + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIPassiveGrab.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIPassiveGrab.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIPassiveGrab.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIPassiveGrab.c 2009-11-29 19:17:55.985236561 +0100 ++++ libXi-1.3/src/XIPassiveGrab.c 2009-11-29 19:19:03.913035021 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIProperties.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIProperties.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIProperties.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIProperties.c 2009-11-29 19:17:55.985236561 +0100 ++++ libXi-1.3/src/XIProperties.c 2009-11-29 19:19:03.913035021 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryDevice.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryDevice.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryDevice.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIQueryDevice.c 2009-11-29 19:14:41.717573509 +0100 ++++ libXi-1.3/src/XIQueryDevice.c 2009-11-29 19:17:04.390432318 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryPointer.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryPointer.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryPointer.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3/src/XIQueryPointer.c 2009-11-29 22:21:21.244165842 +0100 ++++ libXi-1.3/src/XIQueryPointer.c 2009-11-29 22:21:45.583635373 +0100 +@@ -30,7 +30,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryVersion.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryVersion.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIQueryVersion.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIQueryVersion.c 2009-11-29 19:11:37.322670833 +0100 ++++ libXi-1.3/src/XIQueryVersion.c 2009-11-29 19:12:13.171546047 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XISelEv.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XISelEv.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XISelEv.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XISelEv.c 2009-11-29 19:38:26.221076187 +0100 ++++ libXi-1.3/src/XISelEv.c 2009-11-29 19:38:50.845264126 +0100 +@@ -31,7 +31,11 @@ + */ + + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XISetDevFocus.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XISetDevFocus.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XISetDevFocus.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XISetDevFocus.c 2009-11-29 19:17:55.985236561 +0100 ++++ libXi-1.3/src/XISetDevFocus.c 2009-11-29 19:19:03.913035021 +0100 +@@ -22,7 +22,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XIWarpPointer.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XIWarpPointer.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XIWarpPointer.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XIWarpPointer.c 2009-11-29 19:48:25.658001547 +0100 ++++ libXi-1.3/src/XIWarpPointer.c 2009-11-29 19:48:49.798058492 +0100 +@@ -30,7 +30,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Added: csw/mgar/pkg/x11/lib/libxi/trunk/files/XSetCPtr.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/files/XSetCPtr.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxi/trunk/files/XSetCPtr.c.diff 2009-12-01 21:56:44 UTC (rev 7529) @@ -0,0 +1,14 @@ +--- libXi-1.3.orig/src/XSetCPtr.c.orig 2009-11-29 18:30:33.259326221 +0100 ++++ libXi-1.3/src/XSetCPtr.c 2009-11-29 18:33:08.647183904 +0100 +@@ -30,7 +30,11 @@ + * + */ + ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include Modified: csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile 2009-12-01 21:56:44 UTC (rev 7529) @@ -1,5 +1,5 @@ GARNAME = libXScrnSaver -GARVERSION = 1.1.3 +GARVERSION = 1.2.0 CATEGORIES = x11 DESCRIPTION = The XScrnSaver Library @@ -15,19 +15,19 @@ CONFIGURE_ARGS = $(DIRPATHS) -PACKAGES = CSWlibxscrnsaver CSWlibxscrnsaverdevel +PACKAGES = CSWlibxscrnsaver CSWlibxscrnsaverdev CATALOGNAME_CSWlibxscrnsaver = libxscrnsaver -CATALOGNAME_CSWlibxscrnsaverdevel = libxscrnsaver_devel +CATALOGNAME_CSWlibxscrnsaverdev = libxscrnsaver_devel SPKG_DESC_CSWlibxscrnsaver = $(DESCRIPTION) -SPKG_DESC_CSWlibxscrnsaverdevel = $(DESCRIPTION) development files +SPKG_DESC_CSWlibxscrnsaverdev = $(DESCRIPTION) development files # PREREQUISITE_PKGS = CSWscrnsaverproto REQUIRED_PKGS_CSWlibxscrnsaver = CSWlibx11 CSWlibxext -REQUIRED_PKGS_CSWlibxscrnsaverdevel = CSWlibxscrnsaver +REQUIRED_PKGS_CSWlibxscrnsaverdev = CSWlibxscrnsaver -PKGFILES_CSWlibxscrnsaverdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxscrnsaverdev = $(PKGFILES_DEVEL) BUILD64 = 1 NOISALIST = 1 Modified: csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/checksums 2009-12-01 21:56:44 UTC (rev 7529) @@ -1 +1 @@ -93f84b6797f2f29cae1ce23b0355d00d download/libXScrnSaver-1.1.3.tar.bz2 +33e54f64b55f22d8bbe822a5b62568cb libXScrnSaver-1.2.0.tar.bz2 Modified: csw/mgar/pkg/x11/libwindowswm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libwindowswm/trunk/Makefile 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/libwindowswm/trunk/Makefile 2009-12-01 21:56:44 UTC (rev 7529) @@ -1,5 +1,5 @@ GARNAME = libWindowsWM -GARVERSION = 1.0.0 +GARVERSION = 1.0.1 CATEGORIES = x11 DESCRIPTION = Cygwin/X rootless window management extension @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibwindowswm = $(DESCRIPTION) SPKG_DESC_CSWlibwindowswmdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWwindowswmproto +PREREQUISITE_PKGS = CSWx11windowswmproto REQUIRED_PKGS_CSWlibwindowswm = CSWlibx11 CSWlibxext REQUIRED_PKGS_CSWlibwindowswmdevel = CSWlibwindowswm Modified: csw/mgar/pkg/x11/libwindowswm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libwindowswm/trunk/checksums 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/libwindowswm/trunk/checksums 2009-12-01 21:56:44 UTC (rev 7529) @@ -1 +1 @@ -337b379fd00a67345b083100c4e6ba95 download/libWindowsWM-1.0.0.tar.bz2 +274b2b5620a524fd7bb739edb97317f5 libWindowsWM-1.0.1.tar.bz2 Modified: csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile 2009-12-01 21:56:44 UTC (rev 7529) @@ -1,5 +1,5 @@ -GARVERSION = 2.3 -CATEGORIES = x11.0 +GARVERSION = 2.3.0 +CATEGORIES = x11 PROTONAME = videoproto GARNAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) Modified: csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums 2009-12-01 20:24:04 UTC (rev 7528) +++ csw/mgar/pkg/x11/proto/x11_videoproto/trunk/checksums 2009-12-01 21:56:44 UTC (rev 7529) @@ -1 +1 @@ -ace6f55cd4dcebf4b191c0c31755ed92 download/videoproto-2.2.2.tar.gz +888543493cd69c6c78002ac59c3f077f videoproto-2.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Dec 2 01:25:50 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Dec 2009 00:25:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7530] csw/mgar/pkg/colormake/trunk/Makefile Message-ID: Revision: 7530 http://gar.svn.sourceforge.net/gar/?rev=7530&view=rev Author: bdwalton Date: 2009-12-02 00:25:50 +0000 (Wed, 02 Dec 2009) Log Message: ----------- colormake: update custom install to match old package (and not conflict with cmake) Modified Paths: -------------- csw/mgar/pkg/colormake/trunk/Makefile Modified: csw/mgar/pkg/colormake/trunk/Makefile =================================================================== --- csw/mgar/pkg/colormake/trunk/Makefile 2009-12-01 21:56:44 UTC (rev 7529) +++ csw/mgar/pkg/colormake/trunk/Makefile 2009-12-02 00:25:50 UTC (rev 7530) @@ -39,6 +39,7 @@ install-custom: @(cd $(WORKSRC); \ ginstall -d -m 0755 $(DESTDIR)$(bindir) $(DESTDIR)$(CMDD); \ - ginstall -m 0755 colormake.pl cmake clmake $(DESTDIR)$(bindir); \ + ginstall -m 0755 colormake.pl clmake $(DESTDIR)$(bindir); \ + ginstall -m 0755 cmake $(DESTDIR)$(bindir)/colormake; \ ginstall -m 0644 AUTHORS README $(DESTDIR)$(CMDD) ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 2 01:29:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 00:29:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7531] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7531 http://gar.svn.sourceforge.net/gar/?rev=7531&view=rev Author: wahwah Date: 2009-12-02 00:29:09 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Enabling contrib Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 00:25:50 UTC (rev 7530) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 00:29:09 UTC (rev 7531) @@ -83,7 +83,14 @@ # NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-includes=/opt/csw/include +CONFIGURE_ARGS_isa-sparcv8 += --with-libraries=/opt/csw/lib/32 +CONFIGURE_ARGS_isa-i386 += --with-libraries=/opt/csw/lib/32 +CONFIGURE_ARGS_isa-sparcv9 += --with-libraries=/opt/csw/lib/64 +CONFIGURE_ARGS_isa-amd64 += --with-libraries=/opt/csw/lib/64 +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) + TEST_TARGET = check EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" @@ -93,6 +100,7 @@ PKGFILES_CSWpostgresqldevel += $(prefix)/share/doc/postgresql/html.* PKGFILES_CSWlibpq = $(PKGFILES_RT) PKGFILES_CSWlibpq += $(libdir)/64 +PKGFILES_CSWlibpq += $(libdir)/32 INITSMF = /etc$(prefix)/init\.d/cswpostgres-$(BASE_VERSION) USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) @@ -117,6 +125,14 @@ CFLAGS := $(filter-out -I%,$(CFLAGS)) +post-build-modulated: + $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all + @$(MAKECOOKIE) + +post-install-modulated: + $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install + @$(MAKECOOKIE) + post-merge: ginstall -d $(PKGROOT)/etc$(prefix)/init.d sed -e 's+ at PGDATA@+$(PGDATA)+' \ @@ -146,4 +162,5 @@ done ginstall -d $(PKGROOT)$(PGDATA) gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + gln -s . $(PKGROOT)$(libdir)/32 @$(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 Wed Dec 2 04:43:03 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Dec 2009 03:43:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7532] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 7532 http://gar.svn.sourceforge.net/gar/?rev=7532&view=rev Author: bdwalton Date: 2009-12-02 03:43:03 +0000 (Wed, 02 Dec 2009) Log Message: ----------- libxml2: bump version to 2.7.6 Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-02 00:29:09 UTC (rev 7531) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-02 03:43:03 UTC (rev 7532) @@ -1,5 +1,5 @@ GARNAME = libxml2 -GARVERSION = 2.7.3 +GARVERSION = 2.7.6 CATEGORIES = lib DESCRIPTION = XML Parser Library 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 Dec 2 10:07:33 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 09:07:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7533] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 7533 http://gar.svn.sourceforge.net/gar/?rev=7533&view=rev Author: wahwah Date: 2009-12-02 09:07:27 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Symlinks for contrib, trying to make smf work Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 03:43:03 UTC (rev 7532) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 09:07:27 UTC (rev 7533) @@ -82,7 +82,7 @@ # # NO_ISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-includes=/opt/csw/include CONFIGURE_ARGS_isa-sparcv8 += --with-libraries=/opt/csw/lib/32 CONFIGURE_ARGS_isa-i386 += --with-libraries=/opt/csw/lib/32 @@ -90,10 +90,29 @@ CONFIGURE_ARGS_isa-amd64 += --with-libraries=/opt/csw/lib/64 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) +# # Perl support only in the 32-bit version +# CONFIGURE_ARGS_isa-sparcv8 += --with-perl +# CONFIGURE_ARGS_isa-i386 += --with-perl +# # Python support in 32-bit only +# CONFIGURE_ARGS_isa-sparcv8 += --with-python +# CONFIGURE_ARGS_isa-i386 += --with-python + +CONFIGURE_ARGS += --with-gssapi +# CONFIGURE_ARGS += --with-krb5 +CONFIGURE_ARGS += --with-pam +# CONFIGURE_ARGS += --with-bonjour +CONFIGURE_ARGS += --with-openssl +CONFIGURE_ARGS += --with-libxml +CONFIGURE_ARGS += --with-libxslt +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) + +# Skipping tests to save time during packaging, and to enable x86 builds. +SKIPTEST = 1 TEST_TARGET = check -EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" +# What's that for? +# EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" PKGFILES_CSWpostgresqldoc = $(PKGFILES_DOC) PKGFILES_CSWpostgresqldevel = $(PKGFILES_DEVEL) @@ -102,13 +121,35 @@ PKGFILES_CSWlibpq += $(libdir)/64 PKGFILES_CSWlibpq += $(libdir)/32 -INITSMF = /etc$(prefix)/init\.d/cswpostgres-$(BASE_VERSION) +INITSMF = /etc$(prefix)/init\.d/cswpostgresql_$(BASE_VERSION) USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) PRESERVECONF = $(sysconfdir)/postgresql\.conf -BIN_NAMES = clusterdb createdb createlang createuser dropdb droplang dropuser -BIN_NAMES += ecpg initdb pg_config pg_controldata pg_ctl pg_dump pg_dumpall -BIN_NAMES += pg_resetxlog pg_restore postgres postmaster psql reindexdb +BIN_NAMES = clusterdb +BIN_NAMES += createdb +BIN_NAMES += createlang +BIN_NAMES += createuser +BIN_NAMES += dropdb +BIN_NAMES += droplang +BIN_NAMES += dropuser +BIN_NAMES += ecpg +BIN_NAMES += initdb +BIN_NAMES += oid2name +BIN_NAMES += pg_config +BIN_NAMES += pg_controldata +BIN_NAMES += pg_ctl +BIN_NAMES += pg_dump +BIN_NAMES += pg_dumpall +BIN_NAMES += pg_resetxlog +BIN_NAMES += pg_restore +BIN_NAMES += pg_standby +BIN_NAMES += pgbench +BIN_NAMES += postgres +BIN_NAMES += postmaster +BIN_NAMES += psql +BIN_NAMES += reindexdb +BIN_NAMES += vacuumdb +BIN_NAMES += vacuumlo PGDATA = $(localstatedir)/pgdata @@ -139,10 +180,10 @@ -e 's+ at sysconfdir@+$(sysconfdir)+' \ -e 's+ at bindir@+$(bindir)+' \ < $(FILEDIR)/cswpostgres.tmpl \ - > $(WORKDIR)/cswpostgres + > $(WORKDIR)/cswpostgres_$(BASE_VERSION) ginstall \ - $(WORKDIR)/cswpostgres \ - $(PKGROOT)/etc$(prefix)/init.d/cswpostgres-$(BASE_VERSION) + $(WORKDIR)/cswpostgres_$(BASE_VERSION) \ + $(PKGROOT)/etc$(prefix)/init.d/cswpostgres_$(BASE_VERSION) ginstall -d $(PKGROOT)/etc$(prefix)/pkg/$(GARNAME) sed -e 's+ at PGDATA@+$(PGDATA)+' \ < $(FILEDIR)/cswusergroup.tmpl \ Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2009-12-02 03:43:03 UTC (rev 7532) +++ csw/mgar/pkg/postgresql/trunk/checksums 2009-12-02 09:07:27 UTC (rev 7533) @@ -1,5 +1,5 @@ 6e4e2a7755acf94bc83200a308e21ef3 README-CSW.txt -922febb720931220e272c2872ebf47e4 cswpostgres.tmpl +e6f5d88d673c79e3948bf0fde2ba282f cswpostgres.tmpl 9e1e49d76fee70cb8e2d49304695ec89 cswusergroup.tmpl f2015af17bacbbfe140daf0d1067f9c9 postgresql-8.4.1.tar.bz2 8237c74666058f607f5418e3b57c74a9 postgresql.conf.tmpl Modified: csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl 2009-12-02 03:43:03 UTC (rev 7532) +++ csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl 2009-12-02 09:07:27 UTC (rev 7533) @@ -4,10 +4,14 @@ # PostgreSQL startup script - part of the CSWpostgresql package # mark at blastwave.org # -# 2009-11-29: Parametrized file locations -# Maciej Blizinski (maciej at opencsw.org) +# 2009-11-29 Maciej Blizinski (maciej at opencsw.org) +# - Parametrized file locations +# - Style changes +# # -# Variables to substitute: +# This files is a template. The following variables need to be substituted +# before it can be run: +# # - PGDATA # - bindir # - sysconfdir @@ -27,6 +31,8 @@ # version - it checks if the 64-bit server was last run. If so, # it forces the 64-bit server, otherwise it won't start up! # And vice-versa for the 32-bit server... +# +# This version doesn't check the i386/amd64 architectures. if [ -f "${PGDATA}/postmaster.opts" ]; then if grep 'sparcv9' ${PGDATA}/postmaster.opts > /dev/null; then echo ${PGCTL} | grep "sparcv8" > /dev/null @@ -47,14 +53,14 @@ PGINIT=@bindir@/sparcv8/initdb else echo "Couldn't detect whether the previously run version was 32 or 64-bit." + echo "Running the default." PGCTL=@bindir@/pg_ctl PGINIT=@bindir@/initdb fi fi # Exit if postgres user hasn't been created. -grep '^postgres:' /etc/passwd >/dev/null -if [ $? -ne 0 ] ; then +if ! grep '^postgres:' /etc/passwd >/dev/null; then getent passwd postgres >/dev/null if [ $? -ne 0 ] ; then exit 0 @@ -65,7 +71,7 @@ # a directory that they can read cd /var/tmp -case "${1}" in +case "$1" in start) if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then # PostgreSQL data directory exists and is populated @@ -110,4 +116,4 @@ esac -# vim:set sw=2 ts=2 sts=2 expandtab: +# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci: 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 Dec 2 10:09:56 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 09:09:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7534] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7534 http://gar.svn.sourceforge.net/gar/?rev=7534&view=rev Author: wahwah Date: 2009-12-02 09:09:54 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Adding dependencies on lixml2, libxslt and openssl Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 09:07:27 UTC (rev 7533) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 09:09:54 UTC (rev 7534) @@ -54,7 +54,7 @@ SPKG_DESC_CSWpostgresqldevel = PostgreSQL Developer Files SPKG_DESC_CSWlibpq = PostgreSQL Libraries -REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq +REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq CSWlibxml2 CSWlibxslt CSWosslrt REQUIRED_PKGS_CSWpostgresqldevel = CSWpostgresql ARCHALL_CSWpostgresqldevel = 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 Wed Dec 2 13:37:53 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 02 Dec 2009 12:37:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7535] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7535 http://gar.svn.sourceforge.net/gar/?rev=7535&view=rev Author: bonivart Date: 2009-12-02 12:37:53 +0000 (Wed, 02 Dec 2009) Log Message: ----------- pkgutil: add pkgask dir Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-02 09:09:54 UTC (rev 7534) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-02 12:37:53 UTC (rev 7535) @@ -71,5 +71,6 @@ @pod2man --section=1 $(WORKSRC)/chkcat > $(DESTDIR)$(mandir)/man1/chkcat.1 @chmod 444 $(DESTDIR)$(mandir)/man1/* @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/pkgask @ginstall $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-02 09:09:54 UTC (rev 7534) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-02 12:37:53 UTC (rev 7535) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec -b93ce519cebdc48350eb0e2a22214827 CSWpkgutil.prototype +a751314ee495d7477888522435b769e4 CSWpkgutil.prototype 33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil bdc6afd165a5117c9d0f3a3a54109461 pkgutil-1.9.zip 6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-12-02 09:09:54 UTC (rev 7534) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-12-02 12:37:53 UTC (rev 7535) @@ -24,3 +24,4 @@ d none /var/opt/csw/pkgutil 0755 root bin f cswpkgutil /var/opt/csw/pkgutil/admin.CSW 644 root bin d none /var/opt/csw/pkgutil/packages 0755 root bin +d none /var/opt/csw/pkgutil/pkgask 0755 root bin 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 Dec 2 14:05:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 13:05:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7536] csw/mgar/pkg/chromium/trunk Message-ID: Revision: 7536 http://gar.svn.sourceforge.net/gar/?rev=7536&view=rev Author: wahwah Date: 2009-12-02 13:05:15 +0000 (Wed, 02 Dec 2009) Log Message: ----------- chromium: First few bits. Modified Paths: -------------- csw/mgar/pkg/chromium/trunk/Makefile csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py Added Paths: ----------- csw/mgar/pkg/chromium/trunk/files/IDLParser.pm-gcc.patch.patch csw/mgar/pkg/chromium/trunk/files/make-css-file-arrays.pl-gcc.patch csw/mgar/pkg/chromium/trunk/files/make-shell.patch csw/mgar/pkg/chromium/trunk/files/make_names.pl-gcc.patch Modified: csw/mgar/pkg/chromium/trunk/Makefile =================================================================== --- csw/mgar/pkg/chromium/trunk/Makefile 2009-12-02 12:37:53 UTC (rev 7535) +++ csw/mgar/pkg/chromium/trunk/Makefile 2009-12-02 13:05:15 UTC (rev 7536) @@ -2,182 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## GARNAME = chromium CHROMIUM_REVISION = 32797 GARVERSION = 0.$(CHROMIUM_REVISION) -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. DESCRIPTION = An open-source web browser -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. define BLURB endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = http://build.chromium.org/buildbot/archives/ -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). # DISTFILES = chromium.r$(CHROMIUM_REVISION).tgz DISTFILES = -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. REQUIRED_PKGS = CSWnspr CSWnss CSWffmpeg -## -## A list of packages necessary to build this package -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. +# CSWpyxml must be uninstalled +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg CSWgperf CSWpython CONFIGURE_SCRIPTS = chromium -BUILD_SCRIPTS = chromium -INSTALL_SCRIPTS = chromium -TEST_SCRIPTS = chromium -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -## CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## +BUILD_SCRIPTS = chromium +INSTALL_SCRIPTS = chromium +TEST_SCRIPTS = chromium +GIT_URI = git://git.chromium.org/chromium.git + GYP_GENERATORS = make export GYP_GENERATORS @@ -189,25 +35,29 @@ GARCOMPILER = GNU -# Because of bashisms in Makefiles in Chromium -SHELL = /opt/csw/bin/bash +# # Because of bashisms in Makefiles in Chromium +# SHELL = /opt/csw/bin/bash +# TODO: Make V8 realize it's a known architecture. +# EXTRA_CFLAGS = -DV8_TARGET_ARCH_IA32 +# EXTRA_CXXFLAGS = -DV8_TARGET_ARCH_IA32 + include gar/category.mk $(WORKSRC)/.gclient: - (cd $(WORKSRC) && \ - PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools) \ - GYP_GENERATORS=make \ + (cd $(WORKSRC) \ + && \ + PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools) \ gclient config http://src.chromium.org/svn/trunk/src) post-extract-modulated: mkdir -p $(WORKSRC) (cd $(WORKSRC) \ - && \ + && \ if [ -d src ]; then \ (cd src && git fetch ); \ else \ - git clone git://git.chromium.org/chromium.git src; \ + git clone $(GIT_URI) src; \ fi) @$(MAKECOOKIE) @@ -216,14 +66,18 @@ # I don't think there's anything platform-specific for Solaris in the source # code repository. -configure-chromium: depot-tools gclient-sync +configure-chromium: prerequisite-tests depot-tools gclient-sync +prerequisite-tests: + python files/xml_dom_minidom_test.py + @$(MAKECOOKIE) + gclient-sync: $(WORKSRC)/.gclient (cd $(WORKSRC) \ && \ - PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ - GYP_DEFINES="use_system_ffmpeg=1" \ - GYP_GENERATORS=make \ + PATH=$(PATH):$(abspath $(WORKDIR)/depot_tools) \ + GYP_DEFINES="use_system_ffmpeg=1" \ + GYP_GENERATORS=make \ gclient sync --revision src@$(CHROMIUM_REVISION)) # gclient sync) @$(MAKECOOKIE) @@ -231,15 +85,15 @@ gclient-runhooks: $(WORKSRC)/.gclient (cd $(WORKSRC) \ && \ - PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ - GYP_GENERATORS=make \ - GYP_DEFINES="use_system_ffmpeg=1" \ + PATH=$(PATH):$(abspath $(WORKDIR)/depot_tools) \ + GYP_GENERATORS=make \ + GYP_DEFINES="use_system_ffmpeg=1" \ gclient runhooks --force) @$(MAKECOOKIE) depot-tools: (cd $(WORKDIR) \ - && \ + && \ if [ -d depot_tools ]; then \ (cd depot_tools; svn up); \ else \ @@ -253,3 +107,5 @@ && \ PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ gmake $(PARALLELMFLAGS) chrome) + false + @$(MAKECOOKIE) Added: csw/mgar/pkg/chromium/trunk/files/IDLParser.pm-gcc.patch.patch =================================================================== --- csw/mgar/pkg/chromium/trunk/files/IDLParser.pm-gcc.patch.patch (rev 0) +++ csw/mgar/pkg/chromium/trunk/files/IDLParser.pm-gcc.patch.patch 2009-12-02 13:05:15 UTC (rev 7536) @@ -0,0 +1,11 @@ +--- src/third_party/WebKit/WebCore/bindings/scripts/IDLParser.pm.orig 2009-11-28 10:25:59.122473741 +0000 ++++ src/third_party/WebKit/WebCore/bindings/scripts/IDLParser.pm 2009-11-28 10:26:07.807234188 +0000 +@@ -64,7 +64,7 @@ + $parentsOnly = shift; + + if (!$preprocessor) { +- $preprocessor = "/usr/bin/gcc -E -P -x c++"; ++ $preprocessor = "/opt/csw/gcc4/bin/gcc -E -P -x c++"; + } + + if (!$defines) { Added: csw/mgar/pkg/chromium/trunk/files/make-css-file-arrays.pl-gcc.patch =================================================================== --- csw/mgar/pkg/chromium/trunk/files/make-css-file-arrays.pl-gcc.patch (rev 0) +++ csw/mgar/pkg/chromium/trunk/files/make-css-file-arrays.pl-gcc.patch 2009-12-02 13:05:15 UTC (rev 7536) @@ -0,0 +1,11 @@ +--- src/third_party/WebKit/WebCore/css/make-css-file-arrays.pl.orig 2009-11-28 10:22:54.972192369 +0000 ++++ src/third_party/WebKit/WebCore/css/make-css-file-arrays.pl 2009-11-28 10:23:20.152912664 +0000 +@@ -28,7 +28,7 @@ + GetOptions('preprocessor=s' => \$preprocessor); + + if (!$preprocessor) { +- $preprocessor = "/usr/bin/gcc -E -P -x c++"; ++ $preprocessor = "/opt/csw/gcc4/bin/gcc -E -P -x c++"; + } + + my $header = $ARGV[0]; Added: csw/mgar/pkg/chromium/trunk/files/make-shell.patch =================================================================== --- csw/mgar/pkg/chromium/trunk/files/make-shell.patch (rev 0) +++ csw/mgar/pkg/chromium/trunk/files/make-shell.patch 2009-12-02 13:05:15 UTC (rev 7536) @@ -0,0 +1,8 @@ +--- src/Makefile.orig 2009-11-28 09:56:56.496441208 +0000 ++++ src/Makefile 2009-11-28 09:57:22.425335593 +0000 +@@ -1,3 +1,5 @@ ++SHELL = /opt/csw/bin/bash ++ + # The source directory tree. + srcdir := . + Added: csw/mgar/pkg/chromium/trunk/files/make_names.pl-gcc.patch =================================================================== --- csw/mgar/pkg/chromium/trunk/files/make_names.pl-gcc.patch (rev 0) +++ csw/mgar/pkg/chromium/trunk/files/make_names.pl-gcc.patch 2009-12-02 13:05:15 UTC (rev 7536) @@ -0,0 +1,11 @@ +--- src/third_party/WebKit/WebCore/dom/make_names.pl.orig 2009-11-28 10:24:25.492039333 +0000 ++++ src/third_party/WebKit/WebCore/dom/make_names.pl 2009-11-28 10:24:37.696563843 +0000 +@@ -46,7 +46,7 @@ + my %attrs = (); + my %parameters = (); + my $extraDefines = 0; +-my $preprocessor = "/usr/bin/gcc -E -P -x c++"; ++my $preprocessor = "/opt/csw/gcc4/bin/gcc -E -P -x c++"; + + GetOptions( + 'tags=s' => \$tagsFile, Modified: csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py =================================================================== --- csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py 2009-12-02 12:37:53 UTC (rev 7535) +++ csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py 2009-12-02 13:05:15 UTC (rev 7536) @@ -35,6 +35,8 @@ gmake[1]: *** [gclient-sync] Error 1 gmake[1]: Leaving directory `/export/home/blizinski/opencsw/pkg/chromium/trunk' gmake: *** [build-isa-i386] Error 2 + +It was fixed by removing CSWpyxml. """ __author__ = 'Maciej Blizi?ski (blizinski at google.com)' 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 Dec 2 15:28:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 14:28:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7537] csw/mgar/pkg/postgresql/trunk/files/bench-32-vs-64. sh Message-ID: Revision: 7537 http://gar.svn.sourceforge.net/gar/?rev=7537&view=rev Author: wahwah Date: 2009-12-02 14:28:09 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgres: Benchmarking script Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/files/bench-32-vs-64.sh Added: csw/mgar/pkg/postgresql/trunk/files/bench-32-vs-64.sh =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/bench-32-vs-64.sh (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/bench-32-vs-64.sh 2009-12-02 14:28:09 UTC (rev 7537) @@ -0,0 +1,74 @@ +#!/opt/csw/bin/bash +# vim:set sw=2 ts=2 sts=2: +# +# $Id$ +# +# Usage: run as user postgres +# $ ./bench-32-vs-64.sh sparcv8 +# $ ./bench-32-vs-64.sh sparcv9 + +set -u +set -e + +do_arch() { + local arch="$1" + local bindir=/opt/csw/bin/postgresql/8.4/${arch} + local pgdatadir=/var/opt/csw/postgresql/8.4/pgdata-${arch} + echo "architecture: ${arch}" + echo "bindir: ${bindir}" + echo "pgdatadir: ${pgdatadir}" + read -p "Press ENTER to continue. > " JUNK + echo "Stopping the database." + ${bindir}/pg_ctl -D ${pgdatadir} -l ${pgdatadir}/postgresql.log stop || true + echo "Removing ${pgdatadir}" + rm -rf "${pgdatadir}" + mkdir -p "${pgdatadir}" + echo "Initializing ${pgdatadir}" + ${bindir}/initdb -D ${pgdatadir} -E "utf-8" -U postgres + echo "Starting the database" + ${bindir}/pg_ctl -D ${pgdatadir} -l ${pgdatadir}/postgresql.log start + echo "Waiting for the database to start up." + sleep 3 + echo "Creating the pgbench database" + ${bindir}/createdb -E utf-8 pgbench + echo "Initializing pgbench" + pgbench -i -s 10 pgbench + + echo "Running benchmarks" + # http://www.robsell.com/howto/pgbench.html + # local HOST=localhost + local USER=postgres + local DB=pgbench + local totxacts=1000 + for c in 10 + do + t=`expr $totxacts / $c` + # psql -h $HOST -U $USER -c 'vacuum analyze' $DB + # psql -h $HOST -U $USER -c 'checkpoint' $DB + psql -U $USER -c 'vacuum analyze' $DB + psql -U $USER -c 'checkpoint' $DB + echo "===== sync ======" 1>&2 + sync;sync;sync;sleep 10 + echo $c concurrent users... 1>&2 + pgbench -n -U $USER -t $t -c $c $DB + done + ${bindir}/pg_ctl -D ${pgdatadir} -l ${pgdatadir}/postgresql.log stop || true +} + +all_architectures() { + for arch in sparcv8 sparcv9 + do + do_arch ${arch} + done +} + +main() { + arg1="${1:-}" + if [[ -n "$arg1" ]]; then + do_arch $arg1 + else + all_architectures + fi +} + +main "$@" Property changes on: csw/mgar/pkg/postgresql/trunk/files/bench-32-vs-64.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + 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 Dec 2 16:43:37 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 15:43:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7538] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7538 http://gar.svn.sourceforge.net/gar/?rev=7538&view=rev Author: wahwah Date: 2009-12-02 15:43:37 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Fixing initsmf path, removing references to /opt/csw/lib/32 Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 14:28:09 UTC (rev 7537) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 15:43:37 UTC (rev 7538) @@ -84,11 +84,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-includes=/opt/csw/include -CONFIGURE_ARGS_isa-sparcv8 += --with-libraries=/opt/csw/lib/32 -CONFIGURE_ARGS_isa-i386 += --with-libraries=/opt/csw/lib/32 -CONFIGURE_ARGS_isa-sparcv9 += --with-libraries=/opt/csw/lib/64 -CONFIGURE_ARGS_isa-amd64 += --with-libraries=/opt/csw/lib/64 -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) +CONFIGURE_ARGS += --with-library=$(abspath /opt/csw/lib/$(MM_LIBDIR)) # # Perl support only in the 32-bit version # CONFIGURE_ARGS_isa-sparcv8 += --with-perl @@ -119,9 +115,8 @@ PKGFILES_CSWpostgresqldevel += $(prefix)/share/doc/postgresql/html.* PKGFILES_CSWlibpq = $(PKGFILES_RT) PKGFILES_CSWlibpq += $(libdir)/64 -PKGFILES_CSWlibpq += $(libdir)/32 -INITSMF = /etc$(prefix)/init\.d/cswpostgresql_$(BASE_VERSION) +INITSMF = /etc$(prefix)/init\.d/cswpostgres_$(BASE_VERSION) USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) PRESERVECONF = $(sysconfdir)/postgresql\.conf @@ -203,5 +198,4 @@ done ginstall -d $(PKGROOT)$(PGDATA) gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 - gln -s . $(PKGROOT)$(libdir)/32 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Dec 2 16:55:17 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 02 Dec 2009 15:55:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7539] csw/mgar/pkg/sudosh2/trunk Message-ID: Revision: 7539 http://gar.svn.sourceforge.net/gar/?rev=7539&view=rev Author: skayser Date: 2009-12-02 15:55:09 +0000 (Wed, 02 Dec 2009) Log Message: ----------- sudosh2: modify /etc/shells on installation/removal, included file handle leak patch Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/Makefile csw/mgar/pkg/sudosh2/trunk/checksums csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/sudosh2/trunk/files/004-replay-close-fds.patch csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postinstall csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postremove Modified: csw/mgar/pkg/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile 2009-12-02 15:43:37 UTC (rev 7538) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-12-02 15:55:09 UTC (rev 7539) @@ -1,7 +1,6 @@ # TODO/Issues # - Submit 001- (DESTDIR) and 002- (man page) patches upstream # - clearenvironment is not documented in sudosh.conf(5), others? -# - add /opt/csw/bin/sudosh to /etc/shells in postinstall GARNAME = sudosh2 GARVERSION = 1.0.2 CATEGORIES = apps @@ -21,9 +20,11 @@ Sudosh2 is a fork of sudosh (by Douglas Hanks). endef -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tgz SPKG_SOURCEURL = http://sudosh2.sf.net +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES += CSWsudosh2.postinstall +DISTFILES += CSWsudosh2.postremove sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw @@ -56,6 +57,9 @@ PATCHFILES += 002-strip-man-page-blank.patch # The binary is called sudosh (not sudosh2 - only leave sudosh2 in the title) PATCHFILES += 003-adjust-sudosh-man-binary-name.patch +# sudosh-replay leaks FDs on listing sessions +# http://sourceforge.net/tracker/?func=detail&aid=2040342&group_id=213047&atid=1024149 +PATCHFILES += 004-replay-close-fds.patch include gar/category.mk Modified: csw/mgar/pkg/sudosh2/trunk/checksums =================================================================== --- csw/mgar/pkg/sudosh2/trunk/checksums 2009-12-02 15:43:37 UTC (rev 7538) +++ csw/mgar/pkg/sudosh2/trunk/checksums 2009-12-02 15:55:09 UTC (rev 7539) @@ -1,4 +1,7 @@ -652d339ec04952f3d114b9aea838afc5 download/001-installsudosh.conf-destdir.patch -9752d641a2233caf7789711ecbcd890e download/002-strip-man-page-blank.patch -882f7d2ddb59330350dd2d82184aff50 download/003-adjust-sudosh-man-binary-name.patch -4c837f7739d9db780ad324ed8482e8a7 download/sudosh2-1.0.2.tgz +652d339ec04952f3d114b9aea838afc5 001-installsudosh.conf-destdir.patch +9752d641a2233caf7789711ecbcd890e 002-strip-man-page-blank.patch +882f7d2ddb59330350dd2d82184aff50 003-adjust-sudosh-man-binary-name.patch +41edfc118e6aaf191e647decee641bee 004-replay-close-fds.patch +0b8a0b464681f636262f716d096420f6 CSWsudosh2.postinstall +e324c66237a431004242d274fa2ad1f4 CSWsudosh2.postremove +4c837f7739d9db780ad324ed8482e8a7 sudosh2-1.0.2.tgz Added: csw/mgar/pkg/sudosh2/trunk/files/004-replay-close-fds.patch =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/004-replay-close-fds.patch (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/004-replay-close-fds.patch 2009-12-02 15:55:09 UTC (rev 7539) @@ -0,0 +1,36 @@ +diff -uNr sudosh2-1.0.2/src/replay.c sudosh2-1.0.3/src/replay.c +--- sudosh2-1.0.2/src/replay.c 2008-01-30 16:56:15.000000000 -0600 ++++ sudosh2-1.0.3/src/replay.c 2008-04-02 10:50:38.000000000 -0500 +@@ -345,8 +345,7 @@ + fprintf(stderr, + "[warning]: session %s is missing input information.\n", + scan->id); +- else +- close(scan->input.fd); ++ close(scan->input.fd); + + if ((scan->script.fd = open(scan->script.str, O_RDONLY)) == -1) { + LL(); +@@ -355,6 +354,7 @@ + scan->id); + continue; + } ++ close(scan->script.fd); + + if(!strcmp(scan->type, "interactive")) + fprintf(stdout, "%-19s %-8s %-12s %-12s %s\n", scan->date, +@@ -469,6 +469,8 @@ + fflush(stdout); + memset(read_buffer, '\0', BUFSIZ); + } ++ close(s_script.fd); ++ fclose(s_time.f); + fprintf(stderr, "[info]: EOF\n"); + fflush(stderr); + } +@@ -655,4 +657,5 @@ + } + + s->secs = (long) t_time; ++ fclose(s_time.f); + } Added: csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postinstall =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postinstall (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postinstall 2009-12-02 15:55:09 UTC (rev 7539) @@ -0,0 +1,52 @@ +#!/bin/sh +PATH=/usr/bin +export PATH + +SHELLS=/etc/shells +SUDOSH=/opt/csw/bin/sudosh + +if [ -z "${PKG_INSTALL_ROOT}" -o "${PKG_INSTALL_ROOT}" = "/" ] +then + RSHELLS=${SHELLS} + RSUDOSH=${SUDOSH} +else + RSHELLS=${PKG_INSTALL_ROOT}${SHELLS} + RSUDOSH=${SUDOSH} +fi + +if [ -f "${RSHELLS}" ]; then + echo "${RSHELLS} already exists." +else + cat > ${RSHELLS} < /dev/null 2>&1; then + echo "${RSHELLS} UNCHANGED because entry ${RSUDOSH} already exists." +else + echo "${RSUDOSH} # Added by CSWsudosh2" >> ${RSHELLS} + echo "ADDED ${RSUDOSH} to ${RSHELLS}." +fi Added: csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postremove =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postremove (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/CSWsudosh2.postremove 2009-12-02 15:55:09 UTC (rev 7539) @@ -0,0 +1,22 @@ +#!/bin/sh +PATH=/usr/bin +export PATH + +SHELLS=/etc/shells +SUDOSH=/opt/csw/bin/sudosh + +if [ -z "${PKG_INSTALL_ROOT}" -o "${PKG_INSTALL_ROOT}" = "/" ] +then + RSHELLS=${SHELLS} + RSUDOSH=${SUDOSH} +else + RSHELLS=${PKG_INSTALL_ROOT}${SHELLS} + RSUDOSH=${SUDOSH} +fi + +if /usr/bin/grep "^${RSUDOSH}" ${RSHELLS} > /dev/null 2>&1; then + /usr/bin/perl -i -pwe '$_ = "" if m%^'${RSUDOSH}'%' ${RSHELLS} + echo "REMOVED ${RSUDOSH} from ${RSHELLS}." +else + echo "${RSHELLS} UNCHANGED because it did not contain entry ${RSUDOSH}." +fi Modified: csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW 2009-12-02 15:43:37 UTC (rev 7538) +++ csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW 2009-12-02 15:55:09 UTC (rev 7539) @@ -1,3 +1,11 @@ +sudosh2 (1.0.2,REV=2009.12.02) + + * Applied file handle leak patch so that sudosh-replay doesn't run out of + file handles when listing sessions (#2040342 @ SF). + * Added postinstall/postremove scripts to include sudosh in /etc/shells + + -- Sebastian Kayser Wed, 2 Dec 2009 16:35:14 +0100 + sudosh2 (1.0.2,REV=2009.09.17) * Initial release. 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 Dec 2 17:15:10 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 02 Dec 2009 16:15:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7540] csw/mgar/pkg Message-ID: Revision: 7540 http://gar.svn.sourceforge.net/gar/?rev=7540&view=rev Author: bonivart Date: 2009-12-02 16:14:56 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgrey: initial commit Added Paths: ----------- csw/mgar/pkg/postgrey/ csw/mgar/pkg/postgrey/branches/ csw/mgar/pkg/postgrey/tags/ csw/mgar/pkg/postgrey/trunk/ csw/mgar/pkg/postgrey/trunk/Makefile csw/mgar/pkg/postgrey/trunk/checksums csw/mgar/pkg/postgrey/trunk/files/ csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init csw/mgar/pkg/postgrey/trunk/files/cswusergroup Property changes on: csw/mgar/pkg/postgrey/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/postgrey/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgrey/trunk/Makefile (rev 0) +++ csw/mgar/pkg/postgrey/trunk/Makefile 2009-12-02 16:14:56 UTC (rev 7540) @@ -0,0 +1,48 @@ +GARNAME = postgrey +GARVERSION = 1.32 +CATEGORIES = net + +DESCRIPTION = Postfix policy server implementing greylisting +define BLURB + Postfix policy server implementing greylisting +endef + +MASTER_SITES = http://postgrey.schweikert.ch/pub/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +REQUIRED_PKGS = CSWperl CSWpmiomultiplex CSWpmnetserver CSWbdb48 CSWpostfix +ARCHALL = 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +INITSMF = /etc/opt/csw/init.d/cswpostgrey +USERGROUP = /etc/opt/csw/pkg/CSWpostgrey/cswusergroup + +include gar/category.mk + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/CSWpostgrey.init $(DESTDIR)/etc/opt/csw/init.d/cswpostgrey + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/postfix + @ginstall -m 644 $(WORKSRC)/postgrey_whitelist_clients $(DESTDIR)/etc/opt/csw/postfix + @ginstall -m 644 $(WORKSRC)/postgrey_whitelist_recipients $(DESTDIR)/etc/opt/csw/postfix + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWpostgrey + @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWpostgrey/cswusergroup + @ginstall -m 755 -d $(DESTDIR)$(sbindir) + @ginstall -m 755 $(WORKSRC)/postgrey $(DESTDIR)$(sbindir) + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKSRC)/Changes $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 $(WORKSRC)/policy-test $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 $(WORKSRC)/contrib/postgreyreport $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 -d $(DESTDIR)$(mandir)/man1 + @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/$(GARNAME).1 + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/postgrey/trunk/checksums =================================================================== --- csw/mgar/pkg/postgrey/trunk/checksums (rev 0) +++ csw/mgar/pkg/postgrey/trunk/checksums 2009-12-02 16:14:56 UTC (rev 7540) @@ -0,0 +1 @@ +524a4e165bf997996f3bccade394712f postgrey-1.32.tar.gz Added: csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init =================================================================== --- csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init (rev 0) +++ csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init 2009-12-02 16:14:56 UTC (rev 7540) @@ -0,0 +1,40 @@ +#!/sbin/sh + +# 2009-12-02 Peter Bonivart + +if [ -f /lib/svc/share/smf_include.sh ]; then + . /lib/svc/share/smf_include.sh +fi + +SERVICE=postgrey + +OPTIONS="--inet=10023 -d --whitelist-clients=/etc/opt/csw/postfix/postgrey_whitelist_clients --whitelist-recipients=/etc/opt/csw/postfix/postgrey_whitelist_recipients --pidfile=/var/opt/csw/postgrey/postgrey.pid" + +case "$1" in + start) + echo "Starting $SERVICE ..." + /opt/csw/sbin/postgrey $OPTIONS + ;; + stop) + echo "Stopping $SERVICE ..." + pkill $SERVICE + ;; + restart) + echo "Restarting $SERVICE ... " + $0 stop + echo "Waiting for $SERVICE to stop: \c" + while ( pgrep $SERVICE > /dev/null ) + do + echo ".\c" + sleep 1 + done + echo + sleep 1 + $0 start + ;; + *) + echo "Usage: `basename $0` { start | stop | restart}" + exit 1 +esac + +exit 0 Added: csw/mgar/pkg/postgrey/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/postgrey/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/postgrey/trunk/files/cswusergroup 2009-12-02 16:14:56 UTC (rev 7540) @@ -0,0 +1 @@ +postgrey:postgrey:CSW Postgrey:/var/opt/csw/postgrey:/bin/false:::NP 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 Dec 2 17:34:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 16:34:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7541] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7541 http://gar.svn.sourceforge.net/gar/?rev=7541&view=rev Author: wahwah Date: 2009-12-02 16:34:55 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Moving html files to CSWpostgresqldoc Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 16:14:56 UTC (rev 7540) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 16:34:55 UTC (rev 7541) @@ -111,8 +111,8 @@ # EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" PKGFILES_CSWpostgresqldoc = $(PKGFILES_DOC) +PKGFILES_CSWpostgresqldoc += $(prefix)/share/doc/postgresql/html.* PKGFILES_CSWpostgresqldevel = $(PKGFILES_DEVEL) -PKGFILES_CSWpostgresqldevel += $(prefix)/share/doc/postgresql/html.* PKGFILES_CSWlibpq = $(PKGFILES_RT) PKGFILES_CSWlibpq += $(libdir)/64 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 Dec 2 17:56:23 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 02 Dec 2009 16:56:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7542] csw/mgar/pkg/postgrey/trunk/Makefile Message-ID: Revision: 7542 http://gar.svn.sourceforge.net/gar/?rev=7542&view=rev Author: bonivart Date: 2009-12-02 16:56:23 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgrey: use classutils for config files Modified Paths: -------------- csw/mgar/pkg/postgrey/trunk/Makefile Modified: csw/mgar/pkg/postgrey/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgrey/trunk/Makefile 2009-12-02 16:34:55 UTC (rev 7541) +++ csw/mgar/pkg/postgrey/trunk/Makefile 2009-12-02 16:56:23 UTC (rev 7542) @@ -23,6 +23,7 @@ INITSMF = /etc/opt/csw/init.d/cswpostgrey USERGROUP = /etc/opt/csw/pkg/CSWpostgrey/cswusergroup +SAMPLECONF = /etc/opt/csw/postfix/postgrey_whitelist_clients /etc/opt/csw/postfix/postgrey_whitelist_recipients include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 2 18:24:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 17:24:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7543] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7543 http://gar.svn.sourceforge.net/gar/?rev=7543&view=rev Author: wahwah Date: 2009-12-02 17:24:30 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: More dependencies added Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 16:56:23 UTC (rev 7542) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 17:24:30 UTC (rev 7543) @@ -54,8 +54,10 @@ SPKG_DESC_CSWpostgresqldevel = PostgreSQL Developer Files SPKG_DESC_CSWlibpq = PostgreSQL Libraries -REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq CSWlibxml2 CSWlibxslt CSWosslrt +REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq +REQUIRED_PKGS_CSWpostgresql += CSWlibxml2 CSWlibxslt CSWosslrt CSWkrb5lib REQUIRED_PKGS_CSWpostgresqldevel = CSWpostgresql +REQUIRED_PKGS_CSWlibpq = CSWkrb5lib CSWlibxml2 CSWlibxslt CSWosslrt CSWzlib ARCHALL_CSWpostgresqldevel = 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 Dec 2 19:30:53 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 18:30:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7544] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7544 http://gar.svn.sourceforge.net/gar/?rev=7544&view=rev Author: wahwah Date: 2009-12-02 18:30:52 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Make it possible to set GARFLAVOR from the command line Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 17:24:30 UTC (rev 7543) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 18:30:52 UTC (rev 7544) @@ -9,7 +9,7 @@ CATEGORIES = apps # Useful when making a series of builds on the same day -GARFLAVOR = DBG +GARFLAVOR ?= DBG DESCRIPTION = An advanced open source database SPKG_SOURCEURL = http://www.postgresql.org/ 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 Dec 2 20:29:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Dec 2009 19:29:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7545] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7545 http://gar.svn.sourceforge.net/gar/?rev=7545&view=rev Author: wahwah Date: 2009-12-02 19:29:07 +0000 (Wed, 02 Dec 2009) Log Message: ----------- postgresql: Making the *doc package ARCHALL Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 18:30:52 UTC (rev 7544) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-02 19:29:07 UTC (rev 7545) @@ -60,6 +60,7 @@ REQUIRED_PKGS_CSWlibpq = CSWkrb5lib CSWlibxml2 CSWlibxslt CSWosslrt CSWzlib ARCHALL_CSWpostgresqldevel = 1 +ARCHALL_CSWpostgresqldoc = 1 LICENSE = COPYRIGHT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 2 22:10:44 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 02 Dec 2009 21:10:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7546] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 7546 http://gar.svn.sourceforge.net/gar/?rev=7546&view=rev Author: chninkel Date: 2009-12-02 21:10:44 +0000 (Wed, 02 Dec 2009) Log Message: ----------- lftp: updated to 4.0.4 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2009-12-02 19:29:07 UTC (rev 7545) +++ csw/mgar/pkg/lftp/trunk/Makefile 2009-12-02 21:10:44 UTC (rev 7546) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = lftp -GARVERSION = 4.0.3 +GARVERSION = 4.0.4 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-12-02 19:29:07 UTC (rev 7545) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-12-02 21:10:44 UTC (rev 7546) @@ -1,3 +1,3 @@ 5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype -db4f98b7f4e325262647231ebba66b74 changelog.CSW -3dcda96e6567c0829055dc7e0f92ff5c lftp-4.0.3.tar.gz +e813870b518281ca71c398a9b05494e6 changelog.CSW +08461f56eb149382dfd120f461f49b5f lftp-4.0.4.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-12-02 19:29:07 UTC (rev 7545) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-12-02 21:10:44 UTC (rev 7546) @@ -1,3 +1,9 @@ +lftp (4.0.4,REV=2009.12.02) unstable + + * New upstream release. + + -- Yann Rouillard Wed, 02 Dec 2009 21:47:50 +0100 + lftp (4.0.3,REV=2009.11.01) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 2 22:44:40 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 02 Dec 2009 21:44:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7547] csw/mgar/pkg/rlwrap/trunk Message-ID: Revision: 7547 http://gar.svn.sourceforge.net/gar/?rev=7547&view=rev Author: chninkel Date: 2009-12-02 21:44:40 +0000 (Wed, 02 Dec 2009) Log Message: ----------- rlwrap: updated to 0.33 Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile csw/mgar/pkg/rlwrap/trunk/checksums csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2009-12-02 21:10:44 UTC (rev 7546) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2009-12-02 21:44:40 UTC (rev 7547) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = rlwrap -GARVERSION = 0.32 +GARVERSION = 0.33 CATEGORIES = utils DESCRIPTION = A readline wrapper Modified: csw/mgar/pkg/rlwrap/trunk/checksums =================================================================== --- csw/mgar/pkg/rlwrap/trunk/checksums 2009-12-02 21:10:44 UTC (rev 7546) +++ csw/mgar/pkg/rlwrap/trunk/checksums 2009-12-02 21:44:40 UTC (rev 7547) @@ -1,5 +1,2 @@ -1c940e58cea90e9fd91c3286d5f2a31e CSWrlwrap.depend -e699f8a2167f07465cfe891bba7a1bc7 CSWrlwrap.gspec -64db02a1daa57c76f7bf1e501d5cee17 CSWrlwrap.prototype -913fd14e3f46b7bc09c56a3325424123 changelog.CSW -441282a9a65c1d516c1c9a6821184539 rlwrap-0.32.tar.gz +ada93921f64eaa8153db0307bc11795f changelog.CSW +831f375ca6c9d7ac77bebff616bd03a6 rlwrap-0.33.tar.gz Modified: csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2009-12-02 21:10:44 UTC (rev 7546) +++ csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2009-12-02 21:44:40 UTC (rev 7547) @@ -1,3 +1,9 @@ +rlwrap (0.33,REV=2009.12.02) unstable + + * New upstream release. + + -- Yann Rouillard Wed, 02 Dec 2009 21:47:50 +0100 + rlwrap (0.32,REV=2009.10.09) unstable * New upstream release. 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 Dec 4 09:28:54 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Dec 2009 08:28:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7548] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Makefile Message-ID: Revision: 7548 http://gar.svn.sourceforge.net/gar/?rev=7548&view=rev Author: wahwah Date: 2009-12-04 08:28:54 +0000 (Fri, 04 Dec 2009) Log Message: ----------- mysql5: first try to do a /opt/csw prefix Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2009-12-02 21:44:40 UTC (rev 7547) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2009-12-04 08:28:54 UTC (rev 7548) @@ -8,7 +8,11 @@ GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server +# Useful when making a series of builds on the same day +GARFLAVOR = DBG + DISTNAME = mysql-$(GARVERSION) +SPKG_SOURCEURL = http://www.mysql.com/ DESCRIPTION = Multithreaded SQL database server define BLURB @@ -16,38 +20,44 @@ (Structured Query Language) database server. endef -GARFLAVOR = DBG +bindir_install = $(prefix)/bin/$(GARNAME)/$(BASE_VERSION) +datadir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) +docdir=$(prefix)/share/doc/$(GARNAME)/$(BASE_VERSION) +includedir=$(prefix)/include/$(GARNAME)/$(BASE_VERSION) +infodir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/info +libdir_install =$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) +libexecdir_install =$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) +lispdir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/emacs/site-lisp +localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION) +mandir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/man +sbindir_install = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) +sharedstatedir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) +sourcedir=$(prefix)/src/$(GARNAME)/$(BASE_VERSION) +sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION) -bindir = $(prefix)/bin/mysql/$(BASE_VERSION) -datadir=$(prefix)/share/mysql/$(BASE_VERSION) -docdir=$(prefix)/share/doc/mysql/$(BASE_VERSION) -includedir=$(prefix)/include/mysql/$(BASE_VERSION) -infodir=$(prefix)/share/mysql/$(BASE_VERSION)/info -libdir=$(prefix)/lib/mysql/$(BASE_VERSION) -libexecdir=$(prefix)/libexec/mysql/$(BASE_VERSION) -lispdir=$(prefix)/share/mysql/$(BASE_VERSION)/emacs/site-lisp -localstatedir = /var/opt/csw/mysql/$(BASE_VERSION) -mandir=$(prefix)/share/mysql/$(BASE_VERSION)/man -sbindir = $(prefix)/sbin/mysql/$(BASE_VERSION) -sharedstatedir=$(prefix)/share/mysql/$(BASE_VERSION) -sourcedir=$(prefix)/src/mysql/$(BASE_VERSION) -sysconfdir = /etc/opt/csw/mysql/$(BASE_VERSION) - # Where to put the init script -global_sysconfdir = /etc/opt/csw +global_sysconfdir = /etc$(prefix) # Where to link the binaries -global_bindir = /opt/csw/bin +global_bindir = /opt$(prefix) INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION) +PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel +PACKAGES += CSWmysql5rt CSWmysql5test + 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 -PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel -PACKAGES += CSWmysql5rt CSWmysql5test +SPKG_DESC_CSWmysql5 = Multithreaded SQL database +SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking +SPKG_DESC_CSWmysql5client = MySQL 5 client binaries +SPKG_DESC_CSWmysql5devel = MySQL 5 header files +SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files +SPKG_DESC_CSWmysql5test = MySQL 5 testing files + CATALOGNAME_CSWmysql5 = $(GARNAME) CATALOGNAME_CSWmysql5bench = $(GARNAME)bench CATALOGNAME_CSWmysql5client = $(GARNAME)client @@ -61,13 +71,6 @@ INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test -SPKG_DESC_CSWmysql5 = Multithreaded SQL database -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking -SPKG_DESC_CSWmysql5client = MySQL 5 client binaries -SPKG_DESC_CSWmysql5devel = MySQL 5 header files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files -SPKG_DESC_CSWmysql5test = MySQL 5 testing files - # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSWmysql5client_programs = myisamlog @@ -87,8 +90,21 @@ CSWmysql5client_programs += perror CSWmysql5client_programs += replace +# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared +# library not found. EXTRA_LIB was tried too, but did not work, as the -R path +# ended up with having two $ISALIST tokens. +# +# Without this setting it looks for: +# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 +# The library is at: +# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql + CSWmysql5devel_programs += mysql_config +# Enable 64 bits build +BUILD64 = 1 + PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5client = $(bindir) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) @@ -130,20 +146,10 @@ EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared -# library not found. EXTRA_LIB was tried too, but did not work, as the -R path -# ended up with having two $ISALIST tokens. -# -# Without this setting it looks for: -# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 -# The library is at: -# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 -EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql - # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler -CONFIGURE_ARGS += --without-docs +# CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile CONFIGURE_ARGS += --with-extra-charsets=all CONFIGURE_ARGS += --with-low-memory @@ -160,42 +166,43 @@ TEST_SCRIPTS = TEST_TARGETS = check -# Enable 64 bits build -BUILD64 = 1 USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup -PROTOTYPE_MODIFIERS = ownmysql -PROTOTYPE_FILES_ownmysql = /var/opt/csw/mysql5 -PROTOTYPE_USER_ownmysql = mysql -PROTOTYPE_GROUP_ownmysql = mysql -PROTOTYPE_PERMS_ownmysql = 0700 -PROTOTYPE_CLASS_ownmysql = ugfiles +PROTOTYPE_MODIFIERS = dbdir +PROTOTYPE_FILES_dbdir = $(localstatedir) +PROTOTYPE_USER_dbdir = mysql +PROTOTYPE_GROUP_dbdir = mysql +PROTOTYPE_PERMS_dbdir = 0700 +PROTOTYPE_CLASS_dbdir = ugfiles SPKG_CLASSES = none ugfiles include gar/category.mk -post-install-modulated: - ginstall -m 755 -d $(DESTDIR)$(localstatedir) - ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc - ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ - $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW - ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql - ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 +CFLAGS := $(filter-out -I%,$(CFLAGS)) + +post-merge: + ginstall -m 755 -d $(PKGROOT)$(localstatedir) + ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc + # ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ + # $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW + ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/cswmysql5 $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql + ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 - # A symlink for mysql5 include files - ginstall -m 755 -d $(DESTDIR)/opt/csw/include - ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql + $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 + ## A symlink for mysql5 include files + ## ginstall -m 755 -d $(PKGROOT)/opt/csw/include + ## ln -s ../mysql5/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries - ginstall -m 755 -d $(DESTDIR)$(global_bindir) - for f in $(DESTDIR)$(bindir)/*; do \ - ln -s mysql/$(BASE_VERSION)/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + ginstall -m 755 -d $(PKGROOT)$(global_bindir) + for f in $(PKGROOT)$(bindir)/*; do \ + ln -s mysql/$(BASE_VERSION)/`basename $$f` $(PKGROOT)$(global_bindir)/`basename $$f`; \ done + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 4 15:25:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Dec 2009 14:25:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7549] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 7549 http://gar.svn.sourceforge.net/gar/?rev=7549&view=rev Author: dmichelsen Date: 2009-12-04 14:25:33 +0000 (Fri, 04 Dec 2009) Log Message: ----------- mysql5: Fix some typos Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-04 08:28:54 UTC (rev 7548) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-04 14:25:33 UTC (rev 7549) @@ -15,11 +15,18 @@ CATALOGNAME_CSWmysql5 = $(GARNAME) CATALOGNAME_CSWmysql5bench = $(GARNAME)bench -CATALOGNAME_CSWmysql5clien = $(GARNAME)client +CATALOGNAME_CSWmysql5client = $(GARNAME)client CATALOGNAME_CSWmysql5devel = $(GARNAME)devel CATALOGNAME_CSWmysql5rt = $(GARNAME)rt CATALOGNAME_CSWmysql5test = $(GARNAME)test +SPKG_DESC_CSWmysql5 = $(DESCRIPTION) +SPKG_DESC_CSWmysql5bench = MySQL 5 benchmark tools +SPKG_DESC_CSWmysql5client = MySQL 5 client +SPKG_DESC_CSWmysql5devel = MySQL 5 development files +SPKG_DESC_CSWmysql5rt = MySQL 5 runtime libraries +SPKG_DESC_CSWmysql5test = MySQL 5 testing environment + MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ DISTFILES = mysql-$(GARVERSION).tar.gz @@ -31,7 +38,7 @@ # because we alter the prefix. this gets us proper linking as well as # LD_OPTIONS (RPATH) -EXTRA_LIB = /opt/csw/lib +# EXTRA_LIB = /opt/csw/lib EXTRA_INC = /opt/csw/include EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ 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 Dec 4 15:47:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Dec 2009 14:47:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7550] csw/mgar/pkg Message-ID: Revision: 7550 http://gar.svn.sourceforge.net/gar/?rev=7550&view=rev Author: dmichelsen Date: 2009-12-04 14:47:19 +0000 (Fri, 04 Dec 2009) Log Message: ----------- lastx: Initial commit Added Paths: ----------- csw/mgar/pkg/lastx/ csw/mgar/pkg/lastx/branches/ csw/mgar/pkg/lastx/tags/ csw/mgar/pkg/lastx/trunk/ csw/mgar/pkg/lastx/trunk/Makefile csw/mgar/pkg/lastx/trunk/checksums csw/mgar/pkg/lastx/trunk/files/ csw/mgar/pkg/lastx/trunk/files/COPYING Property changes on: csw/mgar/pkg/lastx/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/lastx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lastx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lastx/trunk/Makefile 2009-12-04 14:47:19 UTC (rev 7550) @@ -0,0 +1,36 @@ +GARNAME = lastx +GARVERSION = 1.1 +CATEGORIES = utils + +DESCRIPTION = An extension of the last utility shipped with Solaris +define BLURB + lastx is an extension of the last utility shipped with Solaris. It + prints all 32-characters of the users utmpx entry, and provides + facilities to display last data over a period of days. It also + allows the user to print unique logins, and the total # of attempted + logins. +endef + +MASTER_SITES = http://prefetch.net/code/ +DISTFILES = lastx.c +DISTFILES += COPYING + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://prefetch.net/code/lastx.c.html + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +build-custom: + cd $(WORKDIR) && $(CC) -o lastx $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) lastx.c + @$(MAKECOOKIE) + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKDIR)/lastx $(DESTDIR)$(bindir)/lastx Added: csw/mgar/pkg/lastx/trunk/checksums =================================================================== --- csw/mgar/pkg/lastx/trunk/checksums (rev 0) +++ csw/mgar/pkg/lastx/trunk/checksums 2009-12-04 14:47:19 UTC (rev 7550) @@ -0,0 +1,2 @@ +bb18f5d59310199db2915aae5f528fdc COPYING +5e57ffdd9e1ecd4baf5f5ecba766e15c lastx.c Added: csw/mgar/pkg/lastx/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/lastx/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/lastx/trunk/files/COPYING 2009-12-04 14:47:19 UTC (rev 7550) @@ -0,0 +1,13 @@ + 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 2, or (at your option) any + later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 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 Dec 4 17:02:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Dec 2009 16:02:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7551] csw/mgar/pkg Message-ID: Revision: 7551 http://gar.svn.sourceforge.net/gar/?rev=7551&view=rev Author: dmichelsen Date: 2009-12-04 16:02:42 +0000 (Fri, 04 Dec 2009) Log Message: ----------- libcdio: Initial commit Added Paths: ----------- csw/mgar/pkg/libcdio/ csw/mgar/pkg/libcdio/branches/ csw/mgar/pkg/libcdio/tags/ csw/mgar/pkg/libcdio/trunk/ csw/mgar/pkg/libcdio/trunk/Makefile csw/mgar/pkg/libcdio/trunk/checksums csw/mgar/pkg/libcdio/trunk/files/ Property changes on: csw/mgar/pkg/libcdio/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/libcdio/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcdio/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libcdio/trunk/Makefile 2009-12-04 16:02:42 UTC (rev 7551) @@ -0,0 +1,23 @@ +GARNAME = libcdio +GARVERSION = 0.82 +CATEGORIES = lib + +DESCRIPTION = Encapsulate CD-ROM reading and control +define BLURB + The Compact Disc Input and Control library encapsulates CD-ROM reading and control and + can be used in applications wishing to be oblivious of the OS- and device-dependant + properties of a CD-ROM. +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +GARCOMPILER = GNU + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/libcdio/trunk/checksums =================================================================== --- csw/mgar/pkg/libcdio/trunk/checksums (rev 0) +++ csw/mgar/pkg/libcdio/trunk/checksums 2009-12-04 16:02:42 UTC (rev 7551) @@ -0,0 +1 @@ +1c29b18e01ab2b966162bc727bf3c360 libcdio-0.82.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 Fri Dec 4 17:57:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Dec 2009 16:57:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7552] csw/mgar/pkg/gnupg2/trunk Message-ID: Revision: 7552 http://gar.svn.sourceforge.net/gar/?rev=7552&view=rev Author: wahwah Date: 2009-12-04 16:57:30 +0000 (Fri, 04 Dec 2009) Log Message: ----------- gnupg2: Making incompatible with gnupg 1.x, adding a symlink from gpg to gpg2, version bump to 2.0.13 Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile csw/mgar/pkg/gnupg2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch Removed Paths: ------------- csw/mgar/pkg/gnupg2/trunk/files/patch-keyserver_and_sm.diff Property Changed: ---------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-04 16:02:42 UTC (rev 7551) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-04 16:57:30 UTC (rev 7552) @@ -1,5 +1,9 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = gnupg -GARVERSION = 2.0.10 +GARVERSION = 2.0.13 CATEGORIES = apps DESCRIPTION = GnuPG is a complete and free replacement for PGP. @@ -19,10 +23,8 @@ # Bug ID 996 filed up stream along with patch # Supposed to be Fixed in the 01/2009 SVN version but has not # made it into a release at the time of this packaging -PATCHFILES = patch-keyserver_and_sm.diff +PATCHFILES = sm-libraries.patch -# We define upstream file regex so we can be notifed of -# new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) NOISALIST = 1 @@ -35,16 +37,27 @@ CONFIGURE_ARGS += --with-bzip2 CONFIGURE_ARGS += --with-readline CONFIGURE_ARGS += --enable-threads=solaris +CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses +PROTOTYPE_FILTER = awk '$$$$3 ~/\/gpg2$$$$/ { $$$$4 = 4755 } { print }' + # This is somehow not correctly detected from autoconf EXTRA_LINKER_FLAGS = -lgpg-error # Needed for nanosleep() EXTRA_LINKER_FLAGS += -lrt -REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt -REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn +REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt +REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn REQUIRED_PKGS += CSWbzip2 CSWreadline CSWggettextrt CSWiconv CSWosslrt +REQUIRED_PKGS += CSWpinentry CSWlibassuan +PREREQUISITE_PKGS = $(REQUIRED_PKGS) +INCOMPATIBLE_PKGS = CSWgnupg + TEST_TARGET = check include gar/category.mk + +post-merge: + ln -s gnupg2 $(DESTDIR)$(bindir)/gnupg + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/gnupg2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/gnupg2/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg2/trunk/checksums 2009-12-04 16:02:42 UTC (rev 7551) +++ csw/mgar/pkg/gnupg2/trunk/checksums 2009-12-04 16:57:30 UTC (rev 7552) @@ -1,2 +1,2 @@ -1cb778dd555f87685a8fde2f7113725e download/gnupg-2.0.10.tar.bz2 -37677df3905ce0e4b23a2fb3cc4d7207 download/patch-keyserver_and_sm.diff +41bd7629d815b90c15b37bb31c2f07c0 download/gnupg-2.0.13.tar.bz2 +9ee96ed5623d9ff8f3be8c3d70709509 download/sm-libraries.patch Deleted: csw/mgar/pkg/gnupg2/trunk/files/patch-keyserver_and_sm.diff =================================================================== --- csw/mgar/pkg/gnupg2/trunk/files/patch-keyserver_and_sm.diff 2009-12-04 16:02:42 UTC (rev 7551) +++ csw/mgar/pkg/gnupg2/trunk/files/patch-keyserver_and_sm.diff 2009-12-04 16:57:30 UTC (rev 7552) @@ -1,40 +0,0 @@ -diff -Nru gnupg-2.0.10.orig/keyserver/Makefile.in gnupg-2.0.10/keyserver/Makefile.in ---- gnupg-2.0.10.orig/keyserver/Makefile.in 2009-01-12 03:29:44.000000000 -0600 -+++ gnupg-2.0.10/keyserver/Makefile.in 2009-02-03 21:29:41.031225041 -0600 -@@ -395,7 +395,7 @@ - libexec_SCRIPTS = $(GPGKEYS_MAILTO) - noinst_SCRIPTS = gpg2keys_test - common_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a --other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) -+other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) ../jnlib/libjnlib.a - gpg2keys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h no-libgcrypt.c - gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS) - gpg2keys_ldap_LDADD = ../jnlib/libjnlib.a $(LDAPLIBS) $(GPG_ERROR_LIBS) \ -@@ -417,13 +417,13 @@ - $(am__append_8) - @FAKE_CURL_FALSE at gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS) - @FAKE_CURL_TRUE at gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS) -- at FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT) -+ at FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT) $(other_libs) - @FAKE_CURL_TRUE at gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \ - @FAKE_CURL_TRUE@ $(other_libs) - - @FAKE_CURL_FALSE at gpg2keys_hkp_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS) - @FAKE_CURL_TRUE at gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS) -- at FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT) -+ at FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT) $(other_libs) - @FAKE_CURL_TRUE at gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \ - @FAKE_CURL_TRUE@ $(other_libs) - -diff -Nru gnupg-2.0.10.orig/sm/Makefile.in gnupg-2.0.10/sm/Makefile.in ---- gnupg-2.0.10.orig/sm/Makefile.in 2009-01-12 03:29:44.000000000 -0600 -+++ gnupg-2.0.10/sm/Makefile.in 2009-02-03 21:30:03.836999289 -0600 -@@ -375,7 +375,7 @@ - common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \ - ../gl/libgnu.a - --gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \ -+gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a $(NETLIBS) \ - $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ - $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) $(ZLIBS) $(LIBICONV) - Added: csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch =================================================================== --- csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch (rev 0) +++ csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch 2009-12-04 16:57:30 UTC (rev 7552) @@ -0,0 +1,29 @@ +Otherwise: + + /opt/studio/SOS11/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I.. -I../gl -I../common -I../intl -DLOCALEDIR=\"/opt/csw/share/locale\" -DGNUPG_BINDIR="\"/opt/csw/bin\"" -DGNUPG_LIBEXECDIR="\"/opt/csw/libexec\"" -DGNUPG_LIBDIR="\"/opt/csw/lib/gnupg\"" -DGNUPG_DATADIR="\"/opt/csw/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/opt/csw/etc/gnupg\"" -DGNUPG_DEFAULT_PINENTRY="\"/opt/csw/bin/pinentry-curses\"" -I/opt/csw/include -I/opt/csw/include -I/opt/csw/include -I/opt/csw/include -xO3 -xarch=386 -I/opt/csw/include -c qualified.c +/opt/studio/SOS11/SUNWspro/bin/cc -I/opt/csw/include -I/opt/csw/include -I/opt/csw/include -xO3 -xarch=386 -I/opt/csw/include -xarch=386 -L/opt/csw/lib -lgpg-error -lrt -o gpgsm gpgsm.o misc.o keydb.o server.o call-agent.o call-dirmngr.o fingerprint.o base64.o certlist.o certdump.o certcheck.o certchain.o keylist.o verify.o sign.o encrypt.o decrypt.o import.o export.o delete.o certreqgen.o certreqgen-ui.o qualified.o ../common/libcommon.a ../kbx/libkeybox.a ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libgpgrl.a -L/opt/csw/lib -lgcrypt -lgpg-error -L/opt/csw/lib -lksba -lgpg-error -L/opt/csw/lib -lassuan -L/opt/csw/lib -lgpg-error -lreadline /opt/csw/lib/libintl.so -R/opt/csw/lib -lz -lbz2 /opt/csw/lib/libiconv.so -R/opt/csw/lib +Undefined first referenced + symbol in file +__xnet_connect /opt/csw/lib/libassuan.a(assuan-socket.o) (symbol belongs to implicit dependency /lib/libsocket.so.1) +__xnet_socket /opt/csw/lib/libassuan.a(assuan-socket.o) (symbol belongs to implicit dependency /lib/libsocket.so.1) +__xnet_socketpair /opt/csw/lib/libassuan.a(assuan-pipe-connect.o) (symbol belongs to implicit dependency /lib/libsocket.so.1) +__xnet_bind /opt/csw/lib/libassuan.a(assuan-socket.o) (symbol belongs to implicit dependency /lib/libsocket.so.1) +__xnet_recvmsg /opt/csw/lib/libassuan.a(assuan-io.o) (symbol belongs to implicit dependency /lib/libsocket.so.1) +__xnet_sendmsg /opt/csw/lib/libassuan.a(assuan-io.o) (symbol belongs to implicit dependency /lib/libsocket.so.1) +ld: fatal: Symbol referencing errors. No output written to gpgsm +gmake[4]: *** [gpgsm] Error 1 +gmake[4]: Leaving directory `/export/home/blizinski/opencsw/pkg/gnupg2/trunk/work/build-isa-i386/gnupg-2.0.13/sm' + + +diff -Nru gnupg-2.0.10.orig/sm/Makefile.in gnupg-2.0.10/sm/Makefile.in +--- gnupg-2.0.10.orig/sm/Makefile.in 2009-01-12 03:29:44.000000000 -0600 ++++ gnupg-2.0.10/sm/Makefile.in 2009-02-03 21:30:03.836999289 -0600 +@@ -375,7 +375,7 @@ + common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \ + ../gl/libgnu.a + +-gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \ ++gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a $(NETLIBS) \ + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ + $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) $(ZLIBS) $(LIBICONV) + 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 Dec 4 18:30:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Dec 2009 17:30:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7553] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 7553 http://gar.svn.sourceforge.net/gar/?rev=7553&view=rev Author: wahwah Date: 2009-12-04 17:30:14 +0000 (Fri, 04 Dec 2009) Log Message: ----------- pinentry: Setting packaging platforms and the compiler. Fails on build8s. Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-04 16:57:30 UTC (rev 7552) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-04 17:30:14 UTC (rev 7553) @@ -9,9 +9,13 @@ define BLURB endef SPKG_SOURCEURL = http://www.gnupg.org/ -PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ -PATCHFILES = 0001-remove-__extension__-from-util.c.patch +# PATCHFILES = 0001-remove-__extension__-from-util.c.patch +EXTRA_CFLAGS = -D__EXTENSIONS__ +EXTRA_CXXFLAGS = -D__EXTENSIONS__ PATCHFILES += 0002-ncurses-include.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -20,5 +24,32 @@ PREREQUISITE_PKGS += CSWgtk2devel TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) + +# Unfortunately, the compilation fails with SOS11. Because of that, pinentry +# can't be compiled on Solaris 8, and CSWgnupg2 needs to be compiled for +# Solaris 8 with no pinentry support. +# +# gmake[4]: Entering directory +# `(...)/pinentry-0.7.6/secmem' +# source='util.c' object='util.o' libtool=no \ +# DEPDIR=.deps depmode=none /bin/bash ../depcomp \ +# /opt/studio/SOS11/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I.. \ +# -I/opt/csw/X11/include -I/opt/csw/include -xO3 -xarch=v8 \ +# -D__EXTENSIONS__ -c util.c +# "util.c", line 57: warning: implicit function declaration: __extension__ +# "util.c", line 57: syntax error before or at: { +# "util.c", line 57: undefined symbol: __result +# "util.c", line 57: undefined symbol: __result +# "util.c", line 57: undefined symbol: __result +# "util.c", line 57: syntax error before or at: ) +# "util.c", line 58: warning: syntax error: empty declaration +# "util.c", line 59: warning: old-style declaration or incorrect type for: written +# cc: acomp failed for util.c +# gmake[4]: *** [util.o] Error 2 + GARCOMPILER = SOS12 + +PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 + + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Dec 4 18:47:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Dec 2009 17:47:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7554] csw/mgar/gar/v2-git Message-ID: Revision: 7554 http://gar.svn.sourceforge.net/gar/?rev=7554&view=rev Author: wahwah Date: 2009-12-04 17:47:14 +0000 (Fri, 04 Dec 2009) Log Message: ----------- gar-v2-git: Merging v2 up to r7553 Modified Paths: -------------- csw/mgar/gar/v2-git/gar.conf.mk csw/mgar/gar/v2-git/gar.pkg.mk Property Changed: ---------------- csw/mgar/gar/v2-git/ Property changes on: csw/mgar/gar/v2-git ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,6916-7336 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678,6915-7553 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2-git/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-git/gar.conf.mk 2009-12-04 17:30:14 UTC (rev 7553) +++ csw/mgar/gar/v2-git/gar.conf.mk 2009-12-04 17:47:14 UTC (rev 7554) @@ -499,8 +499,8 @@ CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) CXX = $($(GARCOMPILER)_CXX) -CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE_FLAGS)) -CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS) $(INCLUDE_FLAGS)) +CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS)) +CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS)) CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(_CATEGORY_CPPFLAGS) $(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS)) LDFLAGS ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(_CATEGORY_LDFLAGS) $(EXTRA_LDFLAGS) $(LINKER_FLAGS)) ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(_CATEGORY_ASFLAGS) $(EXTRA_ASFLAGS)) Modified: csw/mgar/gar/v2-git/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-git/gar.pkg.mk 2009-12-04 17:30:14 UTC (rev 7553) +++ csw/mgar/gar/v2-git/gar.pkg.mk 2009-12-04 17:47:14 UTC (rev 7554) @@ -185,15 +185,16 @@ SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) +SPKG_CLASSES := $(call _spkg_cond_add,CRONTABS,cswcrontab) SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) + # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE)$(TEXINFO),) _CSWCLASS_FILTER = | perl -ane '\ $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ @@ -202,10 +203,13 @@ $(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(CRONTABS),$$F[1] = "cswcrontab" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' +# The TEXINFO dependency is handled dynamically by looking at the prototype for matching files +ifneq ($(MIGRATECONF)$(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _EXTRA_GAR_PKGS += CSWcswclassutils # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. @@ -596,16 +600,14 @@ merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) @$(MAKECOOKIE) -merge-migrateconf-%: MIGRATE_FILES_$* ?= $(MIGRATE_FILES) -merge-migrateconf-%: MIGRATE_SOURCE_DIR_$* ?= $(MIGRATE_SOURCE_DIR) -merge-migrateconf-%: MIGRATE_DEST_DIR_$* ?= $(MIGRATE_DEST_DIR) merge-migrateconf-%: @echo "[ Generating cswmigrateconf for package $* ]" + @echo "X: $(MIGRATE_FILES_$*) Y: $(MIGRATE_FILES)" $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* - $(_DBG)(echo "MIGRATE_FILES=\"$(MIGRATE_FILES_$*)\"";\ + $(_DBG)(echo "MIGRATE_FILES=\"$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES))\"";\ $(if $(MIGRATE_SOURCE_DIR_$*),echo "SOURCE_DIR___default__=\"$(MIGRATE_SOURCE_DIR_$*)\"";)\ $(if $(MIGRATE_DEST_DIR_$*),echo "DEST_DIR___default__=\"$(MIGRATE_DEST_DIR_$*)\"";)\ - $(foreach F,$(MIGRATE_FILES_$*),\ + $(foreach F,$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES)),\ $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ )\ 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 Dec 4 18:51:22 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Dec 2009 17:51:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7555] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: Revision: 7555 http://gar.svn.sourceforge.net/gar/?rev=7555&view=rev Author: wahwah Date: 2009-12-04 17:51:22 +0000 (Fri, 04 Dec 2009) Log Message: ----------- gnupg2: post-merge target has to use PKGROOT Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-04 17:47:14 UTC (rev 7554) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-04 17:51:22 UTC (rev 7555) @@ -37,8 +37,10 @@ CONFIGURE_ARGS += --with-bzip2 CONFIGURE_ARGS += --with-readline CONFIGURE_ARGS += --enable-threads=solaris -CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses +# Waits for pinentry to be compiled on Solaris 8. +# CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses + PROTOTYPE_FILTER = awk '$$$$3 ~/\/gpg2$$$$/ { $$$$4 = 4755 } { print }' # This is somehow not correctly detected from autoconf @@ -49,7 +51,11 @@ REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn REQUIRED_PKGS += CSWbzip2 CSWreadline CSWggettextrt CSWiconv CSWosslrt -REQUIRED_PKGS += CSWpinentry CSWlibassuan +REQUIRED_PKGS += CSWlibassuan + +# Waits for pinentry to be compiled on Solaris 8. +# REQUIRED_PKGS += CSWpinentry + PREREQUISITE_PKGS = $(REQUIRED_PKGS) INCOMPATIBLE_PKGS = CSWgnupg @@ -59,5 +65,5 @@ include gar/category.mk post-merge: - ln -s gnupg2 $(DESTDIR)$(bindir)/gnupg + ln -s gnupg2 $(PKGROOT)$(bindir)/gnupg @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Dec 4 21:17:08 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 04 Dec 2009 20:17:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7556] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 7556 http://gar.svn.sourceforge.net/gar/?rev=7556&view=rev Author: chninkel Date: 2009-12-04 20:17:08 +0000 (Fri, 04 Dec 2009) Log Message: ----------- vsftpd: updated to 2.2.2 Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-12-04 17:51:22 UTC (rev 7555) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-12-04 20:17:08 UTC (rev 7556) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = vsftpd -GARVERSION = 2.2.1 +GARVERSION = 2.2.2 CATEGORIES = server DESCRIPTION = A very secure and fast FTP server. Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2009-12-04 17:51:22 UTC (rev 7555) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-12-04 20:17:08 UTC (rev 7556) @@ -2,7 +2,7 @@ 8944fcd302add66d5b2b287d390b9c91 CSWvsftpd.prototype eeaf77528b2da0c7730323838f30b7ef README.CSW 281c51282cabd9475cceef363bbc699b build_options.patch -c402d9755c9ea931dec6f256aef16541 changelog.CSW +eb30bdbd51e7226289cf9606c318608b changelog.CSW 54c1c39c6bfa8747a4457f135fd5bca1 csw_build_system.patch a9e994d2b57999b76a0e03503745c01a csw_paths.patch 98e1d831801985daf5ce2ed01fbc0efd cswusergroup @@ -10,7 +10,7 @@ 93173edf9931b8eb835c6d0177a7c6bd cswvsftpd.xml 73e59f9ada47d3d20199f7c97849fb13 destdir.patch a9a65f55cbfd01f9d72d1de25e67148d set_priv_sep_user.patch -a25e53dd86fada8d3897910b8f0efdb7 vsftpd-2.2.1.tar.gz +6d6bc136af14c23f8fef6f1a51f55418 vsftpd-2.2.2.tar.gz f6ce22a6959b93e500a4ae800295c2ee vsftpd.conf 0d4a1cf36560892adb9eb9410a01c522 vsftpd.smf_wrapper 60c736802e2ce00c531953b01e4a26f6 vsftpd.userlist Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-12-04 17:51:22 UTC (rev 7555) +++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-12-04 20:17:08 UTC (rev 7556) @@ -1,3 +1,9 @@ +vsftpd (2.2.2,REV=2009.12.04) unstable + + * New upstream version. + + -- Yann Rouillard Fri, 04 Dec 2009 21:12:20 +0100 + vsftpd (2.2.1,REV=2009.11.01) unstable * New upstream version. 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 Dec 5 16:49:18 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Dec 2009 15:49:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7557] csw/mgar/pkg/mysql5/trunk Message-ID: Revision: 7557 http://gar.svn.sourceforge.net/gar/?rev=7557&view=rev Author: wahwah Date: 2009-12-05 15:49:18 +0000 (Sat, 05 Dec 2009) Log Message: ----------- mysql5: Merged 5.1 into trunk, now triggers the libtool problem. Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile csw/mgar/pkg/mysql5/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/trunk/files/0001-Use-libc-not-libcrypt.patch csw/mgar/pkg/mysql5/trunk/files/0002-cast-user_info-pw_gid-to-gid_t.patch csw/mgar/pkg/mysql5/trunk/files/0003-OpenCSW-perl-for-tests.patch csw/mgar/pkg/mysql5/trunk/files/0004-basedir-and-datadir-in-the-cnf-files.patch csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall csw/mgar/pkg/mysql5/trunk/files/ChangeLog csw/mgar/pkg/mysql5/trunk/files/README.CSW csw/mgar/pkg/mysql5/trunk/files/cswmysql5 csw/mgar/pkg/mysql5/trunk/files/cswusergroup csw/mgar/pkg/mysql5/trunk/files/quick_start-csw Property Changed: ---------------- csw/mgar/pkg/mysql5/trunk/ csw/mgar/pkg/mysql5/trunk/Makefile Property changes on: csw/mgar/pkg/mysql5/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work mysql-5.0.84 old-pkgs CSWmysql5 Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-git Added: svn:mergeinfo + /csw/mgar/pkg/mysql5/branches/mysql-5.0.x:6058-7197 /csw/mgar/pkg/mysql5/branches/mysql-5.1.x:7198-7556 Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-04 20:17:08 UTC (rev 7556) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-05 15:49:18 UTC (rev 7557) @@ -1,53 +1,136 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = mysql5 -GARVERSION = 5.1.33 +GARVERSION = 5.1.40 CATEGORIES = server DISTNAME = mysql-$(GARVERSION) -DESCRIPTION = Multithreaded SQL database +DESCRIPTION = Multithreaded SQL database server define BLURB MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. endef +GARFLAVOR = DBG + +# Change prefix to /opt/csw/mysql5 +prefix = /opt/csw/mysql5 +sysconfdir = /etc/opt/csw/mysql5 +localstatedir = /var/opt/csw/mysql5 +global_sysconfdir = /etc/opt/csw +global_bindir = /opt/csw/bin + +INITSMF = $(global_sysconfdir)/init\.d/cswmysql5 + +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 + PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel PACKAGES += CSWmysql5rt CSWmysql5test -CATALOGNAME_CSWmysql5 = $(GARNAME) -CATALOGNAME_CSWmysql5bench = $(GARNAME)bench +CATALOGNAME_CSWmysql5 = $(GARNAME) +CATALOGNAME_CSWmysql5bench = $(GARNAME)bench CATALOGNAME_CSWmysql5client = $(GARNAME)client -CATALOGNAME_CSWmysql5devel = $(GARNAME)devel -CATALOGNAME_CSWmysql5rt = $(GARNAME)rt -CATALOGNAME_CSWmysql5test = $(GARNAME)test +CATALOGNAME_CSWmysql5devel = $(GARNAME)devel +CATALOGNAME_CSWmysql5rt = $(GARNAME)rt +CATALOGNAME_CSWmysql5test = $(GARNAME)test -SPKG_DESC_CSWmysql5 = $(DESCRIPTION) -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmark tools -SPKG_DESC_CSWmysql5client = MySQL 5 client -SPKG_DESC_CSWmysql5devel = MySQL 5 development files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime libraries -SPKG_DESC_CSWmysql5test = MySQL 5 testing environment +INCOMPATIBLE_PKGS_CSWmysql5bench = CSWmysql4bench +INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client +INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 +INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel +INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test +SPKG_DESC_CSWmysql5 = Multithreaded SQL database +SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking +SPKG_DESC_CSWmysql5client = MySQL 5 client binaries +SPKG_DESC_CSWmysql5devel = MySQL 5 header files +SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files +SPKG_DESC_CSWmysql5test = MySQL 5 testing files + +# Defining the client programs, which are going to pick up the 32- and 64-bit +# binaries, symbolic links, isaexec stuff and man pages. +CSWmysql5client_programs = myisamlog +CSWmysql5client_programs += myisampack +CSWmysql5client_programs += mysql +CSWmysql5client_programs += mysqlaccess +CSWmysql5client_programs += mysqladmin +CSWmysql5client_programs += mysqlbin +CSWmysql5client_programs += mysqlbinlog +CSWmysql5client_programs += mysqlcheck +CSWmysql5client_programs += mysql_client_test +CSWmysql5client_programs += mysqldump +CSWmysql5client_programs += mysqlhotcopy +CSWmysql5client_programs += mysqlimport +CSWmysql5client_programs += mysqlshow +CSWmysql5client_programs += mysql_zap +CSWmysql5client_programs += perror +CSWmysql5client_programs += replace + +CSWmysql5devel_programs += mysql_config + +PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* +PKGFILES_CSWmysql5client = $(bindir) +PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSWmysql5devel += $(prefix)/include.* +PKGFILES_CSWmysql5devel += /opt/csw/include/mysql + +PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* +PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* + +REQUIRED_PKGS_CSWmysql5bench = CSWmysql5 +REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt +REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt +REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 +REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl + MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ DISTFILES = mysql-$(GARVERSION).tar.gz +DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog +DISTFILES += CSWmysql5.preinstall +DISTFILES += CSWmysql5.postinstall +DISTFILES += cswusergroup -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz -# Change prefix to /opt/csw/mysql5 -prefix = /opt/csw/mysql5 +REQUIRED_PKGS = CSWncurses CSWzlib +PREREQUISITE_PKGS = $(REQUIRED_PKGS) -# because we alter the prefix. this gets us proper linking as well as -# LD_OPTIONS (RPATH) -# EXTRA_LIB = /opt/csw/lib +# MySQL-5.1.40 doesn't compile without setting EXTRA_INC. EXTRA_INC = /opt/csw/include -EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +EXTRA_LIB = /opt/csw/lib +EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared +# library not found. EXTRA_LIB was tried too, but did not work, as the -R path +# ended up with having two $ISALIST tokens. +# +# Without this setting it looks for: +# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 +# The library is at: +# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql + # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile +CONFIGURE_ARGS += --with-charset=utf8 CONFIGURE_ARGS += --with-extra-charsets=all CONFIGURE_ARGS += --with-low-memory CONFIGURE_ARGS += --with-pthread @@ -55,10 +138,50 @@ CONFIGURE_ARGS += --with-zlib-dir=/opt/csw CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb +CONFIGURE_ARGS += --with-comment +CONFIGURE_ARGS_DBG = --with-debug +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) -#TEST_ARGS = test-force +# TODO: Make the tests pass. They don't at the moment. +# TEST_SCRIPTS = +TEST_TARGETS = check # Enable 64 bits build BUILD64 = 1 +USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup + +PROTOTYPE_MODIFIERS = ownmysql +PROTOTYPE_FILES_ownmysql = /var/opt/csw/mysql5 +PROTOTYPE_USER_ownmysql = mysql +PROTOTYPE_GROUP_ownmysql = mysql +PROTOTYPE_PERMS_ownmysql = 0700 +PROTOTYPE_CLASS_ownmysql = ugfiles + +SPKG_CLASSES = none ugfiles + include gar/category.mk + +post-install-modulated: + ginstall -m 755 -d $(DESTDIR)$(localstatedir) + ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc + ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc + ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ + $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW + ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql + ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + ginstall -m 644 $(FILEDIR)/cswusergroup \ + $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + # A symlink for mysql5 include files + ginstall -m 755 -d $(DESTDIR)/opt/csw/include + ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql + # Create symlinks to binaries + ginstall -m 755 -d $(DESTDIR)$(global_bindir) + for f in $(DESTDIR)$(bindir)/*; do \ + ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + done + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/mysql5/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/mysql5/trunk/checksums =================================================================== --- csw/mgar/pkg/mysql5/trunk/checksums 2009-12-04 20:17:08 UTC (rev 7556) +++ csw/mgar/pkg/mysql5/trunk/checksums 2009-12-05 15:49:18 UTC (rev 7557) @@ -1 +1,12 @@ -9c5711e9bea4514df6f2659f283f0aa0 download/mysql-5.1.33.tar.gz +a0b98a7320bce2da3e1f90da704d3c85 0001-Use-libc-not-libcrypt.patch +1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch +5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch +8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch +747637bc4be42207974ae845d832ae65 CSWmysql5.postinstall +60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall +e691b0cf00a3925ac55c1844045d6e30 ChangeLog +e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW +aaca748fc044834e71ad544ab293c494 cswmysql5 +67228e1f096fe08a94f4267439a4ec36 cswusergroup +32e7373c16271606007374396e6742ad mysql-5.1.40.tar.gz +90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw Copied: csw/mgar/pkg/mysql5/trunk/files/0001-Use-libc-not-libcrypt.patch (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0001-Use-libc-not-libcrypt.patch) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/0001-Use-libc-not-libcrypt.patch (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/0001-Use-libc-not-libcrypt.patch 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,28 @@ +From a527f284ef5646dbdd731af007aace3daee3e946 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:27:38 +0100 +Subject: [PATCH 1/4] Use libc, not libcrypt + +--- + configure.in | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index ec432e1..577cfe3 100644 +--- a/configure.in ++++ b/configure.in +@@ -891,7 +891,10 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) + # This may get things to compile even if bind-8 is installed + AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) + # Check if crypt() exists in libc or libcrypt, sets LIBS if needed +-AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) ++## AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) ++# For crypt() on Solaris use libc, not libcrypt ++AC_CHECK_LIB(c, crypt) ++AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) + # See if we need a library for address lookup. + AC_SEARCH_LIBS(inet_aton, [socket nsl resolv]) + +-- +1.6.3.2 + Copied: csw/mgar/pkg/mysql5/trunk/files/0002-cast-user_info-pw_gid-to-gid_t.patch (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/0002-cast-user_info-pw_gid-to-gid_t.patch (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/0002-cast-user_info-pw_gid-to-gid_t.patch 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,27 @@ +From 8536f5925a96634950decd8779b2c6a60d183134 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:29:57 +0100 +Subject: [PATCH 2/4] cast user_info->pw_gid to gid_t + +--- + sql/mysqld.cc | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/sql/mysqld.cc b/sql/mysqld.cc +index 592ae3e..695fbb9 100644 +--- a/sql/mysqld.cc ++++ b/sql/mysqld.cc +@@ -1436,7 +1436,9 @@ static void set_user(const char *user, struct passwd *user_info_arg) + output a specific message to help the user resolve this problem. + */ + calling_initgroups= TRUE; +- initgroups((char*) user, user_info_arg->pw_gid); ++/* Solaris patch */ ++/* initgroups((char*) user, user_info->pw_gid); */ ++ initgroups((char*) user,(gid_t) user_info->pw_gid); + calling_initgroups= FALSE; + #endif + if (setgid(user_info_arg->pw_gid) == -1) +-- +1.6.3.2 + Copied: csw/mgar/pkg/mysql5/trunk/files/0003-OpenCSW-perl-for-tests.patch (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0003-OpenCSW-perl-for-tests.patch) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/0003-OpenCSW-perl-for-tests.patch (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/0003-OpenCSW-perl-for-tests.patch 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,22 @@ +From bd9a3ff419f5a614d584aa6156a512e69f470e0f Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:36:09 +0100 +Subject: [PATCH 3/4] OpenCSW perl for tests + +--- + mysql-test/mysql-test-run.pl | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl +index f60701b..cd9f843 100755 +--- a/mysql-test/mysql-test-run.pl ++++ b/mysql-test/mysql-test-run.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/opt/csw/bin/perl + # -*- cperl -*- + + # +-- +1.6.3.2 + Copied: csw/mgar/pkg/mysql5/trunk/files/0004-basedir-and-datadir-in-the-cnf-files.patch (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/0004-basedir-and-datadir-in-the-cnf-files.patch (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,81 @@ +From 194dbf9ff230f747bb093970831fbdf4cb0f0674 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:38:35 +0100 +Subject: [PATCH 4/4] basedir and datadir in the cnf files + +--- + support-files/my-huge.cnf.sh | 2 ++ + support-files/my-innodb-heavy-4G.cnf.sh | 2 ++ + support-files/my-large.cnf.sh | 2 ++ + support-files/my-medium.cnf.sh | 2 ++ + support-files/my-small.cnf.sh | 2 ++ + 5 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh +index e4747ac..907b41d 100644 +--- a/support-files/my-huge.cnf.sh ++++ b/support-files/my-huge.cnf.sh +@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh +index cda11d6..a9d5514 100644 +--- a/support-files/my-innodb-heavy-4G.cnf.sh ++++ b/support-files/my-innodb-heavy-4G.cnf.sh +@@ -39,6 +39,8 @@ socket = @MYSQL_UNIX_ADDR@ + # The MySQL server + # + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + + # generic configuration options + port = @MYSQL_TCP_PORT@ +diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh +index 981b137..8b890fb 100644 +--- a/support-files/my-large.cnf.sh ++++ b/support-files/my-large.cnf.sh +@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh +index c3135ea..ef841db 100644 +--- a/support-files/my-medium.cnf.sh ++++ b/support-files/my-medium.cnf.sh +@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh +index 24c0840..89299dd 100644 +--- a/support-files/my-small.cnf.sh ++++ b/support-files/my-small.cnf.sh +@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +-- +1.6.3.2 + Copied: csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $Id$ +# + +MYSQLDATADIR=/var/opt/csw/mysql5 +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/trunk/files/CSWmysql5.preinstall (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall 2009-12-05 15:49:18 UTC (rev 7557) @@ -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 Copied: csw/mgar/pkg/mysql5/trunk/files/ChangeLog (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/ChangeLog (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/ChangeLog 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,37 @@ +2009-11-05 Maciej Blizi?ski + + * Makefile: Reworked the package from ground up, using GAR. + +2007-06-17 Alex Moore + + * Version 5.1: MySQL 5.1 is still in beta. This package is released + for your testing only. + +2007-06-03 Alex Moore + + * Startup script: This update fixes a startup script problem that + caused the script to not work when --datadir is not the default. This + update also adds amd64 mysqld and client libraries. + +2006-12-29 Alex Moore + + * csw.conf: 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 this package is mysql5. + *** IMPORTANT *** + If you are using mysql5rc; please move your options to my.cnf and + eliminate mysql5rc. A future release will remove mysql5rc. my.cnf is + more flexible and any new or missing options will not be added to + mysql5rc. quick_start-csw is changed with this release to Not write + mysql5rc. Options for --basedir and --datadir are included in the + default my.cnf files. + *** END OF IMPORTANT *** + +2006-04-16 Alex Moore + + * quick_start-csw: This update fixes some problems with + quick_start-csw and svc-mysql5. I have also corrected some issues + when using a database directory that is not /opt/csw/mysql5/var 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. Copied: csw/mgar/pkg/mysql5/trunk/files/README.CSW (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/README.CSW 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,58 @@ +MySQL 5 OpenCSW package +======================= + +* http://www.opencsw.org/packages/mysql5 + +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/mysql5, but all the binaries are now linked from + /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/trunk/files/cswmysql5 (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/cswmysql5 (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/cswmysql5 2009-12-05 15:49:18 UTC (rev 7557) @@ -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/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 +MYSQLHOME=/opt/csw/mysql5 +MYSQL_VAR=/var/opt/csw/mysql5 +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +CONFFILE=$MYSQL_VAR/my.cnf + +# +# Source configuration +[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc +[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc + +# To get started quickly, copy a sample configuration file from +# $MYSQLHOME/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 [ 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/mysql5/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 Copied: csw/mgar/pkg/mysql5/trunk/files/cswusergroup (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/cswusergroup 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1 @@ +mysql:mysql:MySQL database user:/var/opt/csw/mysql5:/bin/false:: Copied: csw/mgar/pkg/mysql5/trunk/files/quick_start-csw (from rev 7197, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/quick_start-csw (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/quick_start-csw 2009-12-05 15:49:18 UTC (rev 7557) @@ -0,0 +1,139 @@ +#!/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 +# +BASEDIR=/opt/csw/mysql5 +MYSQL_VAR=/var/opt/csw/mysql5 +DEFAULTS_FILE=$BASEDIR/my.cnf +SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf +MYSQLD_USER=mysql +# +# Provide a default data directory +MYSQLD_DATADIR=$MYSQL_VAR +# +echo +echo "This is the start script to setup a MySQL-5 database" +echo " directory." +echo +echo " The base directory is $BASEDIR." +echo " The default database directory is $MYSQLD_DATADIR." +echo +echo " If you have not setup a partition for the database and" +echo " you want one; now is a good time to exit this script and" +echo " create and mount the partition." +echo +echo " If you have not setup a my.cnf file and you do not want" +echo " one of the sample files; now is a good time to exit and" +echo " create the file $DEFAULTS_FILE." +echo +echo "Data directory: The default is $MYSQLD_DATADIR." +unset usrin +usrin=`/usr/bin/ckpath -ay -d [default] \ + -p "Accept the default or enter a directory" + ` || exit $? +if [ ! "$usrin" = "[default]" ]; then + MYSQLD_DATADIR=$usrin +fi +echo +echo "my.cnf pathname: The default is either to use the supplied file in" +echo " the base directory or to create one in the base directory from" +echo " the small memory footprint sample. If your enter a pathname," +echo " it will be used to create the options file in the base directory." +unset usrin +usrin=`/usr/bin/ckpath -f -d [default] \ + -p "Accept the default or enter a pathname" + ` || exit $? +if [ $usrin = "[default]" ]; then + 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 +else + IN_DEFAULTS_FILE=$usrin + echo "Using $IN_DEFAULTS_FILE to create the options file." +fi + +echo "data directory is $MYSQLD_DATADIR" +if [ ! -d "$MYSQLD_DATADIR" ]; then + echo "data directory will be created." +fi + +unset usrin +usrin=`/usr/bin/ckyorn -d y \ + -p "Continue with installation or quit" + ` || exit $? +if [ "$usrin" = "n" ] ; then + echo "Leaving script without doing anything." + exit 0 +fi + +if [ -d "$MYSQLD_DATADIR/mysql" ]; then + echo "mysql database already exists. Leaving script without doing anything." + 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 root:bin $MYSQLD_DATADIR + chmod -R 0755 $MYSQLD_DATADIR + chown 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 +chown -R mysql: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 quick_start-csw." +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 "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later" +else + 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 dmichelsen at users.sourceforge.net Sat Dec 5 17:39:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 05 Dec 2009 16:39:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7558] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 7558 http://gar.svn.sourceforge.net/gar/?rev=7558&view=rev Author: dmichelsen Date: 2009-12-05 16:39:30 +0000 (Sat, 05 Dec 2009) Log Message: ----------- pinetry: Add buildhosts Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-05 15:49:18 UTC (rev 7557) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-05 16:39:30 UTC (rev 7558) @@ -50,6 +50,9 @@ GARCOMPILER = SOS12 PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 +BUILDHOST_sparc-32 = build9s +BUILDHOST_sparc-64 = build9s +BUILDHOST_i386-32 = build9x +BUILDHOST_i386-64 = build10x - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Dec 5 20:33:51 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Dec 2009 19:33:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7559] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7559 http://gar.svn.sourceforge.net/gar/?rev=7559&view=rev Author: wahwah Date: 2009-12-05 19:33:51 +0000 (Sat, 05 Dec 2009) Log Message: ----------- postgresql: Layout based on the Debian PostgreSQL package Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-05 16:39:30 UTC (rev 7558) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-05 19:33:51 UTC (rev 7559) @@ -17,23 +17,24 @@ define BLURB endef -bindir_install = $(prefix)/bin/$(GARNAME)/$(BASE_VERSION) -datadir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) -docdir=$(prefix)/share/doc/$(GARNAME)/$(BASE_VERSION) -includedir=$(prefix)/include/$(GARNAME)/$(BASE_VERSION) -infodir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/info -libdir_install =$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) -libexecdir_install =$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) -lispdir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/emacs/site-lisp +version_dependent = /lib/$(GARNAME)/$(BASE_VERSION) +bindir_install = $(prefix)$(version_dependent)/bin +sbindir_install = $(prefix)$(version_dependent)/sbin +libdir_install = $(prefix)$(version_dependent)/lib localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION) -mandir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/man -sbindir_install = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) -sharedstatedir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) -sourcedir=$(prefix)/src/$(GARNAME)/$(BASE_VERSION) sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION) +datadir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION) +docdir = $(prefix)/share/doc/$(GARNAME)-$(BASE_VERSION) +includedir = $(prefix)/include/$(GARNAME)/$(BASE_VERSION) +infodir = $(datadir)/info +libexecdir_install = $(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) +lispdir = $(datadir)/emacs/site-lisp +mandir = $(datadir)/man +sharedstatedir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION) +sourcedir = $(prefix)/src/$(GARNAME)/$(BASE_VERSION) -MIGRATE_FILES = postgresql.conf -MIGRATE_DEST_DIR = $(sysconfdir) +MIGRATE_FILES_CSWpostgresql-8.4 = postgresql.conf +MIGRATE_DEST_DIR_CSWpostgresql-8.4 = $(sysconfdir) MASTER_SITES = http://wwwmaster.postgresql.org/redir/53/h/source/v$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 @@ -42,25 +43,31 @@ DISTFILES += postgresql.conf.tmpl DISTFILES += README-CSW.txt -PACKAGES = CSWpostgresql CSWpostgresqldoc CSWpostgresqldevel CSWlibpq +PACKAGES = CSWpostgresql-84 CSWpostgresql-84-doc CSWpostgresql-84-dev CSWlibpq-84 +PACKAGES += CSWpostgresql -CATALOGNAME_CSWpostgresql = postgresql -CATALOGNAME_CSWpostgresqldoc = postgresql_doc -CATALOGNAME_CSWpostgresqldevel = postgresql_devel -CATALOGNAME_CSWlibpq = libpq +CATALOGNAME_CSWpostgresql-84 = postgresql_84 +CATALOGNAME_CSWpostgresql-84-doc = postgresql_84_doc +CATALOGNAME_CSWpostgresql-84-dev = postgresql_84_devel +CATALOGNAME_CSWlibpq-84 = libpq84 +CATALOGNAME_CSWpostgresql = postgresql -SPKG_DESC_CSWpostgresql = An advanced open source database -SPKG_DESC_CSWpostgresqldoc = PostgreSQL Documentation -SPKG_DESC_CSWpostgresqldevel = PostgreSQL Developer Files -SPKG_DESC_CSWlibpq = PostgreSQL Libraries +SPKG_DEST_CSWpostgresql = An advanced open source database, a metapackage +SPKG_DESC_CSWpostgresql-84 = An advanced open source database, version 8.4.x +SPKG_DESC_CSWpostgresql-84-doc = PostgreSQL Documentation +SPKG_DESC_CSWpostgresql-84-dev = PostgreSQL Developer Files +SPKG_DESC_CSWlibpq-84 = PostgreSQL Libraries -REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq -REQUIRED_PKGS_CSWpostgresql += CSWlibxml2 CSWlibxslt CSWosslrt CSWkrb5lib -REQUIRED_PKGS_CSWpostgresqldevel = CSWpostgresql -REQUIRED_PKGS_CSWlibpq = CSWkrb5lib CSWlibxml2 CSWlibxslt CSWosslrt CSWzlib +REQUIRED_PKGS_CSWpostgresql = CSWpostgresql-84 +REQUIRED_PKGS_CSWpostgresql-84 = CSWreadline CSWzlib CSWlibpq-84 +REQUIRED_PKGS_CSWpostgresql-84 += CSWlibxml2 CSWlibxslt CSWosslrt CSWkrb5lib +REQUIRED_PKGS_CSWpostgresql-84-dev = CSWpostgresql-84 +REQUIRED_PKGS_CSWlibpq-84 = CSWkrb5lib CSWlibxml2 CSWlibxslt CSWosslrt +REQUIRED_PKGS_CSWlibpq-84 += CSWzlib -ARCHALL_CSWpostgresqldevel = 1 -ARCHALL_CSWpostgresqldoc = 1 +ARCHALL_CSWpostgresql = 1 +ARCHALL_CSWpostgresql-84-doc = 1 +ARCHALL_CSWpostgresql-84-doc = 1 LICENSE = COPYRIGHT @@ -107,18 +114,16 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) # Skipping tests to save time during packaging, and to enable x86 builds. -SKIPTEST = 1 +SKIPTEST ?= 1 TEST_TARGET = check -# What's that for? -# EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" +PKGFILES_CSWpostgresql = $(prefix)/bin/.* +PKGFILES_CSWpostgresql-84-doc = $(PKGFILES_DOC) +PKGFILES_CSWpostgresql-84-doc += $(prefix)/share/doc/postgresql/html.* +PKGFILES_CSWpostgresql-84-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibpq-84 = $(PKGFILES_RT) +PKGFILES_CSWlibpq-84 += $(libdir)/64 -PKGFILES_CSWpostgresqldoc = $(PKGFILES_DOC) -PKGFILES_CSWpostgresqldoc += $(prefix)/share/doc/postgresql/html.* -PKGFILES_CSWpostgresqldevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibpq = $(PKGFILES_RT) -PKGFILES_CSWlibpq += $(libdir)/64 - INITSMF = /etc$(prefix)/init\.d/cswpostgres_$(BASE_VERSION) USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) PRESERVECONF = $(sysconfdir)/postgresql\.conf @@ -152,7 +157,7 @@ PGDATA = $(localstatedir)/pgdata PROTOTYPE_MODIFIERS = pgdata -PROTOTYPE_FILES_pgdata = $(PGDATA) +PROTOTYPE_FILES_pgdata = $(localstatedir) $(PGDATA) PROTOTYPE_USER_pgdata = postgres PROTOTYPE_GROUP_pgdata = postgres PROTOTYPE_PERMS_pgdata = 0700 @@ -196,8 +201,9 @@ $(PKGROOT)$(sysconfdir) ginstall -d $(PKGROOT)$(docdir) ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir) + ginstall -m 755 -d $(PKGROOT)$(prefix)/bin for b in $(BIN_NAMES); do \ - gln -s $(GARNAME)/$(BASE_VERSION)/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \ + gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \ done ginstall -d $(PKGROOT)$(PGDATA) gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 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 Dec 6 05:23:51 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Dec 2009 04:23:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7560] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 7560 http://gar.svn.sourceforge.net/gar/?rev=7560&view=rev Author: bdwalton Date: 2009-12-06 04:23:50 +0000 (Sun, 06 Dec 2009) Log Message: ----------- libxml2: patch in casts to fix compile breakage; enable pycompile, striplibtool Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile csw/mgar/pkg/libxml2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-05 19:33:51 UTC (rev 7559) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-06 04:23:50 UTC (rev 7560) @@ -9,6 +9,8 @@ MASTER_SITES = ftp://xmlsoft.org/libxml2/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = ld-symbol-handling-fixup.patch +PATCHFILES += 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -39,6 +41,10 @@ BUILD64 = 1 NO_ISAEXEC = 1 +PYCOMPILE = 1 + +STRIP_LIBTOOL = 1 + # Skip 64 bit binaries - they are just big and gain nothing MERGE_DIRS_isa-sparcv9 = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2009-12-05 19:33:51 UTC (rev 7559) +++ csw/mgar/pkg/libxml2/trunk/checksums 2009-12-06 04:23:50 UTC (rev 7560) @@ -1 +1,3 @@ -8f4fda3969237c2a33bdb1583b5d06b2 download/libxml2-2.7.3.tar.gz +f0a8df3f16e7e44d6252d6f0f1896214 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch +5e371e0f0921fc7b366c34aded6ae993 ld-symbol-handling-fixup.patch +7740a8ec23878a2f50120e1faa2730f2 libxml2-2.7.6.tar.gz Added: csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch (rev 0) +++ csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch 2009-12-06 04:23:50 UTC (rev 7560) @@ -0,0 +1,42 @@ +From 960433c24da65100dcb57ec9ce801d59a86722cb Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 5 Dec 2009 13:32:49 -0500 +Subject: [PATCH] relaxng.c: add cast to allow compilation with sun studio 11 + +Sun Studio 11 was failing to compile relaxng.c due to a type mismatch +when calling xmlRngPErr. The issue was caused by a type mismatch with +in the outcomes of a ternary operation ("nothing" vs node->name). + +Cleanup another warning by casting a string literal to const unsigned +char *. + +Signed-off-by: Ben Walton +--- + relaxng.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/relaxng.c b/relaxng.c +index 075fc4a..9c6019d 100644 +--- a/relaxng.c ++++ b/relaxng.c +@@ -5369,7 +5369,7 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node, + } else { + xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, + "expecting name, anyName, nsName or choice : got %s\n", +- (node == NULL ? "nothing" : node->name), NULL); ++ (node == NULL ? (const unsigned char *) "nothing" : node->name), NULL); + return (NULL); + } + if (ret != def) { +@@ -9459,7 +9459,7 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt, + ctxt->states = NULL; + if (found == 0) { + if (cur == NULL) { +- VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); ++ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const unsigned char *) "noname"); + } else { + VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name); + } +-- +1.6.5.3 + Added: csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch (rev 0) +++ csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch 2009-12-06 04:23:50 UTC (rev 7560) @@ -0,0 +1,21 @@ +--- libxml2-2.7.6/configure.orig 2009-12-06 02:38:02.408924064 +0100 ++++ libxml2-2.7.6/configure 2009-12-06 02:38:28.581172792 +0100 +@@ -12150,15 +12150,10 @@ + $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \ + VERSION_SCRIPT_FLAGS=-Wl,--version-script= + test "`uname`" == "SunOS" && \ +- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," ++ VERSION_SCRIPT_FLAGS="-Wl,-M" + +- if test -n "$VERSION_SCRIPT_FLAGS"; then +- USE_VERSION_SCRIPT_TRUE= +- USE_VERSION_SCRIPT_FALSE='#' +-else +- USE_VERSION_SCRIPT_TRUE='#' +- USE_VERSION_SCRIPT_FALSE= +-fi ++USE_VERSION_SCRIPT_TRUE='#' ++USE_VERSION_SCRIPT_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 Sun Dec 6 08:50:29 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Dec 2009 07:50:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7561] csw/mgar/pkg/pinentry/trunk Message-ID: Revision: 7561 http://gar.svn.sourceforge.net/gar/?rev=7561&view=rev Author: wahwah Date: 2009-12-06 07:50:28 +0000 (Sun, 06 Dec 2009) Log Message: ----------- pinentry: Added gnulib, switched on 64-bit build Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile csw/mgar/pkg/pinentry/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pinentry/trunk/files/0003-TEMP_FAILURE_RETRY-macro-expansion.patch csw/mgar/pkg/pinentry/trunk/files/0004-adding-prereq-2.59-to-configure.ac.patch csw/mgar/pkg/pinentry/trunk/files/0005-Importing-getopt-posix-gnulib-module.patch csw/mgar/pkg/pinentry/trunk/files/0006-enabling-gnulib-getopt-module.patch Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 04:23:50 UTC (rev 7560) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 07:50:28 UTC (rev 7561) @@ -14,45 +14,57 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ # PATCHFILES = 0001-remove-__extension__-from-util.c.patch +PATCHFILES += 0002-ncurses-include.patch +PATCHFILES += 0003-TEMP_FAILURE_RETRY-macro-expansion.patch +PATCHFILES += 0004-adding-prereq-2.59-to-configure.ac.patch +PATCHFILES += 0005-Importing-getopt-posix-gnulib-module.patch +PATCHFILES += 0006-enabling-gnulib-getopt-module.patch EXTRA_CFLAGS = -D__EXTENSIONS__ EXTRA_CXXFLAGS = -D__EXTENSIONS__ -PATCHFILES += 0002-ncurses-include.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWglib CSWgtk CSWiconv CSWncurses +REQUIRED_PKGS = CSWfconfig +REQUIRED_PKGS += CSWftype2 +REQUIRED_PKGS += CSWggettextrt +REQUIRED_PKGS += CSWglib +REQUIRED_PKGS += CSWglib2 +REQUIRED_PKGS += CSWgtk +REQUIRED_PKGS += CSWgtk2 +REQUIRED_PKGS += CSWiconv +REQUIRED_PKGS += CSWlibatk +REQUIRED_PKGS += CSWlibcairo +REQUIRED_PKGS += CSWlibxext +REQUIRED_PKGS += CSWncurses +REQUIRED_PKGS += CSWpango PREREQUISITE_PKGS = $(REQUIRED_PKGS) PREREQUISITE_PKGS += CSWgtk2devel TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_LINKER_FLAGS_isa-i386 = /usr/openwin/lib/libXext.so +EXTRA_LINKER_FLAGS_isa-sparcv8 = /usr/openwin/lib/libXext.so +EXTRA_LINKER_FLAGS_isa-amd64 = /usr/openwin/lib/sparcv9/libXext.so +EXTRA_LINKER_FLAGS_isa-sparcv9 = /usr/openwin/lib/sparcv9/libXext.so +EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(MODULATION)) +BUILD64 = 1 -# Unfortunately, the compilation fails with SOS11. Because of that, pinentry -# can't be compiled on Solaris 8, and CSWgnupg2 needs to be compiled for -# Solaris 8 with no pinentry support. -# -# gmake[4]: Entering directory -# `(...)/pinentry-0.7.6/secmem' -# source='util.c' object='util.o' libtool=no \ -# DEPDIR=.deps depmode=none /bin/bash ../depcomp \ -# /opt/studio/SOS11/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I.. \ -# -I/opt/csw/X11/include -I/opt/csw/include -xO3 -xarch=v8 \ -# -D__EXTENSIONS__ -c util.c -# "util.c", line 57: warning: implicit function declaration: __extension__ -# "util.c", line 57: syntax error before or at: { -# "util.c", line 57: undefined symbol: __result -# "util.c", line 57: undefined symbol: __result -# "util.c", line 57: undefined symbol: __result -# "util.c", line 57: syntax error before or at: ) -# "util.c", line 58: warning: syntax error: empty declaration -# "util.c", line 59: warning: old-style declaration or incorrect type for: written -# cc: acomp failed for util.c -# gmake[4]: *** [util.o] Error 2 +include gar/category.mk -GARCOMPILER = SOS12 +# Switch this target on when working with gnulib. +# pre-configure-modulated: +# # To pick up the gnulib bits. +# ( \ +# cd $(WORKSRC) \ +# && \ +# aclocal -I m4 \ +# && \ +# autoconf -I m4 \ +# && \ +# autoheader \ +# && \ +# automake --add-missing --foreign \ +# ) +# @$(MAKECOOKIE) -PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 -BUILDHOST_sparc-32 = build9s -BUILDHOST_sparc-64 = build9s -BUILDHOST_i386-32 = build9x -BUILDHOST_i386-64 = build10x - -include gar/category.mk +# It works with SOS11 now, thanks to +# 0003-TEMP_FAILURE_RETRY-macro-expansion.patch +# GARCOMPILER = SOS12 Modified: csw/mgar/pkg/pinentry/trunk/checksums =================================================================== --- csw/mgar/pkg/pinentry/trunk/checksums 2009-12-06 04:23:50 UTC (rev 7560) +++ csw/mgar/pkg/pinentry/trunk/checksums 2009-12-06 07:50:28 UTC (rev 7561) @@ -1,3 +1,6 @@ -2964e403781bf656b04b46b3846057e4 download/0001-remove-__extension__-from-util.c.patch -1cfd306236b7fb0bc01a2a408f4f5abb download/0002-ncurses-include.patch -5a4f676375fa882009da02013d77210f download/pinentry-0.7.6.tar.gz +1cfd306236b7fb0bc01a2a408f4f5abb 0002-ncurses-include.patch +acafe7b0e415b707d2ab91dd5c24ac68 0003-TEMP_FAILURE_RETRY-macro-expansion.patch +9ce352e0abab7435d54123ad3bad03ce 0004-adding-prereq-2.59-to-configure.ac.patch +b2817a6ea1682a53e6d89ea96e64d5fc 0005-Importing-getopt-posix-gnulib-module.patch +c4440acb2da95db03342e45eb10bec4d 0006-enabling-gnulib-getopt-module.patch +5a4f676375fa882009da02013d77210f pinentry-0.7.6.tar.gz Added: csw/mgar/pkg/pinentry/trunk/files/0003-TEMP_FAILURE_RETRY-macro-expansion.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0003-TEMP_FAILURE_RETRY-macro-expansion.patch (rev 0) +++ csw/mgar/pkg/pinentry/trunk/files/0003-TEMP_FAILURE_RETRY-macro-expansion.patch 2009-12-06 07:50:28 UTC (rev 7561) @@ -0,0 +1,60 @@ +From e5752fdc0313d3b2ec35d8192bdeb39c25e0795c Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 4 Dec 2009 18:55:28 +0100 +Subject: [PATCH] TEMP_FAILURE_RETRY macro expansion + +--- + secmem/util.c | 22 ++++++++++++++++++++-- + 1 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/secmem/util.c b/secmem/util.c +index 580fd34..0ee1e8d 100644 +--- a/secmem/util.c ++++ b/secmem/util.c +@@ -32,6 +32,11 @@ + + #include "util.h" + ++/* ++ * This macro does not work with Sun Studio 11. ++ */ ++ ++#if 0 + #ifndef TEMP_FAILURE_RETRY + #define TEMP_FAILURE_RETRY(expression) \ + (__extension__ \ +@@ -40,6 +45,7 @@ + while (__result == -1L && errno == EINTR); \ + __result; })) + #endif ++#endif + + #ifndef HAVE_DOSISH_SYSTEM + static int uid_set = 0; +@@ -53,9 +59,21 @@ ssize_t xwrite(int fd, const void *data, size_t bytes) + size_t todo; + ssize_t written = 0; + +- for (ptr = (char *)data, todo = bytes; todo; ptr += written, todo -= written) +- if ((written = TEMP_FAILURE_RETRY(write(fd, ptr, todo))) < 0) ++ for (ptr = (char *)data, todo = bytes; todo; ptr += written, todo -= written) { ++ ++ do { ++ written = (long int) write(fd, ptr, todo); ++ } while (written == -1L && errno == EINTR); ++ ++ if (written < 0) + break; ++ } ++ /* ++ * Original code inside the for loop: ++ * ++ * if ((written = TEMP_FAILURE_RETRY(write(fd, ptr, todo))) < 0) ++ * break; ++ */ + return written; + } + +-- +1.6.5.1 + Added: csw/mgar/pkg/pinentry/trunk/files/0004-adding-prereq-2.59-to-configure.ac.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0004-adding-prereq-2.59-to-configure.ac.patch (rev 0) +++ csw/mgar/pkg/pinentry/trunk/files/0004-adding-prereq-2.59-to-configure.ac.patch 2009-12-06 07:50:28 UTC (rev 7561) @@ -0,0 +1,25 @@ +From 6f95e3011e203a98a1dc7cde43887a155bd2c041 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 4 Dec 2009 19:37:47 +0100 +Subject: [PATCH 4/6] adding-prereq-2.59-to-configure.ac + +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e091dd9..8707ff1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -19,7 +19,7 @@ + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + + # (Process this file with autoconf to produce a configure script.) +-AC_PREREQ(2.57) ++AC_PREREQ(2.59) + min_automake_version="1.7.6" + + # Version number: Remember to change it immediately *after* a release. +-- +1.6.5.1 + Added: csw/mgar/pkg/pinentry/trunk/files/0005-Importing-getopt-posix-gnulib-module.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0005-Importing-getopt-posix-gnulib-module.patch (rev 0) +++ csw/mgar/pkg/pinentry/trunk/files/0005-Importing-getopt-posix-gnulib-module.patch 2009-12-06 07:50:28 UTC (rev 7561) @@ -0,0 +1,5816 @@ +From 5ab452427bdb2f48759090c0acd4b49ab33a0d9e Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 4 Dec 2009 19:39:08 +0100 +Subject: [PATCH 5/6] Importing getopt-posix gnulib module + +--- + lib/Makefile.am | 219 ++++++++++ + lib/Makefile.am~ | 219 ++++++++++ + lib/Makefile.in | 933 ++++++++++++++++++++++++++++++++++++++++ + lib/dummy.c | 42 ++ + lib/getopt.c | 1187 +++++++++++++++++++++++++++++++++++++++++++++++++++ + lib/getopt.in.h | 247 +++++++++++ + lib/getopt1.c | 170 ++++++++ + lib/getopt_int.h | 132 ++++++ + lib/gettext.h | 279 ++++++++++++ + lib/stddef.in.h | 86 ++++ + lib/unistd.in.h | 810 +++++++++++++++++++++++++++++++++++ + link-warning.h | 28 ++ + m4/00gnulib.m4 | 30 ++ + m4/extensions.m4 | 104 +++++ + m4/getopt.m4 | 250 +++++++++++ + m4/gnulib-cache.m4 | 34 ++ + m4/gnulib-common.m4 | 124 ++++++ + m4/gnulib-comp.m4 | 201 +++++++++ + m4/gnulib-tool.m4 | 57 +++ + m4/include_next.m4 | 187 ++++++++ + m4/onceonly.m4 | 90 ++++ + m4/stddef_h.m4 | 45 ++ + m4/unistd_h.m4 | 119 +++++ + m4/wchar_t.m4 | 20 + + 24 files changed, 5613 insertions(+), 0 deletions(-) + create mode 100644 lib/Makefile.am + create mode 100644 lib/Makefile.am~ + create mode 100644 lib/Makefile.in + create mode 100644 lib/dummy.c + create mode 100644 lib/getopt.c + create mode 100644 lib/getopt.in.h + create mode 100644 lib/getopt1.c + create mode 100644 lib/getopt_int.h + create mode 100644 lib/gettext.h + create mode 100644 lib/stddef.in.h + create mode 100644 lib/unistd.in.h + create mode 100644 link-warning.h + create mode 100644 m4/00gnulib.m4 + create mode 100644 m4/extensions.m4 + create mode 100644 m4/getopt.m4 + create mode 100644 m4/gnulib-cache.m4 + create mode 100644 m4/gnulib-common.m4 + create mode 100644 m4/gnulib-comp.m4 + create mode 100644 m4/gnulib-tool.m4 + create mode 100644 m4/include_next.m4 + create mode 100644 m4/onceonly.m4 + create mode 100644 m4/stddef_h.m4 + create mode 100644 m4/unistd_h.m4 + create mode 100644 m4/wchar_t.m4 + +diff --git a/lib/Makefile.am b/lib/Makefile.am +new file mode 100644 +index 0000000..f407c93 +--- /dev/null ++++ b/lib/Makefile.am +@@ -0,0 +1,219 @@ ++## DO NOT EDIT! GENERATED AUTOMATICALLY! ++## Process this file with automake to produce Makefile.in. ++# Copyright (C) 2002-2009 Free Software Foundation, Inc. ++# ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. ++# ++# Generated by gnulib-tool. ++# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-libtool --macro-prefix=gl getopt-posix ++ ++AUTOMAKE_OPTIONS = 1.5 gnits ++ ++SUBDIRS = ++noinst_HEADERS = ++noinst_LIBRARIES = ++noinst_LTLIBRARIES = ++EXTRA_DIST = ++BUILT_SOURCES = ++SUFFIXES = ++MOSTLYCLEANFILES = core *.stackdump ++MOSTLYCLEANDIRS = ++CLEANFILES = ++DISTCLEANFILES = ++MAINTAINERCLEANFILES = ++ ++AM_CPPFLAGS = ++AM_CFLAGS = ++ ++noinst_LIBRARIES += libgnu.a ++ ++libgnu_a_SOURCES = ++libgnu_a_LIBADD = $(gl_LIBOBJS) ++libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) ++EXTRA_libgnu_a_SOURCES = ++ ++## begin gnulib module getopt-posix ++ ++BUILT_SOURCES += $(GETOPT_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++getopt.h: getopt.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/getopt.in.h; \ ++ } > $@-t && \ ++ mv -f $@-t $@ ++MOSTLYCLEANFILES += getopt.h getopt.h-t ++ ++EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h ++ ++EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c ++ ++## end gnulib module getopt-posix ++ ++## begin gnulib module gettext-h ++ ++libgnu_a_SOURCES += gettext.h ++ ++## end gnulib module gettext-h ++ ++## begin gnulib module link-warning ++ ++LINK_WARNING_H=$(top_srcdir)/./link-warning.h ++ ++EXTRA_DIST += $(top_srcdir)/./link-warning.h ++ ++## end gnulib module link-warning ++ ++## begin gnulib module stddef ++ ++BUILT_SOURCES += $(STDDEF_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++stddef.h: stddef.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ ++ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ ++ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ ++ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ ++ < $(srcdir)/stddef.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += stddef.h stddef.h-t ++ ++EXTRA_DIST += stddef.in.h ++ ++## end gnulib module stddef ++ ++## begin gnulib module unistd ++ ++BUILT_SOURCES += unistd.h ++ ++# We need the following in order to create an empty placeholder for ++# when the system doesn't have one. ++unistd.h: unistd.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ ++ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ ++ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ ++ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ ++ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \ ++ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ ++ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ ++ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \ ++ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ ++ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \ ++ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ ++ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ ++ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ ++ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ ++ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ ++ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \ ++ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ ++ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ ++ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ ++ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ ++ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ ++ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ ++ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ ++ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ ++ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ ++ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ ++ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ ++ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \ ++ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ ++ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ ++ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ ++ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \ ++ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \ ++ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ ++ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ ++ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ ++ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ ++ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ ++ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ ++ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ ++ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ ++ -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ ++ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ ++ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ ++ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ ++ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ ++ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ ++ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ ++ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ ++ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ ++ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ ++ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ ++ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ ++ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ ++ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ ++ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ ++ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ ++ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ ++ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ ++ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ ++ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ ++ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ ++ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ ++ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ ++ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ ++ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ ++ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ ++ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ ++ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ ++ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ ++ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ ++ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ ++ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ ++ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ ++ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ ++ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ ++ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ ++ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ ++ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/unistd.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += unistd.h unistd.h-t ++ ++EXTRA_DIST += unistd.in.h ++ ++## end gnulib module unistd ++ ++## begin gnulib module dummy ++ ++libgnu_a_SOURCES += dummy.c ++ ++## end gnulib module dummy ++ ++ ++mostlyclean-local: mostlyclean-generic ++ @for dir in '' $(MOSTLYCLEANDIRS); do \ ++ if test -n "$$dir" && test -d $$dir; then \ ++ echo "rmdir $$dir"; rmdir $$dir; \ ++ fi; \ ++ done; \ ++ : +diff --git a/lib/Makefile.am~ b/lib/Makefile.am~ +new file mode 100644 +index 0000000..c1fb886 +--- /dev/null ++++ b/lib/Makefile.am~ +@@ -0,0 +1,219 @@ ++## DO NOT EDIT! GENERATED AUTOMATICALLY! ++## Process this file with automake to produce Makefile.in. ++# Copyright (C) 2002-2009 Free Software Foundation, Inc. ++# ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. ++# ++# Generated by gnulib-tool. ++# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-libtool --macro-prefix=gl getopt ++ ++AUTOMAKE_OPTIONS = 1.5 gnits ++ ++SUBDIRS = ++noinst_HEADERS = ++noinst_LIBRARIES = ++noinst_LTLIBRARIES = ++EXTRA_DIST = ++BUILT_SOURCES = ++SUFFIXES = ++MOSTLYCLEANFILES = core *.stackdump ++MOSTLYCLEANDIRS = ++CLEANFILES = ++DISTCLEANFILES = ++MAINTAINERCLEANFILES = ++ ++AM_CPPFLAGS = ++AM_CFLAGS = ++ ++noinst_LIBRARIES += libgnu.a ++ ++libgnu_a_SOURCES = ++libgnu_a_LIBADD = $(gl_LIBOBJS) ++libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) ++EXTRA_libgnu_a_SOURCES = ++ ++## begin gnulib module getopt-posix ++ ++BUILT_SOURCES += $(GETOPT_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++getopt.h: getopt.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/getopt.in.h; \ ++ } > $@-t && \ ++ mv -f $@-t $@ ++MOSTLYCLEANFILES += getopt.h getopt.h-t ++ ++EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h ++ ++EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c ++ ++## end gnulib module getopt-posix ++ ++## begin gnulib module gettext-h ++ ++libgnu_a_SOURCES += gettext.h ++ ++## end gnulib module gettext-h ++ ++## begin gnulib module link-warning ++ ++LINK_WARNING_H=$(top_srcdir)/./link-warning.h ++ ++EXTRA_DIST += $(top_srcdir)/./link-warning.h ++ ++## end gnulib module link-warning ++ ++## begin gnulib module stddef ++ ++BUILT_SOURCES += $(STDDEF_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++stddef.h: stddef.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ ++ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ ++ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ ++ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ ++ < $(srcdir)/stddef.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += stddef.h stddef.h-t ++ ++EXTRA_DIST += stddef.in.h ++ ++## end gnulib module stddef ++ ++## begin gnulib module unistd ++ ++BUILT_SOURCES += unistd.h ++ ++# We need the following in order to create an empty placeholder for ++# when the system doesn't have one. ++unistd.h: unistd.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ ++ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ ++ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ ++ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ ++ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \ ++ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ ++ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ ++ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \ ++ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ ++ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \ ++ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ ++ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ ++ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ ++ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ ++ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ ++ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \ ++ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ ++ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ ++ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ ++ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ ++ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ ++ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ ++ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ ++ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ ++ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ ++ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ ++ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ ++ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \ ++ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ ++ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ ++ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ ++ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \ ++ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \ ++ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ ++ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ ++ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ ++ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ ++ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ ++ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ ++ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ ++ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ ++ -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ ++ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ ++ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ ++ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ ++ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ ++ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ ++ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ ++ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ ++ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ ++ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ ++ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ ++ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ ++ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ ++ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ ++ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ ++ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ ++ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ ++ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ ++ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ ++ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ ++ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ ++ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ ++ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ ++ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ ++ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ ++ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ ++ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ ++ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ ++ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ ++ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ ++ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ ++ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ ++ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ ++ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ ++ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ ++ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ ++ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ ++ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/unistd.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += unistd.h unistd.h-t ++ ++EXTRA_DIST += unistd.in.h ++ ++## end gnulib module unistd ++ ++## begin gnulib module dummy ++ ++libgnu_a_SOURCES += dummy.c ++ ++## end gnulib module dummy ++ ++ ++mostlyclean-local: mostlyclean-generic ++ @for dir in '' $(MOSTLYCLEANDIRS); do \ ++ if test -n "$$dir" && test -d $$dir; then \ ++ echo "rmdir $$dir"; rmdir $$dir; \ ++ fi; \ ++ done; \ ++ : +diff --git a/lib/Makefile.in b/lib/Makefile.in +new file mode 100644 +index 0000000..f22746f +--- /dev/null ++++ b/lib/Makefile.in +@@ -0,0 +1,933 @@ ++# Makefile.in generated by automake 1.11 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. ++# 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. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ at SET_MAKE@ ++ ++# Copyright (C) 2002-2009 Free Software Foundation, Inc. ++# ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. ++# ++# Generated by gnulib-tool. ++# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-libtool --macro-prefix=gl getopt getopt-gnu ++ ++ ++ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++subdir = lib ++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ ++ $(top_srcdir)/m4/curses.m4 $(top_srcdir)/m4/extensions.m4 \ ++ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/glib.m4 \ ++ $(top_srcdir)/m4/gnulib-common.m4 \ ++ $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/gtk.m4 \ ++ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \ ++ $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/qt.m4 \ ++ $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ ++ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++LIBRARIES = $(noinst_LIBRARIES) ++AR = ar ++ARFLAGS = cru ++libgnu_a_AR = $(AR) $(ARFLAGS) ++am__DEPENDENCIES_1 = ++am_libgnu_a_OBJECTS = dummy.$(OBJEXT) ++libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++am__mv = mv -f ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) ++DIST_SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++HEADERS = $(noinst_HEADERS) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" ++ACLOCAL = @ACLOCAL@ ++AMTAR = @AMTAR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++GETOPT_H = @GETOPT_H@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ ++GLIB_CONFIG = @GLIB_CONFIG@ ++GLIB_LIBS = @GLIB_LIBS@ ++GNULIB_CHOWN = @GNULIB_CHOWN@ ++GNULIB_CLOSE = @GNULIB_CLOSE@ ++GNULIB_DUP2 = @GNULIB_DUP2@ ++GNULIB_DUP3 = @GNULIB_DUP3@ ++GNULIB_ENVIRON = @GNULIB_ENVIRON@ ++GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ ++GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ ++GNULIB_FCHDIR = @GNULIB_FCHDIR@ ++GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ ++GNULIB_FSYNC = @GNULIB_FSYNC@ ++GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ ++GNULIB_GETCWD = @GNULIB_GETCWD@ ++GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ ++GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ ++GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ ++GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ ++GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ ++GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ ++GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ ++GNULIB_LCHOWN = @GNULIB_LCHOWN@ ++GNULIB_LINK = @GNULIB_LINK@ ++GNULIB_LINKAT = @GNULIB_LINKAT@ ++GNULIB_LSEEK = @GNULIB_LSEEK@ ++GNULIB_PIPE2 = @GNULIB_PIPE2@ ++GNULIB_READLINK = @GNULIB_READLINK@ ++GNULIB_READLINKAT = @GNULIB_READLINKAT@ ++GNULIB_RMDIR = @GNULIB_RMDIR@ ++GNULIB_SLEEP = @GNULIB_SLEEP@ ++GNULIB_SYMLINK = @GNULIB_SYMLINK@ ++GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ ++GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ ++GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ ++GNULIB_UNLINK = @GNULIB_UNLINK@ ++GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ ++GNULIB_WRITE = @GNULIB_WRITE@ ++GREP = @GREP@ ++GTK2CFLAGS = @GTK2CFLAGS@ ++GTK2LIBS = @GTK2LIBS@ ++GTK_CFLAGS = @GTK_CFLAGS@ ++GTK_CONFIG = @GTK_CONFIG@ ++GTK_LIBS = @GTK_LIBS@ ++HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ++HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ ++HAVE_DUP2 = @HAVE_DUP2@ ++HAVE_DUP3 = @HAVE_DUP3@ ++HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ ++HAVE_FACCESSAT = @HAVE_FACCESSAT@ ++HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ ++HAVE_FSYNC = @HAVE_FSYNC@ ++HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ ++HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ ++HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ ++HAVE_GETGROUPS = @HAVE_GETGROUPS@ ++HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ ++HAVE_GETOPT_H = @HAVE_GETOPT_H@ ++HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ++HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ ++HAVE_LINK = @HAVE_LINK@ ++HAVE_LINKAT = @HAVE_LINKAT@ ++HAVE_OS_H = @HAVE_OS_H@ ++HAVE_PIPE2 = @HAVE_PIPE2@ ++HAVE_READLINK = @HAVE_READLINK@ ++HAVE_READLINKAT = @HAVE_READLINKAT@ ++HAVE_SLEEP = @HAVE_SLEEP@ ++HAVE_SYMLINK = @HAVE_SYMLINK@ ++HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ ++HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ ++HAVE_UNISTD_H = @HAVE_UNISTD_H@ ++HAVE_UNLINKAT = @HAVE_UNLINKAT@ ++HAVE_WCHAR_T = @HAVE_WCHAR_T@ ++INCLUDE_NEXT = @INCLUDE_NEXT@ ++INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LDFLAGS = @LDFLAGS@ ++LIBCAP = @LIBCAP@ ++LIBCURSES = @LIBCURSES@ ++LIBICONV = @LIBICONV@ ++LIBINTL = @LIBINTL@ ++LIBNCURSES = @LIBNCURSES@ ++LIBOBJS = @LIBOBJS@ ++LIBPTHREAD = @LIBPTHREAD@ ++LIBS = @LIBS@ ++LIBTERMCAP = @LIBTERMCAP@ ++LIB_QPE = @LIB_QPE@ ++LN_S = @LN_S@ ++LTLIBICONV = @LTLIBICONV@ ++LTLIBINTL = @LTLIBINTL@ ++LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ ++MOC = @MOC@ ++NCURSES_INCLUDE = @NCURSES_INCLUDE@ ++NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ ++NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ ++NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ ++NEXT_GETOPT_H = @NEXT_GETOPT_H@ ++NEXT_STDDEF_H = @NEXT_STDDEF_H@ ++NEXT_UNISTD_H = @NEXT_UNISTD_H@ ++OBJEXT = @OBJEXT@ ++PACKAGE = @PACKAGE@ ++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@ ++PINENTRY_DEFAULT = @PINENTRY_DEFAULT@ ++PKG_CONFIG = @PKG_CONFIG@ ++PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ ++QT4_CORE_CFLAGS = @QT4_CORE_CFLAGS@ ++QT4_CORE_LIBS = @QT4_CORE_LIBS@ ++QT4_GUI_CFLAGS = @QT4_GUI_CFLAGS@ ++QT4_GUI_LIBS = @QT4_GUI_LIBS@ ++QTE_NORTTI = @QTE_NORTTI@ ++QT_CXXFLAGS = @QT_CXXFLAGS@ ++QT_INCLUDES = @QT_INCLUDES@ ++QT_LDFLAGS = @QT_LDFLAGS@ ++QT_LIBS = @QT_LIBS@ ++QT_MT_LDFLAGS = @QT_MT_LDFLAGS@ ++QT_MT_LIBS = @QT_MT_LIBS@ ++QT_RPATH = @QT_RPATH@ ++RANLIB = @RANLIB@ ++REPLACE_CHOWN = @REPLACE_CHOWN@ ++REPLACE_CLOSE = @REPLACE_CLOSE@ ++REPLACE_DUP = @REPLACE_DUP@ ++REPLACE_DUP2 = @REPLACE_DUP2@ ++REPLACE_FCHDIR = @REPLACE_FCHDIR@ ++REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ ++REPLACE_GETCWD = @REPLACE_GETCWD@ ++REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ ++REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ ++REPLACE_LCHOWN = @REPLACE_LCHOWN@ ++REPLACE_LINK = @REPLACE_LINK@ ++REPLACE_LINKAT = @REPLACE_LINKAT@ ++REPLACE_LSEEK = @REPLACE_LSEEK@ ++REPLACE_NULL = @REPLACE_NULL@ ++REPLACE_READLINK = @REPLACE_READLINK@ ++REPLACE_RMDIR = @REPLACE_RMDIR@ ++REPLACE_SYMLINK = @REPLACE_SYMLINK@ ++REPLACE_UNLINK = @REPLACE_UNLINK@ ++REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ ++REPLACE_WRITE = @REPLACE_WRITE@ ++SETCAP = @SETCAP@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++STDDEF_H = @STDDEF_H@ ++STRIP = @STRIP@ ++UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ ++UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ ++USE_THREADS = @USE_THREADS@ ++VERSION = @VERSION@ ++WINDRES = @WINDRES@ ++XMKMF = @XMKMF@ ++X_CFLAGS = @X_CFLAGS@ ++X_EXTRA_LIBS = @X_EXTRA_LIBS@ ++X_LIBS = @X_LIBS@ ++X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++gl_LIBOBJS = @gl_LIBOBJS@ ++gl_LTLIBOBJS = @gl_LTLIBOBJS@ ++gltests_LIBOBJS = @gltests_LIBOBJS@ ++gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++libgnu_LIBDEPS = @libgnu_LIBDEPS@ ++libgnu_LTLIBDEPS = @libgnu_LTLIBDEPS@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++qt_includes = @qt_includes@ ++qt_libraries = @qt_libraries@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++x_libraries = @x_libraries@ ++AUTOMAKE_OPTIONS = 1.5 gnits ++SUBDIRS = ++noinst_HEADERS = ++noinst_LIBRARIES = libgnu.a ++noinst_LTLIBRARIES = ++EXTRA_DIST = getopt.c getopt.in.h getopt1.c getopt_int.h \ ++ $(top_srcdir)/./link-warning.h stddef.in.h unistd.in.h ++BUILT_SOURCES = $(GETOPT_H) $(STDDEF_H) unistd.h ++SUFFIXES = ++MOSTLYCLEANFILES = core *.stackdump getopt.h getopt.h-t stddef.h \ ++ stddef.h-t unistd.h unistd.h-t ++MOSTLYCLEANDIRS = ++CLEANFILES = ++DISTCLEANFILES = ++MAINTAINERCLEANFILES = ++AM_CPPFLAGS = ++AM_CFLAGS = ++libgnu_a_SOURCES = gettext.h dummy.c ++libgnu_a_LIBADD = $(gl_LIBOBJS) ++libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) ++EXTRA_libgnu_a_SOURCES = getopt.c getopt1.c ++LINK_WARNING_H = $(top_srcdir)/./link-warning.h ++all: $(BUILT_SOURCES) ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive ++ ++.SUFFIXES: ++.SUFFIXES: .c .o .obj ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnits lib/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): ++ ++clean-noinstLIBRARIES: ++ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) ++libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) ++ -rm -f libgnu.a ++ $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) ++ $(RANLIB) libgnu.a ++ ++clean-noinstLTLIBRARIES: ++ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) ++ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ ++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ++ test "$$dir" != "$$p" || dir=.; \ ++ echo "rm -f \"$${dir}/so_locations\""; \ ++ rm -f "$${dir}/so_locations"; \ ++ done ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dummy.Po at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getopt.Po at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getopt1.Po at am__quote@ ++ ++.c.o: ++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ at am__fastdepCC_FALSE@ $(COMPILE) -c $< ++ ++.c.obj: ++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` ++ ++# This directory's subdirectories are mostly independent; you can cd ++# into them and run `make' without going through this Makefile. ++# To change the values of `make' variables: instead of editing Makefiles, ++# (1) if the variable is set in `config.status', edit `config.status' ++# (which will cause the Makefiles to be regenerated when you run `make'); ++# (2) otherwise, pass the desired values on the `make' command line. ++$(RECURSIVE_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" ++ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ ++ done; \ ++ rev="$$rev ."; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ for subdir in $$rev; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done && test -z "$$fail" ++tags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ set x; \ ++ here=`pwd`; \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ empty_fix=.; \ ++ else \ ++ include_option=--include; \ ++ empty_fix=; \ ++ fi; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test ! -f $$subdir/TAGS || \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ ++ done; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ else \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ ++ || exit 1; \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ || exit 1; \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ am__skip_mode_fix=: \ ++ distdir) \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: $(BUILT_SOURCES) ++ $(MAKE) $(AM_MAKEFLAGS) check-recursive ++all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) ++installdirs: installdirs-recursive ++installdirs-am: ++install: $(BUILT_SOURCES) ++ $(MAKE) $(AM_MAKEFLAGS) install-recursive ++install-exec: install-exec-recursive ++install-data: install-data-recursive ++uninstall: uninstall-recursive ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-recursive ++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 ++mostlyclean-generic: ++ -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) ++ ++clean-generic: ++ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) ++ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) ++ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) ++clean: clean-recursive ++ ++clean-am: clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ ++ mostlyclean-am ++ ++distclean: distclean-recursive ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-tags ++ ++dvi: dvi-recursive ++ ++dvi-am: ++ ++html: html-recursive ++ ++html-am: ++ ++info: info-recursive ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-recursive ++ ++install-dvi-am: ++ ++install-exec-am: ++ ++install-html: install-html-recursive ++ ++install-html-am: ++ ++install-info: install-info-recursive ++ ++install-info-am: ++ ++install-man: ++ ++install-pdf: install-pdf-recursive ++ ++install-pdf-am: ++ ++install-ps: install-ps-recursive ++ ++install-ps-am: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-recursive ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-recursive ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-local ++ ++pdf: pdf-recursive ++ ++pdf-am: ++ ++ps: ps-recursive ++ ++ps-am: ++ ++uninstall-am: ++ ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ ++ ctags-recursive install install-am install-strip \ ++ tags-recursive ++ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic \ ++ clean-noinstLIBRARIES clean-noinstLTLIBRARIES ctags \ ++ ctags-recursive distclean distclean-compile distclean-generic \ ++ distclean-tags distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-local pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am ++ ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++getopt.h: getopt.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/getopt.in.h; \ ++ } > $@-t && \ ++ mv -f $@-t $@ ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++stddef.h: stddef.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ ++ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ ++ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ ++ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ ++ < $(srcdir)/stddef.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++ ++# We need the following in order to create an empty placeholder for ++# when the system doesn't have one. ++unistd.h: unistd.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ ++ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ ++ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ ++ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ ++ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \ ++ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ ++ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ ++ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \ ++ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ ++ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \ ++ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ ++ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ ++ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ ++ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ ++ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ ++ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \ ++ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ ++ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ ++ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ ++ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ ++ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ ++ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ ++ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ ++ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ ++ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ ++ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ ++ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ ++ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \ ++ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ ++ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ ++ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ ++ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \ ++ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \ ++ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ ++ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ ++ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ ++ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ ++ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ ++ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ ++ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ ++ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ ++ -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ ++ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ ++ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ ++ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ ++ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ ++ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ ++ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ ++ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ ++ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ ++ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ ++ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ ++ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ ++ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ ++ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ ++ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ ++ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ ++ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ ++ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ ++ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ ++ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ ++ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ ++ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ ++ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ ++ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ ++ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ ++ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ ++ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ ++ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ ++ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ ++ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ ++ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ ++ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ ++ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ ++ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ ++ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ ++ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ ++ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ ++ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/unistd.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++ ++mostlyclean-local: mostlyclean-generic ++ @for dir in '' $(MOSTLYCLEANDIRS); do \ ++ if test -n "$$dir" && test -d $$dir; then \ ++ echo "rmdir $$dir"; rmdir $$dir; \ ++ fi; \ ++ done; \ ++ : ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff --git a/lib/dummy.c b/lib/dummy.c +new file mode 100644 +index 0000000..ccb5c26 +--- /dev/null ++++ b/lib/dummy.c +@@ -0,0 +1,42 @@ ++/* A dummy file, to prevent empty libraries from breaking builds. ++ Copyright (C) 2004, 2007 Free Software Foundation, Inc. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create ++ libraries without any object files. You might get an error like: ++ ++ > ar cru .libs/libgl.a ++ > ar: no archive members specified ++ ++ Compiling this file, and adding its object file to the library, will ++ prevent the library from being empty. */ ++ ++/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries ++ that don't export any symbol. You might get an error like: ++ ++ > cc ... libgnu.a ++ > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a ++ ++ Compiling this file, and adding its object file to the library, will ++ prevent the library from exporting no symbols. */ ++ ++#ifdef __sun ++/* This declaration ensures that the library will export at least 1 symbol. */ ++int gl_dummy_symbol; ++#else ++/* This declaration is solely to ensure that after preprocessing ++ this file is never empty. */ ++typedef int dummy; ++#endif +diff --git a/lib/getopt.c b/lib/getopt.c +new file mode 100644 +index 0000000..797d166 +--- /dev/null ++++ b/lib/getopt.c +@@ -0,0 +1,1187 @@ ++/* Getopt for GNU. ++ NOTE: getopt is now part of the C library, so if you don't know what ++ "Keep this file name-space clean" means, talk to drepper at gnu.org ++ before changing it! ++ Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004,2006,2008,2009 ++ Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++#ifndef _LIBC ++# include ++#endif ++ ++#include "getopt.h" ++ ++#include ++#include ++#include ++#include ++ ++#ifdef _LIBC ++# include ++#else ++# include "gettext.h" ++# define _(msgid) gettext (msgid) ++#endif ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++# include ++#endif ++ ++#ifndef attribute_hidden ++# define attribute_hidden ++#endif ++ ++/* Unlike standard Unix `getopt', functions like `getopt_long' ++ let the user intersperse the options with the other arguments. ++ ++ As `getopt_long' works, it permutes the elements of ARGV so that, ++ when it is done, all the options precede everything else. Thus ++ all application programs are extended to handle flexible argument order. ++ ++ Using `getopt' or setting the environment variable POSIXLY_CORRECT ++ disables permutation. ++ Then the application's behavior is completely standard. ++ ++ GNU application programs can use a third alternative mode in which ++ they can distinguish the relative order of options and other arguments. */ ++ ++#include "getopt_int.h" ++ ++/* For communication from `getopt' to the caller. ++ When `getopt' finds an option that takes an argument, ++ the argument value is returned here. ++ Also, when `ordering' is RETURN_IN_ORDER, ++ each non-option ARGV-element is returned here. */ ++ ++char *optarg; ++ ++/* Index in ARGV of the next element to be scanned. ++ This is used for communication to and from the caller ++ and for communication between successive calls to `getopt'. ++ ++ On entry to `getopt', zero means this is the first call; initialize. ++ ++ When `getopt' returns -1, this is the index of the first of the ++ non-option elements that the caller should itself scan. ++ ++ Otherwise, `optind' communicates from one call to the next ++ how much of ARGV has been scanned so far. */ ++ ++/* 1003.2 says this must be 1 before any call. */ ++int optind = 1; ++ ++/* Callers store zero here to inhibit the error message ++ for unrecognized options. */ ++ ++int opterr = 1; ++ ++/* Set to an option character which was unrecognized. ++ This must be initialized on some systems to avoid linking in the ++ system's own getopt implementation. */ ++ ++int optopt = '?'; ++ ++/* Keep a global copy of all internal members of getopt_data. */ ++ ++static struct _getopt_data getopt_data; ++ ++ ++#if defined HAVE_DECL_GETENV && !HAVE_DECL_GETENV ++extern char *getenv (); ++#endif ++ ++#ifdef _LIBC ++/* Stored original parameters. ++ XXX This is no good solution. We should rather copy the args so ++ that we can compare them later. But we must not use malloc(3). */ ++extern int __libc_argc; ++extern char **__libc_argv; ++ ++/* Bash 2.0 gives us an environment variable containing flags ++ indicating ARGV elements that should not be considered arguments. */ ++ ++# ifdef USE_NONOPTION_FLAGS ++/* Defined in getopt_init.c */ ++extern char *__getopt_nonoption_flags; ++# endif ++ ++# ifdef USE_NONOPTION_FLAGS ++# define SWAP_FLAGS(ch1, ch2) \ ++ if (d->__nonoption_flags_len > 0) \ ++ { \ ++ char __tmp = __getopt_nonoption_flags[ch1]; \ ++ __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ ++ __getopt_nonoption_flags[ch2] = __tmp; \ ++ } ++# else ++# define SWAP_FLAGS(ch1, ch2) ++# endif ++#else /* !_LIBC */ ++# define SWAP_FLAGS(ch1, ch2) ++#endif /* _LIBC */ ++ ++/* Exchange two adjacent subsequences of ARGV. ++ One subsequence is elements [first_nonopt,last_nonopt) ++ which contains all the non-options that have been skipped so far. ++ The other is elements [last_nonopt,optind), which contains all ++ the options processed since those non-options were skipped. ++ ++ `first_nonopt' and `last_nonopt' are relocated so that they describe ++ the new indices of the non-options in ARGV after they are moved. */ ++ ++static void ++exchange (char **argv, struct _getopt_data *d) ++{ ++ int bottom = d->__first_nonopt; ++ int middle = d->__last_nonopt; ++ int top = d->optind; ++ char *tem; ++ ++ /* Exchange the shorter segment with the far end of the longer segment. ++ That puts the shorter segment into the right place. ++ It leaves the longer segment in the right place overall, ++ but it consists of two parts that need to be swapped next. */ ++ ++#if defined _LIBC && defined USE_NONOPTION_FLAGS ++ /* First make sure the handling of the `__getopt_nonoption_flags' ++ string can work normally. Our top argument must be in the range ++ of the string. */ ++ if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len) ++ { ++ /* We must extend the array. The user plays games with us and ++ presents new arguments. */ ++ char *new_str = malloc (top + 1); ++ if (new_str == NULL) ++ d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0; ++ else ++ { ++ memset (__mempcpy (new_str, __getopt_nonoption_flags, ++ d->__nonoption_flags_max_len), ++ '\0', top + 1 - d->__nonoption_flags_max_len); ++ d->__nonoption_flags_max_len = top + 1; ++ __getopt_nonoption_flags = new_str; ++ } ++ } ++#endif ++ ++ while (top > middle && middle > bottom) ++ { ++ if (top - middle > middle - bottom) ++ { ++ /* Bottom segment is the short one. */ ++ int len = middle - bottom; ++ register int i; ++ ++ /* Swap it with the top part of the top segment. */ ++ for (i = 0; i < len; i++) ++ { ++ tem = argv[bottom + i]; ++ argv[bottom + i] = argv[top - (middle - bottom) + i]; ++ argv[top - (middle - bottom) + i] = tem; ++ SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); ++ } ++ /* Exclude the moved bottom segment from further swapping. */ ++ top -= len; ++ } ++ else ++ { ++ /* Top segment is the short one. */ ++ int len = top - middle; ++ register int i; ++ ++ /* Swap it with the bottom part of the bottom segment. */ ++ for (i = 0; i < len; i++) ++ { ++ tem = argv[bottom + i]; ++ argv[bottom + i] = argv[middle + i]; ++ argv[middle + i] = tem; ++ SWAP_FLAGS (bottom + i, middle + i); ++ } ++ /* Exclude the moved top segment from further swapping. */ ++ bottom += len; ++ } ++ } ++ ++ /* Update records for the slots the non-options now occupy. */ ++ ++ d->__first_nonopt += (d->optind - d->__last_nonopt); ++ d->__last_nonopt = d->optind; ++} ++ ++/* Initialize the internal data when the first call is made. */ ++ ++static const char * ++_getopt_initialize (int argc _UNUSED_PARAMETER_, ++ char **argv _UNUSED_PARAMETER_, const char *optstring, ++ int posixly_correct, struct _getopt_data *d) ++{ ++ /* Start processing options with ARGV-element 1 (since ARGV-element 0 ++ is the program name); the sequence of previously skipped ++ non-option ARGV-elements is empty. */ ++ ++ d->__first_nonopt = d->__last_nonopt = d->optind; ++ ++ d->__nextchar = NULL; ++ ++ d->__posixly_correct = posixly_correct || !!getenv ("POSIXLY_CORRECT"); ++ ++ /* Determine how to handle the ordering of options and nonoptions. */ ++ ++ if (optstring[0] == '-') ++ { ++ d->__ordering = RETURN_IN_ORDER; ++ ++optstring; ++ } ++ else if (optstring[0] == '+') ++ { ++ d->__ordering = REQUIRE_ORDER; ++ ++optstring; ++ } ++ else if (d->__posixly_correct) ++ d->__ordering = REQUIRE_ORDER; ++ else ++ d->__ordering = PERMUTE; ++ ++#if defined _LIBC && defined USE_NONOPTION_FLAGS ++ if (!d->__posixly_correct ++ && argc == __libc_argc && argv == __libc_argv) ++ { ++ if (d->__nonoption_flags_max_len == 0) ++ { ++ if (__getopt_nonoption_flags == NULL ++ || __getopt_nonoption_flags[0] == '\0') ++ d->__nonoption_flags_max_len = -1; ++ else ++ { ++ const char *orig_str = __getopt_nonoption_flags; ++ int len = d->__nonoption_flags_max_len = strlen (orig_str); ++ if (d->__nonoption_flags_max_len < argc) ++ d->__nonoption_flags_max_len = argc; ++ __getopt_nonoption_flags = ++ (char *) malloc (d->__nonoption_flags_max_len); ++ if (__getopt_nonoption_flags == NULL) ++ d->__nonoption_flags_max_len = -1; ++ else ++ memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), ++ '\0', d->__nonoption_flags_max_len - len); ++ } ++ } ++ d->__nonoption_flags_len = d->__nonoption_flags_max_len; ++ } ++ else ++ d->__nonoption_flags_len = 0; ++#endif ++ ++ return optstring; ++} ++ ++/* Scan elements of ARGV (whose length is ARGC) for option characters ++ given in OPTSTRING. ++ ++ If an element of ARGV starts with '-', and is not exactly "-" or "--", ++ then it is an option element. The characters of this element ++ (aside from the initial '-') are option characters. If `getopt' ++ is called repeatedly, it returns successively each of the option characters ++ from each of the option elements. ++ ++ If `getopt' finds another option character, it returns that character, ++ updating `optind' and `nextchar' so that the next call to `getopt' can ++ resume the scan with the following option character or ARGV-element. ++ ++ If there are no more option characters, `getopt' returns -1. ++ Then `optind' is the index in ARGV of the first ARGV-element ++ that is not an option. (The ARGV-elements have been permuted ++ so that those that are not options now come last.) ++ ++ OPTSTRING is a string containing the legitimate option characters. ++ If an option character is seen that is not listed in OPTSTRING, ++ return '?' after printing an error message. If you set `opterr' to ++ zero, the error message is suppressed but we still return '?'. ++ ++ If a char in OPTSTRING is followed by a colon, that means it wants an arg, ++ so the following text in the same ARGV-element, or the text of the following ++ ARGV-element, is returned in `optarg'. Two colons mean an option that ++ wants an optional arg; if there is text in the current ARGV-element, ++ it is returned in `optarg', otherwise `optarg' is set to zero. ++ ++ If OPTSTRING starts with `-' or `+', it requests different methods of ++ handling the non-option ARGV-elements. ++ See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. ++ ++ Long-named options begin with `--' instead of `-'. ++ Their names may be abbreviated as long as the abbreviation is unique ++ or is an exact match for some defined option. If they have an ++ argument, it follows the option name in the same ARGV-element, separated ++ from the option name by a `=', or else the in next ARGV-element. ++ When `getopt' finds a long-named option, it returns 0 if that option's ++ `flag' field is nonzero, the value of the option's `val' field ++ if the `flag' field is zero. ++ ++ LONGOPTS is a vector of `struct option' terminated by an ++ element containing a name which is zero. ++ ++ LONGIND returns the index in LONGOPT of the long-named option found. ++ It is only valid when a long-named option has been found by the most ++ recent call. ++ ++ If LONG_ONLY is nonzero, '-' as well as '--' can introduce ++ long-named options. ++ ++ If POSIXLY_CORRECT is nonzero, behave as if the POSIXLY_CORRECT ++ environment variable were set. */ ++ ++int ++_getopt_internal_r (int argc, char **argv, const char *optstring, ++ const struct option *longopts, int *longind, ++ int long_only, int posixly_correct, struct _getopt_data *d) ++{ ++ int print_errors = d->opterr; ++ if (optstring[0] == ':') ++ print_errors = 0; ++ ++ if (argc < 1) ++ return -1; ++ ++ d->optarg = NULL; ++ ++ if (d->optind == 0 || !d->__initialized) ++ { ++ if (d->optind == 0) ++ d->optind = 1; /* Don't scan ARGV[0], the program name. */ ++ optstring = _getopt_initialize (argc, argv, optstring, ++ posixly_correct, d); ++ d->__initialized = 1; ++ } ++ ++ /* Test whether ARGV[optind] points to a non-option argument. ++ Either it does not have option syntax, or there is an environment flag ++ from the shell indicating it is not an option. The later information ++ is only used when the used in the GNU libc. */ ++#if defined _LIBC && defined USE_NONOPTION_FLAGS ++# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \ ++ || (d->optind < d->__nonoption_flags_len \ ++ && __getopt_nonoption_flags[d->optind] == '1')) ++#else ++# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') ++#endif ++ ++ if (d->__nextchar == NULL || *d->__nextchar == '\0') ++ { ++ /* Advance to the next ARGV-element. */ ++ ++ /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been ++ moved back by the user (who may also have changed the arguments). */ ++ if (d->__last_nonopt > d->optind) ++ d->__last_nonopt = d->optind; ++ if (d->__first_nonopt > d->optind) ++ d->__first_nonopt = d->optind; ++ ++ if (d->__ordering == PERMUTE) ++ { ++ /* If we have just processed some options following some non-options, ++ exchange them so that the options come first. */ ++ ++ if (d->__first_nonopt != d->__last_nonopt ++ && d->__last_nonopt != d->optind) ++ exchange ((char **) argv, d); ++ else if (d->__last_nonopt != d->optind) ++ d->__first_nonopt = d->optind; ++ ++ /* Skip any additional non-options ++ and extend the range of non-options previously skipped. */ ++ ++ while (d->optind < argc && NONOPTION_P) ++ d->optind++; ++ d->__last_nonopt = d->optind; ++ } ++ ++ /* The special ARGV-element `--' means premature end of options. ++ Skip it like a null option, ++ then exchange with previous non-options as if it were an option, ++ then skip everything else like a non-option. */ ++ ++ if (d->optind != argc && !strcmp (argv[d->optind], "--")) ++ { ++ d->optind++; ++ ++ if (d->__first_nonopt != d->__last_nonopt ++ && d->__last_nonopt != d->optind) ++ exchange ((char **) argv, d); ++ else if (d->__first_nonopt == d->__last_nonopt) ++ d->__first_nonopt = d->optind; ++ d->__last_nonopt = argc; ++ ++ d->optind = argc; ++ } ++ ++ /* If we have done all the ARGV-elements, stop the scan ++ and back over any non-options that we skipped and permuted. */ ++ ++ if (d->optind == argc) ++ { ++ /* Set the next-arg-index to point at the non-options ++ that we previously skipped, so the caller will digest them. */ ++ if (d->__first_nonopt != d->__last_nonopt) ++ d->optind = d->__first_nonopt; ++ return -1; ++ } ++ ++ /* If we have come to a non-option and did not permute it, ++ either stop the scan or describe it to the caller and pass it by. */ ++ ++ if (NONOPTION_P) ++ { ++ if (d->__ordering == REQUIRE_ORDER) ++ return -1; ++ d->optarg = argv[d->optind++]; ++ return 1; ++ } ++ ++ /* We have found another option-ARGV-element. ++ Skip the initial punctuation. */ ++ ++ d->__nextchar = (argv[d->optind] + 1 ++ + (longopts != NULL && argv[d->optind][1] == '-')); ++ } ++ ++ /* Decode the current option-ARGV-element. */ ++ ++ /* Check whether the ARGV-element is a long option. ++ ++ If long_only and the ARGV-element has the form "-f", where f is ++ a valid short option, don't consider it an abbreviated form of ++ a long option that starts with f. Otherwise there would be no ++ way to give the -f short option. ++ ++ On the other hand, if there's a long option "fubar" and ++ the ARGV-element is "-fu", do consider that an abbreviation of ++ the long option, just like "--fu", and not "-f" with arg "u". ++ ++ This distinction seems to be the most useful approach. */ ++ ++ if (longopts != NULL ++ && (argv[d->optind][1] == '-' ++ || (long_only && (argv[d->optind][2] ++ || !strchr (optstring, argv[d->optind][1]))))) ++ { ++ char *nameend; ++ const struct option *p; ++ const struct option *pfound = NULL; ++ int exact = 0; ++ int ambig = 0; ++ int indfound = -1; ++ int option_index; ++ ++ for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++) ++ /* Do nothing. */ ; ++ ++ /* Test all long options for either exact match ++ or abbreviated matches. */ ++ for (p = longopts, option_index = 0; p->name; p++, option_index++) ++ if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) ++ { ++ if ((unsigned int) (nameend - d->__nextchar) ++ == (unsigned int) strlen (p->name)) ++ { ++ /* Exact match found. */ ++ pfound = p; ++ indfound = option_index; ++ exact = 1; ++ break; ++ } ++ else if (pfound == NULL) ++ { ++ /* First nonexact match found. */ ++ pfound = p; ++ indfound = option_index; ++ } ++ else if (long_only ++ || pfound->has_arg != p->has_arg ++ || pfound->flag != p->flag ++ || pfound->val != p->val) ++ /* Second or later nonexact match found. */ ++ ambig = 1; ++ } ++ ++ if (ambig && !exact) ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"), ++ argv[0], argv[d->optind]) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("%s: option `%s' is ambiguous\n"), ++ argv[0], argv[d->optind]); ++#endif ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ d->optind++; ++ d->optopt = 0; ++ return '?'; ++ } ++ ++ if (pfound != NULL) ++ { ++ option_index = indfound; ++ d->optind++; ++ if (*nameend) ++ { ++ /* Don't test has_arg with >, because some C compilers don't ++ allow it to be used on enums. */ ++ if (pfound->has_arg) ++ d->optarg = nameend + 1; ++ else ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ int n; ++#endif ++ ++ if (argv[d->optind - 1][1] == '-') ++ { ++ /* --option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("\ ++%s: option `--%s' doesn't allow an argument\n"), ++ argv[0], pfound->name); ++#else ++ fprintf (stderr, _("\ ++%s: option `--%s' doesn't allow an argument\n"), ++ argv[0], pfound->name); ++#endif ++ } ++ else ++ { ++ /* +option or -option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("\ ++%s: option `%c%s' doesn't allow an argument\n"), ++ argv[0], argv[d->optind - 1][0], ++ pfound->name); ++#else ++ fprintf (stderr, _("\ ++%s: option `%c%s' doesn't allow an argument\n"), ++ argv[0], argv[d->optind - 1][0], ++ pfound->name); ++#endif ++ } ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++ if (n >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 ++ |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#endif ++ } ++ ++ d->__nextchar += strlen (d->__nextchar); ++ ++ d->optopt = pfound->val; ++ return '?'; ++ } ++ } ++ else if (pfound->has_arg == 1) ++ { ++ if (d->optind < argc) ++ d->optarg = argv[d->optind++]; ++ else ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option `%s' requires an argument\n"), ++ argv[0], argv[d->optind - 1]) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 ++ |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, ++ _("%s: option `%s' requires an argument\n"), ++ argv[0], argv[d->optind - 1]); ++#endif ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ d->optopt = pfound->val; ++ return optstring[0] == ':' ? ':' : '?'; ++ } ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ if (longind != NULL) ++ *longind = option_index; ++ if (pfound->flag) ++ { ++ *(pfound->flag) = pfound->val; ++ return 0; ++ } ++ return pfound->val; ++ } ++ ++ /* Can't find it as a long option. If this is not getopt_long_only, ++ or the option starts with '--' or is not a valid short ++ option, then it's an error. ++ Otherwise interpret it as a short option. */ ++ if (!long_only || argv[d->optind][1] == '-' ++ || strchr (optstring, *d->__nextchar) == NULL) ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ int n; ++#endif ++ ++ if (argv[d->optind][1] == '-') ++ { ++ /* --option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"), ++ argv[0], d->__nextchar); ++#else ++ fprintf (stderr, _("%s: unrecognized option `--%s'\n"), ++ argv[0], d->__nextchar); ++#endif ++ } ++ else ++ { ++ /* +option or -option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"), ++ argv[0], argv[d->optind][0], d->__nextchar); ++#else ++ fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), ++ argv[0], argv[d->optind][0], d->__nextchar); ++#endif ++ } ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++ if (n >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#endif ++ } ++ d->__nextchar = (char *) ""; ++ d->optind++; ++ d->optopt = 0; ++ return '?'; ++ } ++ } ++ ++ /* Look at and handle the next short option-character. */ ++ ++ { ++ char c = *d->__nextchar++; ++ char *temp = strchr (optstring, c); ++ ++ /* Increment `optind' when we start to process its last character. */ ++ if (*d->__nextchar == '\0') ++ ++d->optind; ++ ++ if (temp == NULL || c == ':') ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ int n; ++#endif ++ ++ if (d->__posixly_correct) ++ { ++ /* 1003.2 specifies the format of this message. */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: illegal option -- %c\n"), ++ argv[0], c); ++#else ++ fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); ++#endif ++ } ++ else ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: invalid option -- %c\n"), ++ argv[0], c); ++#else ++ fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c); ++#endif ++ } ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++ if (n >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#endif ++ } ++ d->optopt = c; ++ return '?'; ++ } ++ /* Convenience. Treat POSIX -W foo same as long option --foo */ ++ if (temp[0] == 'W' && temp[1] == ';') ++ { ++ char *nameend; ++ const struct option *p; ++ const struct option *pfound = NULL; ++ int exact = 0; ++ int ambig = 0; ++ int indfound = 0; ++ int option_index; ++ ++ /* This is an option that requires an argument. */ ++ if (*d->__nextchar != '\0') ++ { ++ d->optarg = d->__nextchar; ++ /* If we end this ARGV-element by taking the rest as an arg, ++ we must advance to the next element now. */ ++ d->optind++; ++ } ++ else if (d->optind == argc) ++ { ++ if (print_errors) ++ { ++ /* 1003.2 specifies the format of this message. */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, ++ _("%s: option requires an argument -- %c\n"), ++ argv[0], c) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("%s: option requires an argument -- %c\n"), ++ argv[0], c); ++#endif ++ } ++ d->optopt = c; ++ if (optstring[0] == ':') ++ c = ':'; ++ else ++ c = '?'; ++ return c; ++ } ++ else ++ /* We already incremented `d->optind' once; ++ increment it again when taking next ARGV-elt as argument. */ ++ d->optarg = argv[d->optind++]; ++ ++ /* optarg is now the argument, see if it's in the ++ table of longopts. */ ++ ++ for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '='; ++ nameend++) ++ /* Do nothing. */ ; ++ ++ /* Test all long options for either exact match ++ or abbreviated matches. */ ++ for (p = longopts, option_index = 0; p->name; p++, option_index++) ++ if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) ++ { ++ if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name)) ++ { ++ /* Exact match found. */ ++ pfound = p; ++ indfound = option_index; ++ exact = 1; ++ break; ++ } ++ else if (pfound == NULL) ++ { ++ /* First nonexact match found. */ ++ pfound = p; ++ indfound = option_index; ++ } ++ else ++ /* Second or later nonexact match found. */ ++ ambig = 1; ++ } ++ if (ambig && !exact) ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"), ++ argv[0], argv[d->optind]) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), ++ argv[0], argv[d->optind]); ++#endif ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ d->optind++; ++ return '?'; ++ } ++ if (pfound != NULL) ++ { ++ option_index = indfound; ++ if (*nameend) ++ { ++ /* Don't test has_arg with >, because some C compilers don't ++ allow it to be used on enums. */ ++ if (pfound->has_arg) ++ d->optarg = nameend + 1; ++ else ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option `-W %s' doesn't allow an argument\n"), ++ argv[0], pfound->name) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 ++ |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("\ ++%s: option `-W %s' doesn't allow an argument\n"), ++ argv[0], pfound->name); ++#endif ++ } ++ ++ d->__nextchar += strlen (d->__nextchar); ++ return '?'; ++ } ++ } ++ else if (pfound->has_arg == 1) ++ { ++ if (d->optind < argc) ++ d->optarg = argv[d->optind++]; ++ else ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option `%s' requires an argument\n"), ++ argv[0], argv[d->optind - 1]) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 ++ |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, ++ _("%s: option `%s' requires an argument\n"), ++ argv[0], argv[d->optind - 1]); ++#endif ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ return optstring[0] == ':' ? ':' : '?'; ++ } ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ if (longind != NULL) ++ *longind = option_index; ++ if (pfound->flag) ++ { ++ *(pfound->flag) = pfound->val; ++ return 0; ++ } ++ return pfound->val; ++ } ++ d->__nextchar = NULL; ++ return 'W'; /* Let the application handle it. */ ++ } ++ if (temp[1] == ':') ++ { ++ if (temp[2] == ':') ++ { ++ /* This is an option that accepts an argument optionally. */ ++ if (*d->__nextchar != '\0') ++ { ++ d->optarg = d->__nextchar; ++ d->optind++; ++ } ++ else ++ d->optarg = NULL; ++ d->__nextchar = NULL; ++ } ++ else ++ { ++ /* This is an option that requires an argument. */ ++ if (*d->__nextchar != '\0') ++ { ++ d->optarg = d->__nextchar; ++ /* If we end this ARGV-element by taking the rest as an arg, ++ we must advance to the next element now. */ ++ d->optind++; ++ } ++ else if (d->optind == argc) ++ { ++ if (print_errors) ++ { ++ /* 1003.2 specifies the format of this message. */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option requires an argument -- %c\n"), ++ argv[0], c) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, ++ _("%s: option requires an argument -- %c\n"), ++ argv[0], c); ++#endif ++ } ++ d->optopt = c; ++ if (optstring[0] == ':') ++ c = ':'; ++ else ++ c = '?'; ++ } ++ else ++ /* We already incremented `optind' once; ++ increment it again when taking next ARGV-elt as argument. */ ++ d->optarg = argv[d->optind++]; ++ d->__nextchar = NULL; ++ } ++ } ++ return c; ++ } ++} ++ ++int ++_getopt_internal (int argc, char **argv, const char *optstring, ++ const struct option *longopts, int *longind, ++ int long_only, int posixly_correct) ++{ ++ int result; ++ ++ getopt_data.optind = optind; ++ getopt_data.opterr = opterr; ++ ++ result = _getopt_internal_r (argc, argv, optstring, longopts, longind, ++ long_only, posixly_correct, &getopt_data); ++ ++ optind = getopt_data.optind; ++ optarg = getopt_data.optarg; ++ optopt = getopt_data.optopt; ++ ++ return result; ++} ++ ++/* glibc gets a LSB-compliant getopt. ++ Standalone applications get a POSIX-compliant getopt. */ ++#if _LIBC ++enum { POSIXLY_CORRECT = 0 }; ++#else ++enum { POSIXLY_CORRECT = 1 }; ++#endif ++ ++int ++getopt (int argc, char *const *argv, const char *optstring) ++{ ++ return _getopt_internal (argc, (char **) argv, optstring, NULL, NULL, 0, ++ POSIXLY_CORRECT); ++} ++ ++ ++#ifdef TEST ++ ++/* Compile with -DTEST to make an executable for use in testing ++ the above definition of `getopt'. */ ++ ++int ++main (int argc, char **argv) ++{ ++ int c; ++ int digit_optind = 0; ++ ++ while (1) ++ { ++ int this_option_optind = optind ? optind : 1; ++ ++ c = getopt (argc, argv, "abc:d:0123456789"); ++ if (c == -1) ++ break; ++ ++ switch (c) ++ { ++ case '0': ++ case '1': ++ case '2': ++ case '3': ++ case '4': ++ case '5': ++ case '6': ++ case '7': ++ case '8': ++ case '9': ++ if (digit_optind != 0 && digit_optind != this_option_optind) ++ printf ("digits occur in two different argv-elements.\n"); ++ digit_optind = this_option_optind; ++ printf ("option %c\n", c); ++ break; ++ ++ case 'a': ++ printf ("option a\n"); ++ break; ++ ++ case 'b': ++ printf ("option b\n"); ++ break; ++ ++ case 'c': ++ printf ("option c with value `%s'\n", optarg); ++ break; ++ ++ case '?': ++ break; ++ ++ default: ++ printf ("?? getopt returned character code 0%o ??\n", c); ++ } ++ } ++ ++ if (optind < argc) ++ { ++ printf ("non-option ARGV-elements: "); ++ while (optind < argc) ++ printf ("%s ", argv[optind++]); ++ printf ("\n"); ++ } ++ ++ exit (0); ++} ++ ++#endif /* TEST */ +diff --git a/lib/getopt.in.h b/lib/getopt.in.h +new file mode 100644 +index 0000000..7377f3c +--- /dev/null ++++ b/lib/getopt.in.h +@@ -0,0 +1,247 @@ ++/* Declarations for getopt. ++ Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2005,2006,2007,2009 ++ Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++#ifndef _GL_GETOPT_H ++ ++#if __GNUC__ >= 3 ++ at PRAGMA_SYSTEM_HEADER@ ++#endif ++ ++/* The include_next requires a split double-inclusion guard. We must ++ also inform the replacement unistd.h to not recursively use ++ ; our definitions will be present soon enough. */ ++#if @HAVE_GETOPT_H@ ++# define _GL_SYSTEM_GETOPT ++# @INCLUDE_NEXT@ @NEXT_GETOPT_H@ ++# undef _GL_SYSTEM_GETOPT ++#endif ++ ++#ifndef _GL_GETOPT_H ++ ++#ifndef __need_getopt ++# define _GL_GETOPT_H 1 ++#endif ++ ++/* Standalone applications should #define __GETOPT_PREFIX to an ++ identifier that prefixes the external functions and variables ++ defined in this header. When this happens, include the ++ headers that might declare getopt so that they will not cause ++ confusion if included after this file (if the system had , ++ we have already included it). Then systematically rename ++ identifiers so that they do not collide with the system functions ++ and variables. Renaming avoids problems with some compilers and ++ linkers. */ ++#if defined __GETOPT_PREFIX && !defined __need_getopt ++# if !@HAVE_GETOPT_H@ ++# include ++# include ++# include ++# endif ++# undef __need_getopt ++# undef getopt ++# undef getopt_long ++# undef getopt_long_only ++# undef optarg ++# undef opterr ++# undef optind ++# undef optopt ++# undef option ++# define __GETOPT_CONCAT(x, y) x ## y ++# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) ++# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) ++# define getopt __GETOPT_ID (getopt) ++# define getopt_long __GETOPT_ID (getopt_long) ++# define getopt_long_only __GETOPT_ID (getopt_long_only) ++# define optarg __GETOPT_ID (optarg) ++# define opterr __GETOPT_ID (opterr) @@ 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 wahwah at users.sourceforge.net Sun Dec 6 08:57:38 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Dec 2009 07:57:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7562] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 7562 http://gar.svn.sourceforge.net/gar/?rev=7562&view=rev Author: wahwah Date: 2009-12-06 07:57:38 +0000 (Sun, 06 Dec 2009) Log Message: ----------- pinentry: Use /usr/openwin/lib/amd64/libXext.so for isa-amd64 Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 07:50:28 UTC (rev 7561) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 07:57:38 UTC (rev 7562) @@ -42,7 +42,7 @@ CONFIGURE_ARGS = $(DIRPATHS) EXTRA_LINKER_FLAGS_isa-i386 = /usr/openwin/lib/libXext.so EXTRA_LINKER_FLAGS_isa-sparcv8 = /usr/openwin/lib/libXext.so -EXTRA_LINKER_FLAGS_isa-amd64 = /usr/openwin/lib/sparcv9/libXext.so +EXTRA_LINKER_FLAGS_isa-amd64 = /usr/openwin/lib/amd64/libXext.so EXTRA_LINKER_FLAGS_isa-sparcv9 = /usr/openwin/lib/sparcv9/libXext.so EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(MODULATION)) BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Dec 6 09:51:48 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Dec 2009 08:51:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7563] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 7563 http://gar.svn.sourceforge.net/gar/?rev=7563&view=rev Author: wahwah Date: 2009-12-06 08:51:48 +0000 (Sun, 06 Dec 2009) Log Message: ----------- pinentry: switching off the 64-bit build. Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 07:57:38 UTC (rev 7562) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 08:51:48 UTC (rev 7563) @@ -45,8 +45,11 @@ EXTRA_LINKER_FLAGS_isa-amd64 = /usr/openwin/lib/amd64/libXext.so EXTRA_LINKER_FLAGS_isa-sparcv9 = /usr/openwin/lib/sparcv9/libXext.so EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(MODULATION)) -BUILD64 = 1 +# There's a problem with building on Solaris 10 as getopt.h is already present +# in /usr/include and conflicts with the one provided by gnulib. +# BUILD64 = 1 + include gar/category.mk # Switch this target on when working with gnulib. 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 Dec 6 11:00:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Dec 2009 10:00:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7564] csw/mgar/pkg/pinentry/trunk Message-ID: Revision: 7564 http://gar.svn.sourceforge.net/gar/?rev=7564&view=rev Author: wahwah Date: 2009-12-06 10:00:15 +0000 (Sun, 06 Dec 2009) Log Message: ----------- pinentry: Remove an obsolete patch Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 08:51:48 UTC (rev 7563) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-12-06 10:00:15 UTC (rev 7564) @@ -13,8 +13,7 @@ EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ -# PATCHFILES = 0001-remove-__extension__-from-util.c.patch -PATCHFILES += 0002-ncurses-include.patch +PATCHFILES = 0002-ncurses-include.patch PATCHFILES += 0003-TEMP_FAILURE_RETRY-macro-expansion.patch PATCHFILES += 0004-adding-prereq-2.59-to-configure.ac.patch PATCHFILES += 0005-Importing-getopt-posix-gnulib-module.patch Deleted: csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch 2009-12-06 08:51:48 UTC (rev 7563) +++ csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch 2009-12-06 10:00:15 UTC (rev 7564) @@ -1,25 +0,0 @@ -From 26f9938de29f65324acaedf376801f2e40f04b27 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Tue, 8 Sep 2009 20:02:35 +0100 -Subject: [PATCH 1/2] remove __extension__ from util.c - ---- - secmem/util.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/secmem/util.c b/secmem/util.c -index 580fd34..c836ad0 100644 ---- a/secmem/util.c -+++ b/secmem/util.c -@@ -34,7 +34,7 @@ - - #ifndef TEMP_FAILURE_RETRY - #define TEMP_FAILURE_RETRY(expression) \ -- (__extension__ \ -+ ( \ - ({ long int __result; \ - do __result = (long int) (expression); \ - while (__result == -1L && errno == EINTR); \ --- -1.6.3.2 - 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 Dec 6 14:52:12 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Dec 2009 13:52:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7565] csw/mgar/pkg Message-ID: Revision: 7565 http://gar.svn.sourceforge.net/gar/?rev=7565&view=rev Author: wahwah Date: 2009-12-06 13:52:12 +0000 (Sun, 06 Dec 2009) Log Message: ----------- dpkg: Initial commit, providing update-alternatives only. Modified Paths: -------------- csw/mgar/pkg/dpkg/trunk/Makefile csw/mgar/pkg/dpkg/trunk/checksums Added Paths: ----------- csw/mgar/pkg/dpkg/ Modified: csw/mgar/pkg/dpkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-06 10:00:15 UTC (rev 7564) +++ csw/mgar/pkg/dpkg/trunk/Makefile 2009-12-06 13:52:12 UTC (rev 7565) @@ -2,184 +2,44 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +# This package might provide the dpkg binary itself, but for the time being, it +# provides only update-alternatives. + +GARNAME = dpkg +GARVERSION = 1.15.5.3 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = Debian package manager +PACKAGES = CSWalternatives +SPKG_DESC_CSWalternative = Alternatives management for CSW define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release +SPKG_SOURCEURL = http://wiki.debian.org/Teams/Dpkg +MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/d/dpkg/ +DISTFILES = $(GARNAME)_$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = alternatives +TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +include gar/category.mk -#include gar/category.mk +install-alternatives: + ginstall -m 755 -d $(DESTDIR)$(bindir) + ginstall -m 755 \ + $(WORKSRC)/scripts/update-alternatives.pl \ + $(DESTDIR)$(bindir)/update-alternatives + ginstall -m 755 -d $(DESTDIR)$(mandir)/man8 + ginstall -m 644 \ + $(WORKSRC)/man/update-alternatives.8 \ + $(DESTDIR)$(mandir)/man8 + ginstall -m 755 -d $(DESTDIR)$(datadir)/perl/csw/Dpkg + ginstall -m 644 \ + $(WORKSRC)/scripts/Dpkg.pm \ + $(DESTDIR)$(datadir)/perl/csw + for f in $(WORKSRC)/scripts/Dpkg/*.pm; do \ + ginstall -m 644 $$f $(DESTDIR)$(datadir)/perl/csw/Dpkg; \ + done + ginstall -m 755 -d $(DESTDIR)/var$(prefix)/lib/dpkg/alternatives + ginstall -m 755 -d $(DESTDIR)/etc$(prefix)/alternatives + @$(MAKECOOKIE) Modified: csw/mgar/pkg/dpkg/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-12-06 10:00:15 UTC (rev 7564) +++ csw/mgar/pkg/dpkg/trunk/checksums 2009-12-06 13:52:12 UTC (rev 7565) @@ -0,0 +1 @@ +2fd20b06c23e7c3bfc39525f0b278804 dpkg_1.15.5.3.tar.bz2 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 Sun Dec 6 18:20:16 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 06 Dec 2009 17:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7566] csw/mgar/pkg/nagvis/trunk Message-ID: Revision: 7566 http://gar.svn.sourceforge.net/gar/?rev=7566&view=rev Author: j_arndt Date: 2009-12-06 17:20:16 +0000 (Sun, 06 Dec 2009) Log Message: ----------- nagvis: update to 1.4.5, switch dynamic gspec Modified Paths: -------------- csw/mgar/pkg/nagvis/trunk/Makefile csw/mgar/pkg/nagvis/trunk/checksums csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.prototype Added Paths: ----------- csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php-sample.diff Removed Paths: ------------- csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.gspec csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php.diff Modified: csw/mgar/pkg/nagvis/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagvis/trunk/Makefile 2009-12-06 13:52:12 UTC (rev 7565) +++ csw/mgar/pkg/nagvis/trunk/Makefile 2009-12-06 17:20:16 UTC (rev 7566) @@ -1,18 +1,20 @@ GARNAME = nagvis -GARVERSION = 1.3.2 +GARVERSION = 1.4.5 CATEGORIES = apps -DESCRIPTION = visualization addon for nagios +SPKG_DESC_CSWnagvis = visualization addon for nagios + define BLURB Long description endef MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnagvis, prototype) -PATCHFILES += nagvis.ini.php.diff +DISTFILES += CSWnagvis.prototype +PATCHFILES += nagvis.ini.php-sample.diff + # We define upstream file regex so we can be notifed of new upstream software release #UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -20,12 +22,17 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -REQUIRED_PKGS = CSWnagios CSWphp5gd CSWphp5mysql CSWphp5mbstring CSWphp5session -REQUIRED_PKGS += CSWphp5xmlreader CSWphp5xmlwriter CSWgraphviz2 -REQUIRED_PKGS += CSWcswclassutils +PACKAGES = CSWnagvis +CATALOGNAME_CSWnagvis = nagvis -SPKG_CLASSES = none cswpreserveconf +REQUIRED_PKGS_CSWnagvis = CSWnagios CSWphp5gd CSWphp5mysql CSWphp5mbstring CSWphp5session +REQUIRED_PKGS_CSWnagvis += CSWphp5xmlreader CSWphp5xmlwriter CSWgraphviz2 CSWphp5gettext +REQUIRED_PKGS_CSWnagvis += CSWap2modphp5 CSWcswclassutils +SPKG_CLASSES_CSWnagvis = none cswpreserveconf + +ARCHALL_CSWnagvis = 1 + #CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = custom @@ -47,12 +54,25 @@ install-custom: @ginstall -d $(DESTDIR)$(NAGVISDIR) + #$(WORKSRC)/install.sh -n $(DESTDIR)/opt/csw/nagios \ + #-B $(DESTDIR)/opt/csw/nagios/bin/nagios \ + #-m $(DESTDIR)/opt/csw/nagios/ndoutils/bin/ndo2db-3x \ + #-b $(DESTDIR)/opt/csw/bin \ + #-p $(DESTDIR)/opt/csw/nagios/share/nagvis \ + #-W /nagios/nagvis \ + #-u nobody \ + #-g nobody \ + #-w /opt/csw/apache2/etc \ + #-i ndo2db + @ @# @# not nice but easy @# @cp $(WORKSRC)/etc/maps/__automap.cfg $(WORKSRC)/etc/maps/__automap.cfg.CSW @cp $(WORKSRC)/etc/maps/demo.cfg $(WORKSRC)/etc/maps/demo.cfg.CSW @cp $(WORKSRC)/etc/maps/demo2.cfg $(WORKSRC)/etc/maps/demo2.cfg.CSW + @cp $(WORKSRC)/etc/maps/demo-map.cfg $(WORKSRC)/etc/maps/demo-map.cfg.CSW + @cp $(WORKSRC)/etc/maps/demo-server.cfg $(WORKSRC)/etc/maps/demo-server.cfg.CSW @cp $(WORKSRC)/etc/nagvis.ini.php-sample $(WORKSRC)/etc/nagvis.ini.php.CSW @# @# Modified: csw/mgar/pkg/nagvis/trunk/checksums =================================================================== --- csw/mgar/pkg/nagvis/trunk/checksums 2009-12-06 13:52:12 UTC (rev 7565) +++ csw/mgar/pkg/nagvis/trunk/checksums 2009-12-06 17:20:16 UTC (rev 7566) @@ -1,4 +1,3 @@ -6a8010fb5cb56c6f5cd1f37879c218ae download/nagvis-1.3.2.tar.gz -9b93c302b8a731eee55e6039f44c4650 download/CSWnagvis.gspec -078719dd13f2036a7eaf8ec5ebd3a128 download/CSWnagvis.prototype -f5c6dac77df57bad25504842a3c73554 download/nagvis.ini.php.diff +f4859977d68f015767037271b1858363 download/nagvis-1.4.5.tar.gz +c88f2d9b3bfb49b25b77c21b1efc9833 download/CSWnagvis.prototype +83a92dc54914abc0cc3c9239ca569d62 download/nagvis.ini.php-sample.diff Deleted: csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.gspec =================================================================== --- csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.gspec 2009-12-06 13:52:12 UTC (rev 7565) +++ csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.gspec 2009-12-06 17:20:16 UTC (rev 7566) @@ -1,3 +0,0 @@ -%var bitname nagvis -%var pkgname CSWnagvis -%include url file://%{PKGLIB}/csw_dyndepend.gspec Modified: csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.prototype =================================================================== --- csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.prototype 2009-12-06 13:52:12 UTC (rev 7565) +++ csw/mgar/pkg/nagvis/trunk/files/CSWnagvis.prototype 2009-12-06 17:20:16 UTC (rev 7566) @@ -1,191 +1,384 @@ d none /opt/csw/nagios 0755 root bin -d none /opt/csw/nagios/share 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/INSTALL 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/LICENCE 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/README 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/config.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/etc 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/etc/.htaccess 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/etc/maps 0755 nagios nagios -f cswpreserveconf /opt/csw/nagios/share/nagvis/etc/maps/__automap.cfg.CSW 0664 nagios nagios -f cswpreserveconf /opt/csw/nagios/share/nagvis/etc/maps/demo.cfg.CSW 0664 nagios nagios -f cswpreserveconf /opt/csw/nagios/share/nagvis/etc/maps/demo2.cfg.CSW 0664 nagios nagios -f cswpreserveconf /opt/csw/nagios/share/nagvis/etc/nagvis.ini.php.CSW 0664 nagios nagios -f none /opt/csw/nagios/share/nagvis/index.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/ajax_handler.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/draw.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/20x20.gif 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/configerror_large.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/configerror_medium.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/configerror_small.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/error.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_ack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_critical.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_down.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_downtime.png 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_error.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_ok.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_pending.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_sack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_sdowntime.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_unknown.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_up.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_warning.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_ack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_critical.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_down.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_downtime.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_error.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_ok.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_pending.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_sack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_sdowntime.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_unknown.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_up.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_warning.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_ack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_critical.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_down.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_downtime.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_error.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_ok.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_pending.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_sack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_sdowntime.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_unknown.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_up.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_warning.png 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/internal 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/10x10.gif 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_ack.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_critical.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_down.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_downtime.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_error.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_ok.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_up.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_warning.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/img_error.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/img_permission.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/img_warning.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/logo_119x31.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/pixel.gif 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/wui.gif 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/maps 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/images/maps/nagvis-demo.png 0664 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/shapes 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/templates 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/templates/header 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/images/templates/hover 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackend-ndomy.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendMgmt.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackground.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalForm.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalGraphic.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalLanguage.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalMainCfg.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalMap.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalMapCfg.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalPage.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisAutoMap.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisBackground.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisFrontend.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisMap.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisMapCfg.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisHost.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisHostgroup.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisMapObj.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisObject.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisService.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisServicegroup.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisShape.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisStatefulObject.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisStatelessObject.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisTextbox.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosHost.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosHostgroup.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosService.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosServicegroup.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/css 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/css/style.css 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/defines 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/defines/global.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/defines/matches.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/functions 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/debug.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/getuser.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/oldPhpVersionFixes.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/js 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/ajax.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/dynfavicon.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/hover.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/nagvis.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/overlib.js 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/includes/languages 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/languages/english.xml 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/includes/languages/german.xml 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/index.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/templates 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/templates/header 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/templates/header/tmpl.default.css 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/templates/header/tmpl.default.html 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/nagvis/templates/hover 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/templates/hover/tmpl.default.css 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/nagvis/templates/hover/tmpl.default.html 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/var 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/ajax_handler.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/form_handler.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/images 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/images/internal 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/images/internal/help_icon.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/images/internal/wuilogo.png 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/includes 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/includes/classes 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiAddModify.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiBackendManagement.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiBackground.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiBackgroundManagement.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiEditMainCfg.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiFrontend.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMainCfg.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMap.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMapCfg.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMapManagement.php 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiShapeManagement.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/includes/css 0755 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/icon1.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/icon2.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/icon3.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp.css 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_arrow.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_arrow_o.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_divider.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_menu_left.png 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/css/wui.css 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/includes/functions 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/functions/form_handler.php 0644 nagios nagios -d none /opt/csw/nagios/share/nagvis/wui/includes/js 0755 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/BackendManagement.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/BackgroundManagement.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/EditMainCfg.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/ShapeManagement.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/addmodify.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/ajax.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/jsdomenu.inc.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/jsdomenu.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/map_management.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/wui.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/wz_dragdrop.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/wz_jsgraphics.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/includes/js/wz_tooltip.js 0644 nagios nagios -f none /opt/csw/nagios/share/nagvis/wui/index.php 0644 nagios nagios +d none /opt/csw/nagios/share 0755 root bin +d none /opt/csw/nagios/share/nagvis 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/INSTALL 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/LICENCE 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/README 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/config.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/de_DE 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/about.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/automap.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/backends.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/changelog.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/context_templates.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/de_DE/extending 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/extending/custom_context_actions.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/extending/iconsets.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/extending/languages.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/extending/shapes.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/extending/templates.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/gadgets.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/header_templates.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/hover_templates.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/index.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/installation_instructions.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/installer.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/map_config_format_description.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/nagvis_config_format_description.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/system_requirements.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/toc.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/update_instructions.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/user_interface.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/de_DE/welcome.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/en_US 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/about.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/automap.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/backends.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/changelog.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/context_templates.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/en_US/extending 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/extending/custom_context_actions.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/extending/iconsets.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/extending/languages.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/extending/shapes.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/extending/templates.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/gadgets.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/header_templates.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/hover_templates.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/index.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/installation_instructions.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/installer.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/map_config_format_description.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/nagvis_config_format_description.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/system_requirements.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/toc.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/update_instructions.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/user_interface.html 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/en_US/welcome.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/general 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/general/css 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/css/style.css 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/docs/general/img 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/favicon.ico 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/iconset-std_mini.jpg 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/iconset-std_small.jpg 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/logo-88x23.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/logo.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/medium_nagvis-1.0-wui-preview.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/nagvis-1.3-automap-directed-1-thumb.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/nagvis-1.3-automap_undirected-1-thumb.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/nagvis-1.4-context-ssh-1.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/docs/general/img/nagvis-1.4-gadget-label-hover.png 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/etc 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/.htaccess 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/etc/maps 0775 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/__automap.cfg 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/__automap.cfg.CSW 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo-map.cfg 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo-map.cfg.CSW 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo-server.cfg 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo-server.cfg.CSW 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo.cfg 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo.cfg.CSW 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo2.cfg 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/etc/maps/demo2.cfg.CSW 0664 nobody nobody +f cswpreserveconf /opt/csw/nagios/share/nagvis/etc/nagvis.ini.php.CSW 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/index.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/install.sh 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/ajax_handler.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/gadgets 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/gadgets/gadgets_core.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/gadgets/std_speedometer.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/gadgets 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/gadgets/dummy 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/20x20.gif 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/configerror_large.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/configerror_medium.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/configerror_small.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_ack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_sack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_unknown.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_landscape_warning.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_ack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_sack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_unknown.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/demo_state_warning.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_ack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_downtime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_pending.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_sack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_sdowntime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_unknown.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_big_warning.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_ack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_downtime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_pending.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_sack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_sdowntime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_unknown.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_medium_warning.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_ack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_downtime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_pending.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_sack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_sdowntime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_unknown.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/iconsets/std_small_warning.png 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/internal 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/10x10.gif 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_ack.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_downtime.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/favicon_warning.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/logo_119x31.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_critical.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_down.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_error.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_note.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_ok.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_permission.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_unknown.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_unreachable.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_up.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/internal/msg_warning.png 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/maps 0775 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/maps/demo_background.png 0664 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/maps/nagvis-demo.png 0664 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/shapes 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo-load.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo-server.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo-text_demo.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo-text_hoststate.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo-text_mapstate.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo-text_servicestate.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo_german_landscape.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/images/shapes/demo_server_bg.png 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/templates 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/templates/header 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/images/templates/hover 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendInterface.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendMgmt.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendmerlinmy.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendmklivestatus.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendndo2fs.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackendndomy.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalBackground.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalCore.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalFileCache.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalForm.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalHeaderMenu.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalIndexPage.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalLanguage.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalMainCfg.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalMap.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalMapCfg.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/GlobalPage.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisAutoMap.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisContextMenu.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisFrontend.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisHoverMenu.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisHoverUrl.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisInfoPage.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisMap.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisMapCfg.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisRotation.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/NagVisUrl.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalController.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerAutomap.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerIndex.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerInfo.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerInterface.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerMap.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerRotation.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/controller/GlobalControllerUrl.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/frontend 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/frontend/GlobalFrontendMessage.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/frontend/GlobalFrontendMessageBox.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/httpRequest 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/httpRequest/GlobalHttpRequest.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/httpRequest/GlobalHttpRequestInterface.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisHost.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisHostgroup.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisMapObj.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisObject.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisService.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisServicegroup.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisShape.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisStatefulObject.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisStatelessObject.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagVisTextbox.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosHost.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosHostgroup.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosService.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/objects/NagiosServicegroup.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidator.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidatorAbstract.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidatorBoolean.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidatorInteger.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidatorInterface.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidatorString.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/classes/validator/GlobalValidatorUrl.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/css 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/css/frontendEventlog.css 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/css/style.css 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/defines 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/defines/global.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/defines/matches.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/functions 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/ajaxErrorHandler.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/autoload.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/debug.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/getuser.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/functions/oldPhpVersionFixes.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/js 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/ExtBase.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisHost.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisHostgroup.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisMap.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisObject.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisRotation.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisService.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisServicegroup.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisShape.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisStatefulObject.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisStatelessObject.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/NagVisTextbox.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/ajax.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/dynfavicon.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/frontend.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/frontendContext.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/frontendEventlog.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/frontendMessage.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/hover.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/lines.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/nagvis.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/overlib.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/js/wz_jsgraphics.js 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/de_DE 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/de_DE/LC_MESSAGES 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/de_DE/LC_MESSAGES/nagvis.mo 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/de_DE/LC_MESSAGES/nagvis.po 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/en_US 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/en_US/LC_MESSAGES 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/en_US/LC_MESSAGES/nagvis.mo 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/en_US/LC_MESSAGES/nagvis.po 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/fr_FR 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/fr_FR/LC_MESSAGES 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/fr_FR/LC_MESSAGES/nagvis.mo 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/fr_FR/LC_MESSAGES/nagvis.po 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/pt_BR 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/pt_BR/LC_MESSAGES 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/pt_BR/LC_MESSAGES/nagvis.mo 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/includes/locale/pt_BR/LC_MESSAGES/nagvis.po 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/index.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/sounds 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/sounds/std_critical.mp3 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/sounds/std_down.mp3 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/sounds/std_error.mp3 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/sounds/std_unreachable.mp3 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/sounds/std_warning.mp3 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/templates 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/templates/context 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/templates/context/tmpl.default.css 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/templates/context/tmpl.default.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/templates/header 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/templates/header/tmpl.default.css 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/templates/header/tmpl.default.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/nagvis/templates/hover 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/templates/hover/tmpl.default.css 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/nagvis/templates/hover/tmpl.default.html 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/var 0775 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/ajax_handler.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/form_handler.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/images 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/images/internal 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/images/internal/delete.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/images/internal/help_icon.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/images/internal/modify.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/images/internal/move.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/images/internal/wuilogo.png 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/includes 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/includes/classes 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiAddModify.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiBackendManagement.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiBackground.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiBackgroundManagement.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiCore.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiEditMainCfg.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiFrontend.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMainCfg.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMap.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMapCfg.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiMapManagement.php 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/classes/WuiShapeManagement.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/includes/css 0755 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/icon1.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/icon2.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/icon3.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp.css 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_arrow.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_arrow_o.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_divider.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/office_xp/office_xp_menu_left.png 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/css/wui.css 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/includes/functions 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/functions/form_handler.php 0644 nobody nobody +d none /opt/csw/nagios/share/nagvis/wui/includes/js 0755 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/BackendManagement.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/BackgroundManagement.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/EditMainCfg.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/MapManagement.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/ShapeManagement.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/addmodify.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/ajax.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/jsdomenu.inc.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/jsdomenu.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/popupWindow.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/wui.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/wz_dragdrop.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/wz_jsgraphics.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/includes/js/wz_tooltip.js 0644 nobody nobody +f none /opt/csw/nagios/share/nagvis/wui/index.php 0644 nobody nobody Added: csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php-sample.diff =================================================================== --- csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php-sample.diff (rev 0) +++ csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php-sample.diff 2009-12-06 17:20:16 UTC (rev 7566) @@ -0,0 +1,24 @@ +diff --speed-large-files --minimal -Nru nagvis-1.4.5.orig/etc/nagvis.ini.php-sample nagvis-1.4.5/etc/nagvis.ini.php-sample +--- nagvis-1.4.5.orig/etc/nagvis.ini.php-sample 2009-11-27 16:41:36.000000000 +0100 ++++ nagvis-1.4.5/etc/nagvis.ini.php-sample 2009-12-05 18:18:53.986605941 +0100 +@@ -25,7 +25,7 @@ + ; Path definitions + [paths] + ; absolute physical NagVis path +-;base="/usr/local/nagios/share/nagvis/" ++base="/opt/csw/nagios/share/nagvis/" + ; absolute html NagVis path + ;htmlbase="/nagios/nagvis" + ; absolute html NagVis cgi path +@@ -173,9 +173,9 @@ + ; database name for NDO-db + ;dbname="nagios" + ; username for NDO-db +-;dbuser="root" ++dbuser="nagios" + ; password for NDO-db +-;dbpass="" ++dbpass="nagios" + ; prefix for tables in NDO-db + ;dbprefix="nagios_" + ; instance name for tables in NDO-db Deleted: csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php.diff =================================================================== --- csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php.diff 2009-12-06 13:52:12 UTC (rev 7565) +++ csw/mgar/pkg/nagvis/trunk/files/nagvis.ini.php.diff 2009-12-06 17:20:16 UTC (rev 7566) @@ -1,24 +0,0 @@ -diff --speed-large-files --minimal -Nru nagvis-1.3.2.orig/etc/nagvis.ini.php-sample nagvis-1.3.2/etc/nagvis.ini.php-sample ---- nagvis-1.3.2.orig/etc/nagvis.ini.php-sample 2008-06-04 19:57:06.000000000 +0200 -+++ nagvis-1.3.2/etc/nagvis.ini.php-sample 2009-03-26 11:57:24.335438559 +0100 -@@ -84,7 +84,7 @@ - ; path options - [paths] - ; absolute physical NagVis path --;base="/usr/local/nagios/share/nagvis/" -+base="/opt/csw/nagios/share/share/nagvis/" - ; absolute html NagVis path - ;htmlbase="/nagios/nagvis" - ; absolute html NagVis cgi path -@@ -102,9 +102,9 @@ - ; database-name for NDO-db - ;dbname="nagios" - ; username for NDO-db --;dbuser="root" -+dbuser="nagios" - ; password for NDO-db --;dbpass="" -+dbpass="nagios" - ; prefix for tables in NDO-db - ;dbprefix="nagios_" - ; instace-name for tables in NDO-db 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 Sun Dec 6 18:23:02 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 06 Dec 2009 17:23:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7567] csw/mgar/pkg/ndoutils/trunk Message-ID: Revision: 7567 http://gar.svn.sourceforge.net/gar/?rev=7567&view=rev Author: j_arndt Date: 2009-12-06 17:23:02 +0000 (Sun, 06 Dec 2009) Log Message: ----------- ndoutils: patched config to CSW paths Modified Paths: -------------- csw/mgar/pkg/ndoutils/trunk/Makefile csw/mgar/pkg/ndoutils/trunk/checksums Modified: csw/mgar/pkg/ndoutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/ndoutils/trunk/Makefile 2009-12-06 17:20:16 UTC (rev 7566) +++ csw/mgar/pkg/ndoutils/trunk/Makefile 2009-12-06 17:23:02 UTC (rev 7567) @@ -17,8 +17,8 @@ DISTFILES += $(call admfiles,CSWndoutils3x, prototype postinstall) DISTFILES += cswndoutils -#PATCHFILES += config.diff -#PATCHFILES += installdb.diff +PATCHFILES += config.diff +PATCHFILES += installdb.diff # We define upstream file regex so we can be notifed of new upstream software release #UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -76,7 +76,7 @@ @ginstall -m 755 $(WORKSRC)/src/ndomod-3x.o $(DESTDIR)/$(BINDIR) @ginstall -m 755 $(WORKSRC)/src/file2sock $(DESTDIR)/$(BINDIR) @ginstall -m 755 $(WORKSRC)/src/log2ndo $(DESTDIR)/$(BINDIR) - cp -r $(WORKSRC)/db $(DESTDIR)/$(CONTRIBDIR) + @cp -r $(WORKSRC)/db $(DESTDIR)/$(CONTRIBDIR) #@ginstall -m 744 $(WORKSRC)/db/installdb $(DESTDIR)/$(DOCDIR)/db @ginstall -m 644 $(WORKSRC)/docs/"NDOUTILS_DB_Model.pdf" $(DESTDIR)/$(DOCDIR) @ginstall -m 644 $(WORKSRC)/docs/"NDOUtils_Documentation.pdf" $(DESTDIR)/$(DOCDIR) Modified: csw/mgar/pkg/ndoutils/trunk/checksums =================================================================== --- csw/mgar/pkg/ndoutils/trunk/checksums 2009-12-06 17:20:16 UTC (rev 7566) +++ csw/mgar/pkg/ndoutils/trunk/checksums 2009-12-06 17:23:02 UTC (rev 7567) @@ -4,5 +4,7 @@ 5b1fa6c2971d0f13d1e56ab7bb9939bd download/CSWndoutils3x.gspec 86e430bdcd2e3681fa73b2280b435406 download/CSWndoutils3x.postinstall 70ab91abfc5447c5bf9c0ab74b52a94c download/CSWndoutils3x.prototype +0cadac9fada2aacb909e8b1e4f9c2f9c download/config.diff 842170f59e6f5092554ca7a3b3ce6d95 download/cswndoutils +a1d5f59d751be796f367a1eb8b0db7c3 download/installdb.diff a454f7434f401bd48047cc42b045ff8b download/ndoutils-1.4b7.tar.gz 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 Sun Dec 6 18:38:21 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 06 Dec 2009 17:38:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7568] csw/mgar/pkg/ndoutils/trunk Message-ID: Revision: 7568 http://gar.svn.sourceforge.net/gar/?rev=7568&view=rev Author: j_arndt Date: 2009-12-06 17:38:21 +0000 (Sun, 06 Dec 2009) Log Message: ----------- ndoutils: fixed typo in start / stop script Modified Paths: -------------- csw/mgar/pkg/ndoutils/trunk/checksums csw/mgar/pkg/ndoutils/trunk/files/cswndoutils Modified: csw/mgar/pkg/ndoutils/trunk/checksums =================================================================== --- csw/mgar/pkg/ndoutils/trunk/checksums 2009-12-06 17:23:02 UTC (rev 7567) +++ csw/mgar/pkg/ndoutils/trunk/checksums 2009-12-06 17:38:21 UTC (rev 7568) @@ -5,6 +5,6 @@ 86e430bdcd2e3681fa73b2280b435406 download/CSWndoutils3x.postinstall 70ab91abfc5447c5bf9c0ab74b52a94c download/CSWndoutils3x.prototype 0cadac9fada2aacb909e8b1e4f9c2f9c download/config.diff -842170f59e6f5092554ca7a3b3ce6d95 download/cswndoutils +5cd659c88c8a507428e92dea115ef757 download/cswndoutils a1d5f59d751be796f367a1eb8b0db7c3 download/installdb.diff a454f7434f401bd48047cc42b045ff8b download/ndoutils-1.4b7.tar.gz Modified: csw/mgar/pkg/ndoutils/trunk/files/cswndoutils =================================================================== --- csw/mgar/pkg/ndoutils/trunk/files/cswndoutils 2009-12-06 17:23:02 UTC (rev 7567) +++ csw/mgar/pkg/ndoutils/trunk/files/cswndoutils 2009-12-06 17:38:21 UTC (rev 7568) @@ -19,7 +19,7 @@ exit $SMF_EXIT_ERR_CONFIG fi -NAGIOS_MAJOR_RELEASE=`/opt/csw/nagios/bin/nagios -v | head -2 | tail -1 | awk '{print $2}' | awk -F. '{print $1}'` +NAGIOS_MAJOR_RELEASE=`/opt/csw/nagios/bin/nagios -v | head -2 | tail -1 | awk '{print $3}' | awk -F. '{print $1}'` BIN_DIR="/opt/csw/nagios/ndoutils/bin" if [ $NAGIOS_MAJOR_RELEASE -eq 2 ] 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 Dec 7 04:02:37 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Dec 2009 03:02:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7569] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 7569 http://gar.svn.sourceforge.net/gar/?rev=7569&view=rev Author: bdwalton Date: 2009-12-07 03:02:36 +0000 (Mon, 07 Dec 2009) Log Message: ----------- libxml2: clean up patch for upstream submission Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/checksums csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2009-12-06 17:38:21 UTC (rev 7568) +++ csw/mgar/pkg/libxml2/trunk/checksums 2009-12-07 03:02:36 UTC (rev 7569) @@ -1,3 +1,3 @@ -f0a8df3f16e7e44d6252d6f0f1896214 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch +238e60413c73cb046ac5ee90dac8c848 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch 5e371e0f0921fc7b366c34aded6ae993 ld-symbol-handling-fixup.patch 7740a8ec23878a2f50120e1faa2730f2 libxml2-2.7.6.tar.gz Modified: csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch 2009-12-06 17:38:21 UTC (rev 7568) +++ csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch 2009-12-07 03:02:36 UTC (rev 7569) @@ -1,4 +1,4 @@ -From 960433c24da65100dcb57ec9ce801d59a86722cb Mon Sep 17 00:00:00 2001 +From e7372dda4881e8421b55b80f556f62ec977bfe0f Mon Sep 17 00:00:00 2001 From: Ben Walton Date: Sat, 5 Dec 2009 13:32:49 -0500 Subject: [PATCH] relaxng.c: add cast to allow compilation with sun studio 11 @@ -6,34 +6,37 @@ Sun Studio 11 was failing to compile relaxng.c due to a type mismatch when calling xmlRngPErr. The issue was caused by a type mismatch with in the outcomes of a ternary operation ("nothing" vs node->name). +Cast the string literal to const xmlChar * so that both outcomes are +of the same type and compatible with the xmlRngPErr function prototype. Cleanup another warning by casting a string literal to const unsigned char *. Signed-off-by: Ben Walton --- - relaxng.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + relaxng.c | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/relaxng.c b/relaxng.c -index 075fc4a..9c6019d 100644 +index 075fc4a..e78fa18 100644 --- a/relaxng.c +++ b/relaxng.c -@@ -5369,7 +5369,7 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node, +@@ -5369,7 +5369,8 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node, } else { xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, "expecting name, anyName, nsName or choice : got %s\n", - (node == NULL ? "nothing" : node->name), NULL); -+ (node == NULL ? (const unsigned char *) "nothing" : node->name), NULL); ++ (node == NULL ? (const xmlChar *) "nothing" : node->name), ++ NULL); return (NULL); } if (ret != def) { -@@ -9459,7 +9459,7 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt, +@@ -9459,7 +9460,7 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt, ctxt->states = NULL; if (found == 0) { if (cur == NULL) { - VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); -+ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const unsigned char *) "noname"); ++ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const unsigned char *) "noname"); } else { VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->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 Mon Dec 7 09:04:29 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Dec 2009 08:04:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7570] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: Revision: 7570 http://gar.svn.sourceforge.net/gar/?rev=7570&view=rev Author: wahwah Date: 2009-12-07 08:04:29 +0000 (Mon, 07 Dec 2009) Log Message: ----------- gnupg2: Splitting off CSWgnupg-agent Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-07 03:02:36 UTC (rev 7569) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-07 08:04:29 UTC (rev 7570) @@ -11,9 +11,11 @@ RFC 2440 compliant tool for secure communication and data storage endef -PACKAGES = CSWgnupg2 -CATALOGNAME_CSWgnupg2 = gnupg2 -SPKG_DESC_CSWgnupg2 = GnuPG is a complete and free replacement for PGP. +PACKAGES = CSWgnupg2 CSWgnupg-agent +CATALOGNAME_CSWgnupg2 = gnupg2 +CATALOGNAME_CSWgnupg-agent = gnupg_agent +SPKG_DESC_CSWgnupg2 = GnuPG is a complete and free replacement for PGP. +SPKG_DESC_CSWgnupg-agent = GNU privacy guard - password agent SPKG_SOURCEURL = http://www.gnupg.org/ MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ @@ -38,8 +40,7 @@ CONFIGURE_ARGS += --with-readline CONFIGURE_ARGS += --enable-threads=solaris -# Waits for pinentry to be compiled on Solaris 8. -# CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses +CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses PROTOTYPE_FILTER = awk '$$$$3 ~/\/gpg2$$$$/ { $$$$4 = 4755 } { print }' @@ -48,22 +49,34 @@ # Needed for nanosleep() EXTRA_LINKER_FLAGS += -lrt -REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt -REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn -REQUIRED_PKGS += CSWbzip2 CSWreadline CSWggettextrt CSWiconv CSWosslrt -REQUIRED_PKGS += CSWlibassuan +PKGFILES_CSWgnupg-agent = .*gpg-agent.* +PKGFILES_CSWgnupg-agent += .*gpg-connect-agent.* +PKGFILES_CSWgnupg-agent += .*gpgkey2ssh.* +PKGFILES_CSWgnupg-agent += .*symcryptrun.* -# Waits for pinentry to be compiled on Solaris 8. -# REQUIRED_PKGS += CSWpinentry +REQUIRED_PKGS_common_CSWgnupg2 = CSWbzip2 +REQUIRED_PKGS_common_CSWgnupg2 += CSWcurlrt +REQUIRED_PKGS_common_CSWgnupg2 += CSWgcrypt +REQUIRED_PKGS_common_CSWgnupg2 += CSWggettextrt +REQUIRED_PKGS_common_CSWgnupg2 += CSWgpgerr +REQUIRED_PKGS_common_CSWgnupg2 += CSWiconv +REQUIRED_PKGS_common_CSWgnupg2 += CSWlibassuan +REQUIRED_PKGS_common_CSWgnupg2 += CSWlibidn +REQUIRED_PKGS_common_CSWgnupg2 += CSWlibksba +REQUIRED_PKGS_common_CSWgnupg2 += CSWoldaprt +REQUIRED_PKGS_common_CSWgnupg2 += CSWosslrt +REQUIRED_PKGS_common_CSWgnupg2 += CSWpth +REQUIRED_PKGS_common_CSWgnupg2 += CSWreadline +REQUIRED_PKGS_common_CSWgnupg2 += CSWzlib -PREREQUISITE_PKGS = $(REQUIRED_PKGS) +REQUIRED_PKGS_CSWgnupg2 += $(REQUIRED_PKGS_common_CSWgnupg2) +REQUIRED_PKGS_CSWgnupg2 += CSWgnupg-agent -INCOMPATIBLE_PKGS = CSWgnupg +REQUIRED_PKGS_CSWgnupg-agent = CSWpinentry +PREREQUISITE_PKGS = $(REQUIRED_PKGS_common_CSWgnupg2) +PREREQUISITE_PKGS += $(REQUIRED_PKGS_CSWgnupg-agent) + TEST_TARGET = check include gar/category.mk - -post-merge: - ln -s gnupg2 $(PKGROOT)$(bindir)/gnupg - @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 7 09:55:16 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Dec 2009 08:55:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7571] csw/mgar/pkg/cheetah/trunk/Makefile Message-ID: Revision: 7571 http://gar.svn.sourceforge.net/gar/?rev=7571&view=rev Author: wahwah Date: 2009-12-07 08:55:16 +0000 (Mon, 07 Dec 2009) Log Message: ----------- cheetah: Using CSWpy-cheetah for pkgname, adding CSWpython-rt dependency Modified Paths: -------------- csw/mgar/pkg/cheetah/trunk/Makefile Modified: csw/mgar/pkg/cheetah/trunk/Makefile =================================================================== --- csw/mgar/pkg/cheetah/trunk/Makefile 2009-12-07 08:04:29 UTC (rev 7570) +++ csw/mgar/pkg/cheetah/trunk/Makefile 2009-12-07 08:55:16 UTC (rev 7571) @@ -20,5 +20,6 @@ DISTFILES = $(DISTNAME).tar.gz UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = py_cheetah -PACKAGES = CSWpycheetah +PACKAGES = CSWpy-cheetah +REQUIRED_PKGS_CSWpy-cheetah = CSWpython-rt include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 7 10:20:11 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Dec 2009 09:20:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7572] csw/mgar/pkg/dpkg/trunk/Makefile Message-ID: Revision: 7572 http://gar.svn.sourceforge.net/gar/?rev=7572&view=rev Author: wahwah Date: 2009-12-07 09:20:11 +0000 (Mon, 07 Dec 2009) Log Message: ----------- dpkg: Fixing a typo Modified Paths: -------------- csw/mgar/pkg/dpkg/trunk/Makefile Modified: csw/mgar/pkg/dpkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/dpkg/trunk/Makefile 2009-12-07 08:55:16 UTC (rev 7571) +++ csw/mgar/pkg/dpkg/trunk/Makefile 2009-12-07 09:20:11 UTC (rev 7572) @@ -10,7 +10,7 @@ CATEGORIES = lib DESCRIPTION = Debian package manager PACKAGES = CSWalternatives -SPKG_DESC_CSWalternative = Alternatives management for CSW +SPKG_DESC_CSWalternatives = Alternatives management for CSW, based on dpkg define BLURB endef SPKG_SOURCEURL = http://wiki.debian.org/Teams/Dpkg 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 Dec 7 11:20:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Dec 2009 10:20:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7573] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7573 http://gar.svn.sourceforge.net/gar/?rev=7573&view=rev Author: dmichelsen Date: 2009-12-07 10:20:50 +0000 (Mon, 07 Dec 2009) Log Message: ----------- mGAR v2: Dynamically inspect the prototype for each package to see if it should depend on CSWcswclassutils Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-12-07 09:20:11 UTC (rev 7572) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-12-07 10:20:50 UTC (rev 7573) @@ -208,13 +208,15 @@ $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' -# The TEXINFO dependency is handled dynamically by looking at the prototype for matching files -ifneq ($(MIGRATECONF)$(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) -_EXTRA_GAR_PKGS += CSWcswclassutils +# If you add another filter above, also add the class to this list. It is used +# to detect if a package needs to depends on CSWcswclassutils by looking at +# files belonging to one of these in the prototype. +_CSWCLASSES = cswmigrateconf cswcpsampleconf cswpreserveconf cswetcservices cswinetd cswinitsmf +_CSWCLASSES += cswusergroup cswcrontab cswpycompile cswtexinfo + # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. _EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.CSW=%) $(PRESERVECONF:%\.CSW=%),-s ",^\.\($(FILE)\)$$,.\1\.CSW,p") -endif PKGGET_DESTDIR ?= @@ -427,7 +429,7 @@ # The dependencies to CSWcswclassutils and CSWtexinfo are only added if there are files # actually matching the _TEXINFO_FILTER. This is done at the prototype-level. $(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype -$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),CSWcswclassutils) +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) $(WORKDIR)/%.depend: $(WORKDIR) $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_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 Dec 7 11:21:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Dec 2009 10:21:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7574] csw/mgar/pkg/dhcp/trunk/Makefile Message-ID: Revision: 7574 http://gar.svn.sourceforge.net/gar/?rev=7574&view=rev Author: dmichelsen Date: 2009-12-07 10:21:41 +0000 (Mon, 07 Dec 2009) Log Message: ----------- dhcp: Fix classutils variables Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-07 10:20:50 UTC (rev 7573) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-07 10:21:41 UTC (rev 7574) @@ -49,8 +49,8 @@ # $$$$3 ~ /\/dhcpd.leases.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ # { print }' -INITSMF_CSWdhcp = /etc/opt/csw/init.d/cswdhcpd -SAMPLECONF_CSWdhcp = /etc/opt/csw/dhcpd.conf /etc/opt/csw/dhclient.conf /var/opt/csw/dhcp/db/dhcpd.leases +INITSMF = /etc/opt/csw/init.d/cswdhcpd +SAMPLECONF = /etc/opt/csw/dhcpd.conf /etc/opt/csw/dhclient.conf /var/opt/csw/dhcp/db/dhcpd.leases SPKG_SOURCEURL = https://www.isc.org/software/dhcp #SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf 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 Dec 7 14:34:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Dec 2009 13:34:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7575] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7575 http://gar.svn.sourceforge.net/gar/?rev=7575&view=rev Author: dmichelsen Date: 2009-12-07 13:34:56 +0000 (Mon, 07 Dec 2009) Log Message: ----------- mGAR v2: Pick up SPKG_CLASSES per-package from the respective prototype file Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-12-07 10:21:41 UTC (rev 7574) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-12-07 13:34:56 UTC (rev 7575) @@ -159,12 +159,6 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg -# Handle cswclassutils -# append $2 to SPKG_CLASSES if $1 is non-null -define _spkg_cond_add -$(SPKG_CLASSES) $(if $($(1)),$(if $(filter $(2),$(SPKG_CLASSES)),,$(2))) -endef - MIGRATECONF ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) # It is NOT sufficient to change the pathes here, they must be adjusted in merge-* also @@ -176,21 +170,6 @@ INETDCONF += $(_INETDCONF_FILES) ETCSERVICES += $(_ETCSERVICES_FILES) -# NOTE: Order _can_ be important here. cswinitsmf and cswinetd should -# always be the last two added. The reason for this is that -# you need to ensure any binaries and config files are already on disk -# and able to be consumed by a service that might be started. -SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) -SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) -SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) -SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) -SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) -SPKG_CLASSES := $(call _spkg_cond_add,CRONTABS,cswcrontab) -SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) -SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) -SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) - - # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) @@ -211,9 +190,21 @@ # If you add another filter above, also add the class to this list. It is used # to detect if a package needs to depends on CSWcswclassutils by looking at # files belonging to one of these in the prototype. -_CSWCLASSES = cswmigrateconf cswcpsampleconf cswpreserveconf cswetcservices cswinetd cswinitsmf -_CSWCLASSES += cswusergroup cswcrontab cswpycompile cswtexinfo +# NOTE: Order _can_ be important here. cswinitsmf and cswinetd should +# always be the last two added. The reason for this is that +# you need to ensure any binaries and config files are already on disk +# and able to be consumed by a service that might be started. + +_CSWCLASSES = cswmigrateconf cswcpsampleconf cswpreserveconf +_CSWCLASSES += cswetcservices +_CSWCLASSES += cswusergroup +_CSWCLASSES += cswcrontab +_CSWCLASSES += cswpycompile +_CSWCLASSES += cswinetd +_CSWCLASSES += cswinitsmf +_CSWCLASSES += cswtexinfo + # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. _EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.CSW=%) $(PRESERVECONF:%\.CSW=%),-s ",^\.\($(FILE)\)$$,.\1\.CSW,p") @@ -534,7 +525,7 @@ # The texinfo filter has been taken out of the normal filters as TEXINFO has a default. $(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype -$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),cswtexinfo) +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C " if( $$F[1] eq "$C" && !$$done{$C}++ );)') $(WORKDIR)/%.pkginfo: $(WORKDIR) $(_DBG)(echo "PKG=$*"; \ 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 Dec 7 14:44:57 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 07 Dec 2009 13:44:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7576] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 7576 http://gar.svn.sourceforge.net/gar/?rev=7576&view=rev Author: bonivart Date: 2009-12-07 13:44:57 +0000 (Mon, 07 Dec 2009) Log Message: ----------- dhcp: update to beta 3, modified init script, gar updates Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-07 13:34:56 UTC (rev 7575) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-07 13:44:57 UTC (rev 7576) @@ -42,18 +42,10 @@ INSTALL_SCRIPTS = custom -#PROTOTYPE_FILTER = awk ' \ -# $$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } \ -# $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ -# $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ -# $$$$3 ~ /\/dhcpd.leases.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ -# { print }' - INITSMF = /etc/opt/csw/init.d/cswdhcpd SAMPLECONF = /etc/opt/csw/dhcpd.conf /etc/opt/csw/dhclient.conf /var/opt/csw/dhcp/db/dhcpd.leases SPKG_SOURCEURL = https://www.isc.org/software/dhcp -#SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf include gar/category.mk @@ -64,12 +56,8 @@ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @cp $(FILEDIR)/CSWdhcp.cswdhcpd $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd @chmod 755 $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd -# @( cd $(DESTDIR)/etc/opt/csw ; \ -# mv dhcpd.conf dhcpd.conf.CSW ; \ -# mv dhclient.conf dhclient.conf.CSW ) @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(FILEDIR)/CSWdhcp.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/db -# @touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases.CSW @touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases @$(MAKECOOKIE) Modified: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd 2009-12-07 13:34:56 UTC (rev 7575) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd 2009-12-07 13:44:57 UTC (rev 7576) @@ -1,8 +1,9 @@ #!/sbin/sh # rc-script for CSW DHCP -# Peter Bonivart, 2009-01-27 +# Peter Bonivart, 2009-12-04 +SERVICE=dhcp PID=/var/opt/csw/dhcp/dhcpd.pid #CONF=/opt/csw/etc/dhcpd.conf # use old location of conf file CONF=/etc/opt/csw/dhcpd.conf @@ -11,14 +12,14 @@ ZONE= # used for initialization, do not change case "$1" in - 'start') + start) if [ -f /opt/csw/sbin/dhcpd -a -f $CONF ]; then - echo 'Starting dhcp.' + echo "Starting $SERVICE." /opt/csw/sbin/dhcpd -cf $CONF $OPTIONS fi ;; - 'stop') - echo 'Shutting down dhcp.' + stop) + echo "Stopping $SERVICE." if [ -x /usr/bin/zonename ]; then if [ "`/usr/bin/zonename`" = "global" ]; then ZONE="-z global" @@ -28,8 +29,25 @@ [ -f $PID ] && /usr/bin/rm $PID exit 0 ;; + restart) + FAIL= + /opt/csw/sbin/dhcpd -cf $CONF -t || FAIL=1 + /opt/csw/sbin/dhcpd -cf $CONF -T || FAIL=2 + [ $FAIL = 1 ] && echo "Your configuration seems broken. Exiting." + [ $FAIL = 2 ] && echo "Your lease file seems broken. Exiting." + [ $FAIL ] && exit 1 + $0 stop + echo "Waiting for $SERVICE to stop.\c" + while ( /usr/bin/pgrep -x dhcpd > /dev/null ); do + echo ".\c" + sleep 1 + done + echo + sleep 1 + $0 start + ;; *) - echo "Usage: $0 { start | stop }" + echo "Usage: $0 { start | stop | restart }" exit 1 ;; esac 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 Dec 7 16:22:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Dec 2009 15:22:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7577] csw/mgar/pkg Message-ID: Revision: 7577 http://gar.svn.sourceforge.net/gar/?rev=7577&view=rev Author: wahwah Date: 2009-12-07 15:22:15 +0000 (Mon, 07 Dec 2009) Log Message: ----------- cx-oracle: Initial commit Modified Paths: -------------- csw/mgar/pkg/cx-oracle/trunk/Makefile csw/mgar/pkg/cx-oracle/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cx-oracle/ Modified: csw/mgar/pkg/cx-oracle/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-07 13:44:57 UTC (rev 7576) +++ csw/mgar/pkg/cx-oracle/trunk/Makefile 2009-12-07 15:22:15 UTC (rev 7577) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = cx-oracle +GARVERSION = 5.0.2 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -22,24 +22,29 @@ ## Possible settings are: ## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, ## utils, x11, xfce, xorg, xtra -CATEGORIES = lib +CATEGORIES = python ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = a Python db API conforming module for Oracle database access ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. define BLURB - + cx_Oracle is a Python extension module that allows access to Oracle databases + and conforms to the Python database API specification. This module is + currently built against Oracle 9.2.0, 10.2.0 and 11.1.0. For more information + on the database API specification, see here. Use the provided setup.py to + build and install the module which makes use of the DistUtils module made + available in Python 2.0 and up. endef ## ## Upstream URL that should show up in the VENDOR field as well as on ## http://opencsw.org/packages/. -SPKG_SOURCEURL = +SPKG_SOURCEURL = http://cx-oracle.sourceforge.net/ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = $(SF_MIRRORS) ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -54,9 +59,10 @@ ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DL_NAME = cx_Oracle +DISTNAME = $(DL_NAME)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz ## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ## ## Catalog name is the name to be used with pkg{-get,util} -i . @@ -176,10 +182,4 @@ ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 ## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/cx-oracle/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-12-07 13:44:57 UTC (rev 7576) +++ csw/mgar/pkg/cx-oracle/trunk/checksums 2009-12-07 15:22:15 UTC (rev 7577) @@ -0,0 +1 @@ +7f2e521142f0be47347398941438ef79 cx_Oracle-5.0.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Dec 8 00:06:50 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 07 Dec 2009 23:06:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7578] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 7578 http://gar.svn.sourceforge.net/gar/?rev=7578&view=rev Author: chninkel Date: 2009-12-07 23:06:50 +0000 (Mon, 07 Dec 2009) Log Message: ----------- openssl: made the openssl package archall Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-12-07 15:22:15 UTC (rev 7577) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-12-07 23:06:50 UTC (rev 7578) @@ -29,6 +29,7 @@ SPKG_DESC_CSWossl = Openssl meta package CATALOGNAME_CSWossl = openssl REQUIRED_PKGS_CSWossl = CSWossldevel CSWosslutils CSWosslrt +ARCH_ALL_CSWossl = 1 SPKG_DESC_CSWosslrt = Openssl runtime libraries CATALOGNAME_CSWosslrt = openssl_rt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Dec 8 00:25:16 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 07 Dec 2009 23:25:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7579] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 7579 http://gar.svn.sourceforge.net/gar/?rev=7579&view=rev Author: chninkel Date: 2009-12-07 23:25:16 +0000 (Mon, 07 Dec 2009) Log Message: ----------- openssl: updated changelog Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2009-12-07 23:06:50 UTC (rev 7578) +++ csw/mgar/pkg/openssl/trunk/checksums 2009-12-07 23:25:16 UTC (rev 7579) @@ -8,6 +8,6 @@ 521028d0016ae5a4cc8fd5e0b0add53f CSWosslrt.prototype-sparc 88634d81695a173bdb35df1a80cc9761 CSWosslutils.prototype b78faa440d6f6a2a07663de331678648 README.CSW -5c447b39d30f5ae4ede50d53dfcdfb58 changelog.CSW +28a305623ad6de6f8370e36482716873 changelog.CSW 64f7c3f3a6cae483209b69c31c82557d more_configure_targets.patch 05a0ece1372392a2cf310ebb96333025 openssl-0.9.8l.tar.gz Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2009-12-07 23:06:50 UTC (rev 7578) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2009-12-07 23:25:16 UTC (rev 7579) @@ -1,9 +1,9 @@ -openssl (0.9.8l,REV=2009.03.27) unstable +openssl (0.9.8l,REV=2009.12.08) unstable * New upstream version. * Changed package version numbering scheme. - -- Yann Rouillard Fri, 06 Nov 2009 11:16:03 +0100 + -- Yann Rouillard Fri, 08 Dec 2009 11:16:03 +0100 openssl (0.9.8,REV=2009.03.27_rev=k) unstable 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 Dec 8 02:05:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 08 Dec 2009 01:05:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7580] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 7580 http://gar.svn.sourceforge.net/gar/?rev=7580&view=rev Author: bdwalton Date: 2009-12-08 01:05:35 +0000 (Tue, 08 Dec 2009) Log Message: ----------- libxml2: further patch cleanup Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile csw/mgar/pkg/libxml2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch Removed Paths: ------------- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-07 23:25:16 UTC (rev 7579) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-08 01:05:35 UTC (rev 7580) @@ -10,7 +10,7 @@ MASTER_SITES = ftp://xmlsoft.org/libxml2/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = ld-symbol-handling-fixup.patch -PATCHFILES += 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch +PATCHFILES += 0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2009-12-07 23:25:16 UTC (rev 7579) +++ csw/mgar/pkg/libxml2/trunk/checksums 2009-12-08 01:05:35 UTC (rev 7580) @@ -1,3 +1,3 @@ -238e60413c73cb046ac5ee90dac8c848 0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch +288c7d9bbe8b1a28eab9421493f1186a 0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch 5e371e0f0921fc7b366c34aded6ae993 ld-symbol-handling-fixup.patch 7740a8ec23878a2f50120e1faa2730f2 libxml2-2.7.6.tar.gz Deleted: csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch 2009-12-07 23:25:16 UTC (rev 7579) +++ csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-add-cast-to-allow-compilation-with-sun-stu.patch 2009-12-08 01:05:35 UTC (rev 7580) @@ -1,45 +0,0 @@ -From e7372dda4881e8421b55b80f556f62ec977bfe0f Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sat, 5 Dec 2009 13:32:49 -0500 -Subject: [PATCH] relaxng.c: add cast to allow compilation with sun studio 11 - -Sun Studio 11 was failing to compile relaxng.c due to a type mismatch -when calling xmlRngPErr. The issue was caused by a type mismatch with -in the outcomes of a ternary operation ("nothing" vs node->name). -Cast the string literal to const xmlChar * so that both outcomes are -of the same type and compatible with the xmlRngPErr function prototype. - -Cleanup another warning by casting a string literal to const unsigned -char *. - -Signed-off-by: Ben Walton ---- - relaxng.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/relaxng.c b/relaxng.c -index 075fc4a..e78fa18 100644 ---- a/relaxng.c -+++ b/relaxng.c -@@ -5369,7 +5369,8 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node, - } else { - xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, - "expecting name, anyName, nsName or choice : got %s\n", -- (node == NULL ? "nothing" : node->name), NULL); -+ (node == NULL ? (const xmlChar *) "nothing" : node->name), -+ NULL); - return (NULL); - } - if (ret != def) { -@@ -9459,7 +9460,7 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt, - ctxt->states = NULL; - if (found == 0) { - if (cur == NULL) { -- VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); -+ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const unsigned char *) "noname"); - } else { - VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name); - } --- -1.6.5.3 - Added: csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch (rev 0) +++ csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch 2009-12-08 01:05:35 UTC (rev 7580) @@ -0,0 +1,47 @@ +From f2cee2dd783b6c71ea3d98ab9701b9b397753f0a Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 5 Dec 2009 13:32:49 -0500 +Subject: [PATCH] relaxng.c: cast to allow compilation with sun studio 11 + +Sun Studio 11 was failing to compile relaxng.c due to a type mismatch +in a ternary operator used to provide an argument to xmlRngPErr. It +seems that sos11 cc is more pedantic about this part of the C99 +standard. GCC issues a warning but doesn't fail by default. + +After casting the string literal "nothing" to (const xmlChar *) sos11 +cc is happy. GCC no longer issues a warning either. + +Another warning was cleaned up with an identical cast. + +Signed-off-by: Ben Walton +--- + relaxng.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/relaxng.c b/relaxng.c +index 075fc4a..6dbc499 100644 +--- a/relaxng.c ++++ b/relaxng.c +@@ -5369,7 +5369,8 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node, + } else { + xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, + "expecting name, anyName, nsName or choice : got %s\n", +- (node == NULL ? "nothing" : node->name), NULL); ++ (node == NULL ? (const xmlChar *) "nothing" : node->name), ++ NULL); + return (NULL); + } + if (ret != def) { +@@ -9459,7 +9460,8 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt, + ctxt->states = NULL; + if (found == 0) { + if (cur == NULL) { +- VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); ++ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, ++ (const xmlChar *) "noname"); + } else { + VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name); + } +-- +1.6.5.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Dec 8 10:38:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Dec 2009 09:38:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7581] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 7581 http://gar.svn.sourceforge.net/gar/?rev=7581&view=rev Author: wahwah Date: 2009-12-08 09:38:30 +0000 (Tue, 08 Dec 2009) Log Message: ----------- wxwidgets: Reworked package dependencies, shuffled files around the packages to clean up the common package and move appropriate files into the devel package. Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-12-08 01:05:35 UTC (rev 7580) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-12-08 09:38:30 UTC (rev 7581) @@ -70,31 +70,39 @@ PACKAGES += CSWwxwidgetsgtk2 ARCHALL_CSWwxwidgetsdevel = 1 SPKG_DESC_CSWwxwidgetscommon = A cross-platform toolkit, common files -SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files -SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support +SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files +SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support -REQUIRED_PKGS = CSWexpat -REQUIRED_PKGS += CSWfconfig -REQUIRED_PKGS += CSWftype2 -REQUIRED_PKGS += CSWggettextrt -REQUIRED_PKGS += CSWglib2 -REQUIRED_PKGS += CSWgtk2 -REQUIRED_PKGS += CSWiconv -REQUIRED_PKGS += CSWjpeg -REQUIRED_PKGS += CSWlibatk -REQUIRED_PKGS += CSWlibsm -REQUIRED_PKGS += CSWlibxext -REQUIRED_PKGS += CSWmesa -REQUIRED_PKGS += CSWncurses -REQUIRED_PKGS += CSWpango -REQUIRED_PKGS += CSWpng -REQUIRED_PKGS += CSWsunmath -REQUIRED_PKGS += CSWtiff -REQUIRED_PKGS += CSWzlib +REQUIRED_PKGS_CSWwxwidgetscommon += CSWexpat +REQUIRED_PKGS_CSWwxwidgetscommon += CSWiconv +REQUIRED_PKGS_CSWwxwidgetscommon += CSWlibxext +REQUIRED_PKGS_CSWwxwidgetscommon += CSWncurses +REQUIRED_PKGS_CSWwxwidgetscommon += CSWsunmath +REQUIRED_PKGS_CSWwxwidgetscommon += CSWzlib -REQUIRED_PKGS_CSWwxwidgetsgtk2 = CSWwxwidgetscommon -REQUIRED_PKGS_CSWwxwidgetsdevel = CSWwxwidgetscommon +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWexpat +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWfconfig +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWftype2 +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWggettextrt +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWglib2 +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWgtk2 +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWiconv +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWjpeg +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWlibatk +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWlibsm +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWlibxext +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWmesa +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWncurses +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWpango +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWpng +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWsunmath +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWtiff +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWzlib +# Dependencies between wxwidgets subpackages +REQUIRED_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgetscommon +REQUIRED_PKGS_CSWwxwidgetsdevel += CSWwxwidgetscommon CSWwxwidgetsgtk2 + PREREQUISITE_PKGS = $(REQUIRED_PKGS) PREREQUISITE_PKGS += CSWgtk2devel PREREQUISITE_PKGS += CSWlibpthreadstubs @@ -110,6 +118,13 @@ PKGFILES_CSWwxwidgetsdevel = $(PKGFILES_DEVEL) PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config +PKGFILES_CSWwxwidgetsdevel += /opt/csw/share/bakefile/presets.* +PKGFILES_CSWwxwidgetsdevel += /opt/csw/share/aclocal.* +PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config +PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wxrc=wxrc-2.8 +PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wxrc-2.8 +PKGFILES_CSWwxwidgetsdevel += /opt/csw/lib/wx/config.* +PKGFILES_CSWwxwidgetsdevel += /opt/csw/lib/wx/include.* PKGFILES_CSWwxwidgetsgtk2 = /opt/csw/lib/wx/(include|config)/gtk2-.* PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/lib/libwx_gtk2.* PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/bin/wx(-config|rc(|-2.8)) 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 Dec 8 11:03:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Dec 2009 10:03:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7582] csw/mgar/pkg/libstatgrab/trunk/Makefile Message-ID: Revision: 7582 http://gar.svn.sourceforge.net/gar/?rev=7582&view=rev Author: dmichelsen Date: 2009-12-08 10:03:02 +0000 (Tue, 08 Dec 2009) Log Message: ----------- libstatgrab: Make shared lib self-sufficient Modified Paths: -------------- csw/mgar/pkg/libstatgrab/trunk/Makefile Modified: csw/mgar/pkg/libstatgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/libstatgrab/trunk/Makefile 2009-12-08 09:38:30 UTC (rev 7581) +++ csw/mgar/pkg/libstatgrab/trunk/Makefile 2009-12-08 10:03:02 UTC (rev 7582) @@ -18,10 +18,13 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# Don't pull in ncurses from CSW -LINKER_FLAGS = +SPKG_SOURCEURL = http://www.i-scream.org/libstatgrab/ +# Don't pull in ncurses from CSW, but add needed libraries to be self-sufficient +LINKER_FLAGS = -lkstat -ldevinfo -lsocket -lnsl + BUILD64 = 1 +NORUNPATH = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-curses-prefix=/usr 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 Dec 8 15:27:03 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Dec 2009 14:27:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7583] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7583 http://gar.svn.sourceforge.net/gar/?rev=7583&view=rev Author: bonivart Date: 2009-12-08 14:27:03 +0000 (Tue, 08 Dec 2009) Log Message: ----------- pkgutil: update to 1.9.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 2009-12-08 10:03:02 UTC (rev 7582) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-08 14:27:03 UTC (rev 7583) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.9 +GARVERSION = 1.9.1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -13,11 +13,14 @@ # Disable inclusion of CSWcommon by default. COMMON_PKG_DEPENDS = -MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES += svn-http://gar.svn.sourceforge.net/svnroot/opencsw/ DISTFILES = $(GARNAME)-$(GARVERSION).zip DISTFILES += $(call admfiles,CSWpkgutil,prototype) DISTFILES += i.cswpkgutil DISTFILES += r.cswpkgutil +DISTFILES += utilities +NOCHECKSUM = utilities PACKAGES = CSWpkgutil CSWpkgutilplus @@ -31,6 +34,8 @@ PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* PKGFILES_CSWpkgutilplus += .*pkgutilplus.* +PKGFILES_CSWpkgutilplus += .*build_sun_catalog.* +PKGFILES_CSWpkgutilplus += .*opencsw.py.* ARCHALL_CSWpkgutilplus = 1 @@ -60,6 +65,9 @@ @ginstall $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW @ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) @ginstall $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget + @ginstall $(WORKSRC)/utilities/build_sun_catalog.py $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @ginstall $(WORKSRC)/utilities/opencsw.py $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @ln -s ../libexec/pkgutil/build_sun_catalog.py $(DESTDIR)$(bindir)/build_sun_catalog @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @ginstall $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)plus Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-08 10:03:02 UTC (rev 7582) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-08 14:27:03 UTC (rev 7583) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec a751314ee495d7477888522435b769e4 CSWpkgutil.prototype 33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil -bdc6afd165a5117c9d0f3a3a54109461 pkgutil-1.9.zip +0d33234b106bb0584af460ce249ae52d pkgutil-1.9.1.zip 6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil 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 Dec 8 19:39:58 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Dec 2009 18:39:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7584] csw/mgar/pkg/pkgutil/trunk/Makefile Message-ID: Revision: 7584 http://gar.svn.sourceforge.net/gar/?rev=7584&view=rev Author: bonivart Date: 2009-12-08 18:39:58 +0000 (Tue, 08 Dec 2009) Log Message: ----------- pkgutil: add python and pkgloghooks as deps Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-08 14:27:03 UTC (rev 7583) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-08 18:39:58 UTC (rev 7584) @@ -29,7 +29,7 @@ # Explicitly depend on CSWcommon here since it's not the default #REQUIRED_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil CSWpmwwwcurl -REQUIRED_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil +REQUIRED_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil CSWcswpkgloghooks CSWpython PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Dec 8 21:20:41 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 08 Dec 2009 20:20:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7585] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 7585 http://gar.svn.sourceforge.net/gar/?rev=7585&view=rev Author: chninkel Date: 2009-12-08 20:20:41 +0000 (Tue, 08 Dec 2009) Log Message: ----------- openssl: fixed archall Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-12-08 18:39:58 UTC (rev 7584) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-12-08 20:20:41 UTC (rev 7585) @@ -29,7 +29,7 @@ SPKG_DESC_CSWossl = Openssl meta package CATALOGNAME_CSWossl = openssl REQUIRED_PKGS_CSWossl = CSWossldevel CSWosslutils CSWosslrt -ARCH_ALL_CSWossl = 1 +ARCHALL_CSWossl = 1 SPKG_DESC_CSWosslrt = Openssl runtime libraries CATALOGNAME_CSWosslrt = openssl_rt 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 Dec 9 02:51:26 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Dec 2009 01:51:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7586] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7586 http://gar.svn.sourceforge.net/gar/?rev=7586&view=rev Author: bdwalton Date: 2009-12-09 01:51:26 +0000 (Wed, 09 Dec 2009) Log Message: ----------- coreutils: build with gcc4 for extra tools Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-08 20:20:41 UTC (rev 7585) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-09 01:51:26 UTC (rev 7586) @@ -2,6 +2,9 @@ GARVERSION = 8.1 CATEGORIES = utils +# building with gcc gets us extra tools (eg: stdbuf) +GARCOMPILER = GCC4 + SHELL = /opt/csw/bin/bash PREREQUISITE_PKGS = CSWbash This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 9 10:19:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Dec 2009 09:19:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7587] csw/mgar/pkg/automake/trunk Message-ID: Revision: 7587 http://gar.svn.sourceforge.net/gar/?rev=7587&view=rev Author: dmichelsen Date: 2009-12-09 09:19:13 +0000 (Wed, 09 Dec 2009) Log Message: ----------- automake: Update to 1.11.1 Modified Paths: -------------- csw/mgar/pkg/automake/trunk/Makefile csw/mgar/pkg/automake/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/automake/trunk/ Property changes on: csw/mgar/pkg/automake/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2009-12-09 01:51:26 UTC (rev 7586) +++ csw/mgar/pkg/automake/trunk/Makefile 2009-12-09 09:19:13 UTC (rev 7587) @@ -1,10 +1,10 @@ GARNAME = automake -GARVERSION = 1.11 +GARVERSION = 1.11.1 CATEGORIES = devel EXTRA_MODULATORS = GARVERSION # Version 1.1.2 is the last to contain libflac.so.7 where most of the binaries depend on -MODULATIONS_GARVERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.2 1.11 +MODULATIONS_GARVERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.1 DESCRIPTION = A tool for automatically generating Makefiles. define BLURB Modified: csw/mgar/pkg/automake/trunk/checksums =================================================================== --- csw/mgar/pkg/automake/trunk/checksums 2009-12-09 01:51:26 UTC (rev 7586) +++ csw/mgar/pkg/automake/trunk/checksums 2009-12-09 09:19:13 UTC (rev 7587) @@ -1,6 +1,6 @@ -ede3e08c696861a01f4d2c6a2e822053 download/automake-1.10.2.tar.gz -fab0bd2c3990a6679adaf9eeac0c6d2a download/automake-1.11.tar.gz -2bd506db63b6d10458cb644b6171ce93 download/automake-1.6.3.tar.gz -eb25355e3cf00aac83c580dde970a0b4 download/automake-1.7.9.tar.gz -ce0662da5df68014eb1683c184c47a8e download/automake-1.8.5.tar.gz -c60f77a42f103606981d456f1615f5b4 download/automake-1.9.6.tar.gz +03bc9ebfa805f9ee5635f1f53fa1fa5f automake-1.10.3.tar.gz +4ee7f0ff5f0e467d58b6bd5da96b1c74 automake-1.11.1.tar.gz +2bd506db63b6d10458cb644b6171ce93 automake-1.6.3.tar.gz +eb25355e3cf00aac83c580dde970a0b4 automake-1.7.9.tar.gz +ce0662da5df68014eb1683c184c47a8e automake-1.8.5.tar.gz +c60f77a42f103606981d456f1615f5b4 automake-1.9.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Wed Dec 9 17:02:46 2009 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Wed, 09 Dec 2009 16:02:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7588] csw/mgar/pkg Message-ID: Revision: 7588 http://gar.svn.sourceforge.net/gar/?rev=7588&view=rev Author: a_o_m Date: 2009-12-09 16:02:46 +0000 (Wed, 09 Dec 2009) Log Message: ----------- libfasttime: Initial commit Added Paths: ----------- csw/mgar/pkg/libfasttime/ csw/mgar/pkg/libfasttime/branches/ csw/mgar/pkg/libfasttime/tags/ csw/mgar/pkg/libfasttime/trunk/ csw/mgar/pkg/libfasttime/trunk/Makefile csw/mgar/pkg/libfasttime/trunk/checksums csw/mgar/pkg/libfasttime/trunk/files/ Property changes on: csw/mgar/pkg/libfasttime/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/libfasttime/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfasttime/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libfasttime/trunk/Makefile 2009-12-09 16:02:46 UTC (rev 7588) @@ -0,0 +1,22 @@ +GARNAME = libfasttime +GARVERSION = 1.0 +CATEGORIES = lib + +DESCRIPTION = a optimized, caching time() library function +define BLURB + See for details: http://developers.sun.com/solaris/articles/time_stamp.html +endef + +MASTER_SITES = http://metis.utfs.org/html/csw/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 Added: csw/mgar/pkg/libfasttime/trunk/checksums =================================================================== --- csw/mgar/pkg/libfasttime/trunk/checksums (rev 0) +++ csw/mgar/pkg/libfasttime/trunk/checksums 2009-12-09 16:02:46 UTC (rev 7588) @@ -0,0 +1 @@ +e3b5af6668664c9f370f0c431b4afbe1 libfasttime-1.0.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 Dec 10 04:35:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Dec 2009 03:35:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7589] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 7589 http://gar.svn.sourceforge.net/gar/?rev=7589&view=rev Author: bdwalton Date: 2009-12-10 03:35:34 +0000 (Thu, 10 Dec 2009) Log Message: ----------- git: depend on less, set less as default pager; revamp a few args that can be set in configure; prepare for 1.6.6 Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-12-09 16:02:46 UTC (rev 7588) +++ csw/mgar/pkg/git/trunk/Makefile 2009-12-10 03:35:34 UTC (rev 7589) @@ -1,6 +1,6 @@ GARNAME = git -GARVERSION = 1.6.5.1 -#xPATCHLEVEL = rc3 +GARVERSION = 1.6.6 +PATCHLEVEL = rc2 CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) @@ -33,7 +33,7 @@ REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWosshclient CSWiconv CSWexpat CSWbash CSWpmerror -REQUIRED_PKGS_CSWgit += CSWpmtermreadkey CSWpmnetsmtpssl +REQUIRED_PKGS_CSWgit += CSWpmtermreadkey CSWpmnetsmtpssl CSWless REQUIRED_PKGS_CSWgitk = CSWgit CSWtk @@ -86,7 +86,6 @@ GIT_TREEISH_git.git = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) DISTFILES = CSWgit.postinstall -#PATCHFILES = 0001-ls-files-die-instead-of-fprintf-exit-in-i-error.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files @@ -115,18 +114,19 @@ CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-default_pager=/opt/csw/bin/less CONFIGURE_ARGS += --with-iconv=$(prefix) CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-expat=$(prefix) CONFIGURE_ARGS += --enable-pthreads="-D_REENTRANT -lpthread" +CONFIGURE_ARGS += --with-gitconfig=$(sysconfdir)/gitconfig +CONFIGURE_ARGS += --with-pager=/opt/csw/bin/less BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ - ETC_GITCONFIG=$(sysconfdir)/gitconfig \ ASCIIDOC_NO_ROFF=YesPlease \ all doc -INSTALL_ARGS = ETC_GITCONFIG=$(sysconfdir)/gitconfig \ - INSTALLDIRS=vendor \ +INSTALL_ARGS = INSTALLDIRS=vendor \ install-man install-html # We want static libs installed for our devel 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 Thu Dec 10 09:28:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Dec 2009 08:28:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7590] csw/mgar/pkg/perl/tags/perl-5.8.8, REV=2009.11.12/ Message-ID: Revision: 7590 http://gar.svn.sourceforge.net/gar/?rev=7590&view=rev Author: dmichelsen Date: 2009-12-10 08:28:12 +0000 (Thu, 10 Dec 2009) Log Message: ----------- perl: Tag current release Added Paths: ----------- csw/mgar/pkg/perl/tags/perl-5.8.8,REV=2009.11.12/ 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 Dec 10 18:43:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Dec 2009 17:43:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7591] csw/mgar/pkg/dpkg/trunk/Makefile Message-ID: Revision: 7591 http://gar.svn.sourceforge.net/gar/?rev=7591&view=rev Author: wahwah Date: 2009-12-10 17:43:20 +0000 (Thu, 10 Dec 2009) Log Message: ----------- dpkg: Adding ARCHALL to CSWalternatives Modified Paths: -------------- csw/mgar/pkg/dpkg/trunk/Makefile Modified: csw/mgar/pkg/dpkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/dpkg/trunk/Makefile 2009-12-10 08:28:12 UTC (rev 7590) +++ csw/mgar/pkg/dpkg/trunk/Makefile 2009-12-10 17:43:20 UTC (rev 7591) @@ -10,6 +10,7 @@ CATEGORIES = lib DESCRIPTION = Debian package manager PACKAGES = CSWalternatives +ARCHALL_CSWalternatives = 1 SPKG_DESC_CSWalternatives = Alternatives management for CSW, based on dpkg define BLURB endef 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 Dec 10 20:20:17 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 10 Dec 2009 19:20:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7592] csw/mgar/pkg/pkgutil/trunk/checksums Message-ID: Revision: 7592 http://gar.svn.sourceforge.net/gar/?rev=7592&view=rev Author: bonivart Date: 2009-12-10 19:20:17 +0000 (Thu, 10 Dec 2009) Log Message: ----------- pkgutil: source update Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-10 17:43:20 UTC (rev 7591) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-10 19:20:17 UTC (rev 7592) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec a751314ee495d7477888522435b769e4 CSWpkgutil.prototype 33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil -0d33234b106bb0584af460ce249ae52d pkgutil-1.9.1.zip +a52020816f3dda83d32621f85321632a pkgutil-1.9.1.zip 6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil 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 Dec 10 21:02:51 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 10 Dec 2009 20:02:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7593] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7593 http://gar.svn.sourceforge.net/gar/?rev=7593&view=rev Author: bonivart Date: 2009-12-10 20:02:50 +0000 (Thu, 10 Dec 2009) Log Message: ----------- pkgutil: source update, update Makefile Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pkgutil/trunk/files/build_sun_catalog.py csw/mgar/pkg/pkgutil/trunk/files/opencsw.py Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-10 19:20:17 UTC (rev 7592) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-12-10 20:02:50 UTC (rev 7593) @@ -14,13 +14,12 @@ COMMON_PKG_DEPENDS = MASTER_SITES = $(SF_MIRRORS) -MASTER_SITES += svn-http://gar.svn.sourceforge.net/svnroot/opencsw/ DISTFILES = $(GARNAME)-$(GARVERSION).zip DISTFILES += $(call admfiles,CSWpkgutil,prototype) DISTFILES += i.cswpkgutil DISTFILES += r.cswpkgutil -DISTFILES += utilities -NOCHECKSUM = utilities +DISTFILES += build_sun_catalog.py +DISTFILES += opencsw.py PACKAGES = CSWpkgutil CSWpkgutilplus @@ -57,19 +56,18 @@ @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d - @ginstall $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW + @ginstall -m 644 $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW @ginstall -m 755 $(WORKSRC)/pkgutillog $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d/01-CSW$(GARNAME)plus-log @ginstall -m 755 -d $(DESTDIR)$(bindir) - @ginstall $(WORKSRC)/$(GARNAME) $(WORKSRC)/bldcat $(WORKSRC)/chkcat $(DESTDIR)$(bindir) - @ginstall -m 755 -d $(DESTDIR)$(sysconfdir) - @ginstall $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW + @ginstall -m 755 $(WORKSRC)/$(GARNAME) $(WORKSRC)/bldcat $(WORKSRC)/chkcat $(DESTDIR)$(bindir) + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc + @ginstall -m 644 $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/opt/csw/etc/$(GARNAME).conf.CSW @ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) - @ginstall $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget - @ginstall $(WORKSRC)/utilities/build_sun_catalog.py $(DESTDIR)/opt/csw/libexec/$(GARNAME) - @ginstall $(WORKSRC)/utilities/opencsw.py $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @ginstall -m 755 $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget + @ginstall -m 755 $(FILEDIR)/build_sun_catalog.py $(FILEDIR)/opencsw.py $(DESTDIR)/opt/csw/libexec/$(GARNAME) @ln -s ../libexec/pkgutil/build_sun_catalog.py $(DESTDIR)$(bindir)/build_sun_catalog @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ + @ginstall -m 444 $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)plus @ginstall -m 444 $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ @ginstall -m 444 $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme @@ -80,5 +78,5 @@ @chmod 444 $(DESTDIR)$(mandir)/man1/* @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/pkgask - @ginstall $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW + @ginstall -m 644 $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-10 19:20:17 UTC (rev 7592) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-12-10 20:02:50 UTC (rev 7593) @@ -1,5 +1,7 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec a751314ee495d7477888522435b769e4 CSWpkgutil.prototype +b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil -a52020816f3dda83d32621f85321632a pkgutil-1.9.1.zip +3a6b789b3d5e05f41d2363dd26a92acf opencsw.py +d65a85a929f3901d4a613006e7c2c7bd pkgutil-1.9.1.zip 6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil Added: csw/mgar/pkg/pkgutil/trunk/files/build_sun_catalog.py =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/build_sun_catalog.py (rev 0) +++ csw/mgar/pkg/pkgutil/trunk/files/build_sun_catalog.py 2009-12-10 20:02:50 UTC (rev 7593) @@ -0,0 +1,42 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +"""Builds a SUNW catalog in the OpenCSW format. + +$Id: build_sun_catalog.py 107 2009-12-08 18:32:37Z wahwah $ +""" + +__author__ = "Maciej Blizi?ski " + +import os +import os.path +import logging +import opencsw +import optparse +import shutil +import subprocess +import tempfile + + +def main(): + parser = optparse.OptionParser() + parser.add_option("-p", "--product", dest="product_dir", + help="Product dir, e.g. .../Solaris_10/Product") + parser.add_option("-c", "--catalog-dir", dest="catalog_dir", + help="Target catalog dir") + options, args = parser.parse_args() + logging.basicConfig(level=logging.DEBUG) + options_ok = True + if not options.product_dir: + logging.error("--product directory is required. See --help.") + options_ok = False + if not options.catalog_dir: + logging.error("--catalog-dir is required. See --help.") + options_ok = False + if options_ok: + b = opencsw.OpencswCatalogBuilder(options.product_dir, + options.catalog_dir) + b.Run() + + +if __name__ == "__main__": + main() Property changes on: csw/mgar/pkg/pkgutil/trunk/files/build_sun_catalog.py ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/pkgutil/trunk/files/opencsw.py =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/opencsw.py (rev 0) +++ csw/mgar/pkg/pkgutil/trunk/files/opencsw.py 2009-12-10 20:02:50 UTC (rev 7593) @@ -0,0 +1,680 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# +# $Id: opencsw.py 107 2009-12-08 18:32:37Z wahwah $ +# +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# Copyright (c) 2009 OpenCSW +# Author: Maciej Blizi?ski +# +# $Id: opencsw.py 107 2009-12-08 18:32:37Z wahwah $ +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by the +# Free Software Foundation. + +import datetime +import difflib +import logging +import os +import os.path +import re +import shutil +import subprocess +import tempfile +import urllib2 + +ARCHITECTURES = ["i386", "sparc", "all"] +MAJOR_VERSION = "major version" +MINOR_VERSION = "minor version" +PATCHLEVEL = "patchlevel" +REVISION = "revision" +OTHER_VERSION_INFO = "other version info" +NEW_PACKAGE = "new package" +NO_VERSION_CHANGE = "no version change" +PKG_URL_TMPL = "http://www.opencsw.org/packages/%s" +CATALOG_URL = "http://ftp.heanet.ie/pub/opencsw/current/i386/5.10/catalog" +ADMIN_FILE_CONTENT = """ +basedir=default +runlevel=nocheck +conflict=nocheck +setuid=nocheck +action=nocheck +partial=nocheck +instance=unique +idepend=quit +rdepend=quit +space=quit +authentication=nocheck +networktimeout=10 +networkretries=5 +keystore=/var/sadm/security +proxy= +""" +EMAIL_TMPL = """From: %(from)s +To: %(to)s +Cc: %(cc)s +Date: %(date)s +Subject: newpkgs %(pkgnames)s + +%(body)s + +-- +$Id: opencsw.py 107 2009-12-08 18:32:37Z wahwah $ +""" + + +class Error(Exception): + pass + + +class PackageError(Error): + pass + + +def ParsePackageFileName(p): + bits = p.split("-") + catalogname = bits[0] + version, version_info, revision_info = ParseVersionString(bits[1]) + data = { + 'catalogname': catalogname, + 'full_version_string': bits[1], + 'version': version, + 'version_info': version_info, + 'revision_info': revision_info, + } + return data + +def ParseVersionString(s): + version_bits = re.split("_|,", s) + version_str = version_bits[0] + revision_bits = version_bits[1:] + revision_info = {} + version_info = {} + version_number_bits = version_str.split(".") + version_info[MAJOR_VERSION] = version_number_bits[0] + if len(version_number_bits) >= 2: + version_info[MINOR_VERSION] = version_number_bits[1] + if len(version_number_bits) >= 3: + version_info[PATCHLEVEL] = version_number_bits[2] + for version_bit in revision_bits: + if "=" in version_bit: + (var_name, var_value) = version_bit.split("=") + revision_info[var_name] = var_value + else: + if not "extra_strings" in revision_info: + revision_info["extra_strings"] = [] + revision_info["extra_strings"].append(version_bit) + return version_str, version_info, revision_info + + +class OpencswPackage(object): + + catalog_downloaded = False + + def __init__(self, catalogname): + self.catalogname = catalogname + + def IsOnTheWeb(self): + url = PKG_URL_TMPL % self.catalogname + logging.debug("Opening %s", repr(url)) + package_page = urllib2.urlopen(url) + html = package_page.read() + # Since beautifulsoup is not installed on the buildfarm yet, a quirk in + # package page display is going to be used. + package_not_in_mantis_pattern = u"cannot find maintainer" + return html.find(package_not_in_mantis_pattern) >= 0 + + def IsNew(self): + return not self.IsOnTheWeb() + + def UpgradeType(self, new_version_string): + """What kind of upgrade would it be if the new version was X.""" + (new_version, + new_version_info, + new_revision_info) = ParseVersionString(new_version_string) + catalog_data = self.GetCatalogPkgData() + if not catalog_data: + return (NEW_PACKAGE, + "/dev/null -> %s" % new_version_string, + (None, new_version_string)) + cat_version_info = catalog_data["version_info"] + levels = (MAJOR_VERSION, MINOR_VERSION, PATCHLEVEL) + for level in levels: + if level in cat_version_info and level in new_version_info: + if (cat_version_info[level] != new_version_info[level]): + versions = (catalog_data["full_version_string"], new_version_string) + msg = "%s --> %s" % versions + return level, msg, versions + cat_rev_info = catalog_data["revision_info"] + for rev_kw in cat_rev_info: + if rev_kw in new_revision_info: + if cat_rev_info[rev_kw] != new_revision_info[rev_kw]: + msg = "%s: %s --> %s" % (rev_kw, + cat_rev_info[rev_kw], + new_revision_info[rev_kw]) + versions = cat_rev_info[rev_kw], new_revision_info[rev_kw] + return REVISION, msg, versions + if (catalog_data["version"] == new_version + and + catalog_data["revision_info"] == new_revision_info): + return NO_VERSION_CHANGE, "no", (new_version, new_version) + return OTHER_VERSION_INFO, "other", (None, None) + + @classmethod + def LazyDownloadCatalogData(cls, catalog_source=None): + if not cls.catalog_downloaded: + cls.DownloadCatalogData(catalog_source) + cls.catalog_downloaded = True + + @classmethod + def DownloadCatalogData(cls, catalog_source): + """Downloads catalog data.""" + logging.debug("Downloading catalog data from %s.", repr(CATALOG_URL)) + if not catalog_source: + catalog_source = urllib2.urlopen(CATALOG_URL) + cls.catalog = {} + for line in catalog_source: + # Working around the GPG signature + if line.startswith("#"): continue + if line.startswith("-----BEGIN PGP SIGNED MESSAGE-----"): continue + if line.startswith("Hash:"): continue + if len(line.strip()) <= 0: continue + if line.startswith("-----BEGIN PGP SIGNATURE-----"): break + fields = re.split(r"\s+", line) + try: + cls.catalog[fields[0]] = ParsePackageFileName(fields[3]) + except IndexError, e: + print repr(line) + print fields + print e + raise + + @classmethod + def _GetCatalogPkgData(cls, catalogname): + cls.LazyDownloadCatalogData() + if catalogname in cls.catalog: + return cls.catalog[catalogname] + else: + return None + + def GetCatalogPkgData(self): + """A wrapper for the classmethod _GetCatalogPkgData, supplying the catalogname.""" + return self._GetCatalogPkgData(self.catalogname) + + +class StagingDir(object): + """Represents a staging directory.""" + + def __init__(self, dir_path): + self.dir_path = dir_path + + def GetLatest(self, software, architectures=ARCHITECTURES): + files = os.listdir(self.dir_path) + package_files = [] + for a in architectures: + relevant_pkgs = sorted(shutil.fnmatch.filter(files, + "*-%s-*.pkg.gz" % a)) + relevant_pkgs = sorted(shutil.fnmatch.filter(relevant_pkgs, + "%s-*.pkg.gz" % software)) + if relevant_pkgs: + package_files.append(relevant_pkgs[-1]) + if not package_files: + raise PackageError("Could not find %s in %s" % (software, self.dir_path)) + logging.debug("The latest packages %s in %s are %s", + repr(software), + repr(self.dir_path), + repr(package_files)) + return [os.path.join(self.dir_path, x) for x in package_files] + + +class NewpkgMailer(object): + + def __init__(self, pkgnames, paths, + release_mgr_name, + release_mgr_email, + sender_name, + sender_email, + release_cc): + self.sender = u"%s <%s>" % (sender_name, sender_email) + self.pkgnames = pkgnames + self.paths = paths + self.release_mgr = u"%s <%s>" % (release_mgr_name, release_mgr_email) + self.release_cc = u"%s" % release_cc + + def FormatPackageAnnouncement(self, catalogname, new_pkgpath): + """TODO: Group common version upgrades.""" + pkg = OpencswPackage(catalogname) + new_pkg_basename = os.path.split(new_pkgpath)[1] + new_data = ParsePackageFileName(new_pkg_basename) + new_version_str = new_data["full_version_string"] + upgrade_type, upgrade_msg = pkg.UpgradeType(new_version_str) + msg = [] + if upgrade_type == NEW_PACKAGE: + msg.append("* new package") + else: + msg.append("* %s upgrade" % upgrade_type) + msg.append(" - %s" % upgrade_msg) + msg.append(" - %s" % new_pkgpath) + return msg + + def FormatMail(self): + body_list = ["The following package files are ready to be released:"] + body_list.append("") + # Gathering package information, grouping packages that are upgraded + # together. + pkgs_data = {} + for p in self.paths: + base_file_name = os.path.split(p)[1] + catalogname = base_file_name.split("-")[0] + pkg = OpencswPackage(catalogname) + new_data = ParsePackageFileName(base_file_name) + new_version_str = new_data["full_version_string"] + catalog_data = pkg.GetCatalogPkgData() + if catalog_data: + catalog_version_str = catalog_data["full_version_string"] + else: + catalog_version_str = "package not in the catalog" + upgrade_type, upgrade_msg, versions = pkg.UpgradeType(new_version_str) + pkgs_data_key = (upgrade_type, upgrade_msg, versions) + if pkgs_data_key not in pkgs_data: + pkgs_data[pkgs_data_key] = [] + pkg.srv4path = p + pkg.cat_version_str = catalog_version_str + pkg.new_version_str = new_version_str + pkgs_data[pkgs_data_key].append(pkg) + # Formatting grouped packages: + for upgrade_type, upgrade_msg, versions in pkgs_data: + msg = [] + if upgrade_type == NEW_PACKAGE: + msg.append("* %s: %s" % (upgrade_type, upgrade_msg)) + elif upgrade_type == NO_VERSION_CHANGE: + msg.append("* WARNING: no version change") + else: + msg.append("* %s upgrade" % (upgrade_type)) + msg.append(" - from: %s" % versions[0]) + msg.append(" - to: %s" % versions[1]) + for pkg in pkgs_data[(upgrade_type, upgrade_msg, versions)]: + msg.append(" + %s" % pkg.srv4path) + body_list.extend(msg) + body_list.append("") + body = "\n".join(body_list) + d = { + 'from': self.sender, + 'to': self.release_mgr, + 'cc': self.release_cc, + 'pkgnames': ", ".join(self.pkgnames), + 'body': body, + 'date': datetime.datetime.now(), + } + mail_text = EMAIL_TMPL % d + return mail_text + + def GetEditorName(self, env): + editor = "/opt/csw/bin/vim" + if "EDITOR" in env: + editor = env["EDITOR"] + if "VISUAL" in env: + editor = env["VISUAL"] + return editor + + +class ShellMixin(object): + + def ShellCommand(self, args, quiet=False): + logging.debug("Calling: %s", repr(args)) + if quiet: + sub_stdout = subprocess.PIPE + sub_stderr = subprocess.PIPE + else: + sub_stdout = None + sub_stderr = None + retcode = subprocess.call(args, + stdout=sub_stdout, + stderr=sub_stderr) + if retcode: + raise Error("Running %s has failed." % repr(args)) + return retcode + + +class CswSrv4File(ShellMixin, object): + """Represents a package in the srv4 format (pkg).""" + + def __init__(self, pkg_path): + self.pkg_path = pkg_path + self.workdir = None + self.gunzipped_path = None + self.transformed = False + self.dir_format_pkg = None + + def GetWorkDir(self): + if not self.workdir: + self.workdir = tempfile.mkdtemp(prefix="pkg_") + fd = open(os.path.join(self.workdir, "admin"), "w") + fd.write(ADMIN_FILE_CONTENT) + fd.close() + return self.workdir + + def GetAdminFilePath(self): + return os.path.join(self.GetWorkDir(), "admin") + + def GetGunzippedPath(self): + gzip_suffix = ".gz" + pkg_suffix = ".pkg" + if not self.gunzipped_path: + if self.pkg_path.endswith("%s%s" % (pkg_suffix, gzip_suffix)): + base_name_gz = os.path.split(self.pkg_path)[1] + shutil.copy(self.pkg_path, self.GetWorkDir()) + self.pkg_path = os.path.join(self.GetWorkDir(), base_name_gz) + args = ["gunzip", "-f", self.pkg_path] + retcode = self.ShellCommand(args) + self.gunzipped_path = self.pkg_path[:(-len(gzip_suffix))] + elif self.pkg_path.endswith(pkg_suffix): + self.gunzipped_path = self.pkg_path + else: + raise Error("The file name should end in either " + "%s or %s." % (gzip_suffix, pkg_suffix)) + return self.gunzipped_path + + def TransformToDir(self): + if not self.transformed: + args = ["pkgtrans", "-a", self.GetAdminFilePath(), + self.GetGunzippedPath(), self.GetWorkDir(), "all"] + retcode = self.ShellCommand(args, quiet=True) + dirs = self.GetDirs() + if len(dirs) != 1: + raise Error("Need exactly one package in the package stream: " + "%s." % (dirs)) + self.dir_format_pkg = DirectoryFormatPackage(dirs[0]) + self.transformed = True + + def GetDirFormatPkg(self): + self.TransformToDir(self) + return self.dir_format_pkg + + def GetDirs(self): + paths = os.listdir(self.GetWorkDir()) + dirs = [] + for p in paths: + abspath = os.path.join(self.GetWorkDir(), p) + if os.path.isdir(abspath): + dirs.append(abspath) + return dirs + + def GetPkgmap(self, analyze_permissions, strip=None): + dir_format_pkg = self.GetDirFormatPkg() + return dir_format_pkg.GetPkgmap(analyze_permissions, strip) + + def __del__(self): + if self.workdir: + logging.debug("Removing %s", repr(self.workdir)) + shutil.rmtree(self.workdir) + + +def ParsePkginfo(lines): + """Parses a pkginfo data.""" + d = {} + for line in lines: + try: + # Can't use split, because there might be multiple '=' characters. + line = line.strip() + # Skip empty and commented lines + if not line: continue + if line.startswith("#"): continue + var_name, var_value = line.split("=", 1) + d[var_name] = var_value + except ValueError, e: + raise PackageError("Can't parse %s: %s" % (repr(line), e)) + return d + + +def PkgnameToCatName(pkgname): + """Creates a catalog name based on the pkgname. + + SUNWbash --> sunw_bash + SUNWbashS --> sunw_bash_s + SUNWPython --> sunw_python + + Incomprehensible, but unit tested! + """ + known_prefixes = ["SUNW", "FJSV", "CSW"] + for prefix in known_prefixes: + if pkgname.startswith(prefix): + unused, tmp_prefix, the_rest = pkgname.partition(prefix) + pkgname = tmp_prefix + "_" + the_rest + return "_".join(SplitByCase(pkgname)) + + +def SplitByCase(s): + def CharType(c): + if c.isalnum(): + if c.isupper(): + return 1 + else: + return 2 + else: + return 3 + chartype_list = [CharType(x) for x in s] + neighbors = zip(chartype_list, chartype_list[1:]) + casechange = [False] + [x != y for x, y in neighbors] + str_list = [(cc * "_") + l.lower() for l, cc in zip(s, casechange)] + s2 = "".join(str_list) + return re.findall(r"[a-z]+", s2) + + +def PkginfoToSrv4Name(pkginfo_dict): + SRV4_FN_TMPL = "%(catalog_name)s-%(version)s-%(osver)s-%(arch)s-%(tag)s.pkg" + fn_data = {} + fn_data["catalog_name"] = PkgnameToCatName(pkginfo_dict["PKG"]) + fn_data["version"] = pkginfo_dict["VERSION"] + # os_version = pkginfo_dict["SUNW_PRODVERS"].split("/", 1)[0] + # fn_data["osver"] = pkginfo_dict["SUNW_PRODNAME"] + os_version + fn_data["osver"] = "SunOS5.10" # Hardcoded, because the original data contains + # trash. + fn_data["arch"] = pkginfo_dict["ARCH"] + fn_data["tag"] = "SUNW" + return SRV4_FN_TMPL % fn_data + + +class DirectoryFormatPackage(ShellMixin, object): + + def __init__(self, directory): + self.directory = directory + self.pkginfo_dict = None + + def GetParsedPkginfo(self): + if not self.pkginfo_dict: + pkginfo_fd = open(self.GetPkginfoFilename(), "r") + self.pkginfo_dict = ParsePkginfo(pkginfo_fd) + pkginfo_fd.close() + return self.pkginfo_dict + + def GetSrv4FileName(self): + """Guesses the Srv4FileName based on the package directory contents.""" + return PkginfoToSrv4Name(self.GetParsedPkginfo()) + + def ToSrv4(self, target_dir): + target_file_name = self.GetSrv4FileName() + target_path = os.path.join(target_dir, target_file_name) + if os.path.exists(target_path): + return target_path + pkg_container_dir, pkg_dir = os.path.split(self.directory) + if not os.path.isdir(target_dir): + os.makedirs(target_dir) + args = ["pkgtrans", "-s", pkg_container_dir, target_path, pkg_dir] + self.ShellCommand(args, quiet=True) + args = ["gzip", "-f", target_path] + self.ShellCommand(args, quiet=True) + return target_path + + def GetPkgmap(self, analyze_permissions=False, strip=None): + fd = open(os.path.join(self.directory, "pkgmap"), "r") + return Pkgmap(fd, analyze_permissions, strip) + + def SetPkginfoEntry(self, key, value): + pkginfo = self.GetParsedPkginfo() + logging.debug("Setting %s to %s", repr(key), repr(value)) + pkginfo[key] = value + self.WritePkginfo(pkginfo) + pkgmap_path = os.path.join(self.directory, "pkgmap") + pkgmap_fd = open(pkgmap_path, "r") + new_pkgmap_lines = [] + pkginfo_re = re.compile("1 i pkginfo") + ws_re = re.compile(r"\s+") + for line in pkgmap_fd: + if pkginfo_re.search(line): + fields = ws_re.split(line) + # 3: size + # 4: sum + pkginfo_path = os.path.join(self.directory, "pkginfo") + args = ["cksum", pkginfo_path] + cksum_process = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = cksum_process.communicate() + cksum_process.wait() + size = ws_re.split(stdout)[1] + args = ["sum", pkginfo_path] + sum_process = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = sum_process.communicate() + sum_process.wait() + sum = ws_re.split(stdout)[0] + fields[3] = size + fields[4] = sum + logging.debug("New pkgmap line: %s", fields) + line = " ".join(fields) + new_pkgmap_lines.append(line.strip()) + pkgmap_fd.close() + # Write that back + pkgmap_path_new = pkgmap_path + ".new" + logging.debug("Writing back to %s", pkgmap_path_new) + pkgmap_fd = open(pkgmap_path_new, "w") + pkgmap_fd.write("\n".join(new_pkgmap_lines)) + pkgmap_fd.close() + shutil.move(pkgmap_path_new, pkgmap_path) + + # TODO(maciej): Need to update the relevant line on pkgmap too + + def GetPkginfoFilename(self): + return os.path.join(self.directory, "pkginfo") + + def WritePkginfo(self, pkginfo_dict): + # Some packages extract read-only. To be sure, change them to be + # user-writable. + args = ["chmod", "-R", "u+w", self.directory] + self.ShellCommand(args) + pkginfo_filename = self.GetPkginfoFilename() + os.chmod(pkginfo_filename, 0644) + pkginfo_fd = open(pkginfo_filename, "w") + pkginfo_dict = self.GetParsedPkginfo() + for k, v in pkginfo_dict.items(): + pkginfo_fd.write("%s=%s\n" % (k, pkginfo_dict[k])) + pkginfo_fd.close() + + def ResetNameProperty(self): + """Sometimes, NAME= contains useless data. This method resets them.""" + pkginfo_dict = self.GetParsedPkginfo() + catalog_name = PkgnameToCatName(pkginfo_dict["PKG"]) + description = pkginfo_dict["DESC"] + pkginfo_name = "%s - %s" % (catalog_name, description) + self.SetPkginfoEntry("NAME", pkginfo_name) + +class Pkgmap(object): + + def __init__(self, input, permissions=False, + strip=None): + self.paths = set() + self.analyze_permissions = permissions + for line in input: + fields = re.split(r'\s+', line) + if strip: + strip_re = re.compile(r"^%s" % strip) + fields = [re.sub(strip_re, "", x) for x in fields] + logging.debug(fields) + line_to_add = None + if len(fields) < 2: + continue + elif fields[1] in ('f', 'd'): + line_to_add = fields[3] + if self.analyze_permissions: + line_to_add += " %s" % fields[4] + elif fields[1] in ('s', 'l'): + link_from, link_to = fields[3].split("=") + line_to_add = "%s --> %s" % (link_from, link_to) + if line_to_add: + self.paths.add(line_to_add) + + +class PackageComparator(object): + + def __init__(self, file_name_a, file_name_b, + permissions=False, + strip_a=None, + strip_b=None): + self.analyze_permissions = permissions + self.pkg_a = CswSrv4File(file_name_a) + self.pkg_b = CswSrv4File(file_name_b) + self.strip_a = strip_a + self.strip_b = strip_b + + def Run(self): + pkgmap_a = self.pkg_a.GetPkgmap(self.analyze_permissions, strip=self.strip_a) + pkgmap_b = self.pkg_b.GetPkgmap(self.analyze_permissions, strip=self.strip_b) + diff_ab = difflib.unified_diff(sorted(pkgmap_a.paths), + sorted(pkgmap_b.paths), + fromfile=self.pkg_a.pkg_path, + tofile=self.pkg_b.pkg_path) + diff_text = "\n".join(diff_ab) + if diff_text: + less_proc = subprocess.Popen(["less"], stdin=subprocess.PIPE) + less_stdout, less_stderr = less_proc.communicate(input=diff_text) + less_proc.wait() + else: + print "No differences found." + + +class OpencswCatalogBuilder(object): + + def __init__(self, product_dir, catalog_dir): + self.product_dir = product_dir + self.catalog_dir = catalog_dir + + def Run(self): + pkg_dirs = os.listdir(self.product_dir) + for pkg_dir in pkg_dirs: + pkg_path = os.path.join(self.product_dir, pkg_dir) + pkginfo_path = os.path.join(pkg_path, "pkginfo") + if (os.path.isdir(pkg_path) + and + os.path.exists(pkginfo_path)): + if not self.Srv4Exists(pkg_path): + pkg = None + tmpdir = None + try: + tmpdir = tempfile.mkdtemp(prefix="sunw-pkg-") + logging.debug("Copying %s to %s", repr(pkg_path), repr(tmpdir)) + tmp_pkg_dir = os.path.join(tmpdir, pkg_dir) + shutil.copytree(pkg_path, tmp_pkg_dir, symlinks=True) + pkg = DirectoryFormatPackage(tmp_pkg_dir) + # Replacing NAME= in the pkginfo, setting it to the catalog name. + pkg.ResetNameProperty() + pkg.ToSrv4(self.catalog_dir) + except IOError, e: + logging.warn("%s has failed: %s", pkg_path, e) + finally: + if pkg: + del(pkg) + if os.path.exists(tmpdir): + shutil.rmtree(tmpdir) + else: + logging.warn("srv4 file for %s already exists, skipping", pkg_path) + else: + logging.warn("%s is not a directory.", pkg_path) + + def Srv4Exists(self, pkg_dir): + pkg = DirectoryFormatPackage(pkg_dir) + srv4_name = pkg.GetSrv4FileName() + srv4_name += ".gz" + srv4_path = os.path.join(self.catalog_dir, srv4_name) + result = os.path.exists(srv4_path) + logging.debug("Srv4Exists(%s) => %s, %s", pkg_dir, repr(srv4_path), result) + return result 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 Dec 10 23:58:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Dec 2009 22:58:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7594] csw/mgar/pkg/pca/trunk Message-ID: Revision: 7594 http://gar.svn.sourceforge.net/gar/?rev=7594&view=rev Author: dmichelsen Date: 2009-12-10 22:58:42 +0000 (Thu, 10 Dec 2009) Log Message: ----------- pca: Update to 20091210-01 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2009-12-10 20:02:50 UTC (rev 7593) +++ csw/mgar/pkg/pca/trunk/Makefile 2009-12-10 22:58:42 UTC (rev 7594) @@ -1,5 +1,5 @@ GARNAME = pca -GARVERSION = 20091030-01 +GARVERSION = 20091210-01 CATEGORIES = utils DESCRIPTION = Patch Check Advanced Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2009-12-10 20:02:50 UTC (rev 7593) +++ csw/mgar/pkg/pca/trunk/checksums 2009-12-10 22:58:42 UTC (rev 7594) @@ -1,4 +1,4 @@ 4376789925fa9002d0567d739f717748 0001-prefer-opencsw-perl.diff 6f2f2376eba0a788795dd43d68ad32d1 COPYING -d915e06b37750db9e6d9806f1114a9b8 pca-20091030-01 +78cc7aa4238a782b5b63b0da93a2c60c pca-20091210-01 12de68ff8f67b4bb8b095e5646402208 pca.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Dec 11 13:35:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 11 Dec 2009 12:35:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7595] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 7595 http://gar.svn.sourceforge.net/gar/?rev=7595&view=rev Author: wahwah Date: 2009-12-11 12:35:23 +0000 (Fri, 11 Dec 2009) Log Message: ----------- sudo: Version bump to 1.7.2p2 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 2009-12-10 22:58:42 UTC (rev 7594) +++ csw/mgar/pkg/sudo/trunk/Makefile 2009-12-11 12:35:23 UTC (rev 7595) @@ -1,7 +1,7 @@ GARNAME = sudo GARVERSION = 1.7.2 CATEGORIES = utils -RELEASE = p1 +RELEASE = p2 DISTVERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) @@ -47,6 +47,10 @@ CONFIGURE_ARGS += --with-project endif +# sysconfdir to be enabled later +# sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + TEST_TARGET = check FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2009-12-10 22:58:42 UTC (rev 7594) +++ csw/mgar/pkg/sudo/trunk/checksums 2009-12-11 12:35:23 UTC (rev 7595) @@ -1,3 +1,3 @@ -955d99eda1432c7b7e00d98b91e35a79 download/CSWsudo-common.postinstall -157b2e5e38ca54eb36e0364706bd0292 download/install.diff -4449d466a774f5ce401c9c0e3866c026 download/sudo-1.7.2p1.tar.gz +955d99eda1432c7b7e00d98b91e35a79 CSWsudo-common.postinstall +157b2e5e38ca54eb36e0364706bd0292 install.diff +2a19cf1ab4afc94fe19d0d0899d4cd45 sudo-1.7.2p2.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 Fri Dec 11 17:30:14 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 11 Dec 2009 16:30:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7596] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 7596 http://gar.svn.sourceforge.net/gar/?rev=7596&view=rev Author: bonivart Date: 2009-12-11 16:30:14 +0000 (Fri, 11 Dec 2009) Log Message: ----------- dhcp: update to 4.1.1rc1, fix init script Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-11 12:35:23 UTC (rev 7595) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2009-12-11 16:30:14 UTC (rev 7596) @@ -1,5 +1,5 @@ GARNAME = dhcp -GARVERSION = 4.1.1b3 +GARVERSION = 4.1.1rc1 CATEGORIES = net DESCRIPTION = ISC DHCP reference implementation Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2009-12-11 12:35:23 UTC (rev 7595) +++ csw/mgar/pkg/dhcp/trunk/checksums 2009-12-11 16:30:14 UTC (rev 7596) @@ -1 +1 @@ -085da9c98f3d4ec285b319fcdda6d552 dhcp-4.1.1b3.tar.gz +f2b4dfe70640d33b29da6b75eb5c82a0 dhcp-4.1.1rc1.tar.gz Modified: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd 2009-12-11 12:35:23 UTC (rev 7595) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd 2009-12-11 16:30:14 UTC (rev 7596) @@ -33,9 +33,9 @@ FAIL= /opt/csw/sbin/dhcpd -cf $CONF -t || FAIL=1 /opt/csw/sbin/dhcpd -cf $CONF -T || FAIL=2 - [ $FAIL = 1 ] && echo "Your configuration seems broken. Exiting." - [ $FAIL = 2 ] && echo "Your lease file seems broken. Exiting." - [ $FAIL ] && exit 1 + [ "$FAIL" = 1 ] && echo "Your configuration seems broken. Not restarting." + [ "$FAIL" = 2 ] && echo "Your lease file seems broken. Not restarting." + [ "$FAIL" ] && exit 1 $0 stop echo "Waiting for $SERVICE to stop.\c" while ( /usr/bin/pgrep -x dhcpd > /dev/null ); do 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 Dec 11 19:32:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 11 Dec 2009 18:32:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7597] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: Revision: 7597 http://gar.svn.sourceforge.net/gar/?rev=7597&view=rev Author: wahwah Date: 2009-12-11 18:32:41 +0000 (Fri, 11 Dec 2009) Log Message: ----------- gnupg2: Split out the gpg-agent package, added pinentry dependency, disabled the 64-bit build due to the missing ldap library. Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-11 16:30:14 UTC (rev 7596) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2009-12-11 18:32:41 UTC (rev 7597) @@ -30,15 +30,15 @@ UFILES_REGEX = (\d+(?:\.\d+)*) NOISALIST = 1 -BUILD64 = 1 +# There are no 64-bit ldap libraries, disabling the 64-bit build +# BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-libcurl -CONFIGURE_ARGS += --with-ldap -CONFIGURE_ARGS += --with-zlib -CONFIGURE_ARGS += --with-bzip2 -CONFIGURE_ARGS += --with-readline -CONFIGURE_ARGS += --enable-threads=solaris +CONFIGURE_ARGS += --with-libcurl=/opt/csw +CONFIGURE_ARGS += --with-ldap=/opt/csw +CONFIGURE_ARGS += --with-zlib=/opt/csw +CONFIGURE_ARGS += --with-bzip2=/opt/csw +CONFIGURE_ARGS += --with-readline=/opt/csw CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses @@ -54,27 +54,35 @@ PKGFILES_CSWgnupg-agent += .*gpgkey2ssh.* PKGFILES_CSWgnupg-agent += .*symcryptrun.* -REQUIRED_PKGS_common_CSWgnupg2 = CSWbzip2 -REQUIRED_PKGS_common_CSWgnupg2 += CSWcurlrt -REQUIRED_PKGS_common_CSWgnupg2 += CSWgcrypt -REQUIRED_PKGS_common_CSWgnupg2 += CSWggettextrt -REQUIRED_PKGS_common_CSWgnupg2 += CSWgpgerr -REQUIRED_PKGS_common_CSWgnupg2 += CSWiconv -REQUIRED_PKGS_common_CSWgnupg2 += CSWlibassuan -REQUIRED_PKGS_common_CSWgnupg2 += CSWlibidn -REQUIRED_PKGS_common_CSWgnupg2 += CSWlibksba -REQUIRED_PKGS_common_CSWgnupg2 += CSWoldaprt -REQUIRED_PKGS_common_CSWgnupg2 += CSWosslrt -REQUIRED_PKGS_common_CSWgnupg2 += CSWpth -REQUIRED_PKGS_common_CSWgnupg2 += CSWreadline -REQUIRED_PKGS_common_CSWgnupg2 += CSWzlib +REQUIRED_PKGS_common = CSWbzip2 +REQUIRED_PKGS_common += CSWcurlrt +REQUIRED_PKGS_common += CSWgcrypt +REQUIRED_PKGS_common += CSWggettextrt +REQUIRED_PKGS_common += CSWgpgerr +REQUIRED_PKGS_common += CSWiconv +REQUIRED_PKGS_common += CSWlibassuan +REQUIRED_PKGS_common += CSWlibidn +REQUIRED_PKGS_common += CSWlibksba +REQUIRED_PKGS_common += CSWoldaprt +REQUIRED_PKGS_common += CSWosslrt +REQUIRED_PKGS_common += CSWpth +REQUIRED_PKGS_common += CSWreadline +REQUIRED_PKGS_common += CSWzlib -REQUIRED_PKGS_CSWgnupg2 += $(REQUIRED_PKGS_common_CSWgnupg2) + +REQUIRED_PKGS_CSWgnupg2 += $(REQUIRED_PKGS_common) REQUIRED_PKGS_CSWgnupg2 += CSWgnupg-agent -REQUIRED_PKGS_CSWgnupg-agent = CSWpinentry +REQUIRED_PKGS_CSWgnupg-agent = CSWpinentry +REQUIRED_PKGS_CSWgnupg-agent += CSWgcrypt +REQUIRED_PKGS_CSWgnupg-agent += CSWggettextrt +REQUIRED_PKGS_CSWgnupg-agent += CSWgpgerr +REQUIRED_PKGS_CSWgnupg-agent += CSWiconv +REQUIRED_PKGS_CSWgnupg-agent += CSWpth +REQUIRED_PKGS_CSWgnupg-agent += CSWreadline -PREREQUISITE_PKGS = $(REQUIRED_PKGS_common_CSWgnupg2) + +PREREQUISITE_PKGS = $(REQUIRED_PKGS_common) PREREQUISITE_PKGS += $(REQUIRED_PKGS_CSWgnupg-agent) TEST_TARGET = check 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 Dec 11 21:27:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Dec 2009 20:27:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7598] csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile Message-ID: Revision: 7598 http://gar.svn.sourceforge.net/gar/?rev=7598&view=rev Author: dmichelsen Date: 2009-12-11 20:27:43 +0000 (Fri, 11 Dec 2009) Log Message: ----------- cpan/Mail-SPF: Relocate spfd Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile Modified: csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2009-12-11 18:32:41 UTC (rev 7597) +++ csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2009-12-11 20:27:43 UTC (rev 7598) @@ -16,6 +16,6 @@ ARCHALL = 1 EXTRA_PAX_ARGS = '-s,spfquery,spfquery-cpan,p' -EXTRA_PAX_ARGS += '-s,spfd,spfd-cpan,p' +EXTRA_PAX_ARGS += '-s,/usr/sbin/spfd,$(sbindir)/spfd-cpan,p' 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 Dec 11 21:52:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Dec 2009 20:52:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7599] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 7599 http://gar.svn.sourceforge.net/gar/?rev=7599&view=rev Author: dmichelsen Date: 2009-12-11 20:52:53 +0000 (Fri, 11 Dec 2009) Log Message: ----------- nginx: Add platform support Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-11 20:27:43 UTC (rev 7598) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-11 20:52:53 UTC (rev 7599) @@ -18,6 +18,9 @@ REQUIRED_PKGS = CSWosslrt CSWpcrert CSWzlib +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv9 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 11:49:46 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 10:49:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7600] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 7600 http://gar.svn.sourceforge.net/gar/?rev=7600&view=rev Author: aigoshin Date: 2009-12-12 10:49:43 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.0 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-11 20:52:53 UTC (rev 7599) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 10:49:43 UTC (rev 7600) @@ -1,5 +1,5 @@ GARNAME = nginx -GARVERSION = 0.7.55 +GARVERSION = 0.7.64 CATEGORIES = server DESCRIPTION = HTTP server and mail proxy server @@ -18,7 +18,7 @@ REQUIRED_PKGS = CSWosslrt CSWpcrert CSWzlib -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 EXTRA_BUILD_ISAS_i386 = pentium_pro @@ -40,11 +40,11 @@ CONFIGURE_ARGS += --sbin-path=$(sbindir)/nginx CONFIGURE_ARGS += --lock-path=$(prefix)/var/run/nginx/nginx.lock CONFIGURE_ARGS += --pid-path=$(prefix)/var/run/nginx/nginx.pid -CONFIGURE_ARGS += --http-client-body-temp-path=$(prefix)/var/spool/nginx/client -CONFIGURE_ARGS += --http-fastcgi-temp-path=$(prefix)/var/spool/nginx/fastcgi -CONFIGURE_ARGS += --http-proxy-temp-path=$(prefix)/var/spool/nginx/proxy -CONFIGURE_ARGS += --error-log-path=$(prefix)/var/log/nginx/error.log -CONFIGURE_ARGS += --http-log-path=$(prefix)/var/log/nginx/access.log +CONFIGURE_ARGS += --http-client-body-temp-path=$(prefix)/var/nginx/client +CONFIGURE_ARGS += --http-fastcgi-temp-path=$(prefix)/var/nginx/fastcgi +CONFIGURE_ARGS += --http-proxy-temp-path=$(prefix)/var/nginx/proxy +CONFIGURE_ARGS += --error-log-path=$(prefix)/var/nginx/logs/error.log +CONFIGURE_ARGS += --http-log-path=$(prefix)/var/nginx/logs/access.log CONFIGURE_ARGS += --with-md5=YES CONFIGURE_ARGS += --with-sha1=YES CONFIGURE_ARGS += --with-http_ssl_module @@ -55,7 +55,7 @@ TEST_SCRIPTS = -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/spool\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }' +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }' include gar/category.mk @@ -70,11 +70,11 @@ ginstall -d $(DESTDIR)$(sysconfdir)/nginx/conf.d ginstall -d $(DESTDIR)$(sharedstatedir)/nginx/contrib ginstall -d $(DESTDIR)$(docdir)/nginx - ginstall -d $(DESTDIR)$(prefix)/var/log/nginx + ginstall -d $(DESTDIR)$(prefix)/var/nginx/client + ginstall -d $(DESTDIR)$(prefix)/var/nginx/fastcgi + ginstall -d $(DESTDIR)$(prefix)/var/nginx/logs + ginstall -d $(DESTDIR)$(prefix)/var/nginx/proxy ginstall -d $(DESTDIR)$(prefix)/var/nginx/sites - ginstall -d $(DESTDIR)$(prefix)/var/spool/nginx/client - ginstall -d $(DESTDIR)$(prefix)/var/spool/nginx/fastcgi - ginstall -d $(DESTDIR)$(prefix)/var/spool/nginx/proxy mv $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params.CSW mv $(DESTDIR)$(sysconfdir)/nginx/mime.types $(DESTDIR)$(sysconfdir)/nginx/mime.types.CSW mv $(DESTDIR)$(sysconfdir)/nginx/nginx.conf $(DESTDIR)$(sysconfdir)/nginx/nginx.conf.CSW Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2009-12-11 20:52:53 UTC (rev 7599) +++ csw/mgar/pkg/nginx/trunk/checksums 2009-12-12 10:49:43 UTC (rev 7600) @@ -1,7 +1,7 @@ -bb85ec05a172562e6de38a1e8a64198c download/CSWnginx.checkinstall -12b5333e18e985b17f8a5465646e9a8a download/CSWnginx.gspec -bb404771e330fe98f93cb2d12a808121 download/CSWnginx.postinstall -e9178dc33f2d38aab8f118a8f0550ac7 download/CSWnginx.preremove -5c832758a62ee319ea9dfd1829d736eb download/cswnginx.xml -2064dc7a1ef082eb584e3a75857853f1 download/nginx-0.7.55.tar.gz -c5b3babbd1261bcb3f3e17494822bb9f download/svc-cswnginx +bb85ec05a172562e6de38a1e8a64198c CSWnginx.checkinstall +12b5333e18e985b17f8a5465646e9a8a CSWnginx.gspec +bb404771e330fe98f93cb2d12a808121 CSWnginx.postinstall +e9178dc33f2d38aab8f118a8f0550ac7 CSWnginx.preremove +5c832758a62ee319ea9dfd1829d736eb cswnginx.xml +cfa97c0f784532820110b5eee57fef6d nginx-0.7.64.tar.gz +c5b3babbd1261bcb3f3e17494822bb9f svc-cswnginx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 13:29:30 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 12:29:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7601] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 7601 http://gar.svn.sourceforge.net/gar/?rev=7601&view=rev Author: aigoshin Date: 2009-12-12 12:29:29 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.1 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 10:49:43 UTC (rev 7600) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 12:29:29 UTC (rev 7601) @@ -21,7 +21,7 @@ PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -EXTRA_BUILD_ISAS_i386 = pentium_pro +#EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv9 NGINXCPU_pentium_pro = pentiumpro @@ -35,16 +35,16 @@ CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU) CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl" CONFIGURE_ARGS += --with-ld-opt="$(LDFLAGS)" -CONFIGURE_ARGS += --prefix=$(prefix)/var/nginx CONFIGURE_ARGS += --conf-path=$(sysconfdir)/nginx/nginx.conf CONFIGURE_ARGS += --sbin-path=$(sbindir)/nginx -CONFIGURE_ARGS += --lock-path=$(prefix)/var/run/nginx/nginx.lock -CONFIGURE_ARGS += --pid-path=$(prefix)/var/run/nginx/nginx.pid -CONFIGURE_ARGS += --http-client-body-temp-path=$(prefix)/var/nginx/client -CONFIGURE_ARGS += --http-fastcgi-temp-path=$(prefix)/var/nginx/fastcgi -CONFIGURE_ARGS += --http-proxy-temp-path=$(prefix)/var/nginx/proxy -CONFIGURE_ARGS += --error-log-path=$(prefix)/var/nginx/logs/error.log -CONFIGURE_ARGS += --http-log-path=$(prefix)/var/nginx/logs/access.log +CONFIGURE_ARGS += --prefix=$(localstatedir)/nginx +CONFIGURE_ARGS += --lock-path=$(localstatedir)/nginx/nginx.lock +CONFIGURE_ARGS += --pid-path=$(localstatedir)/nginx/nginx.pid +CONFIGURE_ARGS += --http-client-body-temp-path=$(localstatedir)/nginx/client +CONFIGURE_ARGS += --http-fastcgi-temp-path=$(localstatedir)/nginx/fastcgi +CONFIGURE_ARGS += --http-proxy-temp-path=$(localstatedir)/nginx/proxy +CONFIGURE_ARGS += --error-log-path=$(localstatedir)/nginx/logs/error.log +CONFIGURE_ARGS += --http-log-path=$(localstatedir)/nginx/logs/access.log CONFIGURE_ARGS += --with-md5=YES CONFIGURE_ARGS += --with-sha1=YES CONFIGURE_ARGS += --with-http_ssl_module @@ -55,7 +55,7 @@ TEST_SCRIPTS = -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }' +#PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }' include gar/category.mk @@ -70,11 +70,11 @@ ginstall -d $(DESTDIR)$(sysconfdir)/nginx/conf.d ginstall -d $(DESTDIR)$(sharedstatedir)/nginx/contrib ginstall -d $(DESTDIR)$(docdir)/nginx - ginstall -d $(DESTDIR)$(prefix)/var/nginx/client - ginstall -d $(DESTDIR)$(prefix)/var/nginx/fastcgi - ginstall -d $(DESTDIR)$(prefix)/var/nginx/logs - ginstall -d $(DESTDIR)$(prefix)/var/nginx/proxy - ginstall -d $(DESTDIR)$(prefix)/var/nginx/sites + ginstall -d $(DESTDIR)$(localstatedir)/nginx/client + ginstall -d $(DESTDIR)$(localstatedir)/nginx/fastcgi + ginstall -d $(DESTDIR)$(localstatedir)/nginx/logs + ginstall -d $(DESTDIR)$(localstatedir)/nginx/proxy + ginstall -d $(DESTDIR)$(localstatedir)/nginx/sites mv $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params.CSW mv $(DESTDIR)$(sysconfdir)/nginx/mime.types $(DESTDIR)$(sysconfdir)/nginx/mime.types.CSW mv $(DESTDIR)$(sysconfdir)/nginx/nginx.conf $(DESTDIR)$(sysconfdir)/nginx/nginx.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 13:45:39 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 12:45:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7602] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 7602 http://gar.svn.sourceforge.net/gar/?rev=7602&view=rev Author: aigoshin Date: 2009-12-12 12:45:39 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.2, depend problem Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 12:29:29 UTC (rev 7601) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 12:45:39 UTC (rev 7602) @@ -32,6 +32,9 @@ CFLAGS = +sysconfdir=/etc/opt/csw +localstatedir=/var/opt/csw + CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU) CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl" CONFIGURE_ARGS += --with-ld-opt="$(LDFLAGS)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 14:01:27 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 13:01:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7603] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 7603 http://gar.svn.sourceforge.net/gar/?rev=7603&view=rev Author: aigoshin Date: 2009-12-12 13:01:27 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.3, depend problem Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 12:45:39 UTC (rev 7602) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 13:01:27 UTC (rev 7603) @@ -38,11 +38,11 @@ CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU) CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl" CONFIGURE_ARGS += --with-ld-opt="$(LDFLAGS)" +CONFIGURE_ARGS += --lock-path=/var/run/nginx/nginx.lock +CONFIGURE_ARGS += --pid-path=/var/run/nginx/nginx.pid CONFIGURE_ARGS += --conf-path=$(sysconfdir)/nginx/nginx.conf CONFIGURE_ARGS += --sbin-path=$(sbindir)/nginx CONFIGURE_ARGS += --prefix=$(localstatedir)/nginx -CONFIGURE_ARGS += --lock-path=$(localstatedir)/nginx/nginx.lock -CONFIGURE_ARGS += --pid-path=$(localstatedir)/nginx/nginx.pid CONFIGURE_ARGS += --http-client-body-temp-path=$(localstatedir)/nginx/client CONFIGURE_ARGS += --http-fastcgi-temp-path=$(localstatedir)/nginx/fastcgi CONFIGURE_ARGS += --http-proxy-temp-path=$(localstatedir)/nginx/proxy 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 Dec 12 14:18:53 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Dec 2009 13:18:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7604] csw/mgar/pkg Message-ID: Revision: 7604 http://gar.svn.sourceforge.net/gar/?rev=7604&view=rev Author: wahwah Date: 2009-12-12 13:18:53 +0000 (Sat, 12 Dec 2009) Log Message: ----------- msttcorefonts: Initial commit Modified Paths: -------------- csw/mgar/pkg/msttcorefonts/trunk/Makefile csw/mgar/pkg/msttcorefonts/trunk/checksums Added Paths: ----------- csw/mgar/pkg/msttcorefonts/ Modified: csw/mgar/pkg/msttcorefonts/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-12 12:29:29 UTC (rev 7601) +++ csw/mgar/pkg/msttcorefonts/trunk/Makefile 2009-12-12 13:18:53 UTC (rev 7604) @@ -1,185 +1,94 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ +# +# It doesn't currently qualify for an OpenCSW package, because it puts fonts +# into /usr/... but the advantage is that the fonts work straight away after +# installing the package. If a similar behavior can be achieved with fonts +# underneath /opt/csw, the package could be better. +# +# This file is not intended to build a package to distribute in a binary form. +# It's for users to build the package locally. +FONTDIR = /usr/openwin/lib/X11/fonts/TrueType -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = msttcorefonts +GARVERSION = 1.3_4 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = Microsoft True Type fonts define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = corefonts +EXE_FONT_FILES = wd97vwr32.exe +EXE_FONT_FILES += webdin32.exe +EXE_FONT_FILES += verdan32.exe +EXE_FONT_FILES += trebuc32.exe +EXE_FONT_FILES += times32.exe +EXE_FONT_FILES += impact32.exe +EXE_FONT_FILES += georgi32.exe +EXE_FONT_FILES += courie32.exe +EXE_FONT_FILES += comic32.exe +EXE_FONT_FILES += arialb32.exe +EXE_FONT_FILES += arial32.exe +EXE_FONT_FILES += andale32.exe +DISTFILES = $(EXE_FONT_FILES) +# DISTFILES += msttcorefonts-$(GARVERSION).spec UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +CATALOGNAME_MSFTcorefonts = msttcorefonts +ARCHALL = 1 +PACKAGES = MSFTcorefonts +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWcabex +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = corefonts +INSTALL_SCRIPTS = corefonts +TEST_SCRIPTS = -#include gar/category.mk +LICENSE = License.txt +LICENSE += Licen.TXT +TTF_FILES += AndaleMo.TTF +TTF_FILES += AriBlk.TTF +TTF_FILES += Arial.TTF +TTF_FILES += Arialbd.TTF +TTF_FILES += Arialbi.TTF +TTF_FILES += Ariali.TTF +TTF_FILES += Comic.TTF +TTF_FILES += Comicbd.TTF +TTF_FILES += Georgia.TTF +TTF_FILES += Georgiab.TTF +TTF_FILES += Georgiai.TTF +TTF_FILES += Georgiaz.TTF +TTF_FILES += Impact.TTF +TTF_FILES += Times.TTF +TTF_FILES += Timesbd.TTF +TTF_FILES += Timesbi.TTF +TTF_FILES += Timesi.TTF +TTF_FILES += Trebucbd.ttf +TTF_FILES += Verdana.TTF +TTF_FILES += Verdanab.TTF +TTF_FILES += Verdanai.TTF +TTF_FILES += Verdanaz.TTF +TTF_FILES += Webdings.TTF +TTF_FILES += cour.ttf +TTF_FILES += courbd.ttf +TTF_FILES += courbi.ttf +TTF_FILES += couri.ttf +TTF_FILES += trebuc.ttf +TTF_FILES += trebucbi.ttf +TTF_FILES += trebucit.ttf + +include gar/category.mk + +build-corefonts: + (cd $(WORKDIR); for f in $(EXE_FONT_FILES); do \ + cabextract $${f}; \ + done; \ + tree) + @$(MAKECOOKIE) + +install-corefonts: + ginstall -d $(DESTDIR)$(FONTDIR) + for f in $(TTF_FILES); do \ + ginstall -m 644 $(WORKDIR)/$$f $(DESTDIR)$(FONTDIR); \ + done + @$(MAKECOOKIE) Modified: csw/mgar/pkg/msttcorefonts/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-12-12 12:29:29 UTC (rev 7601) +++ csw/mgar/pkg/msttcorefonts/trunk/checksums 2009-12-12 13:18:53 UTC (rev 7604) @@ -0,0 +1,13 @@ +cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe +9637df0e91703179f0723ec095a36cb5 arial32.exe +c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe +2b30de40bb5e803a0452c7715fc835d1 comic32.exe +4e412c772294403ab62fb2d247d85c60 courie32.exe +4d90016026e2da447593b41a8d8fa8bd georgi32.exe +7907c7dd6684e9bade91cff82683d9d7 impact32.exe +b33f5021f68600ae65ddf24e20ec8b80 msttcorefonts-1.3-4.spec +ed39c8ef91b9fb80f76f702568291bd5 times32.exe +0d7ea16cac6261f8513a061fbfcdb2b5 trebuc32.exe +12d2a75f8156e10607be1eaa8e8ef120 verdan32.exe +efa72d3ed0120a07326ce02f051e9b42 wd97vwr32.exe +230a1d13a365b22815f502eb24d9149b webdin32.exe This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 15:24:46 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 14:24:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7605] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 7605 http://gar.svn.sourceforge.net/gar/?rev=7605&view=rev Author: aigoshin Date: 2009-12-12 14:24:46 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.4 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 13:18:53 UTC (rev 7604) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 14:24:46 UTC (rev 7605) @@ -10,8 +10,7 @@ MASTER_SITES = http://sysoev.ru/nginx/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnginx,checkinstall postinstall preremove) -DISTFILES += cswnginx.xml svc-cswnginx +DISTFILES += cswnginx # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -60,16 +59,20 @@ #PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }' +INITSMF = $(sysconfdir)/init.d/cswnginx +SAMPLECONF = $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf + +NGINXDOCS = CHANGES CHANGES.ru LICENSE README + + include gar/category.mk -NGINXDOCS = CHANGES CHANGES.ru LICENSE README - post-configure-modulated: gsed -i s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h $(MAKECOOKIE) post-install-modulated: - cp $(WORKDIR)/svc-cswnginx $(WORKDIR)/cswnginx + ginstall -d $(DESTDIR)$(sysconfdir)/init.d ginstall -d $(DESTDIR)$(sysconfdir)/nginx/conf.d ginstall -d $(DESTDIR)$(sharedstatedir)/nginx/contrib ginstall -d $(DESTDIR)$(docdir)/nginx @@ -78,9 +81,7 @@ ginstall -d $(DESTDIR)$(localstatedir)/nginx/logs ginstall -d $(DESTDIR)$(localstatedir)/nginx/proxy ginstall -d $(DESTDIR)$(localstatedir)/nginx/sites - mv $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params.CSW - mv $(DESTDIR)$(sysconfdir)/nginx/mime.types $(DESTDIR)$(sysconfdir)/nginx/mime.types.CSW - mv $(DESTDIR)$(sysconfdir)/nginx/nginx.conf $(DESTDIR)$(sysconfdir)/nginx/nginx.conf.CSW + cp $(WORKDIR)/cswnginx $(DESTDIR)$(sysconfdir)/init.d/ cd $(WORKSRC); \ cp -r contrib/* $(DESTDIR)$(sharedstatedir)/nginx/contrib; \ cp $(NGINXDOCS) $(DESTDIR)$(docdir)/nginx Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2009-12-12 13:18:53 UTC (rev 7604) +++ csw/mgar/pkg/nginx/trunk/checksums 2009-12-12 14:24:46 UTC (rev 7605) @@ -1,7 +1,2 @@ -bb85ec05a172562e6de38a1e8a64198c CSWnginx.checkinstall -12b5333e18e985b17f8a5465646e9a8a CSWnginx.gspec -bb404771e330fe98f93cb2d12a808121 CSWnginx.postinstall -e9178dc33f2d38aab8f118a8f0550ac7 CSWnginx.preremove -5c832758a62ee319ea9dfd1829d736eb cswnginx.xml +518551b950c0243f9cdc5d978d40d3e1 cswnginx cfa97c0f784532820110b5eee57fef6d nginx-0.7.64.tar.gz -c5b3babbd1261bcb3f3e17494822bb9f svc-cswnginx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 15:28:59 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 14:28:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7606] csw/mgar/pkg/nginx/trunk/files Message-ID: Revision: 7606 http://gar.svn.sourceforge.net/gar/?rev=7606&view=rev Author: aigoshin Date: 2009-12-12 14:28:59 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.5 Added Paths: ----------- csw/mgar/pkg/nginx/trunk/files/cswnginx Removed Paths: ------------- csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall csw/mgar/pkg/nginx/trunk/files/CSWnginx.preremove csw/mgar/pkg/nginx/trunk/files/cswnginx.xml csw/mgar/pkg/nginx/trunk/files/svc-cswnginx Deleted: csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall =================================================================== --- csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall 2009-12-12 14:24:46 UTC (rev 7605) +++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall 2009-12-12 14:28:59 UTC (rev 7606) @@ -1,47 +0,0 @@ -#!/sbin/sh -################################################################################# -# CUSTOM SECTION -################################################################################# - -UPGRADE_NGINX="0" - -SMF="no" -test -f $BASEDIR/usr/sbin/svccfg -a -f $BASEDIR/usr/sbin/svcadm && SMF="yes" - -if [ "$SMF" = "yes" ]; then - STATE=`$BASEDIR/usr/bin/svcs -Ho STATE nginx 2>/dev/null` - if [ $? -eq 0 ]; then - echo "nginx service is in '$STATE' state" - if [ "$STATE" = "online" ]; then - if [ -x "$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx" ]; then - NXSTATE=`$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx status` - echo "nginx is $NXSTATE" - if [ "$NXSTATE" = "running" ]; then - echo "nginx online upgrade is requested" - UPGRADE_NGINX="1" - fi - fi - fi - fi -else - if [ -x $BASEDIR/etc/init.d/cswnginx ]; then - NXSTATE=`$BASEDIR/etc/init.d/cswnginx status` - echo "nginx is $NXSTATE" - if [ "$NXSTATE" = "running" ]; then - echo "nginx online upgrade is requested" - UPGRADE_NGINX="1" - fi - fi -fi - - -# Make env variables available to other packaging scripts - -cat >$1 </dev/null 2>&1 - case "$?" in - 0) - echo "removing unmodified $CONF_FILE" - rm -f $CONF_FILE - ;; - 1) - echo "not touching modified $CONF_FILE" - ;; - *) - ;; - esac -done - -################################################################################# -# END CUSTOM SECTION -################################################################################# - Added: csw/mgar/pkg/nginx/trunk/files/cswnginx =================================================================== --- csw/mgar/pkg/nginx/trunk/files/cswnginx (rev 0) +++ csw/mgar/pkg/nginx/trunk/files/cswnginx 2009-12-12 14:28:59 UTC (rev 7606) @@ -0,0 +1,172 @@ +#!/bin/sh +# +# SMF Method file for nginx +# + +NGINX=/opt/csw/sbin/nginx +CFGFILE=/etc/opt/csw/nginx/nginx.conf +VARRUNX=/var/run/nginx +PIDFILE=${VARRUNX}/nginx.pid +PIDFILO=${VARRUNX}/nginx.pid.oldbin + +[ ! -f ${NGINX} ] && exit 255 +[ ! -f ${CFGFILE} ] && exit 254 + +RETVAL=0 + +start() { + $NGINX + RETVAL=$? + return $RETVAL +} + +stop() { + killpidf -TERM $PIDFILO + killpidf -TERM +} + +check() { + MSG=`$NGINX -t 2>&1` + RETVAL=$? + [ $RETVAL -ne 0 ] && echo $MSG + return $RETVAL +} + +killpidf() { + if [ "$2" != "" ]; then + PIDF=$2 + else + PIDF=$PIDFILE + fi + if [ -s "$PIDF" ]; then + /bin/kill $1 `/usr/bin/cat $PIDF` + RETVAL=$? + else + RETVAL=1 + fi + return $RETVAL +} + +reload() { + killpidf -HUP + return $RETVAL +} + +restart() { + stop + start + return $RETVAL +} + +rotate() { + killpidf -USR1 + return $RETVAL +} + +status() { + if [ -s "$PIDFILE" ]; then + FPID=`/bin/cat $PIDFILE` + else + echo "not running" + RETVAL=1 + return $RETVAL + fi + PIDP=`/bin/ps -o pid= -p $FPID` + if [ "$PIDP" = "" ]; then + echo "not running" + RETVAL=1 + return $RETVAL + fi + COMM=`/bin/ps -o comm= -p $FPID` + if [ "$NGINX" = "$COMM" ]; then + echo "running" + RETVAL=0 + return $RETVAL + else + echo "running, but it is not a CSW package" + RETVAL=1 + return $RETVAL + fi +} + +upgrade() +{ + killpidf -USR2 + [ $RETVAL -ne 0 ] && return $RETVAL + OLDBINPID=0 + for i in 1 2 3 4 5; do + if [ -s $PIDFILO ]; then + OLDBINPID=1 + sleep 2 + break + else + sleep 1 + fi + done + if [ $OLDBINPID -eq 1 ]; then + status >/dev/null + if [ $RETVAL -eq 0 ]; then + killpidf -WINCH $PIDFILO + fi + else + RETVAL=1 + fi + return $RETVAL +} + +upgrade_commit() +{ + killpidf -QUIT $PIDFILO + return $RETVAL +} + +upgrade_rollback() +{ + killpidf -HUP $PIDFILO + if [ $RETVAL -eq 0 ]; then + killpidf -QUIT $PIDFILE + fi + return $RETVAL +} + + +case "$1" in +start) + [ ! -d $VARRUNX ] && /bin/mkdir -p $VARRUNX ||: + check + [ $RETVAL -eq 0 ] && start ||: + ;; +stop) + stop + ;; +refresh|reload) + check + [ $RETVAL -eq 0 ] && reload ||: + ;; +restart) + check + [ $RETVAL -eq 0 ] && restart ||: + ;; +rotate) + rotate + ;; +status) + status + ;; +upgrade) + check + [ $RETVAL -eq 0 ] && upgrade ||: + ;; +upgrade-commit) + upgrade_commit + ;; +upgrade-rollback) + upgrade_rollback + ;; +*) + echo "Usage:" `basename $0` "{start|stop|refresh|reload|restart|rotate|status|upgrade|upgrade-commit|upgrade-rollback}" + exit 1 + ;; +esac + +exit $RETVAL Property changes on: csw/mgar/pkg/nginx/trunk/files/cswnginx ___________________________________________________________________ Added: svn:executable + * Deleted: csw/mgar/pkg/nginx/trunk/files/cswnginx.xml =================================================================== --- csw/mgar/pkg/nginx/trunk/files/cswnginx.xml 2009-12-12 14:24:46 UTC (rev 7605) +++ csw/mgar/pkg/nginx/trunk/files/cswnginx.xml 2009-12-12 14:28:59 UTC (rev 7606) @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: csw/mgar/pkg/nginx/trunk/files/svc-cswnginx =================================================================== --- csw/mgar/pkg/nginx/trunk/files/svc-cswnginx 2009-12-12 14:24:46 UTC (rev 7605) +++ csw/mgar/pkg/nginx/trunk/files/svc-cswnginx 2009-12-12 14:28:59 UTC (rev 7606) @@ -1,172 +0,0 @@ -#!/bin/sh -# -# SMF Method file for nginx -# - -NGINX=/opt/csw/sbin/nginx -CFGFILE=/opt/csw/etc/nginx/nginx.conf -VARRUNX=/opt/csw/var/run/nginx -PIDFILE=${VARRUNX}/nginx.pid -PIDFILO=${VARRUNX}/nginx.pid.oldbin - -[ ! -f ${NGINX} ] && exit 255 -[ ! -f ${CFGFILE} ] && exit 254 - -RETVAL=0 - -start() { - $NGINX - RETVAL=$? - return $RETVAL -} - -stop() { - killpidf -TERM $PIDFILO - killpidf -TERM -} - -check() { - MSG=`$NGINX -t 2>&1` - RETVAL=$? - [ $RETVAL -ne 0 ] && echo $MSG - return $RETVAL -} - -killpidf() { - if [ "$2" != "" ]; then - PIDF=$2 - else - PIDF=$PIDFILE - fi - if [ -s "$PIDF" ]; then - /bin/kill $1 `/usr/bin/cat $PIDF` - RETVAL=$? - else - RETVAL=1 - fi - return $RETVAL -} - -reload() { - killpidf -HUP - return $RETVAL -} - -restart() { - stop - start - return $RETVAL -} - -rotate() { - killpidf -USR1 - return $RETVAL -} - -status() { - if [ -s "$PIDFILE" ]; then - FPID=`/bin/cat $PIDFILE` - else - echo "not running" - RETVAL=1 - return $RETVAL - fi - PIDP=`/bin/ps -o pid= -p $FPID` - if [ "$PIDP" = "" ]; then - echo "not running" - RETVAL=1 - return $RETVAL - fi - COMM=`/bin/ps -o comm= -p $FPID` - if [ "$NGINX" = "$COMM" ]; then - echo "running" - RETVAL=0 - return $RETVAL - else - echo "running, but it is not a CSW package" - RETVAL=1 - return $RETVAL - fi -} - -upgrade() -{ - killpidf -USR2 - [ $RETVAL -ne 0 ] && return $RETVAL - OLDBINPID=0 - for i in 1 2 3 4 5; do - if [ -s $PIDFILO ]; then - OLDBINPID=1 - sleep 2 - break - else - sleep 1 - fi - done - if [ $OLDBINPID -eq 1 ]; then - status >/dev/null - if [ $RETVAL -eq 0 ]; then - killpidf -WINCH $PIDFILO - fi - else - RETVAL=1 - fi - return $RETVAL -} - -upgrade_commit() -{ - killpidf -QUIT $PIDFILO - return $RETVAL -} - -upgrade_rollback() -{ - killpidf -HUP $PIDFILO - if [ $RETVAL -eq 0 ]; then - killpidf -QUIT $PIDFILE - fi - return $RETVAL -} - - -case "$1" in -start) - [ ! -d $VARRUNX ] && /bin/mkdir -p $VARRUNX ||: - check - [ $RETVAL -eq 0 ] && start ||: - ;; -stop) - stop - ;; -refresh|reload) - check - [ $RETVAL -eq 0 ] && reload ||: - ;; -restart) - check - [ $RETVAL -eq 0 ] && restart ||: - ;; -rotate) - rotate - ;; -status) - status - ;; -upgrade) - check - [ $RETVAL -eq 0 ] && upgrade ||: - ;; -upgrade-commit) - upgrade_commit - ;; -upgrade-rollback) - upgrade_rollback - ;; -*) - echo "Usage:" `basename $0` "{start|stop|refresh|reload|restart|rotate|status|upgrade|upgrade-commit|upgrade-rollback}" - exit 1 - ;; -esac - -exit $RETVAL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Dec 12 17:12:22 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 12 Dec 2009 16:12:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7607] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 7607 http://gar.svn.sourceforge.net/gar/?rev=7607&view=rev Author: aigoshin Date: 2009-12-12 16:12:22 +0000 (Sat, 12 Dec 2009) Log Message: ----------- nginx: milestone 4.6 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 14:28:59 UTC (rev 7606) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-12 16:12:22 UTC (rev 7607) @@ -12,6 +12,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += cswnginx +LICENSE = LICENSE + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec =================================================================== --- csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec 2009-12-12 14:28:59 UTC (rev 7606) +++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec 2009-12-12 16:12:22 UTC (rev 7607) @@ -1,10 +0,0 @@ -%var bitname nginx -%var pkgname CSWnginx -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%include url file://%{PKGLIB}/smf_enabled.gspec -%var SERVICE_CONF_FILES /opt/csw/etc/nginx/nginx.conf /opt/csw/etc/nginx/fastcgi_params /opt/csw/etc/nginx/mime.types -%var RC_INIT_SCRIPT cswnginx -%var INIT_KILL_PRIO 16 -%var INIT_START_PRIO 90 -%var CAN_BE_AUTOENABLED no -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE 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 Dec 12 17:53:02 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Dec 2009 16:53:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7608] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7608 http://gar.svn.sourceforge.net/gar/?rev=7608&view=rev Author: bdwalton Date: 2009-12-12 16:53:02 +0000 (Sat, 12 Dec 2009) Log Message: ----------- coreutils: bump to version 8.2 Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-12 16:12:22 UTC (rev 7607) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-12 16:53:02 UTC (rev 7608) @@ -1,5 +1,5 @@ GARNAME = coreutils -GARVERSION = 8.1 +GARVERSION = 8.2 CATEGORIES = utils # building with gcc gets us extra tools (eg: stdbuf) 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 Dec 12 18:13:05 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Dec 2009 17:13:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7609] csw/mgar/pkg/coreutils/trunk/checksums Message-ID: Revision: 7609 http://gar.svn.sourceforge.net/gar/?rev=7609&view=rev Author: bdwalton Date: 2009-12-12 17:13:05 +0000 (Sat, 12 Dec 2009) Log Message: ----------- coreutils: update checksums Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-12-12 16:53:02 UTC (rev 7608) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-12-12 17:13:05 UTC (rev 7609) @@ -1,3 +1,3 @@ 0fde2b11f34c49995765566acf6cd5b4 0001-Fix-solaris-acl-support-breakage.patch acbd08eef41092a7b348d03206dad625 0002-Add-lintl-to-xalloc-die-LDADD-flags.patch -4cde9f31604f4da188ed302ca55545ea coreutils-8.1.tar.gz +dfb0d3dbc5f555386339f4f74621cda0 coreutils-8.2.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 Sun Dec 13 15:14:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Dec 2009 14:14:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7610] csw/mgar/pkg Message-ID: Revision: 7610 http://gar.svn.sourceforge.net/gar/?rev=7610&view=rev Author: wahwah Date: 2009-12-13 14:14:04 +0000 (Sun, 13 Dec 2009) Log Message: ----------- fontforge: Initial commit Modified Paths: -------------- csw/mgar/pkg/fontforge/trunk/Makefile csw/mgar/pkg/fontforge/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fontforge/ Modified: csw/mgar/pkg/fontforge/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-12 17:13:05 UTC (rev 7609) +++ csw/mgar/pkg/fontforge/trunk/Makefile 2009-12-13 14:14:04 UTC (rev 7610) @@ -2,184 +2,25 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = fontforge +GARVERSION = 20090923 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = An outline font editor define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +SPKG_SOURCEURL = http://fontforge.sourceforge.net/ +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = fontforge +REQUIRED_PKGS += CSWggettextrt +REQUIRED_PKGS += CSWiconv +REQUIRED_PKGS += CSWlibice +REQUIRED_PKGS += CSWlibsm +REQUIRED_PKGS += CSWpython-rt -#include gar/category.mk +PATCHFILES = grayscale.patch grayscale-cvdgloss.c.patch +DISTFILES = fontforge_full-$(GARVERSION).tar.bz2 +UFILES_REGEX = fontforge_full-(\d+(?:\.\d+)*).tar.bz2 +CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_LINKER_FLAGS = -liconv -lintl -lrt +TEST_SCRIPTS = +include gar/category.mk Modified: csw/mgar/pkg/fontforge/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-12-12 17:13:05 UTC (rev 7609) +++ csw/mgar/pkg/fontforge/trunk/checksums 2009-12-13 14:14:04 UTC (rev 7610) @@ -0,0 +1,3 @@ +ea9d8dc38de79235fbe6add725b38ffe fontforge_full-20090923.tar.bz2 +90b177e8bb4c7fac6e0b8ce6470f708e grayscale-cvdgloss.c.patch +df6f242f2a0d390025cb0439e21f93ce grayscale.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 Sun Dec 13 15:14:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Dec 2009 14:14:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7611] csw/mgar/pkg/fontforge/trunk/files Message-ID: Revision: 7611 http://gar.svn.sourceforge.net/gar/?rev=7611&view=rev Author: wahwah Date: 2009-12-13 14:14:43 +0000 (Sun, 13 Dec 2009) Log Message: ----------- fontforge: patches Added Paths: ----------- csw/mgar/pkg/fontforge/trunk/files/grayscale-cvdgloss.c.patch csw/mgar/pkg/fontforge/trunk/files/grayscale.patch Added: csw/mgar/pkg/fontforge/trunk/files/grayscale-cvdgloss.c.patch =================================================================== --- csw/mgar/pkg/fontforge/trunk/files/grayscale-cvdgloss.c.patch (rev 0) +++ csw/mgar/pkg/fontforge/trunk/files/grayscale-cvdgloss.c.patch 2009-12-13 14:14:43 UTC (rev 7611) @@ -0,0 +1,13 @@ +--- fontforge-20090923/fontforge/cvdgloss.c.orig 2009-12-13 11:09:40.099444315 +0100 ++++ fontforge-20090923/fontforge/cvdgloss.c 2009-12-13 11:15:08.708601663 +0100 +@@ -1041,7 +1041,10 @@ + (val1&2) ? exc->tt_metrics.rotated ? "(rotated) | ": "(not rotated) | " : "", + (val1&4) ? exc->tt_metrics.stretched ? "(stretched) | ": "(not stretched) | " : "", + #if FREETYPE_MAJOR>2 || (FREETYPE_MAJOR==2 && (FREETYPE_MINOR>1 || (FREETYPE_MINOR==1 && FREETYPE_PATCH>11 ))) ++ /* + (val1&32) ? exc->grayscale ? "(grey scale)": "(black/white)" : "" ++ */ ++ "" + #else + "" + #endif Added: csw/mgar/pkg/fontforge/trunk/files/grayscale.patch =================================================================== --- csw/mgar/pkg/fontforge/trunk/files/grayscale.patch (rev 0) +++ csw/mgar/pkg/fontforge/trunk/files/grayscale.patch 2009-12-13 14:14:43 UTC (rev 7611) @@ -0,0 +1,12 @@ +--- fontforge-20090923/fontforge/freetypeui.c.orig 2009-12-13 11:06:55.587423639 +0100 ++++ fontforge-20090923/fontforge/freetypeui.c 2009-12-13 11:07:48.584395183 +0100 +@@ -187,7 +187,8 @@ + return( TT_Err_Execution_Too_Long ); /* Some random error code, says we're probably in a infinite loop */ + dc->exc = exc; + #if FREETYPE_MAJOR>2 || (FREETYPE_MAJOR==2 && (FREETYPE_MINOR>1 || (FREETYPE_MINOR==1 && FREETYPE_PATCH>11 ))) +- exc->grayscale = !dc->is_bitmap; /* if we are in 'prep' or 'fpgm' freetype doesn't know this yet */ ++ /* The keyword 'grayscale' doesn't come up in the freetype library headers. */ ++ /* exc->grayscale = !dc->is_bitmap; */ /* if we are in 'prep' or 'fpgm' freetype doesn't know this yet */ + #endif + + /* Set up for watch points */ 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 Dec 13 20:38:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Dec 2009 19:38:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7612] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7612 http://gar.svn.sourceforge.net/gar/?rev=7612&view=rev Author: dmichelsen Date: 2009-12-13 19:38:16 +0000 (Sun, 13 Dec 2009) Log Message: ----------- mGAR v2: Make sure the classes from CSWcswclassutils are added in the correct order Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-12-13 14:14:43 UTC (rev 7611) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-12-13 19:38:16 UTC (rev 7612) @@ -525,7 +525,7 @@ # The texinfo filter has been taken out of the normal filters as TEXINFO has a default. $(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype -$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C " if( $$F[1] eq "$C" && !$$done{$C}++ );)') +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(shell cat $(WORKDIR)/$*.prototype | perl -e 'while(<>){@F=split;$$c{$$F[1]}++};$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$c{$C});)') $(WORKDIR)/%.pkginfo: $(WORKDIR) $(_DBG)(echo "PKG=$*"; \ 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 Dec 13 22:46:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Dec 2009 21:46:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7613] csw/mgar/pkg Message-ID: Revision: 7613 http://gar.svn.sourceforge.net/gar/?rev=7613&view=rev Author: wahwah Date: 2009-12-13 21:46:47 +0000 (Sun, 13 Dec 2009) Log Message: ----------- liberation-fonts: Initial commit Modified Paths: -------------- csw/mgar/pkg/liberation-fonts/trunk/Makefile csw/mgar/pkg/liberation-fonts/trunk/checksums Added Paths: ----------- csw/mgar/pkg/liberation-fonts/ Modified: csw/mgar/pkg/liberation-fonts/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-12 12:29:29 UTC (rev 7601) +++ csw/mgar/pkg/liberation-fonts/trunk/Makefile 2009-12-13 21:46:47 UTC (rev 7613) @@ -2,184 +2,52 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = liberation-fonts +GARVERSION = 1.05.2.20091019 +FONTDIR = /usr/openwin/lib/X11/fonts/TrueType CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = replacements for Times New Roman, Arial, and Courier New define BLURB - + + On May 9, 2007, Red Hat announced the public release of these fonts under the + trademark LIBERATION at the Red Hat Summit. There are three sets: Sans (a + substitute for Arial, Albany, Helvetica, Nimbus Sans L, and Bitstream Vera + Sans), Serif (a substitute for Times New Roman, Thorndale, Nimbus Roman, and + Bitstream Vera Serif) and Mono (a substitute for Courier New, Cumberland, + Courier, Nimbus Mono L, and Bitstream Vera Sans Mono). The fonts are now + available for you to install. + + Those running Red Hat? Enterprise Linux? systems can get the fonts through + the Red Hat Network? service. For Fedor(tm) users they are available in the + Fedora YUM repositories. You can also download the latest released version as + a gzipped tarball or zip file from the Liberation Fonts project at Fedora + Hosted. The fonts are in the popular TrueType format. + + You are free to use these fonts on any system you would like. You are free to + redistribute them under the GPL+exception license found in the download. Using + these fonts does not subject your documents to the GPL--it liberates them from + any proprietary claim. Once you have installed these fonts, we encourage you + to make them your default in Thunderbird, Firefox, and Open Office. Heck, for + that matter make them your default in Microsoft? Office?, in Microsoft + Windows?, in Apple OSX?... in anything you would like. In many applications + you can set Times New Roman, Arial, and Courier New to convert to these fonts. + endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +SPKG_SOURCEURL = https://www.redhat.com/promo/fonts/ +MASTER_SITES = https://fedorahosted.org/releases/l/i/liberation-fonts/ +DISTFILES = liberation-fonts-$(GARVERSION).tar.gz +UFILES_REGEX = liberation-fonts-(\d+(?:\.\d+)*).tar.gz +CATALOGNAME = liberation_fonts +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWfontforge +CONFIGURE_SCRIPTS = +INSTALL_SCRIPTS = liberation +TEST_SCRIPTS = +ARCHALL = 1 +include gar/category.mk -#include gar/category.mk +install-liberation: + ginstall -d $(DESTDIR)$(FONTDIR) + for f in $(WORKSRC)/ttf/*.ttf; do \ + ginstall -m 644 $$f $(DESTDIR)$(FONTDIR); \ + done + @$(MAKECOOKIE) Modified: csw/mgar/pkg/liberation-fonts/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-12-12 12:29:29 UTC (rev 7601) +++ csw/mgar/pkg/liberation-fonts/trunk/checksums 2009-12-13 21:46:47 UTC (rev 7613) @@ -0,0 +1 @@ +89cd7e13588da4ca14a523233b3352f0 liberation-fonts-1.05.2.20091019.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 14 08:44:17 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Dec 2009 07:44:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7614] csw/mgar/pkg/fontforge/trunk/Makefile Message-ID: Revision: 7614 http://gar.svn.sourceforge.net/gar/?rev=7614&view=rev Author: wahwah Date: 2009-12-14 07:44:17 +0000 (Mon, 14 Dec 2009) Log Message: ----------- fontforge: Versioning with 0.${datestamp} Modified Paths: -------------- csw/mgar/pkg/fontforge/trunk/Makefile Modified: csw/mgar/pkg/fontforge/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontforge/trunk/Makefile 2009-12-13 21:46:47 UTC (rev 7613) +++ csw/mgar/pkg/fontforge/trunk/Makefile 2009-12-14 07:44:17 UTC (rev 7614) @@ -3,7 +3,8 @@ # $Id$ GARNAME = fontforge -GARVERSION = 20090923 +VERSION_DATESTAMP = 20090923 +GARVERSION = 0.$(VERSION_DATESTAMP) CATEGORIES = lib DESCRIPTION = An outline font editor define BLURB @@ -15,10 +16,13 @@ REQUIRED_PKGS += CSWiconv REQUIRED_PKGS += CSWlibice REQUIRED_PKGS += CSWlibsm +REQUIRED_PKGS += CSWpython REQUIRED_PKGS += CSWpython-rt -PATCHFILES = grayscale.patch grayscale-cvdgloss.c.patch -DISTFILES = fontforge_full-$(GARVERSION).tar.bz2 +DISTNAME = fontforge-$(VERSION_DATESTAMP) +PATCHFILES = grayscale.patch +PATCHFILES += grayscale-cvdgloss.c.patch +DISTFILES = fontforge_full-$(VERSION_DATESTAMP).tar.bz2 UFILES_REGEX = fontforge_full-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) EXTRA_LINKER_FLAGS = -liconv -lintl -lrt 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 Dec 14 09:21:16 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Dec 2009 08:21:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7615] csw/mgar/pkg/cheetah/trunk/Makefile Message-ID: Revision: 7615 http://gar.svn.sourceforge.net/gar/?rev=7615&view=rev Author: wahwah Date: 2009-12-14 08:21:16 +0000 (Mon, 14 Dec 2009) Log Message: ----------- cheetah: Add CSWpython as a dependency Modified Paths: -------------- csw/mgar/pkg/cheetah/trunk/Makefile Modified: csw/mgar/pkg/cheetah/trunk/Makefile =================================================================== --- csw/mgar/pkg/cheetah/trunk/Makefile 2009-12-14 07:44:17 UTC (rev 7614) +++ csw/mgar/pkg/cheetah/trunk/Makefile 2009-12-14 08:21:16 UTC (rev 7615) @@ -21,5 +21,5 @@ UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = py_cheetah PACKAGES = CSWpy-cheetah -REQUIRED_PKGS_CSWpy-cheetah = CSWpython-rt +REQUIRED_PKGS_CSWpy-cheetah = CSWpython-rt CSWpython 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 Dec 14 11:28:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Dec 2009 10:28:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7616] csw/mgar/pkg/perl/branches Message-ID: Revision: 7616 http://gar.svn.sourceforge.net/gar/?rev=7616&view=rev Author: dmichelsen Date: 2009-12-14 10:28:34 +0000 (Mon, 14 Dec 2009) Log Message: ----------- perl/branches/perl-5.10.1: Prepare for 5.10.1 Modified Paths: -------------- csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile csw/mgar/pkg/perl/branches/perl-5.10.1/checksums Added Paths: ----------- csw/mgar/pkg/perl/branches/perl-5.10.1/ Modified: csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2009-12-10 03:35:34 UTC (rev 7589) +++ csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile 2009-12-14 10:28:34 UTC (rev 7616) @@ -1,5 +1,5 @@ GARNAME = perl -GARVERSION = 5.8.8 +GARVERSION = 5.10.1 CATEGORIES = lang DESCRIPTION = A high-level, general-purpose programming language @@ -28,32 +28,32 @@ LICENSE = Copying # Core module updates -MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ -CORE_UPDATES += PathTools-3.30 -CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ +#CORE_UPDATES += PathTools-3.30 +#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd -MASTER_SITES += $(CPAN_FIRST_MIRROR)/L/LD/LDS/ -CORE_UPDATES += CGI.pm-3.44 -CORE_OBSOLETE += CGI* +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/L/LD/LDS/ +#CORE_UPDATES += CGI.pm-3.44 +#CORE_OBSOLETE += CGI* -MASTER_SITES += $(CPAN_FIRST_MIRROR)/M/MS/MSCHWERN/ -CORE_UPDATES += Test-Simple-0.92 -CORE_OBSOLETE += Test/Builder* Test/More.pm Test/Simple.pm Test/Tutorial.pm +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/M/MS/MSCHWERN/ +#CORE_UPDATES += Test-Simple-0.92 +#CORE_OBSOLETE += Test/Builder* Test/More.pm Test/Simple.pm Test/Tutorial.pm -MASTER_SITES += $(CPAN_FIRST_MIRROR)/T/TJ/TJENNESS/ -CORE_UPDATES += File-Temp-0.22 -CORE_OBSOLETE += File/Temp.pm +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/T/TJ/TJENNESS/ +#CORE_UPDATES += File-Temp-0.22 +#CORE_OBSOLETE += File/Temp.pm -MASTER_SITES += $(CPAN_FIRST_MIRROR)/G/GB/GBARR/ -CORE_UPDATES += IO-1.25 -CORE_OBSOLETE += IO/Socket* IO/IO* IO/Socket.pm IO/Select.pm IO/Seekable.pm IO/Poll.pm IO/Pipe.pm IO/Handle.pm IO/File.pm IO/Dir.pm IO.pm +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/G/GB/GBARR/ +#CORE_UPDATES += IO-1.25 +#CORE_OBSOLETE += IO/Socket* IO/IO* IO/Socket.pm IO/Select.pm IO/Seekable.pm IO/Poll.pm IO/Pipe.pm IO/Handle.pm IO/File.pm IO/Dir.pm IO.pm -MASTER_SITES += $(CPAN_FIRST_MIRROR)/A/AM/AMS/ -CORE_UPDATES += Storable-2.20 -CORE_OBSOLETE += Storable/* Storable.pm +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/A/AM/AMS/ +#CORE_UPDATES += Storable-2.20 +#CORE_OBSOLETE += Storable/* Storable.pm -MASTER_SITES += $(CPAN_FIRST_MIRROR)/M/MS/MSCHWERN/ -CORE_UPDATES += ExtUtils-MakeMaker-6.54 +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/M/MS/MSCHWERN/ +#CORE_UPDATES += ExtUtils-MakeMaker-6.54 #CORE_OBSOLETE += ExtUtils/* DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) @@ -66,9 +66,7 @@ CONFIGURE_SCRIPTS = perl # Compatable with all prior patch revs -PL_MAJOR = 5.8 -PL_PATCH = 0 2 4 6 7 -INC_COMPAT = $(foreach REV,$(PL_PATCH),$(PL_MAJOR).$(REV)) +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 # Force use of db-4.7 PERL_LIBS += -lsocket -lnsl -lgdbm -ldb-4.7 -ldl -lm -lpthread -lc -lperl @@ -126,10 +124,15 @@ # Tests take a long time TEST_SCRIPTS = +# Make sure we don't include the path to the newly built perl as the +# library is not in place yet. +IGNORE_DESTDIR = 1 + # Do not exclude static libs as at least DynaLoader.a is needed for XS compilation MERGE_EXCLUDE_STATICLIBS = include gar/category.mk + ifneq ($(CORE_UPDATES),) POST_TARGETS = install-core-updates include files/updatecore.mk Modified: csw/mgar/pkg/perl/branches/perl-5.10.1/checksums =================================================================== --- csw/mgar/pkg/perl/trunk/checksums 2009-12-10 03:35:34 UTC (rev 7589) +++ csw/mgar/pkg/perl/branches/perl-5.10.1/checksums 2009-12-14 10:28:34 UTC (rev 7616) @@ -1,8 +1 @@ -d1b217a7a2463d5543d25490ff1b3d14 download/CGI.pm-3.44.tar.gz -003c04b33e8c8eed693f5001fe52b647 download/ExtUtils-MakeMaker-6.54.tar.gz -a7e93cf2015881ded1f22b5b2d0cb391 download/File-Temp-0.22.tar.gz -b88aaf2bb7437725b11e9eb48dfb6c93 download/IO-1.25.tar.gz -18a72d6a66bb62ce9bbb422dfa41181a download/PathTools-3.30.tar.gz -2ba3f963daf86c1172cd7bbbd47891be download/Storable-2.20.tar.gz -eaafa92c9a21c4290dd9d0752bb744b0 download/Test-Simple-0.92.tar.gz -b8c118d4360846829beb30b02a6b91a7 download/perl-5.8.8.tar.gz +b9b2fdb957f50ada62d73f43ee75d044 perl-5.10.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 Mon Dec 14 12:50:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Dec 2009 11:50:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7617] csw/mgar/gar/v2/bin/mkpackage Message-ID: Revision: 7617 http://gar.svn.sourceforge.net/gar/?rev=7617&view=rev Author: dmichelsen Date: 2009-12-14 11:50:21 +0000 (Mon, 14 Dec 2009) Log Message: ----------- mGAR v2: Fix wrong use of last index operator according to http://rt.perl.org/rt3/Public/Bug/Display.html?id=49230 Modified Paths: -------------- csw/mgar/gar/v2/bin/mkpackage Modified: csw/mgar/gar/v2/bin/mkpackage =================================================================== --- csw/mgar/gar/v2/bin/mkpackage 2009-12-14 10:28:34 UTC (rev 7616) +++ csw/mgar/gar/v2/bin/mkpackage 2009-12-14 11:50:21 UTC (rev 7617) @@ -461,7 +461,7 @@ # specified file. my ( $dname, $spec, $line, $flag ); - for ( my $i = 0 ; $i <= $#{@$content} ; $i++ ) { + for ( my $i = 0 ; $i <= $#$content ; $i++ ) { my ( $source, $lineno, $line ) = @{ $content->[$i] }; 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 Dec 14 13:02:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Dec 2009 12:02:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7618] csw/mgar/gar Message-ID: Revision: 7618 http://gar.svn.sourceforge.net/gar/?rev=7618&view=rev Author: dmichelsen Date: 2009-12-14 12:02:11 +0000 (Mon, 14 Dec 2009) Log Message: ----------- mGAR: Reapply r7617 (bugfix for faulty use of last-index) to branches Modified Paths: -------------- csw/mgar/gar/v2-git/bin/mkpackage csw/mgar/gar/v2-relocate/bin/mkpackage csw/mgar/gar/v2-skayser/bin/mkpackage Property Changed: ---------------- csw/mgar/gar/v2-git/ csw/mgar/gar/v2-relocate/ csw/mgar/gar/v2-skayser/ Property changes on: csw/mgar/gar/v2-git ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,6915-7553 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678,6915-7553,7617 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2-git/bin/mkpackage =================================================================== --- csw/mgar/gar/v2-git/bin/mkpackage 2009-12-14 11:50:21 UTC (rev 7617) +++ csw/mgar/gar/v2-git/bin/mkpackage 2009-12-14 12:02:11 UTC (rev 7618) @@ -461,7 +461,7 @@ # specified file. my ( $dname, $spec, $line, $flag ); - for ( my $i = 0 ; $i <= $#{@$content} ; $i++ ) { + for ( my $i = 0 ; $i <= $#$content ; $i++ ) { my ( $source, $lineno, $line ) = @{ $content->[$i] }; Property changes on: csw/mgar/gar/v2-relocate ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:7617 /csw/mgar/gar/v2-git/v2-relocate:7617 Modified: csw/mgar/gar/v2-relocate/bin/mkpackage =================================================================== --- csw/mgar/gar/v2-relocate/bin/mkpackage 2009-12-14 11:50:21 UTC (rev 7617) +++ csw/mgar/gar/v2-relocate/bin/mkpackage 2009-12-14 12:02:11 UTC (rev 7618) @@ -461,7 +461,7 @@ # specified file. my ( $dname, $spec, $line, $flag ); - for ( my $i = 0 ; $i <= $#{@$content} ; $i++ ) { + for ( my $i = 0 ; $i <= $#$content ; $i++ ) { my ( $source, $lineno, $line ) = @{ $content->[$i] }; Property changes on: csw/mgar/gar/v2-skayser ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:7617 /csw/mgar/gar/v2-git/v2-skayser:7617 Modified: csw/mgar/gar/v2-skayser/bin/mkpackage =================================================================== --- csw/mgar/gar/v2-skayser/bin/mkpackage 2009-12-14 11:50:21 UTC (rev 7617) +++ csw/mgar/gar/v2-skayser/bin/mkpackage 2009-12-14 12:02:11 UTC (rev 7618) @@ -461,7 +461,7 @@ # specified file. my ( $dname, $spec, $line, $flag ); - for ( my $i = 0 ; $i <= $#{@$content} ; $i++ ) { + for ( my $i = 0 ; $i <= $#$content ; $i++ ) { my ( $source, $lineno, $line ) = @{ $content->[$i] }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Mon Dec 14 15:44:28 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Mon, 14 Dec 2009 14:44:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7619] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 7619 http://gar.svn.sourceforge.net/gar/?rev=7619&view=rev Author: aigoshin Date: 2009-12-14 14:44:28 +0000 (Mon, 14 Dec 2009) Log Message: ----------- nginx: package release 5.0 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums csw/mgar/pkg/nginx/trunk/files/cswnginx Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-12-14 12:02:11 UTC (rev 7618) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-12-14 14:44:28 UTC (rev 7619) @@ -22,14 +22,15 @@ PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -#EXTRA_BUILD_ISAS_i386 = pentium_pro +EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 EXTRA_BUILD_ISAS_sparc = sparcv9 -NGINXCPU_pentium_pro = pentiumpro -NGINXCPU_sparcv8 = sparc32 -NGINXCPU_sparcv9 = sparc64 -NGINXCPU_$(ISA) ?= $(ISA) -NGINXCPU = $(NGINXCPU_$(ISA)) +NGINXCPU_i386 = pentium +NGINXCPU_pentium_pro = pentium3 +NGINXCPU_sparcv8 = sparc32 +NGINXCPU_sparcv9 = sparc64 +NGINXCPU_$(ISA) ?= $(ISA) +NGINXCPU = $(NGINXCPU_$(ISA)) CFLAGS = @@ -51,19 +52,18 @@ CONFIGURE_ARGS += --http-log-path=$(localstatedir)/nginx/logs/access.log CONFIGURE_ARGS += --with-md5=YES CONFIGURE_ARGS += --with-sha1=YES -CONFIGURE_ARGS += --with-http_ssl_module -CONFIGURE_ARGS += --with-http_realip_module CONFIGURE_ARGS += --with-http_dav_module CONFIGURE_ARGS += --with-http_flv_module +CONFIGURE_ARGS += --with-http_realip_module +CONFIGURE_ARGS += --with-http_secure_link_module +CONFIGURE_ARGS += --with-http_ssl_module CONFIGURE_ARGS += --with-http_stub_status_module TEST_SCRIPTS = -#PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }' +INITSMF = $(sysconfdir)/init.d/cswnginx +PRESERVECONF = $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf -INITSMF = $(sysconfdir)/init.d/cswnginx -SAMPLECONF = $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf - NGINXDOCS = CHANGES CHANGES.ru LICENSE README Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2009-12-14 12:02:11 UTC (rev 7618) +++ csw/mgar/pkg/nginx/trunk/checksums 2009-12-14 14:44:28 UTC (rev 7619) @@ -1,2 +1,2 @@ -518551b950c0243f9cdc5d978d40d3e1 cswnginx +4e8863b34556eb28e3ee6849ffb1ed85 cswnginx cfa97c0f784532820110b5eee57fef6d nginx-0.7.64.tar.gz Modified: csw/mgar/pkg/nginx/trunk/files/cswnginx =================================================================== --- csw/mgar/pkg/nginx/trunk/files/cswnginx 2009-12-14 12:02:11 UTC (rev 7618) +++ csw/mgar/pkg/nginx/trunk/files/cswnginx 2009-12-14 14:44:28 UTC (rev 7619) @@ -1,6 +1,10 @@ #!/bin/sh # -# SMF Method file for nginx +#RC_KNUM 20 +#RC_SNUM 88 +#RC_KLEV 0,1,S +#RC_SLEV 2 +#AUTOENABLE no # NGINX=/opt/csw/sbin/nginx 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 Dec 14 16:52:48 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 14 Dec 2009 15:52:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7620] csw/mgar/pkg/dcc/trunk Message-ID: Revision: 7620 http://gar.svn.sourceforge.net/gar/?rev=7620&view=rev Author: bonivart Date: 2009-12-14 15:52:48 +0000 (Mon, 14 Dec 2009) Log Message: ----------- dcc: update to 1.3.116 Modified Paths: -------------- csw/mgar/pkg/dcc/trunk/Makefile csw/mgar/pkg/dcc/trunk/checksums csw/mgar/pkg/dcc/trunk/files/CSWdcc.dcc.xml Removed Paths: ------------- csw/mgar/pkg/dcc/trunk/files/CSWdcc.gspec Modified: csw/mgar/pkg/dcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/dcc/trunk/Makefile 2009-12-14 14:44:28 UTC (rev 7619) +++ csw/mgar/pkg/dcc/trunk/Makefile 2009-12-14 15:52:48 UTC (rev 7620) @@ -1,15 +1,18 @@ +# dep to perl? + GARNAME = dcc -GARVERSION = 1.3.102 +GARVERSION = 1.3.116 CATEGORIES = net DESCRIPTION = E-mail greylisting and a cooperative, distributed system to identify spam MASTER_SITES = http://www.rhyolite.com/dcc/source/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.Z -DISTFILES += $(call admfiles,CSWdcc,) +DISTFILES = $(GARNAME).tar.Z +LICENSE = LICENSE + # Upstream watch -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.Z +#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.Z #CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS = @@ -19,23 +22,32 @@ CONFIGURE_ARGS += --mandir=/opt/csw/share/man CONFIGURE_ARGS += --with-installroot=$(DESTDIR) CONFIGURE_ARGS += --with-DCC-MD5 +#CONFIGURE_ARGS += --with-uid=dcc CONFIGURE_ARGS += --with-uid=bonivart #CONFIGURE_ARGS += --with-cgibin=/var/opt/csw/dcc/cgi-bin CONFIGURE_ARGS += --with-cgibin=/opt/csw/dcc/cgi-bin CONFIGURE_ARGS += --with-rundir=/var/opt/csw/dcc/run CONFIGURE_ARGS += --with-sendmail=/home/bonivart/tmp/sendmail-8.14.2/include/libmilter +GARCOMPILER = GNU + # dcc has no tests TEST_SCRIPTS = INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk '$$$$3 ~ /.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' +SAMPLECONF = /var/opt/csw/dcc/dcc_conf +SAMPLECONF += /var/opt/csw/dcc/flod +SAMPLECONF += /var/opt/csw/dcc/grey_flod +SAMPLECONF += /var/opt/csw/dcc/grey_whitelist +SAMPLECONF += /var/opt/csw/dcc/ids +SAMPLECONF += /var/opt/csw/dcc/map.txt +SAMPLECONF += /var/opt/csw/dcc/whiteclnt +SAMPLECONF += /var/opt/csw/dcc/whitecommon +SAMPLECONF += /var/opt/csw/dcc/whitelist SPKG_SOURCEURL = http://www.rhyolite.com/dcc/ -REQUIRED_PKGS = CSWcswclassutils -SPKG_CLASSES = none cswcpsampleconf CONFFILES = dcc_conf flod grey_flod grey_whitelist ids map.txt whiteclnt whitecommon whitelist -DOCFILES = CHANGES FAQ.txt INSTALL.txt LICENSE RESTRICTIONS misc/README misc/dcc.m4 misc/dccdnsbl.m4 misc/site.config.m4 +DOCFILES = CHANGES FAQ.txt INSTALL.txt RESTRICTIONS misc/README misc/dcc.m4 misc/dccdnsbl.m4 misc/site.config.m4 include gar/category.mk @@ -53,7 +65,7 @@ @( cd $(DESTDIR)/var/opt/csw/$(GARNAME) ; \ sed 's/bonivart/dcc/' dcc_conf > tmp.sed ; \ mv tmp.sed dcc_conf ) - @$(foreach FILE, $(CONFFILES), mv $(DESTDIR)/var/opt/csw/$(GARNAME)/$(FILE) $(DESTDIR)/var/opt/csw/$(GARNAME)/$(FILE).CSW ;) +# @$(foreach FILE, $(CONFFILES), mv $(DESTDIR)/var/opt/csw/$(GARNAME)/$(FILE) $(DESTDIR)/var/opt/csw/$(GARNAME) ;) @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/misc @$(foreach FILE, $(DOCFILES), cp $(WORKSRC)/$(FILE) $(DESTDIR)$(docdir)/$(GARNAME)/$(FILE) ;) @cp $(FILEDIR)/CSWdcc.INSTALL.CSW.txt $(DESTDIR)$(docdir)/$(GARNAME)/INSTALL.CSW.txt Modified: csw/mgar/pkg/dcc/trunk/checksums =================================================================== --- csw/mgar/pkg/dcc/trunk/checksums 2009-12-14 14:44:28 UTC (rev 7619) +++ csw/mgar/pkg/dcc/trunk/checksums 2009-12-14 15:52:48 UTC (rev 7620) @@ -1,2 +1 @@ -6abf97babd8555d37ad91efc7ba4ae7b download/dcc-1.3.102.tar.Z -472a0e3cfd53e0080ddeb5db77d5b708 download/CSWdcc.gspec +dab3c668b82c931eb7191246cb11791f dcc.tar.Z Modified: csw/mgar/pkg/dcc/trunk/files/CSWdcc.dcc.xml =================================================================== --- csw/mgar/pkg/dcc/trunk/files/CSWdcc.dcc.xml 2009-12-14 14:44:28 UTC (rev 7619) +++ csw/mgar/pkg/dcc/trunk/files/CSWdcc.dcc.xml 2009-12-14 15:52:48 UTC (rev 7620) @@ -2,7 +2,7 @@ Deleted: csw/mgar/pkg/dcc/trunk/files/CSWdcc.gspec =================================================================== --- csw/mgar/pkg/dcc/trunk/files/CSWdcc.gspec 2009-12-14 14:44:28 UTC (rev 7619) +++ csw/mgar/pkg/dcc/trunk/files/CSWdcc.gspec 2009-12-14 15:52:48 UTC (rev 7620) @@ -1,7 +0,0 @@ -%var bitname dcc -%var pkgname CSWdcc -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/dcc/LICENSE for license information. - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Dec 14 21:20:59 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 14 Dec 2009 20:20:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7621] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 7621 http://gar.svn.sourceforge.net/gar/?rev=7621&view=rev Author: chninkel Date: 2009-12-14 20:20:59 +0000 (Mon, 14 Dec 2009) Log Message: ----------- openssl: added missing cswclassutils dependancy for openssl_utils Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-12-14 15:52:48 UTC (rev 7620) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-12-14 20:20:59 UTC (rev 7621) @@ -41,7 +41,7 @@ SPKG_DESC_CSWosslutils = Openssl binaries and related tools CATALOGNAME_CSWosslutils = openssl_utils -REQUIRED_PKGS_CSWosslutils = CSWosslrt +REQUIRED_PKGS_CSWosslutils = CSWosslrt CSWcswclassutils SPKG_CLASSES_CSWosslutils = none cswpreserveconf 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 Dec 14 21:22:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Dec 2009 20:22:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7622] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7622 http://gar.svn.sourceforge.net/gar/?rev=7622&view=rev Author: dmichelsen Date: 2009-12-14 20:22:34 +0000 (Mon, 14 Dec 2009) Log Message: ----------- mGAR v2: Add platforms-% Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-12-14 20:20:59 UTC (rev 7621) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-12-14 20:22:34 UTC (rev 7622) @@ -776,6 +776,17 @@ ) @$(MAKECOOKIE) +platforms-%: + $(foreach P,$(PACKAGING_PLATFORMS),\ + $(if $(PACKAGING_HOST_$P),\ + $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ + $(MAKE) PLATFORM=$P $* && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P $*" && \ + ),\ + $(error *** No host has been defined for platform $P)\ + )\ + ) true + replatforms: spotless platforms # Print relecant informations about the platform This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Dec 14 21:23:07 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 14 Dec 2009 20:23:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7623] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 7623 http://gar.svn.sourceforge.net/gar/?rev=7623&view=rev Author: chninkel Date: 2009-12-14 20:23:06 +0000 (Mon, 14 Dec 2009) Log Message: ----------- openssh: updated changelog Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2009-12-14 20:22:34 UTC (rev 7622) +++ csw/mgar/pkg/openssh/trunk/checksums 2009-12-14 20:23:06 UTC (rev 7623) @@ -5,7 +5,7 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 22ffa2a9b7bf310d58d3b299805a41b1 CSWosshlpk.prototype -d9eea5c8d787a514827e94d80e4f5574 changelog.CSW +96b1c2e2ae91fedc8d8324e246b648ef changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-12-14 20:22:34 UTC (rev 7622) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-12-14 20:23:06 UTC (rev 7623) @@ -1,3 +1,9 @@ +openssh (5.3,REV=2008.12.14_rev=p1) unstable + + * Package rebuild to solve an incorrect upload in the repository tree. + + -- Yann Rouillard Mon, 14 Dec 2009 21:19:33 +0100 + openssh (5.3,REV=2009.10.10_rev=p1) unstable * New upstream release. 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 Dec 15 01:46:17 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Dec 2009 00:46:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7624] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7624 http://gar.svn.sourceforge.net/gar/?rev=7624&view=rev Author: bdwalton Date: 2009-12-15 00:46:16 +0000 (Tue, 15 Dec 2009) Log Message: ----------- coreutils: drop cc optimization level to fix issue with seq Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-14 20:23:06 UTC (rev 7623) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-15 00:46:16 UTC (rev 7624) @@ -2,6 +2,11 @@ GARVERSION = 8.2 CATEGORIES = utils +# seq has issues related to the handling of long double's with -O2. +# this issue manifested on sol8 and sol9 x86 only. sparc was unaffected +# and sol10 x86 was fine too. +OPT_FLAGS_GCC = -O1 -pipe + # building with gcc gets us extra tools (eg: stdbuf) GARCOMPILER = GCC4 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 Dec 15 08:50:22 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Dec 2009 07:50:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7625] csw/mgar/pkg/cheetah/trunk/Makefile Message-ID: Revision: 7625 http://gar.svn.sourceforge.net/gar/?rev=7625&view=rev Author: wahwah Date: 2009-12-15 07:50:22 +0000 (Tue, 15 Dec 2009) Log Message: ----------- cheetah: Removing explicit CSWpython dependency Modified Paths: -------------- csw/mgar/pkg/cheetah/trunk/Makefile Modified: csw/mgar/pkg/cheetah/trunk/Makefile =================================================================== --- csw/mgar/pkg/cheetah/trunk/Makefile 2009-12-15 00:46:16 UTC (rev 7624) +++ csw/mgar/pkg/cheetah/trunk/Makefile 2009-12-15 07:50:22 UTC (rev 7625) @@ -21,5 +21,5 @@ UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = py_cheetah PACKAGES = CSWpy-cheetah -REQUIRED_PKGS_CSWpy-cheetah = CSWpython-rt CSWpython +REQUIRED_PKGS_CSWpy-cheetah = CSWpython-rt include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Dec 15 09:36:21 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Dec 2009 08:36:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7626] csw/mgar/pkg/sudo/branches/old-symlink-scheme/ Message-ID: Revision: 7626 http://gar.svn.sourceforge.net/gar/?rev=7626&view=rev Author: wahwah Date: 2009-12-15 08:36:21 +0000 (Tue, 15 Dec 2009) Log Message: ----------- Branching off the revision with the old symlink scheme, i.e. where the /opt/csw/bin/sudo -> sudo.minimal symlink was in CSWsudo-common. Added Paths: ----------- csw/mgar/pkg/sudo/branches/old-symlink-scheme/ 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 Dec 15 09:40:33 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Dec 2009 08:40:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7627] csw/mgar/pkg/sudo/branches/old-symlink-scheme Message-ID: Revision: 7627 http://gar.svn.sourceforge.net/gar/?rev=7627&view=rev Author: wahwah Date: 2009-12-15 08:40:33 +0000 (Tue, 15 Dec 2009) Log Message: ----------- sudo: Old symlink scheme branch version bump up to 1.7.2p2 Modified Paths: -------------- csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile csw/mgar/pkg/sudo/branches/old-symlink-scheme/checksums Modified: csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile =================================================================== --- csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile 2009-12-15 08:36:21 UTC (rev 7626) +++ csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile 2009-12-15 08:40:33 UTC (rev 7627) @@ -1,7 +1,7 @@ GARNAME = sudo GARVERSION = 1.7.2 CATEGORIES = utils -RELEASE = p1 +RELEASE = p2 DISTVERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) Modified: csw/mgar/pkg/sudo/branches/old-symlink-scheme/checksums =================================================================== --- csw/mgar/pkg/sudo/branches/old-symlink-scheme/checksums 2009-12-15 08:36:21 UTC (rev 7626) +++ csw/mgar/pkg/sudo/branches/old-symlink-scheme/checksums 2009-12-15 08:40:33 UTC (rev 7627) @@ -1,3 +1,3 @@ -955d99eda1432c7b7e00d98b91e35a79 download/CSWsudo-common.postinstall -157b2e5e38ca54eb36e0364706bd0292 download/install.diff -4449d466a774f5ce401c9c0e3866c026 download/sudo-1.7.2p1.tar.gz +955d99eda1432c7b7e00d98b91e35a79 CSWsudo-common.postinstall +157b2e5e38ca54eb36e0364706bd0292 install.diff +2a19cf1ab4afc94fe19d0d0899d4cd45 sudo-1.7.2p2.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 Dec 15 09:49:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Dec 2009 08:49:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7628] csw/mgar/pkg/sudo_ldap/trunk Message-ID: Revision: 7628 http://gar.svn.sourceforge.net/gar/?rev=7628&view=rev Author: wahwah Date: 2009-12-15 08:49:09 +0000 (Tue, 15 Dec 2009) Log Message: ----------- sudo_ldap: Version bump up to 1.7.2p2 Modified Paths: -------------- csw/mgar/pkg/sudo_ldap/trunk/Makefile csw/mgar/pkg/sudo_ldap/trunk/checksums Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/Makefile 2009-12-15 08:40:33 UTC (rev 7627) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2009-12-15 08:49:09 UTC (rev 7628) @@ -1,7 +1,7 @@ GARNAME = sudo GARVERSION = 1.7.2 CATEGORIES = utils -RELEASE = p1 +RELEASE = p2 DISTVERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) Modified: csw/mgar/pkg/sudo_ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/checksums 2009-12-15 08:40:33 UTC (rev 7627) +++ csw/mgar/pkg/sudo_ldap/trunk/checksums 2009-12-15 08:49:09 UTC (rev 7628) @@ -1,2 +1,2 @@ -157b2e5e38ca54eb36e0364706bd0292 download/install.diff -4449d466a774f5ce401c9c0e3866c026 download/sudo-1.7.2p1.tar.gz +157b2e5e38ca54eb36e0364706bd0292 install.diff +2a19cf1ab4afc94fe19d0d0899d4cd45 sudo-1.7.2p2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 15 17:15:09 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 15 Dec 2009 16:15:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7629] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 7629 http://gar.svn.sourceforge.net/gar/?rev=7629&view=rev Author: rthurner Date: 2009-12-15 16:15:09 +0000 (Tue, 15 Dec 2009) Log Message: ----------- mercurial, upgrade to 1.4.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 2009-12-15 08:49:09 UTC (rev 7628) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2009-12-15 16:15:09 UTC (rev 7629) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.4 +GARVERSION = 1.4.1 CATEGORIES = devel DESCRIPTION = Fast, lightweight Source Control Management system @@ -20,7 +20,7 @@ CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py # Some tests fail, but manual inspection of the failures show no significant failures. -TEST_TARGET = #tests +TEST_TARGET = tests INSTALL_SCRIPTS = $(WORKSRC)/setup.py INSTALL_ARGS += --root=$(DESTDIR) --prefix=/opt/csw Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2009-12-15 08:49:09 UTC (rev 7628) +++ csw/mgar/pkg/mercurial/trunk/checksums 2009-12-15 16:15:09 UTC (rev 7629) @@ -1,3 +1,3 @@ db884ecb306bcbf49b671f880d29c431 CSWmercurial.changelog.CSW d280026d7687f061371e87ff306c97c2 CSWmercurial.gspec -951ebd4a8153eaa3c56fc0ce2575ab70 mercurial-1.4.tar.gz +eacffecad59ec145e61a1edf332b3f1f mercurial-1.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 15 17:44:44 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 15 Dec 2009 16:44:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7630] csw/mgar/pkg/mod_wsgi/trunk Message-ID: Revision: 7630 http://gar.svn.sourceforge.net/gar/?rev=7630&view=rev Author: rthurner Date: 2009-12-15 16:44:43 +0000 (Tue, 15 Dec 2009) Log Message: ----------- mod_wsgi, upgrade to 3.1 Modified Paths: -------------- csw/mgar/pkg/mod_wsgi/trunk/Makefile csw/mgar/pkg/mod_wsgi/trunk/checksums Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/Makefile 2009-12-15 16:15:09 UTC (rev 7629) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2009-12-15 16:44:43 UTC (rev 7630) @@ -1,5 +1,5 @@ GARNAME = mod_wsgi -GARVERSION = 2.5 +GARVERSION = 3.1 CATEGORIES = lib DESCRIPTION = an Apache/Python WSGI adapter module Modified: csw/mgar/pkg/mod_wsgi/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/checksums 2009-12-15 16:15:09 UTC (rev 7629) +++ csw/mgar/pkg/mod_wsgi/trunk/checksums 2009-12-15 16:44:43 UTC (rev 7630) @@ -1,4 +1,4 @@ -43ad11c477799e2f780c50197c420afd download/mod_wsgi-2.5.tar.gz -a2e8679f45232e56efbc352597ffe456 download/postinstall -a67766841dedbaba0d7b15e7f08c8658 download/preremove -0dd379f20ceb32fc77bb3a9bf045097f download/space +f9aabdcd7a3f66a2319d10793477f9e9 mod_wsgi-3.1.tar.gz +a2e8679f45232e56efbc352597ffe456 postinstall +a67766841dedbaba0d7b15e7f08c8658 preremove +0dd379f20ceb32fc77bb3a9bf045097f space This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 15 18:05:58 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 15 Dec 2009 17:05:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7631] csw/mgar/pkg/trac/trunk Message-ID: Revision: 7631 http://gar.svn.sourceforge.net/gar/?rev=7631&view=rev Author: rthurner Date: 2009-12-15 17:05:57 +0000 (Tue, 15 Dec 2009) Log Message: ----------- trac: upgrade to trac-0.11.6, not working as it complains about wrong dependency CSWgenshi Modified Paths: -------------- csw/mgar/pkg/trac/trunk/Makefile csw/mgar/pkg/trac/trunk/checksums Modified: csw/mgar/pkg/trac/trunk/Makefile =================================================================== --- csw/mgar/pkg/trac/trunk/Makefile 2009-12-15 16:44:43 UTC (rev 7630) +++ csw/mgar/pkg/trac/trunk/Makefile 2009-12-15 17:05:57 UTC (rev 7631) @@ -1,5 +1,5 @@ GARNAME = Trac -GARVERSION = 0.11.5 +GARVERSION = 0.11.6 CATEGORIES = apps DESCRIPTION = Integrated SCM and Project Management @@ -16,7 +16,7 @@ PACKAGES = CSWtrac REQUIRED_PKGS_CSWtrac = CSWpysetuptools CSWpysvn CSWgenshi -REQUIRED_PKGS_CSWtrac += CSWpython-rt +REQUIRED_PKGS_CSWtrac += CSWpython CSWpython-devel CATALOGNAME_CSWtrac = trac SPKG_DESC_CSWtrac = Integrated SCM and Project Management Modified: csw/mgar/pkg/trac/trunk/checksums =================================================================== --- csw/mgar/pkg/trac/trunk/checksums 2009-12-15 16:44:43 UTC (rev 7630) +++ csw/mgar/pkg/trac/trunk/checksums 2009-12-15 17:05:57 UTC (rev 7631) @@ -1 +1 @@ -c8042490096a49478580fd599ad26322 download/Trac-0.11.5.tar.gz +f5a9542d81d3d50c3d9e46d8e2344f38 download/Trac-0.11.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Dec 16 02:41:04 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Dec 2009 01:41:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7632] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7632 http://gar.svn.sourceforge.net/gar/?rev=7632&view=rev Author: bdwalton Date: 2009-12-16 01:41:04 +0000 (Wed, 16 Dec 2009) Log Message: ----------- coreutils: remove patch that is no longer required; correct post-install for gsu Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-15 17:05:57 UTC (rev 7631) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-12-16 01:41:04 UTC (rev 7632) @@ -24,7 +24,6 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Fix-solaris-acl-support-breakage.patch -PATCHFILES += 0002-Add-lintl-to-xalloc-die-LDADD-flags.patch PREREQUISITE_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit PREREQUISITE_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash @@ -49,7 +48,7 @@ post-install-modulated: @echo Cleaning up install directory... rm -rf $(DESTDIR)/$(libdir) - @echo Manually install gsu (so no root rights required) + @echo Manually install gsu \(so no root rights required\) cp $(WORKSRC)/src/su $(DESTDIR)$(bindir)/gsu post-merge: Deleted: csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch 2009-12-15 17:05:57 UTC (rev 7631) +++ csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch 2009-12-16 01:41:04 UTC (rev 7632) @@ -1,29 +0,0 @@ -From 686676e0661bab3d768b5b988e277f5907142e62 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Wed, 25 Nov 2009 05:08:58 +0100 -Subject: [PATCH 2/2] Add -lintl to xalloc-die LDADD flags - -This will allow the file to be linked properly during the gnulib-tests -phase. - -Signed-off-by: Ben Walton ---- - gnulib-tests/Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in -index 427cccd..641201e 100644 ---- a/gnulib-tests/Makefile.in -+++ b/gnulib-tests/Makefile.in -@@ -1185,7 +1185,7 @@ test_wcwidth_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ - libtests.a $(am__DEPENDENCIES_1) - test_xalloc_die_SOURCES = test-xalloc-die.c - test_xalloc_die_OBJECTS = test-xalloc-die.$(OBJEXT) --test_xalloc_die_LDADD = $(LDADD) -+test_xalloc_die_LDADD = $(LDADD) $(LIBINTL) - test_xalloc_die_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ - libtests.a $(am__DEPENDENCIES_1) - test_xfprintf_posix_SOURCES = test-xfprintf-posix.c --- -1.6.5.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 16 10:01:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Dec 2009 09:01:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7633] csw/mgar/pkg/neon/trunk Message-ID: Revision: 7633 http://gar.svn.sourceforge.net/gar/?rev=7633&view=rev Author: dmichelsen Date: 2009-12-16 09:01:05 +0000 (Wed, 16 Dec 2009) Log Message: ----------- neon: Update to 0.29.1 Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile csw/mgar/pkg/neon/trunk/checksums Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2009-12-16 01:41:04 UTC (rev 7632) +++ csw/mgar/pkg/neon/trunk/Makefile 2009-12-16 09:01:05 UTC (rev 7633) @@ -1,9 +1,9 @@ GARNAME = neon -GARVERSION = 0.29.0 +GARVERSION = 0.29.1 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 0.26.4 0.29.0 +MODULATIONS_GARVERSION = 0.26.4 0.29.1 DESCRIPTION = Neon HTTP and WebDAV client library define BLURB @@ -46,24 +46,15 @@ INSTALL_OVERRIDE_VARS = docdir INSTALL_OVERRIDE_VAR_docdir = $(datadir)/doc/neon -MERGE_SCRIPTS_isa-i386-garversion-0.26.4 = copy-only -MERGE_DIRS_isa-i386-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-0.26.4 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-0.26.4 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-0.26.4 = copy-only +MERGE_DIRS_isa-default-garversion-0.26.4 = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-0.26.4 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-i386-garversion-0.29.0 = copy-all -MERGE_SCRIPTS_isa-amd64-garversion-0.29.0 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-0.29.0 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-0.29.1 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-0.29.1 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.29.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) -MERGE_SCRIPTS_isa-sparcv8-garversion-0.26.4 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-0.26.4 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-0.26.4 = $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-0.29.0 = copy-all -MERGE_SCRIPTS_isa-sparcv9-garversion-0.29.0 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-0.29.0 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) PKGFILES_CSWneon-devel += $(docdir)/.* Modified: csw/mgar/pkg/neon/trunk/checksums =================================================================== --- csw/mgar/pkg/neon/trunk/checksums 2009-12-16 01:41:04 UTC (rev 7632) +++ csw/mgar/pkg/neon/trunk/checksums 2009-12-16 09:01:05 UTC (rev 7633) @@ -1,4 +1,3 @@ -4ef5552e8930ef82b1f56c2712f8ed1e download/COPYING -2d11fff51ffa856fc6b5d4bd801d6cc4 download/neon-0.26.4.tar.gz -252578ed555552b71d15909641484951 download/neon-0.28.6.tar.gz -18a3764b70f9317f8b61509fd90d9e7a download/neon-0.29.0.tar.gz +4ef5552e8930ef82b1f56c2712f8ed1e COPYING +2d11fff51ffa856fc6b5d4bd801d6cc4 neon-0.26.4.tar.gz +eb4eac0499cb6fced6e3b11e4b720ebb neon-0.29.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Dec 16 10:01:19 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 16 Dec 2009 09:01:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7634] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 7634 http://gar.svn.sourceforge.net/gar/?rev=7634&view=rev Author: rthurner Date: 2009-12-16 09:01:19 +0000 (Wed, 16 Dec 2009) Log Message: ----------- mercurial-1.4.1, comment tests, only 2 errors left Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2009-12-16 09:01:05 UTC (rev 7633) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2009-12-16 09:01:19 UTC (rev 7634) @@ -20,7 +20,7 @@ CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py # Some tests fail, but manual inspection of the failures show no significant failures. -TEST_TARGET = tests +TEST_TARGET = #tests INSTALL_SCRIPTS = $(WORKSRC)/setup.py INSTALL_ARGS += --root=$(DESTDIR) --prefix=/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 16 11:54:37 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Dec 2009 10:54:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7635] csw/mgar/pkg/django/trunk Message-ID: Revision: 7635 http://gar.svn.sourceforge.net/gar/?rev=7635&view=rev Author: wahwah Date: 2009-12-16 10:54:37 +0000 (Wed, 16 Dec 2009) Log Message: ----------- django: Version bump to 1.1.1, using the python category Modified Paths: -------------- csw/mgar/pkg/django/trunk/Makefile csw/mgar/pkg/django/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/django/trunk/Makefile Modified: csw/mgar/pkg/django/trunk/Makefile =================================================================== --- csw/mgar/pkg/django/trunk/Makefile 2009-12-16 09:01:19 UTC (rev 7634) +++ csw/mgar/pkg/django/trunk/Makefile 2009-12-16 10:54:37 UTC (rev 7635) @@ -1,8 +1,12 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = django -GARVERSION = 1.0.2 -CATEGORIES = lib +GARVERSION = 1.1.1 +CATEGORIES = python -DESCRIPTION = high-level Python Web framework +DESCRIPTION = A high-level Python Web framework define BLURB Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design. @@ -12,41 +16,25 @@ the stringent requirements of the experienced Web developers who wrote it. It lets you build high-performing, elegant Web applications quickly. endef +SPKG_SOURCEURL = http://www.djangoproject.com/ MASTER_SITES = http://www.djangoproject.com/download/$(GARVERSION)/tarball/ -DISTFILES = Django-$(GARVERSION)-final.tar.gz - -SPKG_CLASSES = none cswpycompile +DISTFILES = Django-$(GARVERSION).tar.gz ARCHALL = 1 - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -WORKSRC = $(WORKDIR)/Django-$(GARVERSION)-final - -REQUIRED_PKGS = CSWpython CSWcswclassutils +UFILES_REGEX = Django-(\d+(?:\.\d+)*).tar.gz +WORKSRC = $(WORKDIR)/Django-$(GARVERSION) +REQUIRED_PKGS = PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWpython-devel - CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py - -INSTALL_SCRIPTS = $(WORKSRC)/setup.py -INSTALL_ARGS += --root=$(DESTDIR) --prefix=$(prefix) - TEST_SCRIPTS = - -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } \ - { print }' - -post-install-modulated: - gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \; - @$(MAKECOOKIE) - # There's a problem that the download URL of the Django source tarball does not # contain the file name. The browser is being redirected instead. Hard-coding # the URL and using a custom target to fit the rest of mGAR. -http//www.djangoproject.com/download/$(GARVERSION)/tarball/Django-$(GARVERSION)-final.tar.gz: +http//www.djangoproject.com/download/$(GARVERSION)/tarball/Django-$(GARVERSION).tar.gz: @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) http://www.djangoproject.com/download/$(GARVERSION)/tarball include gar/category.mk + +post-install-modulated: + gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \; + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/django/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/django/trunk/checksums =================================================================== --- csw/mgar/pkg/django/trunk/checksums 2009-12-16 09:01:19 UTC (rev 7634) +++ csw/mgar/pkg/django/trunk/checksums 2009-12-16 10:54:37 UTC (rev 7635) @@ -1 +1 @@ -89353e3749668778f1370d2e444f3adc download/Django-1.0.2-final.tar.gz +d7839c192e115f9c4dd8777de24dc21c Django-1.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 16 12:06:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Dec 2009 11:06:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7636] csw/mgar/pkg/django/trunk/Makefile Message-ID: Revision: 7636 http://gar.svn.sourceforge.net/gar/?rev=7636&view=rev Author: wahwah Date: 2009-12-16 11:06:24 +0000 (Wed, 16 Dec 2009) Log Message: ----------- django: Adding the py- prefix since it's a library rather than a standalone program. Modified Paths: -------------- csw/mgar/pkg/django/trunk/Makefile Modified: csw/mgar/pkg/django/trunk/Makefile =================================================================== --- csw/mgar/pkg/django/trunk/Makefile 2009-12-16 10:54:37 UTC (rev 7635) +++ csw/mgar/pkg/django/trunk/Makefile 2009-12-16 11:06:24 UTC (rev 7636) @@ -20,6 +20,10 @@ MASTER_SITES = http://www.djangoproject.com/download/$(GARVERSION)/tarball/ DISTFILES = Django-$(GARVERSION).tar.gz +PACKAGES = CSWpy-django +CATALOGNAME_CSWpy-django = py_django +# In case someone has an old version from testing +INCOMPATIBLE_PKGS = CSWdjango ARCHALL = 1 UFILES_REGEX = Django-(\d+(?:\.\d+)*).tar.gz WORKSRC = $(WORKDIR)/Django-$(GARVERSION) 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 Dec 16 14:11:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Dec 2009 13:11:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7637] csw/mgar/pkg/django/trunk/Makefile Message-ID: Revision: 7637 http://gar.svn.sourceforge.net/gar/?rev=7637&view=rev Author: wahwah Date: 2009-12-16 13:11:14 +0000 (Wed, 16 Dec 2009) Log Message: ----------- django: Adding information about the getpass() problem Modified Paths: -------------- csw/mgar/pkg/django/trunk/Makefile Modified: csw/mgar/pkg/django/trunk/Makefile =================================================================== --- csw/mgar/pkg/django/trunk/Makefile 2009-12-16 11:06:24 UTC (rev 7636) +++ csw/mgar/pkg/django/trunk/Makefile 2009-12-16 13:11:14 UTC (rev 7637) @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# A known issue: There's a problem with getpass.getpass() on Solaris, in which +# it echoes the entered password. +# http://bugs.python.org/issue7208 + GARNAME = django GARVERSION = 1.1.1 CATEGORIES = python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Dec 16 20:22:47 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 16 Dec 2009 19:22:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7638] csw/mgar/pkg/ghc/trunk Message-ID: Revision: 7638 http://gar.svn.sourceforge.net/gar/?rev=7638&view=rev Author: trygvis Date: 2009-12-16 19:22:47 +0000 (Wed, 16 Dec 2009) Log Message: ----------- ghc: Upgrading to 6.10.4. Fixing (as in removing) LD_LIBRARY_PATH requirement. Modified Paths: -------------- csw/mgar/pkg/ghc/trunk/Makefile csw/mgar/pkg/ghc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ghc/trunk/files/0001-mk-build.mk-Adding-correct-runtime-options.patch csw/mgar/pkg/ghc/trunk/files/CSWghc.postinstall Removed Paths: ------------- csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec Property Changed: ---------------- csw/mgar/pkg/ghc/trunk/ Property changes on: csw/mgar/pkg/ghc/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work *.log Modified: csw/mgar/pkg/ghc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghc/trunk/Makefile 2009-12-16 13:11:14 UTC (rev 7637) +++ csw/mgar/pkg/ghc/trunk/Makefile 2009-12-16 19:22:47 UTC (rev 7638) @@ -6,9 +6,11 @@ # software causes damage. # TODO: Run the test suite +# This assumes that you already have the stage1 compiler installed under ~/opencsw/ghc-bootstrap-$(GARVERSION) +# Download it from http://www.haskell.org/ghc/dist/$(GARVERSION)/maeder/ GARNAME = ghc -GARVERSION = 6.8.3 +GARVERSION = 6.10.4 CATEGORIES = apps DESCRIPTION = State-of-the-art, compiler and interactive environment for Haskell. @@ -23,82 +25,40 @@ GARCOMPILER = GCC4 -# Calculate the correct platform specification for ghc to use when bootstrapping -ifeq ($(shell uname -p),sparc) -GHC_PLATFORM = sparc-sun -else -GHC_PLATFORM = i386-unknown -endif +REQUIRED_PKGS_CSWghc = CSWiconv +REQUIRED_PKGS_CSWghc += CSWlibgmp +REQUIRED_PKGS_CSWghc += CSWncurses # The location of the solaris binaries seems to vary a bit from version to version +MASTER_SITES = http://www.haskell.org/ghc/dist/$(GARVERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 +PATCHFILES = 0001-mk-build.mk-Adding-correct-runtime-options.patch -MASTER_SITES = http://www.haskell.org/ghc/dist/$(GARVERSION)/ http://www.haskell.org/ghc/dist/$(GARVERSION)/maeder/ -DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 testsuite-$(GARVERSION).tar.gz -DISTFILES += $(GARNAME)-$(GARVERSION)-sparc-sun-solaris2.tar.bz2 -DISTFILES += $(GARNAME)-$(GARVERSION)-i386-unknown-solaris2.tar.bz2 -DISTFILES += $(call admfiles,CSW$(GARNAME),) -DISTFILES += $(call admfiles,CSW$(GARNAME)-prof,) - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARVERSION)/$(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PKGFILES_CSWghc-prof = $(prefix)/.*\.p_hi -PKGFILES_CSWghc-prof += $(prefix)/.*\.so +#PKGFILES_CSWghc-prof = $(prefix)/.*\.p_hi +#PKGFILES_CSWghc-prof += $(prefix)/.*\.so -#PKGFILES_CSWghc = -#PKGFILES_CSWghc = $(prefix)/.* -#PKGFILES_CSWghc += $(prefix)/.*\.a -#PKGFILES_CSWghc += $(PKGFILES_DEVEL) -#PKGFILES_CSWghc += $(PKGFILES_RT) +MERGE_EXCLUDE_STATICLIBS = +PKGFILES_CSWghc = +PKGFILES_CSWghc = $(prefix)/.* +PKGFILES_CSWghc += $(prefix)/.*\.a +PKGFILES_CSWghc += $(PKGFILES_DEVEL) +PKGFILES_CSWghc += $(PKGFILES_RT) + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-gcc=/opt/csw/gcc4/bin/gcc +CONFIGURE_ARGS += --with-gmp-includes=/opt/csw/include +CONFIGURE_ARGS += --with-gmp-libraries=/opt/csw/lib +CONFIGURE_ARGS += --with-readline-includes=/opt/csw/include +CONFIGURE_ARGS += --with-readline-libraries=/opt/csw/lib +CONFIGURE_ENV = PATH=$(HOME)/opencsw/ghc-bootstrap-6.10.4/bin:$(PATH) + +BUILD_ENV = PATH=$(HOME)/opencsw/ghc-bootstrap-6.10.4/bin:$(PATH) LD_LIBRARY_PATH=/opt/csw/lib + # Disabled for now TEST_SCRIPTS = -#TEST_SCRIPTS = custom include gar/category.mk - -# Prevent the extracttion of the binary blobs. This has to be after GAR is included -tar-bz-extract-ghc-$(GARVERSION)-sparc-sun-solaris2.tar.bz2: - @$(MAKECOOKIE) - -tar-bz-extract-ghc-$(GARVERSION)-i386-unknown-solaris2.tar.bz2: - @$(MAKECOOKIE) - -STAGE_1_FILE = $(DOWNLOADDIR)/$(GARNAME)-$(GARVERSION)-$(GHC_PLATFORM)-solaris2.tar.bz2 -STAGE_1_BASEDIR=$(WORKDIR)/stage1 -STAGE_1_SRC_DIR=$(STAGE_1_BASEDIR)/ghc-$(GARVERSION) -STAGE_1_DIR=$(shell mkdir -p $(STAGE_1_BASEDIR) && cd $(STAGE_1_BASEDIR) && pwd)/ghc - -PATH := $(STAGE_1_DIR)/bin:$(PATH) - -LD_LIBRARY_PATH=/opt/csw/lib -export LD_LIBRARY_PATH - -$(STAGE_1_SRC_DIR): - @echo Extracting the bootstrap compiler - mkdir -p $(STAGE_1_BASEDIR) - cat $(STAGE_1_FILE) | ( cd $(STAGE_1_BASEDIR) && gtar jxf -) - -$(STAGE_1_SRC_DIR)/Makefile: $(STAGE_1_SRC_DIR) - cd $(STAGE_1_SRC_DIR) && ./configure --prefix=$(STAGE_1_DIR) - -$(STAGE_1_DIR)/bin/ghc: $(STAGE_1_SRC_DIR)/Makefile - cd $(STAGE_1_SRC_DIR) && gmake install - -pre-configure-modulated: $(STAGE_1_DIR)/bin/ghc - echo $$PATH - @$(MAKECOOKIE) - -pre-test-custom: - @echo Extracting the testsuite - @( echo cd $(WORKSRC); echo gtar zxf $(DOWNLOADDIR)/testsuite-$(GARVERSION).tar.gz) - false - @$(MAKECOOKIE) - -test-custom: - @echo ******************************* - @echo *** RUNNING TESTS (not) - @echo ******************************* - @( cd $(WORKSRC)/testsuite/tests/ghc-regress; echo $(MAKE) stage=2 ) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/ghc/trunk/checksums =================================================================== --- csw/mgar/pkg/ghc/trunk/checksums 2009-12-16 13:11:14 UTC (rev 7637) +++ csw/mgar/pkg/ghc/trunk/checksums 2009-12-16 19:22:47 UTC (rev 7638) @@ -1,6 +1,2 @@ -dfa31028b4d06d1d226f55fe3a2ab7b3 download/ghc-6.8.3-src.tar.bz2 -c92b368262a194e8b859815415bc10d0 download/testsuite-6.8.3.tar.gz -ee43ceea42b9353b6613db6d4058ab0a download/ghc-6.8.3-sparc-sun-solaris2.tar.bz2 -907c15e1d7d33dfd5a829936fe18176a download/ghc-6.8.3-i386-unknown-solaris2.tar.bz2 -8f73e728ba2e6f65f738a302d1cc8ff4 download/CSWghc.gspec -2a3d93a43a4499e0c3366f660ffda4bf download/CSWghc-prof.gspec +d49c571bf1709965b97a8fc2e8f3398b 0001-mk-build.mk-Adding-correct-runtime-options.patch +167687fa582ef6702aaac24e139ec982 ghc-6.10.4-src.tar.bz2 Added: csw/mgar/pkg/ghc/trunk/files/0001-mk-build.mk-Adding-correct-runtime-options.patch =================================================================== --- csw/mgar/pkg/ghc/trunk/files/0001-mk-build.mk-Adding-correct-runtime-options.patch (rev 0) +++ csw/mgar/pkg/ghc/trunk/files/0001-mk-build.mk-Adding-correct-runtime-options.patch 2009-12-16 19:22:47 UTC (rev 7638) @@ -0,0 +1,20 @@ +From bb8a10ec43f99716c4767e0788dba2c36f66529b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Trygve=20Laugst=C3=B8l?= +Date: Wed, 16 Dec 2009 15:18:57 +0100 +Subject: [PATCH] mk/build.mk: Adding correct runtime options. + +--- + mk/build.mk | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + create mode 100644 mk/build.mk + +diff --git a/mk/build.mk b/mk/build.mk +new file mode 100644 +index 0000000..ab87adf +--- /dev/null ++++ b/mk/build.mk +@@ -0,0 +1 @@ ++SRC_HC_OPTS=-optl-R/opt/csw/lib +-- +1.6.5.1 + Deleted: csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec 2009-12-16 13:11:14 UTC (rev 7637) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec 2009-12-16 19:22:47 UTC (rev 7638) @@ -1,14 +0,0 @@ -# Copyright 2008 OpenCSW -# -# Redistribution and/or use, with or without modification, is -# permitted. This software is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. - -%var bitname ghc_prof -%var pkgname CSWghc-prof -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/ghc_prof/LICENSE for license information - Deleted: csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec 2009-12-16 13:11:14 UTC (rev 7637) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec 2009-12-16 19:22:47 UTC (rev 7638) @@ -1,14 +0,0 @@ -# Copyright 2008 OpenCSW -# -# Redistribution and/or use, with or without modification, is -# permitted. This software is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. - -%var bitname ghc -%var pkgname CSWghc -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/ghc/LICENSE for license information - Added: csw/mgar/pkg/ghc/trunk/files/CSWghc.postinstall =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc.postinstall (rev 0) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc.postinstall 2009-12-16 19:22:47 UTC (rev 7638) @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +# Implement the procedure described here: +# http://hackage.haskell.org/trac/ghc/wiki/Building/Solaris + +/opt/csw/bin/ghc-pkg describe rts > /tmp/rts.pkg.in + +cat /tmp/rts.pkg.in | sed \ + -e "s, -R/opt/csw/lib ,,g" \ + -e "s,^\(ld-options:\) \(.*\),\1 -R/opt/csw/lib \2," > /tmp/rts.pkg.out + +/opt/csw/bin/ghc-pkg update /tmp/rts.pkg.out 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 Dec 16 21:14:11 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Dec 2009 20:14:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7639] csw/mgar/pkg/python/trunk Message-ID: Revision: 7639 http://gar.svn.sourceforge.net/gar/?rev=7639&view=rev Author: wahwah Date: 2009-12-16 20:14:10 +0000 (Wed, 16 Dec 2009) Log Message: ----------- python: Upgrading to 2.6.4, removing content from CSWpython-rt with the intention to kill it, moving the distutils module to CSWpython, moving smtpd.py to the -devel package. Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile csw/mgar/pkg/python/trunk/checksums Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-16 19:22:47 UTC (rev 7638) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-16 20:14:10 UTC (rev 7639) @@ -1,7 +1,13 @@ GARNAME = Python -GARVERSION = 2.6.2 +GARVERSION = 2.6.4 CATEGORIES = lang +# Known issues: +# +# - No 64-bit build +# - ctypes module doesn't compile +# - http://forums.sun.com/thread.jspa?threadID=5148204 + SPKG_SOURCEURL = http://www.python.org/download/releases/$(GARVERSION) SPKG_CLASSES = none cswpycompile @@ -75,31 +81,46 @@ # use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -PACKAGES = CSWidle CSWpython CSWpydistutils CSWpython-devel CSWpython-rt CSWpython-tk CSWpython-test +PACKAGES = CSWidle +PACKAGES += CSWpython +PACKAGES += CSWpython-devel +PACKAGES += CSWpython-rt +PACKAGES += CSWpython-test +PACKAGES += CSWpython-tk +INCOMPATIBLE_PKGS_CSWpython = CSWpydistutils + PKGFILES_CSWidle = $(libdir)/.*/idlelib/.* PKGFILES_CSWidle += $(bindir)/idle PKGFILES_CSWpython-devel = $(includedir)/.* PKGFILES_CSWpython-devel += $(libdir)/.*/config/.* -PKGFILES_CSWpydistutils += $(libdir)/.*/distutils/.* -PKGFILES_CSWpython-rt += $(libdir)/.*libpython.* +PKGFILES_CSWpython-devel += $(bindir)/.*config.* +# No idea why would this be in CSWpython, and no good idea for a better package +# to put it. +PKGFILES_CSWpython-devel += $(bindir)/smtpd.py +PKGFILES_CSWpython-rt = non-existing PKGFILES_CSWpython-tk = $(libdir)/.*/lib-tk/.* PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* -PKGFILES_CSWpython-test = $(libdir)/python/test/.* +PKGFILES_CSWpython-test = $(libdir)/python/test/.* +PKGFILES_CSWpython-test += $(libdir)/python/bsddb/test.* +PKGFILES_CSWpython-test += $(libdir)/python/ctypes/test.* +PKGFILES_CSWpython-test += $(libdir)/python/email/test.* +PKGFILES_CSWpython-test += $(libdir)/python/distutils/tests.* +PKGFILES_CSWpython-test += $(libdir)/python/json/tests.* +PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* +PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* ENABLE_CHECK = 0 -REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk CSWcswclassutils +REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk REQUIRED_PKGS_CSWpython = CSWbdb CSWbzip2 CSWgdbm CSWggettextrt REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWpython-rt CSWreadline -REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWzlib CSWcswclassutils +REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWzlib REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk -REQUIRED_PKGS_CSWpython-tk += CSWpython-rt CSWcswclassutils -REQUIRED_PKGS_CSWpydistutils = CSWpython CSWcswclassutils -REQUIRED_PKGS_CSWpython-devel = CSWpython CSWcswclassutils -REQUIRED_PKGS_CSWpython-test = CSWpython CSWcswclassutils +REQUIRED_PKGS_CSWpython-tk += CSWpython-rt +REQUIRED_PKGS_CSWpython-devel = CSWpython +REQUIRED_PKGS_CSWpython-test = CSWpython -CATALOGNAME_CSWpydistutils = pydistutils CATALOGNAME_CSWidle = idle CATALOGNAME_CSWpython = python CATALOGNAME_CSWpython-devel = python_devel @@ -108,24 +129,20 @@ CATALOGNAME_CSWpython-test = python_test SPKG_DESC_CSWidle = Python IDE -SPKG_DESC_CSWdistutils = Python Distutils makes modules and extensions easily available SPKG_DESC_CSWpython = A high-level scripting language. SPKG_DESC_CSWpython-devel = Development Files for Python -SPKG_DESC_CSWpython-rt = Python Runtime Libraries +SPKG_DESC_CSWpython-rt = An empty, obsolete package SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) SPKG_DESC_CSWpython-test = Python Test modules -POST_INST_SCR = add-depricated-libs +include gar/category.mk -post-install-modulated: $(POST_INST_SCR) +post-install-modulated: install-deprecated-libs @$(MAKECOOKIE) -add-depricated-libs: - echo "===> Adding Depricated Libs" +install-deprecated-libs: + echo "===> Installing deprecated Libraries into $(libdir)" cp $(DOWNLOADDIR)/libpython2.5.so.1.0-$(MODULATION) \ $(DESTDIR)$(libdir)/libpython2.5.so.1.0 - cd $(DESTDIR)$(libdir);ln -s libpython2.5.so.1.0 libpython2.5.so + cd $(DESTDIR)$(libdir); ln -s libpython2.5.so.1.0 libpython2.5.so @$(MAKECOOKIE) - -include gar/category.mk - Modified: csw/mgar/pkg/python/trunk/checksums =================================================================== --- csw/mgar/pkg/python/trunk/checksums 2009-12-16 19:22:47 UTC (rev 7638) +++ csw/mgar/pkg/python/trunk/checksums 2009-12-16 20:14:10 UTC (rev 7639) @@ -1,11 +1,11 @@ -245db9f1e0f09ab7e0faaa0cf7301011 download/Python-2.6.2.tar.bz2 -42dd6523beb94a805d5764ae1276091c download/faqwiz.diff -5664b3970307d7d39d8d4061e7dccbb0 download/libpython2.5.so.1.0-isa-i386 -a87896c48b2f61b32053e6d02b07b022 download/libpython2.5.so.1.0-isa-sparcv8 -33f4094ee46ce865d3973a197f3fb4a0 download/makesetup.diff -22c5f741b1744213eaef0818ab280ad5 download/modules.diff -afcc79a94e2f8a576c7906a9700e35a0 download/multiprocess.diff -05724da367b025ce525de2bb704af6e3 download/pyport.diff -a1d114e8a20870675649aeef007a9cac download/python-config-in.diff -1d2763e140ff30a491b3ce11d1a44f97 download/setup.diff -d6c86beae46033be70c44c8e0e4c1908 download/site.diff +fee5408634a54e721a93531aba37f8c1 Python-2.6.4.tar.bz2 +42dd6523beb94a805d5764ae1276091c faqwiz.diff +5664b3970307d7d39d8d4061e7dccbb0 libpython2.5.so.1.0-isa-i386 +a87896c48b2f61b32053e6d02b07b022 libpython2.5.so.1.0-isa-sparcv8 +33f4094ee46ce865d3973a197f3fb4a0 makesetup.diff +22c5f741b1744213eaef0818ab280ad5 modules.diff +afcc79a94e2f8a576c7906a9700e35a0 multiprocess.diff +05724da367b025ce525de2bb704af6e3 pyport.diff +a1d114e8a20870675649aeef007a9cac python-config-in.diff +1d2763e140ff30a491b3ce11d1a44f97 setup.diff +d6c86beae46033be70c44c8e0e4c1908 site.diff 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 Dec 16 21:15:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Dec 2009 20:15:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7640] csw/mgar/pkg/django/trunk/Makefile Message-ID: Revision: 7640 http://gar.svn.sourceforge.net/gar/?rev=7640&view=rev Author: wahwah Date: 2009-12-16 20:15:58 +0000 (Wed, 16 Dec 2009) Log Message: ----------- django: Removing the incompatibility declaration on Phil's request Modified Paths: -------------- csw/mgar/pkg/django/trunk/Makefile Modified: csw/mgar/pkg/django/trunk/Makefile =================================================================== --- csw/mgar/pkg/django/trunk/Makefile 2009-12-16 20:14:10 UTC (rev 7639) +++ csw/mgar/pkg/django/trunk/Makefile 2009-12-16 20:15:58 UTC (rev 7640) @@ -26,8 +26,6 @@ DISTFILES = Django-$(GARVERSION).tar.gz PACKAGES = CSWpy-django CATALOGNAME_CSWpy-django = py_django -# In case someone has an old version from testing -INCOMPATIBLE_PKGS = CSWdjango ARCHALL = 1 UFILES_REGEX = Django-(\d+(?:\.\d+)*).tar.gz WORKSRC = $(WORKDIR)/Django-$(GARVERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 16 21:44:06 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 16 Dec 2009 20:44:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7641] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 7641 http://gar.svn.sourceforge.net/gar/?rev=7641&view=rev Author: chninkel Date: 2009-12-16 20:43:58 +0000 (Wed, 16 Dec 2009) Log Message: ----------- openssh: changed version numbering scheme Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2009-12-16 20:15:58 UTC (rev 7640) +++ csw/mgar/pkg/openssh/trunk/Makefile 2009-12-16 20:43:58 UTC (rev 7641) @@ -13,9 +13,8 @@ ###### Package information ####### GARNAME = openssh -GARVERSION = 5.3 -RELEASE = p1 -GSSKEX_PATCH_VERSION = $(GARVERSION)$(RELEASE) +GARVERSION = 5.3p1 +GSSKEX_PATCH_VERSION = $(GARVERSION) GSSKEX_PATCH_DATE = 20090726 CATEGORIES = server @@ -53,10 +52,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*p\d+).tar.gz -DISTVERSION = $(GARVERSION)$(RELEASE) -DISTNAME = $(GARNAME)-$(DISTVERSION) - -DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWossh.prototype CSWossh.preinstall CSWossh.checkinstall DISTFILES += CSWosshlpk.prototype CSWosshlpk.preinstall CSWosshlpk.checkinstall DISTFILES += CSWosshclient.prototype @@ -156,4 +152,3 @@ @$(MAKECOOKIE) -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2009-12-16 20:15:58 UTC (rev 7640) +++ csw/mgar/pkg/openssh/trunk/checksums 2009-12-16 20:43:58 UTC (rev 7641) @@ -5,7 +5,7 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 22ffa2a9b7bf310d58d3b299805a41b1 CSWosshlpk.prototype -96b1c2e2ae91fedc8d8324e246b648ef changelog.CSW +5323516aa6c7714d03473a0879599fc5 changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-12-16 20:15:58 UTC (rev 7640) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-12-16 20:43:58 UTC (rev 7641) @@ -1,6 +1,7 @@ -openssh (5.3,REV=2008.12.14_rev=p1) unstable +openssh (5.3p1,REV=2008.12.16) unstable * Package rebuild to solve an incorrect upload in the repository tree. + * Changed package version numbering scheme. -- Yann Rouillard Mon, 14 Dec 2009 21:19:33 +0100 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 Dec 16 22:33:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Dec 2009 21:33:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7642] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 7642 http://gar.svn.sourceforge.net/gar/?rev=7642&view=rev Author: bdwalton Date: 2009-12-16 21:33:37 +0000 (Wed, 16 Dec 2009) Log Message: ----------- libxml2: py_libxml2 needs to depend on CSWpython-rt too Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-16 20:43:58 UTC (rev 7641) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-16 21:33:37 UTC (rev 7642) @@ -27,7 +27,7 @@ REQUIRED_PKGS_CSWlibxml2 = CSWiconv CSWzlib REQUIRED_PKGS_CSWlibxml2devel = CSWlibxml2 -REQUIRED_PKGS_CSWpylibxml2 = CSWpython CSWlibxml2 +REQUIRED_PKGS_CSWpylibxml2 = CSWpython CSWpython-rt CSWlibxml2 # We don't have 64 bit Python yet CONFIGURE_ARGS_32 = --with-python=$(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 Dec 17 02:04:09 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 17 Dec 2009 01:04:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7643] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 7643 http://gar.svn.sourceforge.net/gar/?rev=7643&view=rev Author: bdwalton Date: 2009-12-17 01:04:08 +0000 (Thu, 17 Dec 2009) Log Message: ----------- libxml2: py_libxml2 directly depends on iconv and zlib too Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-16 21:33:37 UTC (rev 7642) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-12-17 01:04:08 UTC (rev 7643) @@ -27,7 +27,7 @@ REQUIRED_PKGS_CSWlibxml2 = CSWiconv CSWzlib REQUIRED_PKGS_CSWlibxml2devel = CSWlibxml2 -REQUIRED_PKGS_CSWpylibxml2 = CSWpython CSWpython-rt CSWlibxml2 +REQUIRED_PKGS_CSWpylibxml2 = CSWpython CSWpython-rt CSWlibxml2 CSWiconv CSWzlib # We don't have 64 bit Python yet CONFIGURE_ARGS_32 = --with-python=$(prefix) 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 Dec 17 11:19:42 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 17 Dec 2009 10:19:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7644] csw/mgar/pkg/python/trunk Message-ID: Revision: 7644 http://gar.svn.sourceforge.net/gar/?rev=7644&view=rev Author: wahwah Date: 2009-12-17 10:19:41 +0000 (Thu, 17 Dec 2009) Log Message: ----------- python: Adding the patch from http://bugs.python.org/issue7208 Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile csw/mgar/pkg/python/trunk/checksums Added Paths: ----------- csw/mgar/pkg/python/trunk/files/getpass.patch Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-17 01:04:08 UTC (rev 7643) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-17 10:19:41 UTC (rev 7644) @@ -43,6 +43,7 @@ PATCHFILES += site.diff PATCHFILES += python-config-in.diff PATCHFILES += setup.diff +PATCHFILES += getpass.patch # Test for sunaudiodev fails. SKIPTEST = 1 Modified: csw/mgar/pkg/python/trunk/checksums =================================================================== --- csw/mgar/pkg/python/trunk/checksums 2009-12-17 01:04:08 UTC (rev 7643) +++ csw/mgar/pkg/python/trunk/checksums 2009-12-17 10:19:41 UTC (rev 7644) @@ -1,5 +1,6 @@ fee5408634a54e721a93531aba37f8c1 Python-2.6.4.tar.bz2 42dd6523beb94a805d5764ae1276091c faqwiz.diff +88e213f865894051cdd8d3247502d612 getpass.patch 5664b3970307d7d39d8d4061e7dccbb0 libpython2.5.so.1.0-isa-i386 a87896c48b2f61b32053e6d02b07b022 libpython2.5.so.1.0-isa-sparcv8 33f4094ee46ce865d3973a197f3fb4a0 makesetup.diff Added: csw/mgar/pkg/python/trunk/files/getpass.patch =================================================================== --- csw/mgar/pkg/python/trunk/files/getpass.patch (rev 0) +++ csw/mgar/pkg/python/trunk/files/getpass.patch 2009-12-17 10:19:41 UTC (rev 7644) @@ -0,0 +1,30 @@ +--- release26-maint/Lib/getpass.py 2009/11/01 16:17:0676014 ++++ release26-maint/Lib/getpass.py 2009/11/01 18:31:1376015 +@@ -62,12 +62,16 @@ + try: + old = termios.tcgetattr(fd) # a copy to save + new = old[:] +- new[3] &= ~termios.ECHO # 3 == 'lflags' ++ new[3] &= ~(termios.ECHO|termios.ISIG) # 3 == 'lflags' ++ tcsetattr_flags = termios.TCSAFLUSH ++ if hasattr(termios, 'TCSASOFT'): ++ tcsetattr_flags |= termios.TCSASOFT + try: +- termios.tcsetattr(fd, termios.TCSADRAIN, new) ++ termios.tcsetattr(fd, tcsetattr_flags, new) + passwd = _raw_input(prompt, stream, input=input) + finally: +- termios.tcsetattr(fd, termios.TCSADRAIN, old) ++ termios.tcsetattr(fd, tcsetattr_flags, old) ++ stream.flush() # issue7208 + except termios.error, e: + if passwd is not None: + # _raw_input succeeded. The final tcsetattr failed. Reraise +@@ -125,6 +129,7 @@ + if prompt: + stream.write(prompt) + stream.flush() ++ # NOTE: The Python C API calls flockfile() (and unlock) during readline. + line = input.readline() + if not line: + raise EOFError 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 Dec 17 11:56:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Dec 2009 10:56:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7645] csw/mgar/pkg/pca/trunk Message-ID: Revision: 7645 http://gar.svn.sourceforge.net/gar/?rev=7645&view=rev Author: dmichelsen Date: 2009-12-17 10:56:06 +0000 (Thu, 17 Dec 2009) Log Message: ----------- pca: Update to 20091216-02 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2009-12-17 10:19:41 UTC (rev 7644) +++ csw/mgar/pkg/pca/trunk/Makefile 2009-12-17 10:56:06 UTC (rev 7645) @@ -1,5 +1,5 @@ GARNAME = pca -GARVERSION = 20091210-01 +GARVERSION = 20091216-02 CATEGORIES = utils DESCRIPTION = Patch Check Advanced Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2009-12-17 10:19:41 UTC (rev 7644) +++ csw/mgar/pkg/pca/trunk/checksums 2009-12-17 10:56:06 UTC (rev 7645) @@ -1,4 +1,4 @@ 4376789925fa9002d0567d739f717748 0001-prefer-opencsw-perl.diff 6f2f2376eba0a788795dd43d68ad32d1 COPYING -78cc7aa4238a782b5b63b0da93a2c60c pca-20091210-01 +7236327edeb969fd2a223cd5b60c0b57 pca-20091216-02 12de68ff8f67b4bb8b095e5646402208 pca.conf 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 Dec 17 11:59:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Dec 2009 10:59:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7646] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 7646 http://gar.svn.sourceforge.net/gar/?rev=7646&view=rev Author: dmichelsen Date: 2009-12-17 10:59:20 +0000 (Thu, 17 Dec 2009) Log Message: ----------- neon: Add new dependency to pakchois Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2009-12-17 10:56:06 UTC (rev 7645) +++ csw/mgar/pkg/neon/trunk/Makefile 2009-12-17 10:59:20 UTC (rev 7646) @@ -25,7 +25,7 @@ CATALOGNAME_CSWneon = neon CATALOGNAME_CSWneon-devel = neon_devel -REQUIRED_PKGS_CSWneon = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt +REQUIRED_PKGS_CSWneon = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt CSWpakchois REQUIRED_PKGS_CSWneon-devel = CSWneon SPKG_DESC_CSWneon = Neon HTTP and WebDAV client library 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 Dec 17 14:17:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Dec 2009 13:17:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7647] csw/mgar/pkg/libcdio/trunk/Makefile Message-ID: Revision: 7647 http://gar.svn.sourceforge.net/gar/?rev=7647&view=rev Author: dmichelsen Date: 2009-12-17 13:17:08 +0000 (Thu, 17 Dec 2009) Log Message: ----------- libcdio: Fix testsuite and add required pkgs Modified Paths: -------------- csw/mgar/pkg/libcdio/trunk/Makefile Modified: csw/mgar/pkg/libcdio/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcdio/trunk/Makefile 2009-12-17 10:59:20 UTC (rev 7646) +++ csw/mgar/pkg/libcdio/trunk/Makefile 2009-12-17 13:17:08 UTC (rev 7647) @@ -17,7 +17,20 @@ GARCOMPILER = GNU +REQUIRED_PKGS = CSWgcc4corert CSWgcc4g++rt CSWiconv + BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +MERGE_DIRS_isa-extra = $(libdir) + +# There is a minor test regarding timezones failing. +# Disable tests for now until this is fixed: +# https://savannah.gnu.org/support/index.php?107175 +SKIPTEST = 1 + include gar/category.mk + +# Force GNU ld +PATH := /opt/csw/gnu:$(PATH) 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 Dec 17 15:55:25 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 17 Dec 2009 14:55:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7648] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 7648 http://gar.svn.sourceforge.net/gar/?rev=7648&view=rev Author: bonivart Date: 2009-12-17 14:55:24 +0000 (Thu, 17 Dec 2009) Log Message: ----------- memconf: update to 2.12 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 2009-12-17 13:17:08 UTC (rev 7647) +++ csw/mgar/pkg/memconf/trunk/Makefile 2009-12-17 14:55:24 UTC (rev 7648) @@ -1,5 +1,5 @@ GARNAME = memconf -GARVERSION = 2.11 +GARVERSION = 2.12 CATEGORIES = utils DESCRIPTION = perl script that displays memory modules installed Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2009-12-17 13:17:08 UTC (rev 7647) +++ csw/mgar/pkg/memconf/trunk/checksums 2009-12-17 14:55:24 UTC (rev 7648) @@ -1,3 +1,3 @@ -0b50e833d8d48cd471f88fc42f378ed9 download/memconf.gz -fc6326ab5ca12b131f656339b515af59 download/memconf.man -818efbe29da417ad462e3f6345690c3d download/COPYING +818efbe29da417ad462e3f6345690c3d COPYING +25f0fc4fcd06e749dedc2e0fa7e0287b memconf.gz +a99158c0948d76ecb9012494697c840b memconf.man 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 Dec 17 17:37:57 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 17 Dec 2009 16:37:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7649] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 7649 http://gar.svn.sourceforge.net/gar/?rev=7649&view=rev Author: bonivart Date: 2009-12-17 16:37:57 +0000 (Thu, 17 Dec 2009) Log Message: ----------- spamassassin: update to 3.3.0 beta 1 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.checkinstall csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.depend csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.gspec csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.postinstall Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-17 14:55:24 UTC (rev 7648) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-17 16:37:57 UTC (rev 7649) @@ -1,6 +1,6 @@ GARNAME = spamassassin SPKG_NAME = Mail-SpamAssassin -GARVERSION = 3.2.5 +GARVERSION = 3.3.0 CATEGORIES = net DESCRIPTION = mail filter with a wide range of tests @@ -10,30 +10,33 @@ DNS blocklists, and collaborative filtering databases. endef -MASTER_SITES = http://apache.jumper.nu/spamassassin/source/ -DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz +#MASTER_SITES = http://apache.jumper.nu/spamassassin/source/ +MASTER_SITES = http://people.apache.org/~wtogami/devel/ +#DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz +DISTFILES = $(SPKG_NAME)-$(GARVERSION)-beta1.tar.gz LICENSE = $(WORKDIR)/$(SPKG_NAME)-$(GARVERSION)/LICENSE -REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha1 CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetdns CSWpmuri CSWpmhtmlparser CSWzlib CSWcswclassutils +REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha1 +REQUIRED_PKGS += CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib +REQUIRED_PKGS += CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim +REQUIRED_PKGS += CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetdns +REQUIRED_PKGS += CSWpmuri CSWpmhtmlparser CSWzlib # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(SPKG_NAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_CLASSES_CSWspamassassin = none cswusergroup cswcpsampleconf cswinitsmf +SAMPLECONF = /opt/csw/etc/spamassassin/.+\.pre\.CSW +SAMPLECONF += /opt/csw/etc/spamassassin/local\.cf\.CSW +INITSMF = /etc/opt/csw/init.d/cswspamd +USERGROUP = /opt/csw/etc/CSWspamassassin/cswusergroup CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom -TEST_SCRIPTS = custom +#TEST_SCRIPTS = custom +TEST_SCRIPTS = INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/opt\/csw\/etc\/spamassassin\/.+\.pre\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /\/opt\/csw\/etc\/spamassassin\/local\.cf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /\/opt\/csw\/etc\/CSWspamassassin\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \ - $$$$3 ~ /\/init.d\/cswspamd$$$$/ { $$$$2 = "cswinitsmf" } \ - { print }' - include gar/category.mk WORKSRC = $(WORKDIR)/$(SPKG_NAME)-$(GARVERSION) @@ -45,12 +48,12 @@ perl Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) CONFDIR=/opt/csw/etc/spamassassin LOCALSTATEDIR=/var/opt/csw/spamassassin CONTACT_ADDRESS=postmaster ) @$(MAKECOOKIE) -pre-build-modulated: - @echo " ==> Pre-build $(GARNAME) (custom)" - @( cd $(WORKSRC)/spamc ; \ - sed 's/CFLAGS = /CFLAGS = -xarch=v8 /' Makefile.in > Makefile.tmp ; \ - cp Makefile.tmp Makefile.in ) - @$(MAKECOOKIE) +#pre-build-modulated: +# @echo " ==> Pre-build $(GARNAME) (custom)" +# @( cd $(WORKSRC)/spamc ; \ +# sed 's/CFLAGS = /CFLAGS = -xarch=v8 /' Makefile.in > Makefile.tmp ; \ +# cp Makefile.tmp Makefile.in ) +# @$(MAKECOOKIE) build-custom: @echo " ==> Building $(GARNAME) (custom)" @@ -66,6 +69,8 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" + @echo "LICENSE = $(WORKSRC)/LICENSE" + @ls -l $(WORKSRC)/LICENSE @rm -rf $(DESTDIR) @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME) @@ -75,8 +80,9 @@ @ginstall -m 644 $(FILEDIR)/CSWspamassassin.cswusergroup $(DESTDIR)$(sysconfdir)/CSWspamassassin/cswusergroup @cp $(FILEDIR)/CSWspamassassin.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @cp $(FILEDIR)/CSWspamassassin.README.spamd $(DESTDIR)$(docdir)/$(GARNAME)/README.spamd + echo "WORKSRC: $(WORKSRC)" @( cd $(WORKSRC) ; \ - gmake install ) + gmake DESTDIR=$(DESTDIR) install ) @( cd $(WORKSRC) ; \ cp -r C* INSTALL NOTICE README TRADEMARK U* ldap/ sql/ procmailrc.example sample-* $(DESTDIR)$(docdir)/$(GARNAME)/ ) @( cd $(DESTDIR)/opt/csw/etc/spamassassin ; \ Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-17 14:55:24 UTC (rev 7648) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-17 16:37:57 UTC (rev 7649) @@ -1,5 +1 @@ -7fdc1651d0371c4a7f95ac9ae6f828a6 download/Mail-SpamAssassin-3.2.5.tar.gz -cab47048b63840594cdbef3067760ec6 download/CSWspamassassin.gspec -7048882870e87e1f8eaa193b5dcaa7a8 download/CSWspamassassin.checkinstall -ace3e9b5c2b93703e134992fcd73522b download/CSWspamassassin.depend -b9e397df2e43ffe120332465da5fd68f download/CSWspamassassin.postinstall +530fb1bd28977271f30b348bc2b68db1 Mail-SpamAssassin-3.3.0-beta1.tar.gz Deleted: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.checkinstall =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.checkinstall 2009-12-17 14:55:24 UTC (rev 7648) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.checkinstall 2009-12-17 16:37:57 UTC (rev 7649) @@ -1,35 +0,0 @@ -# checkinstall for CSWspamassassin -# This script saves the existing configuration directory user and group -# in variables used by postinstall to reset the configuration directory -# permissions. - -# If installing on a filesystem that is not running the OS, exit this script. -if [ ! x"$PKG_INSTALL_ROOT" = x"" -a ! x"$PKG_INSTALL_ROOT" = x"/" ] ; then exit 0 ; fi - -if [ x"$PKG_INSTALL_ROOT" = x"" ] ; then - PKG_INSTALL_ROOT="/" -fi - -# If available, save user and group permissions for /opt/csw/etc/spamassassin -# directory -CONFDIR="/etc/opt/csw/spamassassin" -if [ ! -d "$CONFDIR" ] ; then - CONFDIR="/opt/csw/etc/spamassassin" - if [ ! -d "$CONFDIR" ] ; then - CONFDIR="" - fi -fi - -if [ x"$CONFDIR" != x ] ; then - SPAMDUSER=`ls -ld "$CONFDIR" |awk '{print $3;}'` - SPAMDGROUP=`ls -ld "$CONFDIR" |awk '{print $4;}'` -# Make env variables available to other packaging scripts -cat >$1 < Revision: 7650 http://gar.svn.sourceforge.net/gar/?rev=7650&view=rev Author: bonivart Date: 2009-12-17 16:48:34 +0000 (Thu, 17 Dec 2009) Log Message: ----------- spamassassin: fix license file Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Added Paths: ----------- csw/mgar/pkg/spamassassin/trunk/files/COPYING Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-17 16:37:57 UTC (rev 7649) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-17 16:48:34 UTC (rev 7650) @@ -14,9 +14,8 @@ MASTER_SITES = http://people.apache.org/~wtogami/devel/ #DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz DISTFILES = $(SPKG_NAME)-$(GARVERSION)-beta1.tar.gz +DISTFILES += COPYING -LICENSE = $(WORKDIR)/$(SPKG_NAME)-$(GARVERSION)/LICENSE - REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha1 REQUIRED_PKGS += CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib REQUIRED_PKGS += CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-17 16:37:57 UTC (rev 7649) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-17 16:48:34 UTC (rev 7650) @@ -1 +1,2 @@ +3b83ef96387f14655fc854ddc3c6bd57 COPYING 530fb1bd28977271f30b348bc2b68db1 Mail-SpamAssassin-3.3.0-beta1.tar.gz Added: csw/mgar/pkg/spamassassin/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/spamassassin/trunk/files/COPYING 2009-12-17 16:48:34 UTC (rev 7650) @@ -0,0 +1,202 @@ + + 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. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Thu Dec 17 20:35:20 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Thu, 17 Dec 2009 19:35:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7651] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 7651 http://gar.svn.sourceforge.net/gar/?rev=7651&view=rev Author: harpchad Date: 2009-12-17 19:35:19 +0000 (Thu, 17 Dec 2009) Log Message: ----------- Bump version to 2.6.4 Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2009-12-17 16:48:34 UTC (rev 7650) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2009-12-17 19:35:19 UTC (rev 7651) @@ -1,7 +1,7 @@ # $Id$ GARNAME = pidgin -GARVERSION = 2.6.3 +GARVERSION = 2.6.4 CATEGORIES = apps DESCRIPTION = Multi-protocol IM client Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2009-12-17 16:48:34 UTC (rev 7650) +++ csw/mgar/pkg/pidgin/trunk/checksums 2009-12-17 19:35:19 UTC (rev 7651) @@ -1 +1 @@ -d0b030f0f746251b48fc78f59fe71861 download/pidgin-2.6.3.tar.gz +81acb7d7e4a5d21ba83b5b00cfb60ac5 download/pidgin-2.6.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Thu Dec 17 21:14:05 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Thu, 17 Dec 2009 20:14:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7652] csw/mgar/pkg/vim/trunk Message-ID: Revision: 7652 http://gar.svn.sourceforge.net/gar/?rev=7652&view=rev Author: harpchad Date: 2009-12-17 20:14:04 +0000 (Thu, 17 Dec 2009) Log Message: ----------- Bump patch level to 320 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vim/trunk/checksums Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2009-12-17 19:35:19 UTC (rev 7651) +++ csw/mgar/pkg/vim/trunk/Makefile 2009-12-17 20:14:04 UTC (rev 7652) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.2 -PATCHREV = 266 +PATCHREV = 320 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2009-12-17 19:35:19 UTC (rev 7651) +++ csw/mgar/pkg/vim/trunk/checksums 2009-12-17 20:14:04 UTC (rev 7652) @@ -264,6 +264,60 @@ 352951ed477e83d3527c2ff95a7c2484 download/7.2.264 4b12ddc88794c20ad3dbe238ccf91807 download/7.2.265 9bfd540da3982b9841421cabc564f958 download/7.2.266 +ff87b49c02d7c7f3a084a1b594ae88ac download/7.2.267 +333855dceb650a83a3a2c0bc39e59883 download/7.2.268 +b668c729a8116bd73296a93807234d86 download/7.2.269 +08dcef5d1f22d8667454b0ab487e533c download/7.2.270 +e7982aaa6e1582e8313b07ad92f7cbec download/7.2.271 +42af89bdd081e67af66ab7ac896ec82f download/7.2.272 +db4a84251344f9be6bc466f0e93b56c2 download/7.2.273 +8375467c6e837d41ffca1044264f07d7 download/7.2.274 +7b01fe74c4b97ca52674c7b48917c8f8 download/7.2.275 +18d2eded81ed3743fb33886856dcaaca download/7.2.276 +2fab085fbd95c7f1ccd5432b42ac171e download/7.2.277 +650cfd7a47be176206e32adb2eb2fbd6 download/7.2.278 +91bd881902deb859eb88a9661a818a06 download/7.2.279 +6718336ff2eda0aebe0ad2f79a87bb72 download/7.2.280 +9021fcb03db3247f052bc2bc8c101554 download/7.2.281 +fd8c5680ec0a72516205f36068987b0f download/7.2.282 +630bfb6d7eb4fe4a365facaf60943151 download/7.2.283 +49f8814cd8e54bc21fe8dffc917b51c3 download/7.2.284 +371d70c8fd279238037d3b8c28a69479 download/7.2.285 +6074a34e9de9ea214aaa9059415ecff7 download/7.2.286 +30399617fc60ba7c6721aba1aa4cb4fe download/7.2.287 +e4af9091b9bd725a03d6f59f24a05d8f download/7.2.288 +b644db8f7cc6fb0dfd72578659d4dd5b download/7.2.289 +4f59608390ca566ef8ddfcf1dedf9cb8 download/7.2.290 +816dda0f77bda27759f5d3cff96ec1d2 download/7.2.291 +fd6f78dbdf02404c49c83e0fc50fdcb1 download/7.2.292 +51d2685c3fd4357d70472bf89c7674f7 download/7.2.293 +60ae3ec3e8c490b139d06260eea95ed6 download/7.2.294 +9029fd778fcbe2d67d2884ab34bd6aa1 download/7.2.295 +204298e1f5edb50ce68dcb5bdf6e0dbb download/7.2.296 +4646ae4272a7ed72ed4531214c1a94ea download/7.2.297 +cb5197804af66e8b7b568d5cbb9aea39 download/7.2.298 +50e000c313d6061be06b7110c101fb49 download/7.2.299 +54512d653ae4947911df73046024c07d download/7.2.300 +dba442d3c7ab15794c48d89ac2bd50ab download/7.2.301 +76ddee93248aaaaeb56a926f90a92d48 download/7.2.302 +9e448cc39db6bca1421c58fd91994c2e download/7.2.303 +dc47073f62ba8b87d29593042e6b9c24 download/7.2.304 +87698db3201d95b973430479872fb70c download/7.2.305 +4927e5f5c757b610db1184ed05c1c355 download/7.2.306 +a3f136eb3e73254fe1bc90dd3319886f download/7.2.307 +366670c20b3dccd17ba16b48c0643543 download/7.2.308 +a33bf5b244644dc1dfcedb58b64e224a download/7.2.309 +2b4e530e0286197917cccc4d5ddad75b download/7.2.310 +a121e8d4f5d3ef109b7dc708160c48ed download/7.2.311 +9d43a4cb5261144c5368afb47e91b15e download/7.2.312 +fc0905f652a5c3e2f8144ad940454ceb download/7.2.313 +bbc2bc5e522158c34f5a957e9a43ec85 download/7.2.314 +abda87ae0b9590203661dff5cf212918 download/7.2.315 +9551787240e4d4d0ba9962a88ffd295e download/7.2.316 +b7cda2d415ef56e93b436b157da65512 download/7.2.317 +d323859a6998ab7566837e4ee487db4d download/7.2.318 +93fcc07a053e4bf17cc329eebf4eec69 download/7.2.319 +d81436a10e166fd5ad0503961bb63f7e download/7.2.320 73612b6658c597ee478abf27a0a89ed5 download/COPYING 80304427884b8b78134bc7c7c9097679 download/gvimrc 35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 17 21:18:13 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 17 Dec 2009 20:18:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7653] csw/mgar/pkg/puppet/branches/puppet-0.24.x/ Message-ID: Revision: 7653 http://gar.svn.sourceforge.net/gar/?rev=7653&view=rev Author: wahwah Date: 2009-12-17 20:18:12 +0000 (Thu, 17 Dec 2009) Log Message: ----------- Branching off to maintain the 0.24.x version. Added Paths: ----------- csw/mgar/pkg/puppet/branches/puppet-0.24.x/ 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 Dec 17 21:24:12 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 17 Dec 2009 20:24:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7654] csw/mgar/pkg/puppet/branches/puppet-0.24.x Message-ID: Revision: 7654 http://gar.svn.sourceforge.net/gar/?rev=7654&view=rev Author: wahwah Date: 2009-12-17 20:24:12 +0000 (Thu, 17 Dec 2009) Log Message: ----------- puppet-0.24.x: Version downgrade to 0.24.8 Modified Paths: -------------- csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums Modified: csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile 2009-12-17 20:18:12 UTC (rev 7653) +++ csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile 2009-12-17 20:24:12 UTC (rev 7654) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh GARNAME = puppet -GARVERSION = 0.25.1 +GARVERSION = 0.24.8 CATEGORIES = apps define BLURB @@ -21,9 +21,9 @@ endef MASTER_SITES = http://reductivelabs.com/downloads/puppet/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/ INITSMF = $(sysconfdir)/init\.d/cswpuppetd @@ -35,7 +35,7 @@ PACKAGES = CSWpuppet CSWpuppetmaster REQUIRED_PKGS = CSWfacter -#PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS = REQUIRED_PKGS_CSWpuppetmaster = CSWpuppet PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd Modified: csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums 2009-12-17 20:18:12 UTC (rev 7653) +++ csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums 2009-12-17 20:24:12 UTC (rev 7654) @@ -3,4 +3,4 @@ f4a95dece2231805abf4754d72471de4 cswpuppetd aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup -55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.1.tar.gz +288d46dee00acad64d0f3ecc6d8ba6fa puppet-0.24.8.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Thu Dec 17 21:48:03 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Thu, 17 Dec 2009 20:48:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7655] csw/mgar/pkg/gvim/trunk Message-ID: Revision: 7655 http://gar.svn.sourceforge.net/gar/?rev=7655&view=rev Author: harpchad Date: 2009-12-17 20:48:03 +0000 (Thu, 17 Dec 2009) Log Message: ----------- Bump patch level to 320 Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gvim/trunk/checksums Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2009-12-17 20:24:12 UTC (rev 7654) +++ csw/mgar/pkg/gvim/trunk/Makefile 2009-12-17 20:48:03 UTC (rev 7655) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.2 -PATCHREV = 266 +PATCHREV = 320 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2009-12-17 20:24:12 UTC (rev 7654) +++ csw/mgar/pkg/gvim/trunk/checksums 2009-12-17 20:48:03 UTC (rev 7655) @@ -1,8 +1,3 @@ -f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 -d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz -35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz -47396843634a6e3c05d4f5d6b4bf8a72 download/gvim.desktop -73612b6658c597ee478abf27a0a89ed5 download/COPYING 7c2dc4a956cf315e546e347bc349968c download/7.2.001 7f16f80814f1e071a689806c2056b39d download/7.2.002 0de916fdfd450a4a0d95bed44ae2c398 download/7.2.003 @@ -269,4 +264,63 @@ 352951ed477e83d3527c2ff95a7c2484 download/7.2.264 4b12ddc88794c20ad3dbe238ccf91807 download/7.2.265 9bfd540da3982b9841421cabc564f958 download/7.2.266 +ff87b49c02d7c7f3a084a1b594ae88ac download/7.2.267 +333855dceb650a83a3a2c0bc39e59883 download/7.2.268 +b668c729a8116bd73296a93807234d86 download/7.2.269 +08dcef5d1f22d8667454b0ab487e533c download/7.2.270 +e7982aaa6e1582e8313b07ad92f7cbec download/7.2.271 +42af89bdd081e67af66ab7ac896ec82f download/7.2.272 +db4a84251344f9be6bc466f0e93b56c2 download/7.2.273 +8375467c6e837d41ffca1044264f07d7 download/7.2.274 +7b01fe74c4b97ca52674c7b48917c8f8 download/7.2.275 +18d2eded81ed3743fb33886856dcaaca download/7.2.276 +2fab085fbd95c7f1ccd5432b42ac171e download/7.2.277 +650cfd7a47be176206e32adb2eb2fbd6 download/7.2.278 +91bd881902deb859eb88a9661a818a06 download/7.2.279 +6718336ff2eda0aebe0ad2f79a87bb72 download/7.2.280 +9021fcb03db3247f052bc2bc8c101554 download/7.2.281 +fd8c5680ec0a72516205f36068987b0f download/7.2.282 +630bfb6d7eb4fe4a365facaf60943151 download/7.2.283 +49f8814cd8e54bc21fe8dffc917b51c3 download/7.2.284 +371d70c8fd279238037d3b8c28a69479 download/7.2.285 +6074a34e9de9ea214aaa9059415ecff7 download/7.2.286 +30399617fc60ba7c6721aba1aa4cb4fe download/7.2.287 +e4af9091b9bd725a03d6f59f24a05d8f download/7.2.288 +b644db8f7cc6fb0dfd72578659d4dd5b download/7.2.289 +4f59608390ca566ef8ddfcf1dedf9cb8 download/7.2.290 +816dda0f77bda27759f5d3cff96ec1d2 download/7.2.291 +fd6f78dbdf02404c49c83e0fc50fdcb1 download/7.2.292 +51d2685c3fd4357d70472bf89c7674f7 download/7.2.293 +60ae3ec3e8c490b139d06260eea95ed6 download/7.2.294 +9029fd778fcbe2d67d2884ab34bd6aa1 download/7.2.295 +204298e1f5edb50ce68dcb5bdf6e0dbb download/7.2.296 +4646ae4272a7ed72ed4531214c1a94ea download/7.2.297 +cb5197804af66e8b7b568d5cbb9aea39 download/7.2.298 +50e000c313d6061be06b7110c101fb49 download/7.2.299 +54512d653ae4947911df73046024c07d download/7.2.300 +dba442d3c7ab15794c48d89ac2bd50ab download/7.2.301 +76ddee93248aaaaeb56a926f90a92d48 download/7.2.302 +9e448cc39db6bca1421c58fd91994c2e download/7.2.303 +dc47073f62ba8b87d29593042e6b9c24 download/7.2.304 +87698db3201d95b973430479872fb70c download/7.2.305 +4927e5f5c757b610db1184ed05c1c355 download/7.2.306 +a3f136eb3e73254fe1bc90dd3319886f download/7.2.307 +366670c20b3dccd17ba16b48c0643543 download/7.2.308 +a33bf5b244644dc1dfcedb58b64e224a download/7.2.309 +2b4e530e0286197917cccc4d5ddad75b download/7.2.310 +a121e8d4f5d3ef109b7dc708160c48ed download/7.2.311 +9d43a4cb5261144c5368afb47e91b15e download/7.2.312 +fc0905f652a5c3e2f8144ad940454ceb download/7.2.313 +bbc2bc5e522158c34f5a957e9a43ec85 download/7.2.314 +abda87ae0b9590203661dff5cf212918 download/7.2.315 +9551787240e4d4d0ba9962a88ffd295e download/7.2.316 +b7cda2d415ef56e93b436b157da65512 download/7.2.317 +d323859a6998ab7566837e4ee487db4d download/7.2.318 +93fcc07a053e4bf17cc329eebf4eec69 download/7.2.319 +d81436a10e166fd5ad0503961bb63f7e download/7.2.320 +73612b6658c597ee478abf27a0a89ed5 download/COPYING +47396843634a6e3c05d4f5d6b4bf8a72 download/gvim.desktop +35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz +d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz +f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.patch 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 Dec 18 09:51:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Dec 2009 08:51:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7656] csw/mgar/pkg Message-ID: Revision: 7656 http://gar.svn.sourceforge.net/gar/?rev=7656&view=rev Author: dmichelsen Date: 2009-12-18 08:51:10 +0000 (Fri, 18 Dec 2009) Log Message: ----------- pdfjam: Initial commit Added Paths: ----------- csw/mgar/pkg/pdfjam/ csw/mgar/pkg/pdfjam/branches/ csw/mgar/pkg/pdfjam/tags/ csw/mgar/pkg/pdfjam/trunk/ csw/mgar/pkg/pdfjam/trunk/Makefile csw/mgar/pkg/pdfjam/trunk/checksums csw/mgar/pkg/pdfjam/trunk/files/ Property changes on: csw/mgar/pkg/pdfjam/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/pdfjam/trunk/Makefile =================================================================== --- csw/mgar/pkg/pdfjam/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pdfjam/trunk/Makefile 2009-12-18 08:51:10 UTC (rev 7656) @@ -0,0 +1,38 @@ +GARNAME = pdfjam +GARVERSION = 1.21 +CATEGORIES = utils + +DESCRIPTION = Small collection of shell scripts to enhance pdflatex +define BLURB + PDFjam is a small collection of shell scripts which provide a simple interface + to some of the functionality of the excellent pdfpages package (by Andreas Matthias) + for pdfLaTeX. +endef + +MASTER_SITES = http://www.warwick.ac.uk/go/pdfjam/ +DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam + +DISTNAME = pdfjam + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +ARCHALL = 1 + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + (cd $(WORKSRC) && ginstall scripts/* $(DESTDIR)$(bindir)) + ginstall -d $(DESTDIR)$(docdir)/pdfjam + (cd $(WORKSRC) && ginstall VERSION PDFjam-README.html pdfdroplets.png $(DESTDIR)$(docdir)/pdfjam) + ginstall -d $(DESTDIR)$(mandir)/man1 + (cd $(WORKSRC) && ginstall man1/* $(DESTDIR)$(mandir)/man1) + @$(MAKECOOKIE) Added: csw/mgar/pkg/pdfjam/trunk/checksums =================================================================== --- csw/mgar/pkg/pdfjam/trunk/checksums (rev 0) +++ csw/mgar/pkg/pdfjam/trunk/checksums 2009-12-18 08:51:10 UTC (rev 7656) @@ -0,0 +1 @@ +71d2d664777d32ec4154ab4c2e5965dc pdfjam_1.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 12:32:41 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 11:32:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7657] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 7657 http://gar.svn.sourceforge.net/gar/?rev=7657&view=rev Author: rthurner Date: 2009-12-18 11:32:41 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apache2 - upgrade to 2.2.14, and new gar Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/checksums Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 08:51:10 UTC (rev 7656) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 11:32:41 UTC (rev 7657) @@ -8,6 +8,14 @@ best around in terms of functionality, efficiency, security and speed. endef +SPKG_DESC_CSWapache2 = Apache 2.2 web server +SPKG_DESC_CSWapache2c = Apache 2.2 web server (core) +SPKG_DESC_CSWapache2rt = Apache 2.2 runtime libraries +SPKG_DESC_CSWap2prefork = Apache 2.2 prefork MPM +SPKG_DESC_CSWap2suexec = Apache 2.2 suEXEC support +SPKG_DESC_CSWapache2-devel = Apache 2.2 development support +SPKG_DESC_CSWapache2-manual = Apache 2.2 manual + include files/config.mk # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2009-12-18 08:51:10 UTC (rev 7656) +++ csw/mgar/pkg/apache2/trunk/checksums 2009-12-18 11:32:41 UTC (rev 7657) @@ -1,31 +1,31 @@ -03b893953995a59649b9afbc5253f9e1 download/CSWap2prefork.gspec -b30329626b94f5e22447c7032c4735b3 download/CSWap2prefork.postinstall -9df2944f619992604f78f477ff5e8c1f download/CSWap2prefork.postremove -f02746d1ed7d57d1171fc4c536451fdb download/CSWap2prefork.prototype -0dd379f20ceb32fc77bb3a9bf045097f download/CSWap2prefork.space -f90d0488f01ba57bffa88a4c1897ca28 download/CSWap2suexec.gspec -405bc4df4662e9faebe34f9b6a093d14 download/CSWap2suexec.postinstall -36128341749fa79f9942f4156b85f5b6 download/CSWap2suexec.preremove -27cc92536c2335868e727f4517a967db download/CSWap2suexec.prototype -020f593630a0d59a4e398814e0e02c0f download/CSWapache2-devel.gspec -557c1d7fea8d6cd6674be399c0ab10d5 download/CSWapache2-devel.prototype -cb25d4b9c4e32f9e308c84824a4ca8f3 download/CSWapache2-manual.gspec -03d560ad0cd320ead33dc6fa2e72ad4c download/CSWapache2-manual.prototype -1b57e8fd32556ee3a3d9fb2a908ddc6c download/CSWapache2.gspec -61b6b11aa70677da9386e90c3b5ba21c download/CSWapache2.killproc -d41d8cd98f00b204e9800998ecf8427e download/CSWapache2.prototype -68cf0129905c2aae52cd23e614a05eb6 download/CSWapache2c.gspec -e629a549294b2d91e8a0365c43d097cd download/CSWapache2c.postinstall -e9af24bf68414f2c1c571e344cc1227a download/CSWapache2c.prototype -0dd379f20ceb32fc77bb3a9bf045097f download/CSWapache2c.space -523b1f316a67090dfc08fe7506cb1aa0 download/CSWapache2rt.checkinstall -7546bc4336d9656e5b02e392264ce114 download/CSWapache2rt.gspec -602b5bc079c3dbf441e9d0b4e1bc3fc7 download/CSWapache2rt.prototype -308836569bf0cc1be27ac45e3123e0c2 download/apu-iconv.diff -a7467a756cbd980d4cfe3c2cfb6a9e35 download/config.layout -b3c2086facecc3f898d29f3c8c74da11 download/cswapache2 -2803e35be6650f5b739e6e91faa824dd download/httpd-2.2.13.tar.gz -d9d1abded665674800f3e5c246a4163f download/httpd-mpm.conf.CSW -796a7d5095ce154c274a2ccfd60ec753 download/httpd-ssl.conf.CSW -f0941e5782e4bee45c2c95bd9460796b download/httpd.conf.CSW -033a19975c59bffcc5b144628f8a8e06 download/update20to22 +03b893953995a59649b9afbc5253f9e1 CSWap2prefork.gspec +b30329626b94f5e22447c7032c4735b3 CSWap2prefork.postinstall +9df2944f619992604f78f477ff5e8c1f CSWap2prefork.postremove +f02746d1ed7d57d1171fc4c536451fdb CSWap2prefork.prototype +0dd379f20ceb32fc77bb3a9bf045097f CSWap2prefork.space +f90d0488f01ba57bffa88a4c1897ca28 CSWap2suexec.gspec +405bc4df4662e9faebe34f9b6a093d14 CSWap2suexec.postinstall +36128341749fa79f9942f4156b85f5b6 CSWap2suexec.preremove +27cc92536c2335868e727f4517a967db CSWap2suexec.prototype +020f593630a0d59a4e398814e0e02c0f CSWapache2-devel.gspec +557c1d7fea8d6cd6674be399c0ab10d5 CSWapache2-devel.prototype +cb25d4b9c4e32f9e308c84824a4ca8f3 CSWapache2-manual.gspec +03d560ad0cd320ead33dc6fa2e72ad4c CSWapache2-manual.prototype +1b57e8fd32556ee3a3d9fb2a908ddc6c CSWapache2.gspec +61b6b11aa70677da9386e90c3b5ba21c CSWapache2.killproc +d41d8cd98f00b204e9800998ecf8427e CSWapache2.prototype +68cf0129905c2aae52cd23e614a05eb6 CSWapache2c.gspec +e629a549294b2d91e8a0365c43d097cd CSWapache2c.postinstall +e9af24bf68414f2c1c571e344cc1227a CSWapache2c.prototype +0dd379f20ceb32fc77bb3a9bf045097f CSWapache2c.space +523b1f316a67090dfc08fe7506cb1aa0 CSWapache2rt.checkinstall +7546bc4336d9656e5b02e392264ce114 CSWapache2rt.gspec +602b5bc079c3dbf441e9d0b4e1bc3fc7 CSWapache2rt.prototype +308836569bf0cc1be27ac45e3123e0c2 apu-iconv.diff +a7467a756cbd980d4cfe3c2cfb6a9e35 config.layout +b3c2086facecc3f898d29f3c8c74da11 cswapache2 +2c1e3c7ba00bcaa0163da7b3e66aaa1e httpd-2.2.14.tar.gz +d9d1abded665674800f3e5c246a4163f httpd-mpm.conf.CSW +796a7d5095ce154c274a2ccfd60ec753 httpd-ssl.conf.CSW +f0941e5782e4bee45c2c95bd9460796b httpd.conf.CSW +033a19975c59bffcc5b144628f8a8e06 update20to22 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 12:39:14 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 11:39:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7658] csw/mgar/pkg/apache2/trunk/files Message-ID: Revision: 7658 http://gar.svn.sourceforge.net/gar/?rev=7658&view=rev Author: rthurner Date: 2009-12-18 11:39:13 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apache2 - gspec remove duplicate information Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec 2009-12-18 11:32:41 UTC (rev 7657) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec 2009-12-18 11:39:13 UTC (rev 7658) @@ -1,5 +1,4 @@ %var bitname apache2_devel %var pkgname CSWapache2-devel %include url file://%{PKGLIB}/csw_standard.gspec -%var desc Apache 2.2 development support %copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec 2009-12-18 11:32:41 UTC (rev 7657) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec 2009-12-18 11:39:13 UTC (rev 7658) @@ -2,5 +2,4 @@ %var pkgname CSWapache2-manual %var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache 2.2 manual %copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec 2009-12-18 11:32:41 UTC (rev 7657) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec 2009-12-18 11:39:13 UTC (rev 7658) @@ -2,5 +2,4 @@ %var pkgname CSWapache2 %var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache 2.2 web server %copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec 2009-12-18 11:32:41 UTC (rev 7657) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec 2009-12-18 11:39:13 UTC (rev 7658) @@ -1,5 +1,4 @@ %var bitname apache2c %var pkgname CSWapache2c %include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache 2.2 web server (core) %copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec 2009-12-18 11:32:41 UTC (rev 7657) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec 2009-12-18 11:39:13 UTC (rev 7658) @@ -1,5 +1,4 @@ %var bitname apache2rt %var pkgname CSWapache2rt %include url file://%{PKGLIB}/csw_standard.gspec -%var desc Apache 2.2 runtime libraries %copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 13:33:03 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 12:33:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7659] csw/mgar/pkg/apr/trunk Message-ID: Revision: 7659 http://gar.svn.sourceforge.net/gar/?rev=7659&view=rev Author: rthurner Date: 2009-12-18 12:33:03 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apr - upgrade to 1.3.9, upgrade to gar-v2 build Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile csw/mgar/pkg/apr/trunk/checksums Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2009-12-18 11:39:13 UTC (rev 7658) +++ csw/mgar/pkg/apr/trunk/Makefile 2009-12-18 12:33:03 UTC (rev 7659) @@ -1,5 +1,5 @@ GARNAME = apr -GARVERSION = 1.3.8 +GARVERSION = 1.3.9 CATEGORIES = lib DESCRIPTION = Apache Portable Runtime Modified: csw/mgar/pkg/apr/trunk/checksums =================================================================== --- csw/mgar/pkg/apr/trunk/checksums 2009-12-18 11:39:13 UTC (rev 7658) +++ csw/mgar/pkg/apr/trunk/checksums 2009-12-18 12:33:03 UTC (rev 7659) @@ -1,2 +1 @@ -310fac12285d94a162c488f4b8f1aabc apr-1.3.8.tar.gz -263cd22b83bd6593398013792c2a3ce4 config.layout +85bcd8005153b8fa63b1e3f95ea31f07 apr-1.3.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 13:38:04 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 12:38:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7660] csw/mgar/pkg/apr-util/trunk Message-ID: Revision: 7660 http://gar.svn.sourceforge.net/gar/?rev=7660&view=rev Author: rthurner Date: 2009-12-18 12:38:04 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apr-util: update to gar v2, and apr-util-1.3.9 Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/apr-util/trunk/ Property changes on: csw/mgar/pkg/apr-util/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2009-12-18 12:33:03 UTC (rev 7659) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2009-12-18 12:38:04 UTC (rev 7660) @@ -1,5 +1,5 @@ GARNAME = apr-util -GARVERSION = 1.2.2 +GARVERSION = 1.3.9 CATEGORIES = lib DESCRIPTION = Apache Portable Runtime Utilities This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 13:45:06 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 12:45:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7661] csw/mgar/pkg/apr-util/trunk Message-ID: Revision: 7661 http://gar.svn.sourceforge.net/gar/?rev=7661&view=rev Author: rthurner Date: 2009-12-18 12:45:06 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apr-util: gar-v2 upgrade Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile csw/mgar/pkg/apr-util/trunk/checksums csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.gspec Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2009-12-18 12:38:04 UTC (rev 7660) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2009-12-18 12:45:06 UTC (rev 7661) @@ -9,6 +9,8 @@ interface to underlying platform-specific implementations. endef +SPKG_DESC_CSWaprutil-devel = Apache Portable Runtime Utility development support + MASTER_SITES = http://apache.crihan.fr/dist/apr/ MASTER_SITES += http://apache.webthing.com/database/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz Modified: csw/mgar/pkg/apr-util/trunk/checksums =================================================================== --- csw/mgar/pkg/apr-util/trunk/checksums 2009-12-18 12:38:04 UTC (rev 7660) +++ csw/mgar/pkg/apr-util/trunk/checksums 2009-12-18 12:45:06 UTC (rev 7661) @@ -1,9 +1,9 @@ -8b3f04dde7048946c3c94f85b4debb94 download/apr-util-1.2.2.tar.gz -1e0b81300c99eacfda07803e345ac3d7 download/CSWaprutil.gspec -985b4fb9c04239118d19ca522072171b download/CSWaprutil.depend -b02e8b9e9d9fc81896aa3741bec37145 download/CSWaprutil.prototype -ab86b57383e04f4b4bc0a1a7c1252bbb download/CSWaprutil-devel.gspec -9e96a2c06d116f2f530b17f0cabd9aff download/CSWaprutil-devel.depend -1b93f3d66d2cc681ecb5905716b79d1e download/CSWaprutil-devel.prototype -f25418280a6214bcf0af804fcef4c950 download/config.layout -2aec82eff00f526a0f2e4c1380a3541e download/iconv.diff +d35666b332b173698383deec8e56e1b3 CSWaprutil-devel.depend +963516b990780cf17616ba32673443a6 CSWaprutil-devel.gspec +094f42b8b66199c1047d9828a82249e4 CSWaprutil-devel.prototype +4447f1d66b43786a4c123f75c1d16962 CSWaprutil.depend +1e0b81300c99eacfda07803e345ac3d7 CSWaprutil.gspec +d1a6d531eef93140a3aebe1e96803b09 CSWaprutil.prototype +cc2ec0ba4f01d88375f1170f762518fa apr-util-1.3.9.tar.gz +f25418280a6214bcf0af804fcef4c950 config.layout +2aec82eff00f526a0f2e4c1380a3541e iconv.diff Modified: csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.gspec =================================================================== --- csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.gspec 2009-12-18 12:38:04 UTC (rev 7660) +++ csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.gspec 2009-12-18 12:45:06 UTC (rev 7661) @@ -1,5 +1,4 @@ %var bitname aprutil_devel %var pkgname CSWaprutil-devel %include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache Portable Runtime Utility development support %copyright url file://%{WORKSRC}/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 Fri Dec 18 14:06:33 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 18 Dec 2009 13:06:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7662] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 7662 http://gar.svn.sourceforge.net/gar/?rev=7662&view=rev Author: wahwah Date: 2009-12-18 13:06:33 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apache2: A comment for Rupert, adding the Id keyword Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 12:45:06 UTC (rev 7661) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 13:06:33 UTC (rev 7662) @@ -1,3 +1,5 @@ +# $Id$ + GARNAME = httpd GARVERSION = 2.2.14 CATEGORIES = server @@ -18,9 +20,11 @@ include files/config.mk -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# All the admfiles can go away. Move the static prototype files +# aside, replace them with PKGFILES_CSWfoo = regexp lines. + # Dummy toplevel package DISTFILES += $(call admfiles,CSWapache2,prototype) # Runtime @@ -124,4 +128,3 @@ gmv -v $$file $$file.CSW ; \ done ) @$(MAKECOOKIE) - Property changes on: csw/mgar/pkg/apache2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 18 14:21:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Dec 2009 13:21:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7663] csw/mgar/pkg Message-ID: Revision: 7663 http://gar.svn.sourceforge.net/gar/?rev=7663&view=rev Author: dmichelsen Date: 2009-12-18 13:21:05 +0000 (Fri, 18 Dec 2009) Log Message: ----------- man2html: Initial commit Added Paths: ----------- csw/mgar/pkg/man2html/ csw/mgar/pkg/man2html/branches/ csw/mgar/pkg/man2html/tags/ csw/mgar/pkg/man2html/trunk/ csw/mgar/pkg/man2html/trunk/Makefile csw/mgar/pkg/man2html/trunk/checksums csw/mgar/pkg/man2html/trunk/files/ Property changes on: csw/mgar/pkg/man2html/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/man2html/trunk/Makefile =================================================================== --- csw/mgar/pkg/man2html/trunk/Makefile (rev 0) +++ csw/mgar/pkg/man2html/trunk/Makefile 2009-12-18 13:21:05 UTC (rev 7663) @@ -0,0 +1,48 @@ +GARNAME = man2html +GARVERSION = 3.0.1 +CATEGORIES = utils + +DESCRIPTION = A Unix manpage-to-HTML converter +define BLURB + A Unix manpage-to-HTML converter. +endef + +MASTER_SITES = http://hydra.nac.uci.edu/indiv/ehood/tar/ +DISTNAME = $(GARNAME)$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://hydra.nac.uci.edu/indiv/ehood/man2html.html + +REQUIRED_PKGS = CSWperl + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +ARCHALL = 1 + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man1 + cd $(WORKSRC) && perl install.me -batch \ + -binpath $(DESTDIR)$(bindir) \ + -manpath $(DESTDIR)$(mandir) \ + -perlpath $(bindir)/perl + ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + cd $(WORKSRC) && ginstall \ + README CHANGES \ + doc/man2html.ps doc/man2html.html doc/man2html.txt \ + $(DESTDIR)$(docdir)/$(GARNAME) + ginstall -d $(DESTDIR)$(sharedstatedir)/www/$(GARNAME)/cgi-bin + cd $(WORKSRC) && ginstall man.cgi \ + $(DESTDIR)$(sharedstatedir)/www/$(GARNAME)/cgi-bin + ginstall -d $(DESTDIR)/opt/csw/apache2/share/cgi-bin + gln -s ../../../share/www/$(GARNAME)/cgi-bin/man.cgi \ + $(DESTDIR)/opt/csw/apache2/share/cgi-bin/man.cgi + @$(MAKECOOKIE) Added: csw/mgar/pkg/man2html/trunk/checksums =================================================================== --- csw/mgar/pkg/man2html/trunk/checksums (rev 0) +++ csw/mgar/pkg/man2html/trunk/checksums 2009-12-18 13:21:05 UTC (rev 7663) @@ -0,0 +1 @@ +1c0d28c83225d0ebc845f2386c8f8384 man2html3.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 Fri Dec 18 14:35:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 18 Dec 2009 13:35:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7664] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 7664 http://gar.svn.sourceforge.net/gar/?rev=7664&view=rev Author: wahwah Date: 2009-12-18 13:35:20 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apache2: Hints for Rupert Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 13:21:05 UTC (rev 7663) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 13:35:20 UTC (rev 7664) @@ -10,6 +10,23 @@ best around in terms of functionality, efficiency, security and speed. endef +include files/config.mk + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# All the admfiles can go away. Move the static prototype files +# aside, replace them with PKGFILES_CSWfoo = regexp lines. + +# The PACKAGES variable tell GAR which packages to build +PACKAGES = CSWapache2 +PACKAGES += CSWapache2c +PACKAGES += CSWapache2rt +PACKAGES += CSWap2prefork +PACKAGES += CSWap2suexec +PACKAGES += CSWapache2-devel +PACKAGES += CSWapache2-manual + +# Descriptions for every package SPKG_DESC_CSWapache2 = Apache 2.2 web server SPKG_DESC_CSWapache2c = Apache 2.2 web server (core) SPKG_DESC_CSWapache2rt = Apache 2.2 runtime libraries @@ -18,31 +35,44 @@ SPKG_DESC_CSWapache2-devel = Apache 2.2 development support SPKG_DESC_CSWapache2-manual = Apache 2.2 manual -include files/config.mk +# Contents for every package. +# The CSWapache2 package is supposed to be an empty meta-package +PKGFILES_CSWapache2 = non-existing +# You don't define PKGFILES_CSWapache2c, it's going to be the default, +# catch-all package. +# PKGFILES_CSWapache2c = +# The runtime package might use the GAR shortcut for the runtime +# files. +PKGFILES_CSWapache2rt = $(PKGFILES_RT) +PKGFILES_CSWap2prefork = $(sbindir)/httpd.prefork +PKGFILES_CSWap2suexec = $(libexecdir)/mod_suexec.so +PKGFILES_CSWap2suexec += $(mandir)/man8/suexec.8 +PKGFILES_CSWap2suexec += $(sbindir)/suexec -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# The rest of PKGFILES is for you to do. You look at the rest of the +# prototype files and construct appropriate regexes for every package. -# All the admfiles can go away. Move the static prototype files -# aside, replace them with PKGFILES_CSWfoo = regexp lines. +# You don't need the $(call admfiles,...) any more. But you might +# need the files/*.prototype files to figure out how to populate packages by +# writing regexes. +## # Dummy toplevel package +## DISTFILES += $(call admfiles,CSWapache2,prototype) +## # Runtime +## DISTFILES += $(call admfiles,CSWapache2rt,prototype checkinstall) +## # Server (core) +## CSWapache2c_admfiles = prototype postinstall space +## DISTFILES += $(call admfiles,CSWapache2c,$(CSWapache2c_admfiles)) +## # Prefork MPM (default) +## CSWap2prefork_admfiles = prototype postinstall postremove space +## DISTFILES += $(call admfiles,CSWap2prefork,$(CSWap2prefork_admfiles)) +## # mod_suexec +## CSWap2suexec_admfiles = prototype postinstall preremove +## DISTFILES += $(call admfiles,CSWap2suexec,$(CSWap2suexec_admfiles)) +## # Manual +## DISTFILES += $(call admfiles,CSWapache2-manual,prototype) +## # Development support +## DISTFILES += $(call admfiles,CSWapache2-devel,prototype) -# Dummy toplevel package -DISTFILES += $(call admfiles,CSWapache2,prototype) -# Runtime -DISTFILES += $(call admfiles,CSWapache2rt,prototype checkinstall) -# Server (core) -CSWapache2c_admfiles = prototype postinstall space -DISTFILES += $(call admfiles,CSWapache2c,$(CSWapache2c_admfiles)) -# Prefork MPM (default) -CSWap2prefork_admfiles = prototype postinstall postremove space -DISTFILES += $(call admfiles,CSWap2prefork,$(CSWap2prefork_admfiles)) -# mod_suexec -CSWap2suexec_admfiles = prototype postinstall preremove -DISTFILES += $(call admfiles,CSWap2suexec,$(CSWap2suexec_admfiles)) -# Manual -DISTFILES += $(call admfiles,CSWapache2-manual,prototype) -# Development support -DISTFILES += $(call admfiles,CSWapache2-devel,prototype) - # Standard package bits DISTFILES += CSWapache2.killproc cswapache2 @@ -66,8 +96,14 @@ REQUIRED_PKGS_CSWapache2-devel = CSWapache2rt REQUIRED_PKGS_CSWapache2-manual = CSWapache2 -SPKG_CLASSES_CSWapache2c = none cswinitsmf +# The SMF support: you don't need to specify cswinitsmf any more. You need to +# make sure the the /etc/opt/csw/init.d/cswapache file gets installed during +# the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to +# the Makefile. +# The following line can go: +## SPKG_CLASSES_CSWapache2c = none cswinitsmf + pre-configure-modulated: (cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); \ ./buildconf) 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 Dec 18 14:58:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Dec 2009 13:58:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7665] csw/mgar/pkg/mtr/trunk Message-ID: Revision: 7665 http://gar.svn.sourceforge.net/gar/?rev=7665&view=rev Author: dmichelsen Date: 2009-12-18 13:58:32 +0000 (Fri, 18 Dec 2009) Log Message: ----------- mtr: Add prototype modifiers and merge wildcards Modified Paths: -------------- csw/mgar/pkg/mtr/trunk/Makefile csw/mgar/pkg/mtr/trunk/checksums Modified: csw/mgar/pkg/mtr/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtr/trunk/Makefile 2009-12-18 13:35:20 UTC (rev 7664) +++ csw/mgar/pkg/mtr/trunk/Makefile 2009-12-18 13:58:32 UTC (rev 7665) @@ -48,6 +48,7 @@ TEST_SCRIPTS = + CONFIGURE_ARGS = $(DIRPATHS) # ------------------ BEWARE: NASTY HACK AHEAD -------------------- @@ -60,38 +61,31 @@ EXTRA_MODULATORS = GUI MODULATIONS_GUI = disable enable -ifeq ($(GUI), disable) -CONFIGURE_ARGS += --without-gtk -endif -ifeq ($(GUI), enable) -CONFIGURE_ARGS += --disable-gtktest -EXTRA_PKG_CONFIG_PATH = /opt/csw/X11/lib/pkgconfig -endif +CONFIGURE_ARGS_GUI-disable = --without-gtk +CONFIGURE_ARGS_GUI-enable = --disable-gtktest +CONFIGURE_ARGS += $(CONFIGURE_ARGS_GUI-$(GUI)) + +EXTRA_PKG_CONFIG_PATH_GUI-enable = /opt/csw/X11/lib/pkgconfig +EXTRA_PKG_CONFIG_PATH += $(EXTRA_PKG_CONFIG_PATH_GUI-$(GUI)) + # Rename the modulated binaries so that we can distinguish them # Could also be done via ./configure --program-suffix, but the # install-exec-hook for mtr doesn't honor the transformed name # and fails. -EXTRA_PAX_ARGS_isa-sparcv8-gui-enable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-gui,p" -EXTRA_PAX_ARGS_isa-sparcv8-gui-disable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-nongui,p" -EXTRA_PAX_ARGS_isa-i386-gui-enable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-gui,p" -EXTRA_PAX_ARGS_isa-i386-gui-disable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-nongui,p" +EXTRA_PAX_ARGS_isa-default-gui-enable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-gui,p" +EXTRA_PAX_ARGS_isa-default-gui-disable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-nongui,p" # Simply copy all files, EXTRA_PAX_ARGS above takes care not to overwrite the # mtr binary on merging. -MERGE_SCRIPTS_isa-sparcv8-gui-enable = copy-all -MERGE_SCRIPTS_isa-sparcv8-gui-disable = copy-all -MERGE_SCRIPTS_isa-i386-gui-enable = copy-all -MERGE_SCRIPTS_isa-i386-gui-disable = copy-all +MERGE_SCRIPTS_isa-default-gui-enable = copy-all +MERGE_SCRIPTS_isa-default-gui-disable = copy-all -# 1) Move the GUI/non-GUI binaries to their proper location -# 2) Make mtr setuid so that it can access raw sockets -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /^\/opt\/csw\/sbin\/mtr-/ { \ - $$$$3 = "/opt/csw/sbin/mtr=" $$$$3; \ - $$$$4 = "4755"; \ - } { print }' +# Make mtr setuid so that it can access raw sockets +PROTOTYPE_MODIFIERS = makesuid +PROTOTYPE_FILES_makesuid = $(sbindir)/mtr-.* +PROTOTYPE_PERMS_makesuid = 4755 # ------------------ /BEWARE: NASTY HACK AHEAD -------------------- Modified: csw/mgar/pkg/mtr/trunk/checksums =================================================================== --- csw/mgar/pkg/mtr/trunk/checksums 2009-12-18 13:35:20 UTC (rev 7664) +++ csw/mgar/pkg/mtr/trunk/checksums 2009-12-18 13:58:32 UTC (rev 7665) @@ -1,2 +1,2 @@ -4a3e6fef662eb4794e61e334f6c33722 download/gar-base.diff -23baca52d0922c2ecba7eba05317868c download/mtr-0.75.tar.gz +4a3e6fef662eb4794e61e334f6c33722 gar-base.diff +23baca52d0922c2ecba7eba05317868c mtr-0.75.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 Dec 18 15:26:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Dec 2009 14:26:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7666] csw/mgar/pkg Message-ID: Revision: 7666 http://gar.svn.sourceforge.net/gar/?rev=7666&view=rev Author: dmichelsen Date: 2009-12-18 14:26:46 +0000 (Fri, 18 Dec 2009) Log Message: ----------- pulseaudio: Initial commit Added Paths: ----------- csw/mgar/pkg/pulseaudio/ csw/mgar/pkg/pulseaudio/branches/ csw/mgar/pkg/pulseaudio/tags/ csw/mgar/pkg/pulseaudio/trunk/ csw/mgar/pkg/pulseaudio/trunk/Makefile csw/mgar/pkg/pulseaudio/trunk/checksums csw/mgar/pkg/pulseaudio/trunk/files/ Property changes on: csw/mgar/pkg/pulseaudio/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/pulseaudio/trunk/Makefile =================================================================== --- csw/mgar/pkg/pulseaudio/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pulseaudio/trunk/Makefile 2009-12-18 14:26:46 UTC (rev 7666) @@ -0,0 +1,20 @@ +GARNAME = pulseaudio +GARVERSION = 0.9.21 +CATEGORIES = lib + +DESCRIPTION = PulseAudio is a sound server for POSIX systems +define BLURB +endef + +MASTER_SITES = http://0pointer.de/lennart/projects/pulseaudio/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://pulseaudio.org/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/pulseaudio/trunk/checksums =================================================================== --- csw/mgar/pkg/pulseaudio/trunk/checksums (rev 0) +++ csw/mgar/pkg/pulseaudio/trunk/checksums 2009-12-18 14:26:46 UTC (rev 7666) @@ -0,0 +1 @@ +76e623c4c72e2258bc8bdeb1599bad74 pulseaudio-0.9.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 15:45:50 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 14:45:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7667] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 7667 http://gar.svn.sourceforge.net/gar/?rev=7667&view=rev Author: rthurner Date: 2009-12-18 14:45:50 +0000 (Fri, 18 Dec 2009) Log Message: ----------- subversion: package names with - Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 14:26:46 UTC (rev 7666) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 14:45:50 UTC (rev 7667) @@ -25,6 +25,9 @@ PACKAGES += CSWap2suexec PACKAGES += CSWapache2-devel PACKAGES += CSWapache2-manual +# packages with dashes need this so gar does not thing -devel is a version number +CATALOGNAME_CSWapache2-devel = apache2_devel +CATALOGNAME_CSWapache2-manual = apache2_manual # Descriptions for every package SPKG_DESC_CSWapache2 = Apache 2.2 web server @@ -43,14 +46,18 @@ # PKGFILES_CSWapache2c = # The runtime package might use the GAR shortcut for the runtime # files. -PKGFILES_CSWapache2rt = $(PKGFILES_RT) -PKGFILES_CSWap2prefork = $(sbindir)/httpd.prefork -PKGFILES_CSWap2suexec = $(libexecdir)/mod_suexec.so -PKGFILES_CSWap2suexec += $(mandir)/man8/suexec.8 -PKGFILES_CSWap2suexec += $(sbindir)/suexec +PKGFILES_CSWapache2rt = $(PKGFILES_RT) +PKGFILES_CSWap2prefork = $(sbindir)/httpd.prefork +PKGFILES_CSWap2suexec = $(libexecdir)/mod_suexec.so +PKGFILES_CSWap2suexec += $(mandir)/man8/suexec.8 +PKGFILES_CSWap2suexec += $(sbindir)/suexec # The rest of PKGFILES is for you to do. You look at the rest of the # prototype files and construct appropriate regexes for every package. +# - this tseems not to work +# PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL) +# PKGFILES_CSWapache2-manual = $(PKGFILES_DOC) +# PKGFILES_CSWapache2-manual += $(prefix)/etc/extra/httpd-manual.conf # You don't need the $(call admfiles,...) any more. But you might # need the files/*.prototype files to figure out how to populate packages by @@ -82,18 +89,18 @@ DISTFILES += httpd-ssl.conf.CSW DISTFILES += update20to22 -REQUIRED_PKGS_CSWapache2 = CSWapache2c CSWap2prefork -REQUIRED_PKGS_CSWapache2c = CSWapache2rt CSWbdb CSWexpat CSWgdbm CSWiconv -REQUIRED_PKGS_CSWapache2c += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib -REQUIRED_PKGS_CSWapache2c += CSWsqlite3 CSWcswclassutils -REQUIRED_PKGS_CSWapache2rt = CSWbdb CSWexpat CSWgdbm CSWggettextrt CSWgsed -REQUIRED_PKGS_CSWapache2rt += CSWiconv CSWoldaprt CSWosslrt CSWperl CSWsasl -REQUIRED_PKGS_CSWapache2rt += CSWzlib CSWsqlite3 CSWlibnet CSWsqlite3rt -REQUIRED_PKGS_CSWap2prefork = CSWapache2c CSWapache2rt CSWbdb CSWexpat CSWgdbm -REQUIRED_PKGS_CSWap2prefork += CSWiconv CSWlibnet CSWoldaprt CSWosslrt CSWsasl -REQUIRED_PKGS_CSWap2prefork += CSWzlib CSWsqlite3 -REQUIRED_PKGS_CSWap2suexec = CSWapache2 -REQUIRED_PKGS_CSWapache2-devel = CSWapache2rt +REQUIRED_PKGS_CSWapache2 = CSWapache2c CSWap2prefork +REQUIRED_PKGS_CSWapache2c = CSWapache2rt CSWbdb CSWexpat CSWgdbm CSWiconv +REQUIRED_PKGS_CSWapache2c += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib +REQUIRED_PKGS_CSWapache2c += CSWsqlite3 CSWcswclassutils +REQUIRED_PKGS_CSWapache2rt = CSWbdb CSWexpat CSWgdbm CSWggettextrt CSWgsed +REQUIRED_PKGS_CSWapache2rt += CSWiconv CSWoldaprt CSWosslrt CSWperl CSWsasl +REQUIRED_PKGS_CSWapache2rt += CSWzlib CSWsqlite3 CSWlibnet CSWsqlite3rt +REQUIRED_PKGS_CSWap2prefork = CSWapache2c CSWapache2rt CSWbdb CSWexpat CSWgdbm +REQUIRED_PKGS_CSWap2prefork += CSWiconv CSWlibnet CSWoldaprt CSWosslrt CSWsasl +REQUIRED_PKGS_CSWap2prefork += CSWzlib CSWsqlite3 +REQUIRED_PKGS_CSWap2suexec = CSWapache2 +REQUIRED_PKGS_CSWapache2-devel = CSWapache2rt REQUIRED_PKGS_CSWapache2-manual = CSWapache2 # The SMF support: you don't need to specify cswinitsmf any more. You need to 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 Dec 18 15:53:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Dec 2009 14:53:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7668] csw/mgar/pkg Message-ID: Revision: 7668 http://gar.svn.sourceforge.net/gar/?rev=7668&view=rev Author: dmichelsen Date: 2009-12-18 14:52:58 +0000 (Fri, 18 Dec 2009) Log Message: ----------- mpg123: Initial commit Added Paths: ----------- csw/mgar/pkg/mpg123/ csw/mgar/pkg/mpg123/branches/ csw/mgar/pkg/mpg123/tags/ csw/mgar/pkg/mpg123/trunk/ csw/mgar/pkg/mpg123/trunk/Makefile csw/mgar/pkg/mpg123/trunk/checksums csw/mgar/pkg/mpg123/trunk/files/ Property changes on: csw/mgar/pkg/mpg123/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/mpg123/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg123/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mpg123/trunk/Makefile 2009-12-18 14:52:58 UTC (rev 7668) @@ -0,0 +1,35 @@ +GARNAME = mpg123 +GARVERSION = 1.10.0 +CATEGORIES = apps + +DESCRIPTION = A command-line MP3 player +define BLURB + This is a console based decoder/player for mono/stereo mpeg audio files, + probably more familiar as MP3 or MP2 files. It's focus is speed. + It can play MPEG1.0/2.0/2.5 layer I, II, II (1, 2, 3;-) files + (VBR files are fine, too) and produce output on a number of different ways: + raw data to stdout and different sound systems depending on your platform. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +REQUIRED_PKGS = CSWesound CSWlibsdl CSWlibtoolrt + +BUILD64 = 1 +NO_ISAEXEC = 1 +EXTRA_BUILD_ISAS = sparcv8plus+vis pentium +CONFIGURE_ARGS = $(DIRPATHS) + +# When we compile 64 bit largefiles are always on +CONFIGURE_ARGS_mm-64 += --disable-largefile +CONFIGURE_ARGS += $(CONFIGURE_ARGS_mm-$(MEMORYMODEL)) + +TEST_TARGET = check + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Added: csw/mgar/pkg/mpg123/trunk/checksums =================================================================== --- csw/mgar/pkg/mpg123/trunk/checksums (rev 0) +++ csw/mgar/pkg/mpg123/trunk/checksums 2009-12-18 14:52:58 UTC (rev 7668) @@ -0,0 +1 @@ +0005c9a89c381484e2d2ff450b3dfe5e mpg123-1.10.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Dec 18 17:20:00 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 18 Dec 2009 16:20:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7669] csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/ Message-ID: Revision: 7669 http://gar.svn.sourceforge.net/gar/?rev=7669&view=rev Author: wahwah Date: 2009-12-18 16:20:00 +0000 (Fri, 18 Dec 2009) Log Message: ----------- Tagging Ihsan's build of Apache 2. Added Paths: ----------- csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 17:28:54 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 16:28:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7670] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 7670 http://gar.svn.sourceforge.net/gar/?rev=7670&view=rev Author: rthurner Date: 2009-12-18 16:28:54 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apache2 - change to only one package, apache2, for the moment Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 16:20:00 UTC (rev 7669) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 16:28:54 UTC (rev 7670) @@ -4,7 +4,7 @@ GARVERSION = 2.2.14 CATEGORIES = server -DESCRIPTION = A high performance Unix-based HTTP server. +DESCRIPTION = A high performance HTTP server. define BLURB Apache is the world\'s most popular HTTP server, being quite possibly the best around in terms of functionality, efficiency, security and speed. @@ -14,72 +14,19 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# All the admfiles can go away. Move the static prototype files -# aside, replace them with PKGFILES_CSWfoo = regexp lines. - -# The PACKAGES variable tell GAR which packages to build +# The PACKAGES variable tell GAR which packages to build PACKAGES = CSWapache2 -PACKAGES += CSWapache2c -PACKAGES += CSWapache2rt -PACKAGES += CSWap2prefork -PACKAGES += CSWap2suexec -PACKAGES += CSWapache2-devel -PACKAGES += CSWapache2-manual # packages with dashes need this so gar does not thing -devel is a version number -CATALOGNAME_CSWapache2-devel = apache2_devel -CATALOGNAME_CSWapache2-manual = apache2_manual +# CATALOGNAME_CSWapache2-devel = apache2_devel # Descriptions for every package -SPKG_DESC_CSWapache2 = Apache 2.2 web server -SPKG_DESC_CSWapache2c = Apache 2.2 web server (core) -SPKG_DESC_CSWapache2rt = Apache 2.2 runtime libraries -SPKG_DESC_CSWap2prefork = Apache 2.2 prefork MPM -SPKG_DESC_CSWap2suexec = Apache 2.2 suEXEC support -SPKG_DESC_CSWapache2-devel = Apache 2.2 development support -SPKG_DESC_CSWapache2-manual = Apache 2.2 manual +# SPKG_DESC_CSWapache2 = $(DESCRIPTION) # Contents for every package. -# The CSWapache2 package is supposed to be an empty meta-package -PKGFILES_CSWapache2 = non-existing -# You don't define PKGFILES_CSWapache2c, it's going to be the default, +# You don't define PKGFILES_CSWapache2, it's going to be the default, # catch-all package. -# PKGFILES_CSWapache2c = -# The runtime package might use the GAR shortcut for the runtime -# files. -PKGFILES_CSWapache2rt = $(PKGFILES_RT) -PKGFILES_CSWap2prefork = $(sbindir)/httpd.prefork -PKGFILES_CSWap2suexec = $(libexecdir)/mod_suexec.so -PKGFILES_CSWap2suexec += $(mandir)/man8/suexec.8 -PKGFILES_CSWap2suexec += $(sbindir)/suexec +# PKGFILES_CSWapache2 = -# The rest of PKGFILES is for you to do. You look at the rest of the -# prototype files and construct appropriate regexes for every package. -# - this tseems not to work -# PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL) -# PKGFILES_CSWapache2-manual = $(PKGFILES_DOC) -# PKGFILES_CSWapache2-manual += $(prefix)/etc/extra/httpd-manual.conf - -# You don't need the $(call admfiles,...) any more. But you might -# need the files/*.prototype files to figure out how to populate packages by -# writing regexes. -## # Dummy toplevel package -## DISTFILES += $(call admfiles,CSWapache2,prototype) -## # Runtime -## DISTFILES += $(call admfiles,CSWapache2rt,prototype checkinstall) -## # Server (core) -## CSWapache2c_admfiles = prototype postinstall space -## DISTFILES += $(call admfiles,CSWapache2c,$(CSWapache2c_admfiles)) -## # Prefork MPM (default) -## CSWap2prefork_admfiles = prototype postinstall postremove space -## DISTFILES += $(call admfiles,CSWap2prefork,$(CSWap2prefork_admfiles)) -## # mod_suexec -## CSWap2suexec_admfiles = prototype postinstall preremove -## DISTFILES += $(call admfiles,CSWap2suexec,$(CSWap2suexec_admfiles)) -## # Manual -## DISTFILES += $(call admfiles,CSWapache2-manual,prototype) -## # Development support -## DISTFILES += $(call admfiles,CSWapache2-devel,prototype) - # Standard package bits DISTFILES += CSWapache2.killproc cswapache2 @@ -89,31 +36,19 @@ DISTFILES += httpd-ssl.conf.CSW DISTFILES += update20to22 -REQUIRED_PKGS_CSWapache2 = CSWapache2c CSWap2prefork -REQUIRED_PKGS_CSWapache2c = CSWapache2rt CSWbdb CSWexpat CSWgdbm CSWiconv -REQUIRED_PKGS_CSWapache2c += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib -REQUIRED_PKGS_CSWapache2c += CSWsqlite3 CSWcswclassutils -REQUIRED_PKGS_CSWapache2rt = CSWbdb CSWexpat CSWgdbm CSWggettextrt CSWgsed -REQUIRED_PKGS_CSWapache2rt += CSWiconv CSWoldaprt CSWosslrt CSWperl CSWsasl -REQUIRED_PKGS_CSWapache2rt += CSWzlib CSWsqlite3 CSWlibnet CSWsqlite3rt -REQUIRED_PKGS_CSWap2prefork = CSWapache2c CSWapache2rt CSWbdb CSWexpat CSWgdbm -REQUIRED_PKGS_CSWap2prefork += CSWiconv CSWlibnet CSWoldaprt CSWosslrt CSWsasl -REQUIRED_PKGS_CSWap2prefork += CSWzlib CSWsqlite3 -REQUIRED_PKGS_CSWap2suexec = CSWapache2 -REQUIRED_PKGS_CSWapache2-devel = CSWapache2rt -REQUIRED_PKGS_CSWapache2-manual = CSWapache2 +REQUIRED_PKGS_CSWapache2 = CSWbdb CSWexpat CSWgdbm CSWiconv +REQUIRED_PKGS_CSWapache2 += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib +REQUIRED_PKGS_CSWapache2 += CSWsqlite3rt CSWsqlite3 CSWcswclassutils +REQUIRED_PKGS_CSWapache2 += CSWggettextrt CSWgsed +REQUIRED_PKGS_CSWapache2 += CSWperl # The SMF support: you don't need to specify cswinitsmf any more. You need to # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during # the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to # the Makefile. -# The following line can go: -## SPKG_CLASSES_CSWapache2c = none cswinitsmf - pre-configure-modulated: - (cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); \ - ./buildconf) + (cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf) # Build Configuration CONFIGURE_ARGS += --with-mpm=prefork Copied: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall (from rev 7664, csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall) =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2009-12-18 16:28:54 UTC (rev 7670) @@ -0,0 +1,75 @@ +#!/bin/sh + +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +AP2_PREFIX=$CSW_PREFIX/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_EXTRADIR=$AP2_CONFDIR/extra + +UPGRADE_CONFIGS="\ + httpd.conf \ + ssl.conf \ + extra/httpd-ssl.conf \ + extra/httpd-mpm.conf \ + " +# Don't overwrite config if it exists +warn_update=0 +echo "Checking configuration files:" +for file in $UPGRADE_CONFIGS; do + config=$AP2_CONFDIR/$file + if [ -f "$config" ]; then + if [ -n "`grep mod_auth.so $config`" ]; then + echo "Updating syntax of $config to Apache 2.2" + $AP2_BINDIR/update20to22 $config + warn_update=1 + fi + # Ensure that the PidFile is pointed at ServerRoot relative path. + perl -i -plne 's#PidFile /var#PidFile var#' + elif [ -f "$config.CSW" ]; then + echo "Creating $config from template" + hostname=`hostname` + sed -e s, at HOSTNAME@,$hostname,g \ + -e s, at USER@,nobody,g \ + -e s, at GROUP@,nobody,g \ + -e s, at ADMIN@,root@$hostname,g $config.CSW > $config + fi +done + +if [ $warn_update -eq 1 ] ; then +cat << EOF + +*** NOTICE: Existing configuration files have been updated to +*** Apache 2.2 syntax. Additional files can be updated using +*** /opt/csw/apache2/sbin/update20to22. + +EOF +fi + +# Copy templates +template_list="\ + share/htdocs/index.html \ + etc/extra/httpd-autoindex.conf \ + etc/extra/httpd-dav.conf \ + etc/extra/httpd-default.conf \ + etc/extra/httpd-info.conf \ + etc/extra/httpd-languages.conf \ + etc/extra/httpd-multilang-errordoc.conf \ + etc/extra/httpd-userdir.conf \ + etc/extra/httpd-vhosts.conf \ + etc/magic \ + etc/mime.types" + +echo Copying CSW templates: +for file in $template_list +do + filepath=$AP2_PREFIX/$file + if [ -f "$filepath" ]; then + echo " preserving $filepath" + elif [ -f "$filepath.CSW" ]; then + echo " creating $filepath" + cp $filepath.CSW $filepath + fi +done + +exit 0 Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall 2009-12-18 16:20:00 UTC (rev 7669) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall 2009-12-18 16:28:54 UTC (rev 7670) @@ -1,75 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -AP2_PREFIX=$CSW_PREFIX/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_LIBEXEC=$AP2_PREFIX/libexec -AP2_CONFDIR=$AP2_PREFIX/etc -AP2_EXTRADIR=$AP2_CONFDIR/extra - -UPGRADE_CONFIGS="\ - httpd.conf \ - ssl.conf \ - extra/httpd-ssl.conf \ - extra/httpd-mpm.conf \ - " -# Don't overwrite config if it exists -warn_update=0 -echo "Checking configuration files:" -for file in $UPGRADE_CONFIGS; do - config=$AP2_CONFDIR/$file - if [ -f "$config" ]; then - if [ -n "`grep mod_auth.so $config`" ]; then - echo "Updating syntax of $config to Apache 2.2" - $AP2_BINDIR/update20to22 $config - warn_update=1 - fi - # Ensure that the PidFile is pointed at ServerRoot relative path. - perl -i -plne 's#PidFile /var#PidFile var#' - elif [ -f "$config.CSW" ]; then - echo "Creating $config from template" - hostname=`hostname` - sed -e s, at HOSTNAME@,$hostname,g \ - -e s, at USER@,nobody,g \ - -e s, at GROUP@,nobody,g \ - -e s, at ADMIN@,root@$hostname,g $config.CSW > $config - fi -done - -if [ $warn_update -eq 1 ] ; then -cat << EOF - -*** NOTICE: Existing configuration files have been updated to -*** Apache 2.2 syntax. Additional files can be updated using -*** /opt/csw/apache2/sbin/update20to22. - -EOF -fi - -# Copy templates -template_list="\ - share/htdocs/index.html \ - etc/extra/httpd-autoindex.conf \ - etc/extra/httpd-dav.conf \ - etc/extra/httpd-default.conf \ - etc/extra/httpd-info.conf \ - etc/extra/httpd-languages.conf \ - etc/extra/httpd-multilang-errordoc.conf \ - etc/extra/httpd-userdir.conf \ - etc/extra/httpd-vhosts.conf \ - etc/magic \ - etc/mime.types" - -echo Copying CSW templates: -for file in $template_list -do - filepath=$AP2_PREFIX/$file - if [ -f "$filepath" ]; then - echo " preserving $filepath" - elif [ -f "$filepath.CSW" ]; then - echo " creating $filepath" - cp $filepath.CSW $filepath - fi -done - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 18 17:30:31 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 16:30:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7671] csw/mgar/pkg/apache2/trunk/files Message-ID: Revision: 7671 http://gar.svn.sourceforge.net/gar/?rev=7671&view=rev Author: rthurner Date: 2009-12-18 16:30:31 +0000 (Fri, 18 Dec 2009) Log Message: ----------- apache2 - remove gspec files for former packages, these should be anyway in Makefile now. Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.gspec csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,7 +0,0 @@ -%var bitname ap2_prefork -%var pkgname CSWap2prefork -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache 2.2 prefork MPM -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE -%preinstall url file://%{WORKDIR}/CSWapache2.killproc -%preremove url file://%{WORKDIR}/CSWapache2.killproc Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,5 +0,0 @@ -%var bitname ap2_suexec -%var pkgname CSWap2suexec -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Apache 2.2 suEXEC support -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,4 +0,0 @@ -%var bitname apache2_devel -%var pkgname CSWapache2-devel -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,5 +0,0 @@ -%var bitname apache2_manual -%var pkgname CSWapache2-manual -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,5 +0,0 @@ -%var bitname apache2 -%var pkgname CSWapache2 -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,4 +0,0 @@ -%var bitname apache2c -%var pkgname CSWapache2c -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec 2009-12-18 16:28:54 UTC (rev 7670) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec 2009-12-18 16:30:31 UTC (rev 7671) @@ -1,4 +0,0 @@ -%var bitname apache2rt -%var pkgname CSWapache2rt -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE 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 Dec 19 00:41:32 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 18 Dec 2009 23:41:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7672] csw/mgar/pkg/trac/trunk/Makefile Message-ID: Revision: 7672 http://gar.svn.sourceforge.net/gar/?rev=7672&view=rev Author: rthurner Date: 2009-12-18 23:41:32 +0000 (Fri, 18 Dec 2009) Log Message: ----------- trac - newly depend on CSWpythonsvn Modified Paths: -------------- csw/mgar/pkg/trac/trunk/Makefile Modified: csw/mgar/pkg/trac/trunk/Makefile =================================================================== --- csw/mgar/pkg/trac/trunk/Makefile 2009-12-18 16:30:31 UTC (rev 7671) +++ csw/mgar/pkg/trac/trunk/Makefile 2009-12-18 23:41:32 UTC (rev 7672) @@ -15,7 +15,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWtrac -REQUIRED_PKGS_CSWtrac = CSWpysetuptools CSWpysvn CSWgenshi +REQUIRED_PKGS_CSWtrac = CSWpysetuptools CSWpythonsvn CSWgenshi REQUIRED_PKGS_CSWtrac += CSWpython CSWpython-devel CATALOGNAME_CSWtrac = trac 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 Dec 19 01:05:13 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 19 Dec 2009 00:05:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7673] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 7673 http://gar.svn.sourceforge.net/gar/?rev=7673&view=rev Author: rthurner Date: 2009-12-19 00:05:11 +0000 (Sat, 19 Dec 2009) Log Message: ----------- python - remove www from urls Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-18 23:41:32 UTC (rev 7672) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-19 00:05:11 UTC (rev 7673) @@ -8,7 +8,7 @@ # - ctypes module doesn't compile # - http://forums.sun.com/thread.jspa?threadID=5148204 -SPKG_SOURCEURL = http://www.python.org/download/releases/$(GARVERSION) +SPKG_SOURCEURL = http://python.org/download/releases/$(GARVERSION) SPKG_CLASSES = none cswpycompile DESCRIPTION = A high-level scripting language. @@ -22,8 +22,8 @@ an extension language for applications that need a programmable interface. endef -MASTER_SITES = http://www.python.org/ftp/python/$(GARVERSION)/ -UPSTREAM_MASTER_SITES = http://www.python.org/ftp/python/ +MASTER_SITES = http://python.org/ftp/python/$(GARVERSION)/ +UPSTREAM_MASTER_SITES = http://python.org/ftp/python/ DISTFILES = $(DISTNAME).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Dec 19 20:53:17 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 19 Dec 2009 19:53:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7674] csw/mgar/pkg/trac/trunk/Makefile Message-ID: Revision: 7674 http://gar.svn.sourceforge.net/gar/?rev=7674&view=rev Author: rthurner Date: 2009-12-19 19:53:17 +0000 (Sat, 19 Dec 2009) Log Message: ----------- trac - remove cswclassutils as it gives a 'duplicate dependendy error', and also some whitespace changes Modified Paths: -------------- csw/mgar/pkg/trac/trunk/Makefile Modified: csw/mgar/pkg/trac/trunk/Makefile =================================================================== --- csw/mgar/pkg/trac/trunk/Makefile 2009-12-19 00:05:11 UTC (rev 7673) +++ csw/mgar/pkg/trac/trunk/Makefile 2009-12-19 19:53:17 UTC (rev 7674) @@ -15,27 +15,26 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWtrac -REQUIRED_PKGS_CSWtrac = CSWpysetuptools CSWpythonsvn CSWgenshi -REQUIRED_PKGS_CSWtrac += CSWpython CSWpython-devel +REQUIRED_PKGS_CSWtrac = CSWpysetuptools CSWpythonsvn CSWgenshi +REQUIRED_PKGS_CSWtrac += CSWpython -CATALOGNAME_CSWtrac = trac -SPKG_DESC_CSWtrac = Integrated SCM and Project Management +CATALOGNAME_CSWtrac = trac +SPKG_DESC_CSWtrac = Integrated SCM and Project Management # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://trac.edgewall.org/wiki/TracDownload +SPKG_SOURCEURL = http://trac.edgewall.org/wiki/TracDownload +SPKG_CLASSES = none cswpycompile EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -REQUIRED_PKGS += CSWcswclassutils -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py -TEST_SCRIPTS = -INSTALL_SCRIPTS = $(WORKSRC)/setup.py -INSTALL_ARGS = --root=$(DESTDIR) +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = $(WORKSRC)/setup.py +TEST_SCRIPTS = +INSTALL_SCRIPTS = $(WORKSRC)/setup.py +INSTALL_ARGS = --root=$(DESTDIR) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Dec 20 00:45:44 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 19 Dec 2009 23:45:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7675] csw/mgar/pkg/exiftool/trunk Message-ID: Revision: 7675 http://gar.svn.sourceforge.net/gar/?rev=7675&view=rev Author: hson Date: 2009-12-19 23:45:44 +0000 (Sat, 19 Dec 2009) Log Message: ----------- exiftool: Update to 8.0.2 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile csw/mgar/pkg/exiftool/trunk/checksums Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-12-19 19:53:17 UTC (rev 7674) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-12-19 23:45:44 UTC (rev 7675) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 8.00 +GARVERSION = 8.02 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information @@ -13,9 +13,8 @@ MASTER_SITES = http://owl.phy.queensu.ca/~phil/exiftool/ MODDIST = DISTFILES = $(DISTNAME).tar.gz -DISTFILES += COPYING -REQUIRED_PKGS = CSWpmiocompress +REQUIRED_PKGS += CSWpmiocompress # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = Image-ExifTool-(\d+(?:\.\d+)*).tar.gz @@ -26,6 +25,4 @@ CONFIGURE_ARGS = $(DIRPATHS) -ARCHALL = 1 - include gar/category.mk Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2009-12-19 19:53:17 UTC (rev 7674) +++ csw/mgar/pkg/exiftool/trunk/checksums 2009-12-19 23:45:44 UTC (rev 7675) @@ -1,2 +1,2 @@ -13f9aae615a5de5e3c145b374950a75c COPYING -525f52712c2ab21c467ade83ceb567b8 Image-ExifTool-8.00.tar.gz +13f9aae615a5de5e3c145b374950a75c CSWexiftool.gspec +fac7cef8a5e618ce84d090320403583c Image-ExifTool-8.02.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Dec 20 01:26:24 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 20 Dec 2009 00:26:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7676] csw/mgar/pkg/libiptcdata/trunk Message-ID: Revision: 7676 http://gar.svn.sourceforge.net/gar/?rev=7676&view=rev Author: hson Date: 2009-12-20 00:26:24 +0000 (Sun, 20 Dec 2009) Log Message: ----------- libiptcdata: Update to 1.0.4 Modified Paths: -------------- csw/mgar/pkg/libiptcdata/trunk/Makefile csw/mgar/pkg/libiptcdata/trunk/checksums Modified: csw/mgar/pkg/libiptcdata/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiptcdata/trunk/Makefile 2009-12-19 23:45:44 UTC (rev 7675) +++ csw/mgar/pkg/libiptcdata/trunk/Makefile 2009-12-20 00:26:24 UTC (rev 7676) @@ -1,5 +1,5 @@ GARNAME = libiptcdata -GARVERSION = 1.0.2 +GARVERSION = 1.0.4 CATEGORIES = lib DESCRIPTION = IPTC Tag Parsing Library @@ -10,7 +10,7 @@ viewing, modifying, and saving this metadata. endef -MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES += $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz SPKG_SOURCEURL = http://libiptcdata.sourceforge.net @@ -22,14 +22,14 @@ # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=130582 UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = # Patch submitted to upstream, pending new release -PATCHFILES = iptc-dataset.patch +#PATCHFILES = iptc-dataset.patch CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libiptcdata/trunk/checksums =================================================================== --- csw/mgar/pkg/libiptcdata/trunk/checksums 2009-12-19 23:45:44 UTC (rev 7675) +++ csw/mgar/pkg/libiptcdata/trunk/checksums 2009-12-20 00:26:24 UTC (rev 7676) @@ -1,3 +1 @@ -4ed81889846a5d9b750331f684651f89 download/libiptcdata-1.0.2.tar.gz -bf0eb61461a91469296b988fccbd8b07 download/CSWlibiptcdata.gspec -741fbca6ca1072a2b3a2a36eff702435 download/iptc-dataset.patch +af886556ecb129b694f2d365d03d95a8 libiptcdata-1.0.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 Sun Dec 20 10:32:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 20 Dec 2009 09:32:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7677] csw/mgar/pkg/help2man Message-ID: Revision: 7677 http://gar.svn.sourceforge.net/gar/?rev=7677&view=rev Author: dmichelsen Date: 2009-12-20 09:32:25 +0000 (Sun, 20 Dec 2009) Log Message: ----------- help2man: Tag old release and update to 1.37.1 Modified Paths: -------------- csw/mgar/pkg/help2man/trunk/Makefile csw/mgar/pkg/help2man/trunk/checksums Added Paths: ----------- csw/mgar/pkg/help2man/tags/help2man-1.36.4,REV=2008.09.18/ Removed Paths: ------------- csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.depend csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.gspec Property Changed: ---------------- csw/mgar/pkg/help2man/trunk/ Property changes on: csw/mgar/pkg/help2man/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/help2man/trunk/Makefile =================================================================== --- csw/mgar/pkg/help2man/trunk/Makefile 2009-12-20 00:26:24 UTC (rev 7676) +++ csw/mgar/pkg/help2man/trunk/Makefile 2009-12-20 09:32:25 UTC (rev 7677) @@ -1,5 +1,5 @@ GARNAME = help2man -GARVERSION = 1.36.4 +GARVERSION = 1.37.1 CATEGORIES = devel DESCRIPTION = A tool for automatically generating simple manual pages from program output @@ -11,11 +11,11 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWhelp2man,depend) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWpmlocalegettext +REQUIRED_PKGS = CSWpmlocalegettext +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CONFIGURE_ARGS = $(DIRPATHS) # We need to disable NLS as we don't have preloadable_libintl.so @@ -24,8 +24,6 @@ TEST_SCRIPTS = -include gar/category.mk +ARCHALL = 1 -post-install: - @echo " ==> Fixing install anomalies" - @rm -f $(DESTDIR)$(prefix)/share/info/dir +include gar/category.mk Modified: csw/mgar/pkg/help2man/trunk/checksums =================================================================== --- csw/mgar/pkg/help2man/trunk/checksums 2009-12-20 00:26:24 UTC (rev 7676) +++ csw/mgar/pkg/help2man/trunk/checksums 2009-12-20 09:32:25 UTC (rev 7677) @@ -1,3 +1 @@ -d31a0a38c2ec71faa06723f6b8bd3076 download/help2man-1.36.4.tar.gz -484faf002d8e710353bcbbcd74b72d94 download/CSWhelp2man.gspec -45b2b2cac12e100249501f8a017e6da8 download/CSWhelp2man.depend +371b5cc74fe9c2ea3ee1ca23c19b19a8 help2man-1.37.1.tar.gz Deleted: csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.depend =================================================================== --- csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.depend 2009-12-20 00:26:24 UTC (rev 7676) +++ csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.depend 2009-12-20 09:32:25 UTC (rev 7677) @@ -1,2 +0,0 @@ -P CSWperl perl - A high-level, general-purpose programming language. -P CSWpmlocalegettext pm_localegettext - Message handling functions Deleted: csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.gspec =================================================================== --- csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.gspec 2009-12-20 00:26:24 UTC (rev 7676) +++ csw/mgar/pkg/help2man/trunk/files/CSWhelp2man.gspec 2009-12-20 09:32:25 UTC (rev 7677) @@ -1,5 +0,0 @@ -%var bitname help2man -%var pkgname CSWhelp2man -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Dec 20 11:55:28 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 20 Dec 2009 10:55:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7678] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 7678 http://gar.svn.sourceforge.net/gar/?rev=7678&view=rev Author: hson Date: 2009-12-20 10:55:28 +0000 (Sun, 20 Dec 2009) Log Message: ----------- imagemagick: Update to 6.5.8-6 Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-12-20 09:32:25 UTC (rev 7677) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-12-20 10:55:28 UTC (rev 7678) @@ -1,6 +1,6 @@ GARNAME = imagemagick -GARVERSION = 6.5.4 -GARSUBREV = 1 +GARVERSION = 6.5.8 +GARSUBREV = 6 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -24,7 +24,7 @@ REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit REQUIRED_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2 REQUIRED_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib -REQUIRED_PKGS += CSWlibtoolrt +REQUIRED_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2009-12-20 09:32:25 UTC (rev 7677) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2009-12-20 10:55:28 UTC (rev 7678) @@ -1,2 +1,2 @@ -fd1641acb602bda064467d277dab590d download/ImageMagick-6.5.4-1.tar.bz2 -6bd361fe352c7d497d60d8d2cbe7cfd4 download/Makefile.patch +7ba3d32af33d716cc0fedb4d4a9e359f ImageMagick-6.5.8-6.tar.bz2 +6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Dec 20 12:49:51 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 20 Dec 2009 11:49:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7679] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 7679 http://gar.svn.sourceforge.net/gar/?rev=7679&view=rev Author: hson Date: 2009-12-20 11:49:51 +0000 (Sun, 20 Dec 2009) Log Message: ----------- librsvg: Added /opt/csw/X11/lib to EXTRA_LD_OPTIONS Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2009-12-20 10:55:28 UTC (rev 7678) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2009-12-20 11:49:51 UTC (rev 7679) @@ -47,6 +47,8 @@ EXTRA_COMMON_EXPORTS = LIBS CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared=yes --enable-static=no +EXTRA_LD_OPTIONS = -R/opt/csw/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib STRIP_LIBTOOL=1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 15:32:45 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 14:32:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7680] csw/mgar/pkg Message-ID: Revision: 7680 http://gar.svn.sourceforge.net/gar/?rev=7680&view=rev Author: rthurner Date: 2009-12-20 14:32:44 +0000 (Sun, 20 Dec 2009) Log Message: ----------- libtorrent - initial checkin - build fails, would need to be gnu? Added Paths: ----------- csw/mgar/pkg/libtorrent/ csw/mgar/pkg/libtorrent/branches/ csw/mgar/pkg/libtorrent/tags/ csw/mgar/pkg/libtorrent/trunk/ csw/mgar/pkg/libtorrent/trunk/Makefile csw/mgar/pkg/libtorrent/trunk/checksums csw/mgar/pkg/libtorrent/trunk/files/ Property changes on: csw/mgar/pkg/libtorrent/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/libtorrent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtorrent/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/Makefile 2009-12-20 14:32:44 UTC (rev 7680) @@ -0,0 +1,25 @@ +GARNAME = libtorrent +GARVERSION = 0.12.6 +CATEGORIES = lib + +DESCRIPTION = BitTorrent library written in C++ for *nix. +define BLURB + BitTorrent library written in C++ for *nix, with a focus on high performance and good code. + The library differentiates itself from other implementations by transfering directly from + file pages to the network stack. On high-bandwidth connections it is able to seed at 3 times + the speed of the official client. +endef + +MASTER_SITES = http://libtorrent.rakshasa.no/downloads/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 Added: csw/mgar/pkg/libtorrent/trunk/checksums =================================================================== --- csw/mgar/pkg/libtorrent/trunk/checksums (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/checksums 2009-12-20 14:32:44 UTC (rev 7680) @@ -0,0 +1 @@ +037499ed708aaf72988cee60e5a8d96b libtorrent-0.12.6.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 Sun Dec 20 15:35:08 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Dec 2009 14:35:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7681] csw/mgar/pkg/mysql5/trunk Message-ID: Revision: 7681 http://gar.svn.sourceforge.net/gar/?rev=7681&view=rev Author: wahwah Date: 2009-12-20 14:35:08 +0000 (Sun, 20 Dec 2009) Log Message: ----------- mysql5: Work around a problem with the libtool version mismatch. Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile csw/mgar/pkg/mysql5/trunk/checksums Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-20 14:32:44 UTC (rev 7680) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-20 14:35:08 UTC (rev 7681) @@ -162,6 +162,10 @@ include gar/category.mk +pre-configure-modulated: + # To work around the libtool version mismatch problem. + cd $(WORKSRC) && autoreconf --force --install --symlink + post-install-modulated: ginstall -m 755 -d $(DESTDIR)$(localstatedir) ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc Modified: csw/mgar/pkg/mysql5/trunk/checksums =================================================================== --- csw/mgar/pkg/mysql5/trunk/checksums 2009-12-20 14:32:44 UTC (rev 7680) +++ csw/mgar/pkg/mysql5/trunk/checksums 2009-12-20 14:35:08 UTC (rev 7681) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -747637bc4be42207974ae845d832ae65 CSWmysql5.postinstall -60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall +558bd157ae37f9d109c6ad02a8f5b049 CSWmysql5.postinstall +a02c82ada9e610d6c6375856161575ec CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW -aaca748fc044834e71ad544ab293c494 cswmysql5 +45f5ca05ed0c61f21951bd2a7122c036 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup 32e7373c16271606007374396e6742ad mysql-5.1.40.tar.gz -90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw +60bc6bed72839668ef6496fd31a01ad3 quick_start-csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Dec 20 15:36:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Dec 2009 14:36:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7682] csw/mgar/pkg/nss/trunk/Makefile Message-ID: Revision: 7682 http://gar.svn.sourceforge.net/gar/?rev=7682&view=rev Author: wahwah Date: 2009-12-20 14:36:40 +0000 (Sun, 20 Dec 2009) Log Message: ----------- nss: Adding options for the optimized build Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-12-20 14:35:08 UTC (rev 7681) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-12-20 14:36:40 UTC (rev 7682) @@ -64,6 +64,7 @@ ifneq (DBG,$(GARFLAVOR)) BUILD_OPT = 1 export BUILD_OPT + CONFIGURE_ARGS += --disable-debug --enable-optimize endif # NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig 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 Dec 20 15:51:01 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Dec 2009 14:51:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7683] csw/mgar/pkg/googletest/trunk/Makefile Message-ID: Revision: 7683 http://gar.svn.sourceforge.net/gar/?rev=7683&view=rev Author: wahwah Date: 2009-12-20 14:51:01 +0000 (Sun, 20 Dec 2009) Log Message: ----------- googletest: Enable tests, they fail. Modified Paths: -------------- csw/mgar/pkg/googletest/trunk/Makefile Modified: csw/mgar/pkg/googletest/trunk/Makefile =================================================================== --- csw/mgar/pkg/googletest/trunk/Makefile 2009-12-20 14:36:40 UTC (rev 7682) +++ csw/mgar/pkg/googletest/trunk/Makefile 2009-12-20 14:51:01 UTC (rev 7683) @@ -20,4 +20,10 @@ WORKSRC = $(WORKDIR)/gtest-$(GARVERSION) UFILES_REGEX = gtest-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = googletest +TEST_TARGETS = check include gar/category.mk + +test-googletest: + (cd $(WORKSRC) && gmake check) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 16:40:36 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 15:40:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7684] csw/mgar/pkg Message-ID: Revision: 7684 http://gar.svn.sourceforge.net/gar/?rev=7684&view=rev Author: rthurner Date: 2009-12-20 15:40:36 +0000 (Sun, 20 Dec 2009) Log Message: ----------- rtorrent - first try, but libtorrent does not compile yet Added Paths: ----------- csw/mgar/pkg/rtorrent/ csw/mgar/pkg/rtorrent/branches/ csw/mgar/pkg/rtorrent/tags/ csw/mgar/pkg/rtorrent/trunk/ csw/mgar/pkg/rtorrent/trunk/Makefile csw/mgar/pkg/rtorrent/trunk/checksums csw/mgar/pkg/rtorrent/trunk/files/ Property changes on: csw/mgar/pkg/rtorrent/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/rtorrent/trunk/Makefile =================================================================== --- csw/mgar/pkg/rtorrent/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/Makefile 2009-12-20 15:40:36 UTC (rev 7684) @@ -0,0 +1,27 @@ +GARNAME = rtorrent +GARVERSION = 0.8.6 +CATEGORIES = apps + +DESCRIPTION = BitTorrent client. +define BLURB + BitTorrent library written in C++ for *nix, with a focus on high performance and good code. + The library differentiates itself from other implementations by transfering directly from + file pages to the network stack. On high-bandwidth connections it is able to seed at 3 times + the speed of the official client. +endef + +MASTER_SITES = http://libtorrent.rakshasa.no/downloads/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +REQUIRED_PKGS = CSWlibtorrent + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/rtorrent/trunk/checksums =================================================================== --- csw/mgar/pkg/rtorrent/trunk/checksums (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/checksums 2009-12-20 15:40:36 UTC (rev 7684) @@ -0,0 +1 @@ +b804c45c01c40312926bcea6b55bb084 rtorrent-0.8.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 19:51:06 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 18:51:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7685] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 7685 http://gar.svn.sourceforge.net/gar/?rev=7685&view=rev Author: rthurner Date: 2009-12-20 18:51:06 +0000 (Sun, 20 Dec 2009) Log Message: ----------- change sysconfig dir Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 15:40:36 UTC (rev 7684) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 18:51:06 UTC (rev 7685) @@ -78,6 +78,7 @@ # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html PATCHFILES += javahl_headers_for_nested_classes.diff PATCHFILES += subversion161.diff +PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch DEPENDS = server/apache2 DEPENDS = lib/neon Added: csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch =================================================================== --- csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch (rev 0) +++ csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch 2009-12-20 18:51:06 UTC (rev 7685) @@ -0,0 +1,25 @@ +From e522142a1517f9c9ffdd670eb2fd0aa974a9a9a1 Mon Sep 17 00:00:00 2001 +From: Rupert Thurner +Date: Sun, 20 Dec 2009 12:33:52 -0600 +Subject: [PATCH] make subversion sysconfigdir as it should be for csw + +--- + subversion/libsvn_subr/config_impl.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/subversion/libsvn_subr/config_impl.h b/subversion/libsvn_subr/config_impl.h +index b5c9d4b..67d46aa 100644 +--- a/subversion/libsvn_subr/config_impl.h ++++ b/subversion/libsvn_subr/config_impl.h +@@ -110,7 +110,7 @@ svn_error_t *svn_config__parse_registry(svn_config_t *cfg, + #ifdef WIN32 + # define SVN_CONFIG__SUBDIRECTORY "Subversion" + #else /* ! WIN32 */ +-# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" ++# define SVN_CONFIG__SYS_DIRECTORY "/etc/opt/csw/subversion" + # define SVN_CONFIG__USR_DIRECTORY ".subversion" + #endif /* WIN32 */ + +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 19:52:04 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 18:52:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7686] csw/mgar/pkg/subversion/trunk/checksums Message-ID: Revision: 7686 http://gar.svn.sourceforge.net/gar/?rev=7686&view=rev Author: rthurner Date: 2009-12-20 18:52:04 +0000 (Sun, 20 Dec 2009) Log Message: ----------- change sysconfig dir Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2009-12-20 18:51:06 UTC (rev 7685) +++ csw/mgar/pkg/subversion/trunk/checksums 2009-12-20 18:52:04 UTC (rev 7686) @@ -1,3 +1,4 @@ +5e2c9e1d117c41a0eb6c977c984e7c36 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch 32b2cc8a237404d160a5617ea2da53d8 CSWap2svn.postinstall 586b9c9924c1547d44451a84d2aca702 CSWap2svn.preremove 395ec6d1bfe07efadc1c0aa8816673fa CSWsvn.checkinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Dec 20 20:12:17 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 20 Dec 2009 19:12:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7687] csw/mgar/pkg/watch/trunk Message-ID: Revision: 7687 http://gar.svn.sourceforge.net/gar/?rev=7687&view=rev Author: skayser Date: 2009-12-20 19:12:17 +0000 (Sun, 20 Dec 2009) Log Message: ----------- watch: updated to procps 3.2.8, refactored Makefile, non-ASCII handling still broken Modified Paths: -------------- csw/mgar/pkg/watch/trunk/Makefile csw/mgar/pkg/watch/trunk/checksums Modified: csw/mgar/pkg/watch/trunk/Makefile =================================================================== --- csw/mgar/pkg/watch/trunk/Makefile 2009-12-20 18:52:04 UTC (rev 7686) +++ csw/mgar/pkg/watch/trunk/Makefile 2009-12-20 19:12:17 UTC (rev 7687) @@ -1,3 +1,8 @@ +# TODO +# - Although watch links against ncursesw, non-ASCII character handling +# is broken. German umlauts for example won't display at all. Try: +# python -c 'print u"\u00E4"' vs. watch -d python -c 'print u"\u00E4"' +# Needs further investigation. GARNAME = watch GARVERSION = 0.2.0 CATEGORIES = utils @@ -10,7 +15,7 @@ # Usually we would use $(SF_MIRROR), but the procps folks didn't upload # procps the usual way SF_PROJ = procps -SF_PROJ_VER = 3.2.7 +SF_PROJ_VER = 3.2.8 MASTER_SITES = http://$(SF_PROJ).sourceforge.net/ DISTFILES = $(SF_PROJ)-$(SF_PROJ_VER).tar.gz DISTNAME = $(SF_PROJ)-$(SF_PROJ_VER) @@ -30,7 +35,7 @@ CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_INC = /opt/csw/include/ncurses +EXTRA_INC = /opt/csw/include/ncursesw include gar/category.mk @@ -43,36 +48,39 @@ # GNU getopt taken from # http://svn.cherokee-project.com/browser/cherokee/trunk/cherokee/getopt # snprintf.c taken from http://www.jhweiss.de/software/snprintf.html -# -# Don't tell snprintf.c that you have v?snprintf, output will be garbled +pre-build-modulated: + rm $(WORKSRC)/ps/module.mk $(WORKSRC)/proc/module.mk + cp $(FILEDIR)/snprintf* $(WORKSRC) + cp $(FILEDIR)/getopt* $(WORKSRC) + cp $(FILEDIR)/gettext.h* $(WORKSRC) + @$(MAKECOOKIE) + +# Feature flags for snprintf.c. Don't tell it that you have v?snprintf, +# output will be garbled. CFLAGS := $(CFLAGS) -DHAVE_STDARG_H -DHAVE_STDLIB_H -DHAVE_STDDEF CFLAGS := $(CFLAGS) -DHAVE_INTTYPES_H -DHAVE_LOCALE_H -DHAVE_LOCALECONV CFLAGS := $(CFLAGS) -DHAVE_LOCALECONV -DHAVE_UINTMAX_T -DHAVE_VA_COPY -pre-build-modulated: - @rm $(WORKSRC)/ps/module.mk $(WORKSRC)/proc/module.mk - @cp $(FILEDIR)/snprintf* $(WORKSRC) - @cp $(FILEDIR)/getopt* $(WORKSRC) - @cp $(FILEDIR)/gettext.h* $(WORKSRC) - $(MAKECOOKIE) - +# CURSES and BUILD_ARGS w/ ALL_?FLAGS req. for $(WORKSRC)/Makefile +build-custom: CURSES=-lncursesw build-custom: BUILD_ARGS:=ALL_CFLAGS="$(CFLAGS)" ALL_LDFLAGS="$(LDFLAGS)" build-custom: - @$(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) snprintf.o - @$(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt.o - @$(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt1.o - @$(BUILD_ENV) gmake -C $(WORKSRC) \ + $(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) snprintf.o + $(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt.o + $(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt1.o + $(BUILD_ENV) gmake -C $(WORKSRC) \ ALL_CFLAGS="$(CFLAGS) snprintf.o getopt.o getopt1.o" \ - ALL_LDFLAGS="$(LDFLAGS)" watch - $(MAKECOOKIE) + ALL_LDFLAGS="$(LDFLAGS)" \ + CURSES=$(CURSES) watch + @$(MAKECOOKIE) install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) install-custom: - @ginstall -d $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(mandir)/man1 - @ginstall -d $(DOCDEST) - @ginstall -m 755 $(WORKSRC)/watch $(DESTDIR)$(bindir) - @cp $(WORKSRC)/watch.1 $(DESTDIR)$(mandir)/man1 - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) - $(MAKECOOKIE) + ginstall -d $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall -d $(DOCDEST) + ginstall -m 755 $(WORKSRC)/watch $(DESTDIR)$(bindir) + cp $(WORKSRC)/watch.1 $(DESTDIR)$(mandir)/man1 + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/watch/trunk/checksums =================================================================== --- csw/mgar/pkg/watch/trunk/checksums 2009-12-20 18:52:04 UTC (rev 7686) +++ csw/mgar/pkg/watch/trunk/checksums 2009-12-20 19:12:17 UTC (rev 7687) @@ -1,3 +1,4 @@ -f490bca772b16472962c7b9f23b1e97d download/procps-3.2.7.tar.gz -05f5e9e304c4300b056ffd61eafebffa download/patch-extralibs.diff -c29461ef280f8a7dca7ef1d5aeec8e2d download/patch-sigpipe.diff +05f5e9e304c4300b056ffd61eafebffa patch-extralibs.diff +c29461ef280f8a7dca7ef1d5aeec8e2d patch-sigpipe.diff +9532714b6846013ca9898984ba4cd7e0 procps-3.2.8.tar.gz +b8b8809849fa14e39da359fb2bd2d955 wide-char-fix.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 22:26:18 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 21:26:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7688] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 7688 http://gar.svn.sourceforge.net/gar/?rev=7688&view=rev Author: rthurner Date: 2009-12-20 21:26:17 +0000 (Sun, 20 Dec 2009) Log Message: ----------- provide old svn libraries to allow startup of the ancient kde apps like kdesdk Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.i csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.s csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.i csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.s Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 19:12:17 UTC (rev 7687) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 21:26:17 UTC (rev 7688) @@ -73,6 +73,10 @@ DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW DISTFILES += fixme.sh +DISTFILES += libsvn_fs_base-1.so.0.0.0.i +DISTFILES += libsvn_fs_base-1.so.0.0.0.s +DISTFILES += libsvn_ra_dav-1.so.0.0.0.i +DISTFILES += libsvn_ra_dav-1.so.0.0.0.s # Fix: Add java headers for nested classes # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html @@ -220,4 +224,17 @@ $(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl; $(MAKECOOKIE) +post-install-isa-sparcv8: + ginstall $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 + ginstall $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 + ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 + ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 + @$(MAKECOOKIE) +post-install-isa-i386: + cp $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 + cp $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 + ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 + ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 + @$(MAKECOOKIE) + Added: csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.i =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.i ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.s =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.s ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.i =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.i ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.s =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.s ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 22:30:31 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 21:30:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7689] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 7689 http://gar.svn.sourceforge.net/gar/?rev=7689&view=rev Author: rthurner Date: 2009-12-20 21:30:31 +0000 (Sun, 20 Dec 2009) Log Message: ----------- subversion - add checksums as well for the old lib files Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 21:26:17 UTC (rev 7688) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 21:30:31 UTC (rev 7689) @@ -225,16 +225,16 @@ $(MAKECOOKIE) post-install-isa-sparcv8: - ginstall $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 - ginstall $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 - ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 - ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 - @$(MAKECOOKIE) + ginstall $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 + ginstall $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 + ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 + ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 + @$(MAKECOOKIE) post-install-isa-i386: - cp $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 - cp $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 - ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 - ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 - @$(MAKECOOKIE) + cp $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 + cp $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 + ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 + ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2009-12-20 21:26:17 UTC (rev 7688) +++ csw/mgar/pkg/subversion/trunk/checksums 2009-12-20 21:30:31 UTC (rev 7689) @@ -5,6 +5,10 @@ 41ec540885de7c34625768aa1fb9682b fixme.sh f107831ad0c702ff32e51df6a207237b httpd-svn.conf.CSW f0aa58c145ae99f8e4d72499ab826169 javahl_headers_for_nested_classes.diff +e6adf167a1050c3f434b7b60e8d94848 libsvn_fs_base-1.so.0.0.0.i +6f9987b00f66c8347f05fc13efc82322 libsvn_fs_base-1.so.0.0.0.s +1e71a0256e2709cd8f6a0f4870bca255 libsvn_ra_dav-1.so.0.0.0.i +15c92123c517b66956e097caaa56ddfa libsvn_ra_dav-1.so.0.0.0.s e5109da756d74c7d98f683f004a539af subversion-1.6.6.tar.bz2 f7d05c59656dcf01fb844295c9912f78 subversion161.diff 1b532d3055708a97771f5cd959983628 svn_access.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 22:36:21 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 21:36:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7690] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 7690 http://gar.svn.sourceforge.net/gar/?rev=7690&view=rev Author: rthurner Date: 2009-12-20 21:36:21 +0000 (Sun, 20 Dec 2009) Log Message: ----------- subversion - classutils causes a double depend Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 21:30:31 UTC (rev 7689) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 21:36:21 UTC (rev 7690) @@ -101,7 +101,6 @@ EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' SPKG_CLASSES_CSWpythonsvn = none cswpycompile -REQUIRED_PKGS_CSWpythonsvn += CSWcswclassutils CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 20 23:22:49 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Dec 2009 22:22:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7691] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 7691 http://gar.svn.sourceforge.net/gar/?rev=7691&view=rev Author: rthurner Date: 2009-12-20 22:22:49 +0000 (Sun, 20 Dec 2009) Log Message: ----------- libsvn_fs_base is there, so no need to provide it Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.i csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.s Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 21:36:21 UTC (rev 7690) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-12-20 22:22:49 UTC (rev 7691) @@ -73,8 +73,6 @@ DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW DISTFILES += fixme.sh -DISTFILES += libsvn_fs_base-1.so.0.0.0.i -DISTFILES += libsvn_fs_base-1.so.0.0.0.s DISTFILES += libsvn_ra_dav-1.so.0.0.0.i DISTFILES += libsvn_ra_dav-1.so.0.0.0.s @@ -224,16 +222,12 @@ $(MAKECOOKIE) post-install-isa-sparcv8: - ginstall $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 ginstall $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 - ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 @$(MAKECOOKIE) post-install-isa-i386: - cp $(FILEDIR)/libsvn_fs_base-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0.0.0 cp $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 - ln -s libsvn_fs_base-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_fs_base-1.so.0 ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 @$(MAKECOOKIE) Deleted: csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/subversion/trunk/files/libsvn_fs_base-1.so.0.0.0.s =================================================================== (Binary files differ) 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 Dec 21 15:15:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Dec 2009 14:15:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7692] csw/mgar/pkg Message-ID: Revision: 7692 http://gar.svn.sourceforge.net/gar/?rev=7692&view=rev Author: dmichelsen Date: 2009-12-21 14:15:23 +0000 (Mon, 21 Dec 2009) Log Message: ----------- cdecl: Initial commit Added Paths: ----------- csw/mgar/pkg/cdecl/ csw/mgar/pkg/cdecl/branches/ csw/mgar/pkg/cdecl/tags/ csw/mgar/pkg/cdecl/trunk/ csw/mgar/pkg/cdecl/trunk/Makefile csw/mgar/pkg/cdecl/trunk/checksums csw/mgar/pkg/cdecl/trunk/files/ csw/mgar/pkg/cdecl/trunk/files/0001-Remove-keyword-for-Sun-Studio.patch Property changes on: csw/mgar/pkg/cdecl/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/cdecl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cdecl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cdecl/trunk/Makefile 2009-12-21 14:15:23 UTC (rev 7692) @@ -0,0 +1,44 @@ +GARNAME = cdecl +GARVERSION = 2.5 +CATEGORIES = utils + +DESCRIPTION = C declaration guide/tool +define BLURB +endef + +MASTER_SITES = http://www.cdecl.org/files/ +DISTNAME = cdecl-blocks-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz +PATCHFILES = 0001-Remove-keyword-for-Sun-Studio.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-blocks-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.cdecl.org/ + +LICENSE = README + +REQUIRED_PKGS = CSWreadline +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +CONFIGURE_SCRIPTS = + +LIBS = -lreadline +EXTRA_CFLAGS = $(CPPFLAGS) $(LDFLAGS) -DUSE_READLINE +BUILD_OVERRIDE_DIRS = CFLAGS CC LIBS + +TEST_TARGET = test +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + ginstall $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/cdecl $(DESTDIR)$(bindir)/cdecl + gln -s cdecl $(DESTDIR)$(bindir)/c++decl + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKSRC)/cdecl.1 $(DESTDIR)$(mandir)/man1 + gln -s cdecl.1 $(DESTDIR)$(mandir)/man1/c++decl.1 + @$(MAKECOOKIE) Added: csw/mgar/pkg/cdecl/trunk/checksums =================================================================== --- csw/mgar/pkg/cdecl/trunk/checksums (rev 0) +++ csw/mgar/pkg/cdecl/trunk/checksums 2009-12-21 14:15:23 UTC (rev 7692) @@ -0,0 +1,2 @@ +0aedb14385504f8e03713029e3922679 0001-Remove-keyword-for-Sun-Studio.patch +c1927e146975b1c7524cbaf07a7c10f8 cdecl-blocks-2.5.tar.gz Added: csw/mgar/pkg/cdecl/trunk/files/0001-Remove-keyword-for-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/cdecl/trunk/files/0001-Remove-keyword-for-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/cdecl/trunk/files/0001-Remove-keyword-for-Sun-Studio.patch 2009-12-21 14:15:23 UTC (rev 7692) @@ -0,0 +1,78 @@ +From d8a9a04271a883179f2b565d1b8b6d49bc50593d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 21 Dec 2009 14:46:57 +0100 +Subject: [PATCH] Remove keyword for Sun Studio + +--- + cdecl.c | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/cdecl.c b/cdecl.c +index 73ad493..8f88658 100644 +--- a/cdecl.c ++++ b/cdecl.c +@@ -76,8 +76,8 @@ char cdeclsccsid[] = "@(#)cdecl.c 2.5 1/15/96"; + # ifndef NOVARARGS + # include + # endif /* ndef NOVARARGS */ +-char *malloc(); +-void free(), exit(), perror(); ++/* char *malloc(); */ ++/* void free(), exit(), perror(); */ + # ifdef BSD + # include + extern int errno; +@@ -245,7 +245,7 @@ struct + /* for unsupported combinations of types. */ + void mbcheck() + { +- register int i, j, restrict; ++ register int i, j, restr; + char *t1, *t2; + + /* Loop through the types */ +@@ -262,26 +262,26 @@ void mbcheck() + if (!(modbits & crosstypes[j].bit)) + continue; + /* check the type of restriction */ +- restrict = crosscheck[i][j]; +- if (restrict == ALWAYS) ++ restr = crosscheck[i][j]; ++ if (restr == ALWAYS) + continue; + t1 = crosstypes[i].name; + t2 = crosstypes[j].name; +- if (restrict == NEVER) ++ if (restr == NEVER) + { + notsupported("", t1, t2); + } +- else if (restrict == RITCHIE) ++ else if (restr == RITCHIE) + { + if (RitchieFlag) + notsupported(" (Ritchie Compiler)", t1, t2); + } +- else if (restrict == PREANSI) ++ else if (restr == PREANSI) + { + if (PreANSIFlag || RitchieFlag) + notsupported(" (Pre-ANSI Compiler)", t1, t2); + } +- else if (restrict == ANSI) ++ else if (restr == ANSI) + { + if (!RitchieFlag && !PreANSIFlag) + notsupported(" (ANSI Compiler)", t1, t2); +@@ -290,7 +290,7 @@ void mbcheck() + { + (void) fprintf (stderr, + "%s: Internal error in crosscheck[%d,%d]=%d!\n", +- progname, i, j, restrict); ++ progname, i, j, restr); + exit(1); /* NOTREACHED */ + } + } +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 21 15:29:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Dec 2009 14:29:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7693] csw/mgar/pkg/pdfjam/trunk Message-ID: Revision: 7693 http://gar.svn.sourceforge.net/gar/?rev=7693&view=rev Author: dmichelsen Date: 2009-12-21 14:29:03 +0000 (Mon, 21 Dec 2009) Log Message: ----------- pdfjam: Fix dependencies and hardcode CSW pathes and tools Modified Paths: -------------- csw/mgar/pkg/pdfjam/trunk/Makefile csw/mgar/pkg/pdfjam/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pdfjam/trunk/files/0001-Hardcode-CSW-tools-and-pathes.patch Modified: csw/mgar/pkg/pdfjam/trunk/Makefile =================================================================== --- csw/mgar/pkg/pdfjam/trunk/Makefile 2009-12-21 14:15:23 UTC (rev 7692) +++ csw/mgar/pkg/pdfjam/trunk/Makefile 2009-12-21 14:29:03 UTC (rev 7693) @@ -11,12 +11,15 @@ MASTER_SITES = http://www.warwick.ac.uk/go/pdfjam/ DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz +PATCHFILES = 0001-Hardcode-CSW-tools-and-pathes.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam +REQUIRED_PKGS = CSWtetex + DISTNAME = pdfjam CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/pdfjam/trunk/checksums =================================================================== --- csw/mgar/pkg/pdfjam/trunk/checksums 2009-12-21 14:15:23 UTC (rev 7692) +++ csw/mgar/pkg/pdfjam/trunk/checksums 2009-12-21 14:29:03 UTC (rev 7693) @@ -1 +1,2 @@ +ad3f63f1304a73f7ef25d4ea70c03b7f 0001-Hardcode-CSW-tools-and-pathes.patch 71d2d664777d32ec4154ab4c2e5965dc pdfjam_1.21.tar.gz Added: csw/mgar/pkg/pdfjam/trunk/files/0001-Hardcode-CSW-tools-and-pathes.patch =================================================================== --- csw/mgar/pkg/pdfjam/trunk/files/0001-Hardcode-CSW-tools-and-pathes.patch (rev 0) +++ csw/mgar/pkg/pdfjam/trunk/files/0001-Hardcode-CSW-tools-and-pathes.patch 2009-12-21 14:29:03 UTC (rev 7693) @@ -0,0 +1,80 @@ +From 260e4cde6050335998d92f62b068e357e2d1ca4c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 21 Dec 2009 15:14:31 +0100 +Subject: [PATCH] Hardcode CSW tools and pathes + +--- + scripts/pdf90 | 4 ++-- + scripts/pdfjoin | 4 ++-- + scripts/pdfnup | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/scripts/pdf90 b/scripts/pdf90 +index 8b9ac02..7402567 100755 +--- a/scripts/pdf90 ++++ b/scripts/pdf90 +@@ -23,7 +23,7 @@ echo "This is pdf90 version ""$version" + ## + ## First say where your "pdflatex" program lives: + ## +-pdflatex=pdflatex ++pdflatex=/opt/csw/bin/pdflatex + #pdflatex="pdflatex.exe" ## this for Windows computers + ## + ## Next a permitted location for temporary files on your system: +@@ -40,7 +40,7 @@ tidy=true ## delete all temporary files immediately + ## + ## Read the configuration file(s) if such exist: + ## +-for d in /etc /usr/share/etc /usr/local/share /usr/local/etc ++for d in /opt/csw/etc /etc/opt/csw + do if test -f $d/pdfnup.conf; then + echo "Reading site configuration from $d/pdfnup.conf" + . $d/pdfnup.conf +diff --git a/scripts/pdfjoin b/scripts/pdfjoin +index 761c68a..afce83a 100755 +--- a/scripts/pdfjoin ++++ b/scripts/pdfjoin +@@ -28,7 +28,7 @@ shopt -u xpg_echo ## mainly to cope with Mac OS 10.5 "Leopard" + ## + ## First say where your "pdflatex" program lives: + ## +-pdflatex=pdflatex ++pdflatex=/opt/csw/bin/pdflatex + #pdflatex="pdflatex.exe" ## this for Windows computers + ## + ## Next a permitted location for temporary files on your system: +@@ -52,7 +52,7 @@ tidy=true ## delete all temporary files immediately + ## + ## Read the configuration file(s) if such exist: + ## +-for d in /etc /usr/share/etc /usr/local/share /usr/local/etc ++for d in /opt/csw/etc /etc/opt/csw + do if test -f $d/pdfnup.conf; then + echo "Reading site configuration from $d/pdfnup.conf" + . $d/pdfnup.conf +diff --git a/scripts/pdfnup b/scripts/pdfnup +index b4efe1c..71330c3 100755 +--- a/scripts/pdfnup ++++ b/scripts/pdfnup +@@ -24,7 +24,7 @@ echo "This is pdfnup version ""$version" + ## + ## First say where your "pdflatex" program lives: + ## +-pdflatex=pdflatex ++pdflatex=/opt/csw/bin/pdflatex + #pdflatex="pdflatex.exe" ## this for Windows computers + ## + ## Next a permitted location for temporary files on your system: +@@ -55,7 +55,7 @@ tidy=true ## delete all temporary files immediately + ## + ## Read the configuration file(s) if such exist: + ## +-for d in /etc /usr/share/etc /usr/local/share /usr/local/etc ++for d in /opt/csw/etc /etc/opt/csw + do if test -f $d/pdfnup.conf; then + echo "Reading site configuration from $d/pdfnup.conf" + . $d/pdfnup.conf +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 21 15:43:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Dec 2009 14:43:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7694] csw/mgar/pkg/pdfjam/trunk Message-ID: Revision: 7694 http://gar.svn.sourceforge.net/gar/?rev=7694&view=rev Author: dmichelsen Date: 2009-12-21 14:43:04 +0000 (Mon, 21 Dec 2009) Log Message: ----------- pdfjam: Some patches for Solaris Modified Paths: -------------- csw/mgar/pkg/pdfjam/trunk/Makefile csw/mgar/pkg/pdfjam/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pdfjam/trunk/files/0002-Step-out-of-tempdir-before-removing-it.patch csw/mgar/pkg/pdfjam/trunk/files/0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch Modified: csw/mgar/pkg/pdfjam/trunk/Makefile =================================================================== --- csw/mgar/pkg/pdfjam/trunk/Makefile 2009-12-21 14:29:03 UTC (rev 7693) +++ csw/mgar/pkg/pdfjam/trunk/Makefile 2009-12-21 14:43:04 UTC (rev 7694) @@ -11,14 +11,16 @@ MASTER_SITES = http://www.warwick.ac.uk/go/pdfjam/ DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz -PATCHFILES = 0001-Hardcode-CSW-tools-and-pathes.patch +PATCHFILES = 0001-Hardcode-CSW-tools-and-pathes.patch +PATCHFILES += 0002-Step-out-of-tempdir-before-removing-it.patch +PATCHFILES += 0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam -REQUIRED_PKGS = CSWtetex +REQUIRED_PKGS = CSWtetex CSWbash DISTNAME = pdfjam Modified: csw/mgar/pkg/pdfjam/trunk/checksums =================================================================== --- csw/mgar/pkg/pdfjam/trunk/checksums 2009-12-21 14:29:03 UTC (rev 7693) +++ csw/mgar/pkg/pdfjam/trunk/checksums 2009-12-21 14:43:04 UTC (rev 7694) @@ -1,2 +1,4 @@ ad3f63f1304a73f7ef25d4ea70c03b7f 0001-Hardcode-CSW-tools-and-pathes.patch +267c5818992a3c1de19f2bcc074892b3 0002-Step-out-of-tempdir-before-removing-it.patch +3b0072b467cb1d961056a1164c531602 0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch 71d2d664777d32ec4154ab4c2e5965dc pdfjam_1.21.tar.gz Added: csw/mgar/pkg/pdfjam/trunk/files/0002-Step-out-of-tempdir-before-removing-it.patch =================================================================== --- csw/mgar/pkg/pdfjam/trunk/files/0002-Step-out-of-tempdir-before-removing-it.patch (rev 0) +++ csw/mgar/pkg/pdfjam/trunk/files/0002-Step-out-of-tempdir-before-removing-it.patch 2009-12-21 14:43:04 UTC (rev 7694) @@ -0,0 +1,53 @@ +From 339813fa03f83e99b0f98626f1ca72f75ab82ca5 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 21 Dec 2009 15:22:00 +0100 +Subject: [PATCH] Step out of tempdir before removing it + +--- + scripts/pdf90 | 2 +- + scripts/pdfjoin | 2 +- + scripts/pdfnup | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/scripts/pdf90 b/scripts/pdf90 +index 7402567..5df5a37 100755 +--- a/scripts/pdf90 ++++ b/scripts/pdf90 +@@ -213,7 +213,7 @@ EndTemplate + "$outfileDir"/"$outfileNameRoot"".pdf" + fi + case "$tidy" in +- true) rm "$tempfileDir"/"$uniqueName"* ;; ++ true) cd && rm "$tempfileDir"/"$uniqueName"* ;; + esac + outFile="" + else echo " Failed: output file not written" +diff --git a/scripts/pdfjoin b/scripts/pdfjoin +index afce83a..24551ce 100755 +--- a/scripts/pdfjoin ++++ b/scripts/pdfjoin +@@ -263,7 +263,7 @@ if test -f "$tempfileDir"/"$uniqueName"".aux"; + "$outfileDir"/"$outfileNameRoot"".pdf" + fi + case "$tidy" in +- true) rm "$tempfileDir"/"$uniqueName"* ;; ++ true) cd && rm "$tempfileDir"/"$uniqueName"* ;; + esac + else echo " Failed: output file not written" + fi +diff --git a/scripts/pdfnup b/scripts/pdfnup +index 71330c3..d7872ac 100755 +--- a/scripts/pdfnup ++++ b/scripts/pdfnup +@@ -342,7 +342,7 @@ EndTemplate + "$outfileDir"/"$outfileNameRoot"".pdf" + fi + case "$tidy" in +- true) rm "$tempfileDir"/"$uniqueName"* ;; ++ true) cd && rm "$tempfileDir"/"$uniqueName"* ;; + esac + outFile="" + else echo " Failed: output file not written" +-- +1.6.5.1 + Added: csw/mgar/pkg/pdfjam/trunk/files/0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch =================================================================== --- csw/mgar/pkg/pdfjam/trunk/files/0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch (rev 0) +++ csw/mgar/pkg/pdfjam/trunk/files/0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch 2009-12-21 14:43:04 UTC (rev 7694) @@ -0,0 +1,44 @@ +From 5f8d163c0b2fa7c6eb6eba6dc271e96573293340 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 21 Dec 2009 15:28:31 +0100 +Subject: [PATCH] Use CSW bash because the Solaris shipped one is too old + +--- + scripts/pdf90 | 2 +- + scripts/pdfjoin | 2 +- + scripts/pdfnup | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/scripts/pdf90 b/scripts/pdf90 +index 5df5a37..cf15109 100755 +--- a/scripts/pdf90 ++++ b/scripts/pdf90 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/opt/csw/bin/bash + ## + ## pdf90: A shell program to rotate all pages of PDF files + ## +diff --git a/scripts/pdfjoin b/scripts/pdfjoin +index 24551ce..0bac762 100755 +--- a/scripts/pdfjoin ++++ b/scripts/pdfjoin +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/opt/csw/bin/bash + ## + ## pdfjoin: A shell program to concatenate PDF pages into one file + ## +diff --git a/scripts/pdfnup b/scripts/pdfnup +index d7872ac..6baeeb1 100755 +--- a/scripts/pdfnup ++++ b/scripts/pdfnup +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/opt/csw/bin/bash + ## + ## pdfnup: A shell program to generate a "n-up" version of a PDF file + ## +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 21 15:59:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 14:59:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7695] csw/mgar/pkg/clusterssh/trunk Message-ID: Revision: 7695 http://gar.svn.sourceforge.net/gar/?rev=7695&view=rev Author: wahwah Date: 2009-12-21 14:59:32 +0000 (Mon, 21 Dec 2009) Log Message: ----------- clusterssh: Moved to GARv2, version bump up to 3.28 Modified Paths: -------------- csw/mgar/pkg/clusterssh/trunk/Makefile csw/mgar/pkg/clusterssh/trunk/checksums Added Paths: ----------- csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.postinstall Removed Paths: ------------- csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.depend csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.gspec Property Changed: ---------------- csw/mgar/pkg/clusterssh/trunk/ Property changes on: csw/mgar/pkg/clusterssh/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/clusterssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterssh/trunk/Makefile 2009-12-21 14:43:04 UTC (rev 7694) +++ csw/mgar/pkg/clusterssh/trunk/Makefile 2009-12-21 14:59:32 UTC (rev 7695) @@ -1,29 +1,30 @@ GARNAME = clusterssh -GARVERSION = 3.25 +GARVERSION = 3.28 CATEGORIES = net DESCRIPTION = ClusterSSH controls a number of xterm windows via a single graphical console window define BLURB - ClusterSSH controls a number of xterm windows via a single graphical console window to allow commands to be interactively run on multiple servers over an ssh connection. + ClusterSSH controls a number of xterm windows via a single graphical console + window to allow commands to be interactively run on multiple servers over an + ssh connection. endef SF_PROJ = $(GARNAME) MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWclusterssh,) -# We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=89139 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -REQUIRED_PKGS = CSWperl CSWpmtk CSWpmx11protocol +REQUIRED_PKGS = CSWperl +REQUIRED_PKGS += CSWpmtk +REQUIRED_PKGS += CSWpmx11protocol +# REQUIRED_PKGS += CSWossh -PREFIX = /opt/csw/ -CONFIGURE_ARGS = --prefix=$(PREFIX) +CONFIGURE_ARGS = $(DIRPATHS) # Not gonna do it TEST_SCRIPTS = include gar/category.mk - Modified: csw/mgar/pkg/clusterssh/trunk/checksums =================================================================== --- csw/mgar/pkg/clusterssh/trunk/checksums 2009-12-21 14:43:04 UTC (rev 7694) +++ csw/mgar/pkg/clusterssh/trunk/checksums 2009-12-21 14:59:32 UTC (rev 7695) @@ -1,2 +1 @@ -dc31291abac025a51cbb95a71f792801 download/clusterssh-3.25.tar.gz -5171cb4f2d0a4df5ade011f46d883ff5 download/CSWclusterssh.gspec +11e012329d2c62e1f7b17f3ac517769a clusterssh-3.28.tar.gz Deleted: csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.depend =================================================================== --- csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.depend 2009-12-21 14:43:04 UTC (rev 7694) +++ csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.depend 2009-12-21 14:59:32 UTC (rev 7695) @@ -1,2 +0,0 @@ -P CSWpmx11protocol -P CSWossh Deleted: csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.gspec =================================================================== --- csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.gspec 2009-12-21 14:43:04 UTC (rev 7694) +++ csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.gspec 2009-12-21 14:59:32 UTC (rev 7695) @@ -1,14 +0,0 @@ -%var bitname clusterssh -%var pkgname CSWclusterssh -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING -%postinstall -echo '*************************************************************************' -echo '*************************************************************************' -echo 'ClusterSSH may not work correctly with Sun's ssh client' -echo 'For best results always use the CSW openSSH client' -echo 'ensure /opt/csw/bin is first in your path, or adjust your .ccshrc' -echo '*************************************************************************' -echo '*************************************************************************' - Added: csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.postinstall =================================================================== --- csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.postinstall (rev 0) +++ csw/mgar/pkg/clusterssh/trunk/files/CSWclusterssh.postinstall 2009-12-21 14:59:32 UTC (rev 7695) @@ -0,0 +1,10 @@ +#!/bin/sh + +echo "*************************************************************************" +echo "*************************************************************************" +echo "ClusterSSH may not work correctly with Sun's ssh client" +echo "For best results always use the CSW openSSH client" +echo "ensure /opt/csw/bin is first in your path, or adjust your .ccshrc" +echo "*************************************************************************" +echo "*************************************************************************" + 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 Dec 21 16:03:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 15:03:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7696] csw/mgar/pkg/clusterssh/trunk/Makefile Message-ID: Revision: 7696 http://gar.svn.sourceforge.net/gar/?rev=7696&view=rev Author: wahwah Date: 2009-12-21 15:03:32 +0000 (Mon, 21 Dec 2009) Log Message: ----------- clusterssh: adding ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/clusterssh/trunk/Makefile Modified: csw/mgar/pkg/clusterssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterssh/trunk/Makefile 2009-12-21 14:59:32 UTC (rev 7695) +++ csw/mgar/pkg/clusterssh/trunk/Makefile 2009-12-21 15:03:32 UTC (rev 7696) @@ -22,6 +22,8 @@ REQUIRED_PKGS += CSWpmx11protocol # REQUIRED_PKGS += CSWossh +ARCHALL = 1 + CONFIGURE_ARGS = $(DIRPATHS) # Not gonna do it 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 Dec 21 16:06:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Dec 2009 15:06:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7697] csw/mgar/pkg Message-ID: Revision: 7697 http://gar.svn.sourceforge.net/gar/?rev=7697&view=rev Author: dmichelsen Date: 2009-12-21 15:06:18 +0000 (Mon, 21 Dec 2009) Log Message: ----------- a52dec+liba52: Split off a52dec package Modified Paths: -------------- csw/mgar/pkg/liba52/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/liba52/ Removed Paths: ------------- csw/mgar/pkg/a52dec/ Modified: csw/mgar/pkg/liba52/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2009-12-07 09:20:11 UTC (rev 7572) +++ csw/mgar/pkg/liba52/trunk/Makefile 2009-12-21 15:06:18 UTC (rev 7697) @@ -17,10 +17,17 @@ UPSTREAM_MASTER_SITES = http://liba52.sourceforge.net/ UFILES_REGEX = (\d+(?:\.\d+)*) -PACKAGES = CSWliba52 -CATALOGNAME = liba52 +PACKAGES = CSWliba52 CSWa52dec -REQUIRED_PKGS = CSWsunmath +CATALOGNAME_CSWliba52 = liba52 +CATALOGNAME_CSWa52dec = a52dec + +SPKG_DESC_CSWliba52 = $(DESCRIPTION) library +SPKG_DESC_CSWa52dec = $(DESCRIPTION) application + +REQUIRED_PKGS_CSWliba52 = CSWsunmath +REQUIRED_PKGS_CSWa52dec = CSWsunmath CSWliba52 + EXTRA_LINKER_FLAGS = -lsunmath BUILD64 = 1 @@ -34,6 +41,9 @@ MERGE_DIRS_isa-extra = $(libdir) +PKGFILES_CSWa52dec = $(bindir)/.* +PKGFILES_CSWa52dec += $(mandir)/man1/.* + include gar/category.mk post-install-modulated: 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 Dec 21 19:50:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 18:50:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7698] csw/mgar/pkg/gnupg/trunk Message-ID: Revision: 7698 http://gar.svn.sourceforge.net/gar/?rev=7698&view=rev Author: wahwah Date: 2009-12-21 18:50:40 +0000 (Mon, 21 Dec 2009) Log Message: ----------- gnupg: Version bump up 1.4.10 Modified Paths: -------------- csw/mgar/pkg/gnupg/trunk/Makefile csw/mgar/pkg/gnupg/trunk/checksums Modified: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2009-12-21 15:06:18 UTC (rev 7697) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2009-12-21 18:50:40 UTC (rev 7698) @@ -1,5 +1,5 @@ GARNAME = gnupg -GARVERSION = 1.4.9 +GARVERSION = 1.4.10 CATEGORIES = apps DESCRIPTION = GnuPG is a complete and free replacement for PGP. Modified: csw/mgar/pkg/gnupg/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg/trunk/checksums 2009-12-21 15:06:18 UTC (rev 7697) +++ csw/mgar/pkg/gnupg/trunk/checksums 2009-12-21 18:50:40 UTC (rev 7698) @@ -1 +1 @@ -cc52393087480ac8d245625004a6a30c download/gnupg-1.4.9.tar.bz2 +dcf7ed712997888d616e029637bfc303 gnupg-1.4.10.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 Mon Dec 21 20:51:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 19:51:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7699] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7699 http://gar.svn.sourceforge.net/gar/?rev=7699&view=rev Author: wahwah Date: 2009-12-21 19:50:58 +0000 (Mon, 21 Dec 2009) Log Message: ----------- mysql5: removing the incompatible mark against mysql4, working around the libtool version problem 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 2009-12-21 18:50:40 UTC (rev 7698) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-12-21 19:50:58 UTC (rev 7699) @@ -3,7 +3,9 @@ # $Id$ GARNAME = mysql5 -GARVERSION = 5.0.87 +MYSQL_MINOR_VERSION = 0 +MYSQL_PATCHLEVEL = 87 +GARVERSION = 5.$(MYSQL_MINOR_VERSION).$(MYSQL_PATCHLEVEL) CATEGORIES = server DISTNAME = mysql-$(GARVERSION) @@ -38,12 +40,6 @@ CATALOGNAME_CSWmysql5rt = $(GARNAME)rt CATALOGNAME_CSWmysql5test = $(GARNAME)test -INCOMPATIBLE_PKGS_CSWmysql5bench = CSWmysql4bench -INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client -INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 -INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel -INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test - SPKG_DESC_CSWmysql5 = Multithreaded SQL database SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking SPKG_DESC_CSWmysql5client = MySQL 5 client binaries @@ -95,7 +91,7 @@ REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/ +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.$(MYSQL_MINOR_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog DISTFILES += CSWmysql5.preinstall @@ -152,7 +148,11 @@ include gar/category.mk -post-install: +pre-configure-modulated: + # To work around the libtool version mismatch problem. + cd $(WORKSRC) && autoreconf --force --install --symlink + +post-install-modulated: ginstall -m 755 -d $(DESTDIR)$(localstatedir) ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc 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 Dec 21 20:59:55 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 19:59:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7700] csw/mgar/pkg/nss/trunk/files/nss.pc Message-ID: Revision: 7700 http://gar.svn.sourceforge.net/gar/?rev=7700&view=rev Author: wahwah Date: 2009-12-21 19:59:48 +0000 (Mon, 21 Dec 2009) Log Message: ----------- nss: Updating nss.pc to point at /opt/csw/lib, not /opt/csw/lib/nss Modified Paths: -------------- csw/mgar/pkg/nss/trunk/files/nss.pc Modified: csw/mgar/pkg/nss/trunk/files/nss.pc =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss.pc 2009-12-21 19:50:58 UTC (rev 7699) +++ csw/mgar/pkg/nss/trunk/files/nss.pc 2009-12-21 19:59:48 UTC (rev 7700) @@ -1,6 +1,6 @@ prefix=/opt/csw exec_prefix=${prefix} -libdir=${prefix}/lib/nss +libdir=${prefix}/lib includedir=${prefix}/include/nss Name: NSS 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 Dec 21 21:12:02 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 20:12:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7701] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 7701 http://gar.svn.sourceforge.net/gar/?rev=7701&view=rev Author: wahwah Date: 2009-12-21 20:11:57 +0000 (Mon, 21 Dec 2009) Log Message: ----------- python: Depend on CSWbdb47, not CSWbdb; don't depend on CSWpython-rt Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-21 19:59:48 UTC (rev 7700) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-21 20:11:57 UTC (rev 7701) @@ -114,11 +114,11 @@ ENABLE_CHECK = 0 REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk -REQUIRED_PKGS_CSWpython = CSWbdb CSWbzip2 CSWgdbm CSWggettextrt -REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWpython-rt CSWreadline +REQUIRED_PKGS_CSWpython = CSWbdb47 CSWbzip2 CSWgdbm CSWggettextrt +REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWreadline REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWzlib REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk -REQUIRED_PKGS_CSWpython-tk += CSWpython-rt +REQUIRED_PKGS_CSWpython-tk += CSWpython REQUIRED_PKGS_CSWpython-devel = CSWpython REQUIRED_PKGS_CSWpython-test = CSWpython 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 Dec 21 21:42:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Dec 2009 20:42:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7702] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 7702 http://gar.svn.sourceforge.net/gar/?rev=7702&view=rev Author: wahwah Date: 2009-12-21 20:42:10 +0000 (Mon, 21 Dec 2009) Log Message: ----------- python: Removing double depends from CSWpython-tk Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-21 20:11:57 UTC (rev 7701) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-21 20:42:10 UTC (rev 7702) @@ -118,7 +118,6 @@ REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWreadline REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWzlib REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk -REQUIRED_PKGS_CSWpython-tk += CSWpython REQUIRED_PKGS_CSWpython-devel = CSWpython REQUIRED_PKGS_CSWpython-test = CSWpython This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 21 22:14:50 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 21 Dec 2009 21:14:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7703] csw/mgar/pkg/apr/trunk/Makefile Message-ID: Revision: 7703 http://gar.svn.sourceforge.net/gar/?rev=7703&view=rev Author: rthurner Date: 2009-12-21 21:14:50 +0000 (Mon, 21 Dec 2009) Log Message: ----------- apr - disable tests as one in testsockets fail Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2009-12-21 20:42:10 UTC (rev 7702) +++ csw/mgar/pkg/apr/trunk/Makefile 2009-12-21 21:14:50 UTC (rev 7703) @@ -22,7 +22,9 @@ CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-other-child -TEST_TARGET = check +# ipv6 tests fail +# TEST_TARGET = check +TEST_TARGET = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 21 23:11:59 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 21 Dec 2009 22:11:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7704] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 7704 http://gar.svn.sourceforge.net/gar/?rev=7704&view=rev Author: rthurner Date: 2009-12-21 22:11:47 +0000 (Mon, 21 Dec 2009) Log Message: ----------- subversion - remove libsvn_ra_dav again, the link should be created in the Makefile Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.i csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.s Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-12-21 21:14:50 UTC (rev 7703) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-12-21 22:11:47 UTC (rev 7704) @@ -73,8 +73,6 @@ DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW DISTFILES += fixme.sh -DISTFILES += libsvn_ra_dav-1.so.0.0.0.i -DISTFILES += libsvn_ra_dav-1.so.0.0.0.s # Fix: Add java headers for nested classes # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html @@ -174,10 +172,8 @@ @# libsvn_ra_dav-1* has been renamed to libsvn_ra_neon-1* @# in the new versions of subversion, @# we need to link for backward compatability - @(gln -s $(DESTDIR)$(libdir)/libsvn_ra_neon-1.so.0.0.0 \ - $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0) - @(gln -s $(DESTDIR)$(libdir)/libsvn_ra_neon-1.so.0.0.0 \ - $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so) + @(gln -s libsvn_ra_neon-1.so.0.0.0 $(DESTDIR)$(SVNLIB)/libsvn_ra_dav-1.so.0) + @(gln -s libsvn_ra_neon-1.so.0.0.0 $(DESTDIR)$(SVNLIB)/libsvn_ra_dav-1.so) @$(MAKECOOKIE) install-extras: @@ -220,14 +216,3 @@ $(BUILD_ENV) gmake -C $(WORKSRC) javahl; $(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl; $(MAKECOOKIE) - -post-install-isa-sparcv8: - ginstall $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 - ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 - @$(MAKECOOKIE) - -post-install-isa-i386: - cp $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0 - ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0 - @$(MAKECOOKIE) - Deleted: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.s =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 21 23:20:32 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 21 Dec 2009 22:20:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7705] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 7705 http://gar.svn.sourceforge.net/gar/?rev=7705&view=rev Author: rthurner Date: 2009-12-21 22:20:32 +0000 (Mon, 21 Dec 2009) Log Message: ----------- libserf - add CSWbdb47 because of an apr bug ... Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2009-12-21 22:11:47 UTC (rev 7704) +++ csw/mgar/pkg/libserf/trunk/Makefile 2009-12-21 22:20:32 UTC (rev 7705) @@ -15,7 +15,7 @@ MASTER_SITES = http://serf.googlecode.com/files/ DISTFILES = $(DISTNAME).tar.bz2 -REQUIRED_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib +REQUIRED_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib CSWbdb47 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 21 23:46:46 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 21 Dec 2009 22:46:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7706] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 7706 http://gar.svn.sourceforge.net/gar/?rev=7706&view=rev Author: rthurner Date: 2009-12-21 22:46:46 +0000 (Mon, 21 Dec 2009) Log Message: ----------- libserf - remove CSWbdb47, apr is fixed now ... Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2009-12-21 22:20:32 UTC (rev 7705) +++ csw/mgar/pkg/libserf/trunk/Makefile 2009-12-21 22:46:46 UTC (rev 7706) @@ -15,7 +15,7 @@ MASTER_SITES = http://serf.googlecode.com/files/ DISTFILES = $(DISTNAME).tar.bz2 -REQUIRED_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib CSWbdb47 +REQUIRED_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Dec 22 01:07:28 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 22 Dec 2009 00:07:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7707] csw/mgar/pkg/exiftool/trunk/Makefile Message-ID: Revision: 7707 http://gar.svn.sourceforge.net/gar/?rev=7707&view=rev Author: hson Date: 2009-12-22 00:07:27 +0000 (Tue, 22 Dec 2009) Log Message: ----------- exiftool: Add ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-12-21 22:46:46 UTC (rev 7706) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-12-22 00:07:27 UTC (rev 7707) @@ -25,4 +25,5 @@ CONFIGURE_ARGS = $(DIRPATHS) +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 dmichelsen at users.sourceforge.net Tue Dec 22 14:14:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Dec 2009 13:14:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7708] csw/mgar/pkg/euler/trunk/Makefile Message-ID: Revision: 7708 http://gar.svn.sourceforge.net/gar/?rev=7708&view=rev Author: dmichelsen Date: 2009-12-22 13:14:36 +0000 (Tue, 22 Dec 2009) Log Message: ----------- euler: Force CFLAGS in all targets Modified Paths: -------------- csw/mgar/pkg/euler/trunk/Makefile Modified: csw/mgar/pkg/euler/trunk/Makefile =================================================================== --- csw/mgar/pkg/euler/trunk/Makefile 2009-12-22 00:07:27 UTC (rev 7707) +++ csw/mgar/pkg/euler/trunk/Makefile 2009-12-22 13:14:36 UTC (rev 7708) @@ -36,6 +36,11 @@ BUILD_OVERRIDE_DIRS = CFLAGS CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check +# Strange thing - there are no tests done during this phase, but everything gets +# rebuild (and CFLAGS are again ignored...) +TEST_SCRIPTS = +INSTALL_OVERRIDE_VARS = CFLAGS +INSTALL_OVERRIDE_VAR_CFLAGS = $(CFLAGS) + 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 Dec 22 14:52:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Dec 2009 13:52:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7709] csw/mgar/pkg Message-ID: Revision: 7709 http://gar.svn.sourceforge.net/gar/?rev=7709&view=rev Author: dmichelsen Date: 2009-12-22 13:52:02 +0000 (Tue, 22 Dec 2009) Log Message: ----------- zshdb: Initial commit Added Paths: ----------- csw/mgar/pkg/zshdb/ csw/mgar/pkg/zshdb/branches/ csw/mgar/pkg/zshdb/tags/ csw/mgar/pkg/zshdb/trunk/ csw/mgar/pkg/zshdb/trunk/Makefile csw/mgar/pkg/zshdb/trunk/checksums csw/mgar/pkg/zshdb/trunk/files/ Property changes on: csw/mgar/pkg/zshdb/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/zshdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/zshdb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/zshdb/trunk/Makefile 2009-12-22 13:52:02 UTC (rev 7709) @@ -0,0 +1,31 @@ +GARNAME = zshdb +GARVERSION = 0_gitcurrent +# PATCHLEVEL = 75eadce +CATEGORIES = utils + +DESCRIPTION = ZSH Debugger +define BLURB + This is a port and cleanup of my bash debugger bashdb +endef + +# MASTER_SITES = http://cloud.github.com/downloads/rocky/zshdb/ +GIT_REPOS = git://github.com/rocky/zshdb.git +GIT_USE_PROXY = 1 +# GIT_TREEISH_zshdb.git = $(PATCHLEVEL) + +# DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWzsh + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +post-extract-isa-sparcv8: + cd $(WORKSRC) && ./autogen.sh --with-zsh=/opt/csw/bin/zsh + @$(MAKECOOKIE) Added: csw/mgar/pkg/zshdb/trunk/checksums =================================================================== --- csw/mgar/pkg/zshdb/trunk/checksums (rev 0) +++ csw/mgar/pkg/zshdb/trunk/checksums 2009-12-22 13:52:02 UTC (rev 7709) @@ -0,0 +1 @@ +faab06bdb35626033fd795d9c1ccfd41 zshdb-0.04.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 Dec 22 14:53:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Dec 2009 13:53:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7710] csw/mgar/pkg/zshdb/trunk/Makefile Message-ID: Revision: 7710 http://gar.svn.sourceforge.net/gar/?rev=7710&view=rev Author: dmichelsen Date: 2009-12-22 13:53:43 +0000 (Tue, 22 Dec 2009) Log Message: ----------- zshdb: Make ARCHALL Modified Paths: -------------- csw/mgar/pkg/zshdb/trunk/Makefile Modified: csw/mgar/pkg/zshdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/zshdb/trunk/Makefile 2009-12-22 13:52:02 UTC (rev 7709) +++ csw/mgar/pkg/zshdb/trunk/Makefile 2009-12-22 13:53:43 UTC (rev 7710) @@ -24,6 +24,8 @@ TEST_TARGET = check +ARCHALL = 1 + include gar/category.mk post-extract-isa-sparcv8: 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 Dec 22 17:10:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Dec 2009 16:10:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7711] csw/mgar/pkg Message-ID: Revision: 7711 http://gar.svn.sourceforge.net/gar/?rev=7711&view=rev Author: dmichelsen Date: 2009-12-22 16:10:13 +0000 (Tue, 22 Dec 2009) Log Message: ----------- bashdb: Initial commit Added Paths: ----------- csw/mgar/pkg/bashdb/ csw/mgar/pkg/bashdb/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/bashdb/trunk/Makefile Deleted: csw/mgar/pkg/bashdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/zshdb/trunk/Makefile 2009-12-22 13:52:02 UTC (rev 7709) +++ csw/mgar/pkg/bashdb/trunk/Makefile 2009-12-22 16:10:13 UTC (rev 7711) @@ -1,31 +0,0 @@ -GARNAME = zshdb -GARVERSION = 0_gitcurrent -# PATCHLEVEL = 75eadce -CATEGORIES = utils - -DESCRIPTION = ZSH Debugger -define BLURB - This is a port and cleanup of my bash debugger bashdb -endef - -# MASTER_SITES = http://cloud.github.com/downloads/rocky/zshdb/ -GIT_REPOS = git://github.com/rocky/zshdb.git -GIT_USE_PROXY = 1 -# GIT_TREEISH_zshdb.git = $(PATCHLEVEL) - -# DISTFILES = $(DISTNAME).tar.gz - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -REQUIRED_PKGS = CSWzsh - -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - -include gar/category.mk - -post-extract-isa-sparcv8: - cd $(WORKSRC) && ./autogen.sh --with-zsh=/opt/csw/bin/zsh - @$(MAKECOOKIE) Copied: csw/mgar/pkg/bashdb/trunk/Makefile (from rev 7710, csw/mgar/pkg/zshdb/trunk/Makefile) =================================================================== --- csw/mgar/pkg/bashdb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bashdb/trunk/Makefile 2009-12-22 16:10:13 UTC (rev 7711) @@ -0,0 +1,33 @@ +GARNAME = bashdb +GARVERSION = 0_gitcurrent +# PATCHLEVEL = 75eadce +CATEGORIES = utils + +DESCRIPTION = Bash Debugger +define BLURB + This is a port and cleanup of my bash debugger bashdb +endef + +# MASTER_SITES = http://cloud.github.com/downloads/rocky/bashdb/ +GIT_REPOS = git://bashdb.git.sourceforge.net/gitroot/bashdb/bashdb +GIT_USE_PROXY = 1 +# GIT_TREEISH_zshdb.git = $(PATCHLEVEL) + +# DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWbash + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +ARCHALL = 1 + +include gar/category.mk + +post-extract-isa-sparcv8: + cd $(WORKSRC) && ./autogen.sh --with-bash=/opt/csw/bin/bash + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Dec 22 17:25:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Dec 2009 16:25:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7712] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7712 http://gar.svn.sourceforge.net/gar/?rev=7712&view=rev Author: wahwah Date: 2009-12-22 16:25:37 +0000 (Tue, 22 Dec 2009) Log Message: ----------- mysql5: mysql5bench ARCHALL = 1 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 2009-12-22 16:10:13 UTC (rev 7711) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-12-22 16:25:37 UTC (rev 7712) @@ -47,6 +47,8 @@ SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files SPKG_DESC_CSWmysql5test = MySQL 5 testing files +ARCHALL_CSWmysql5bench = 1 + # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSWmysql5client_programs = myisamlog 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 Dec 22 18:48:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Dec 2009 17:48:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7713] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 7713 http://gar.svn.sourceforge.net/gar/?rev=7713&view=rev Author: wahwah Date: 2009-12-22 17:48:23 +0000 (Tue, 22 Dec 2009) Log Message: ----------- python: setting CSWpython-rt to depend on CSWpython Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-22 16:25:37 UTC (rev 7712) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-22 17:48:23 UTC (rev 7713) @@ -120,6 +120,7 @@ REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk REQUIRED_PKGS_CSWpython-devel = CSWpython REQUIRED_PKGS_CSWpython-test = CSWpython +REQUIRED_PKGS_CSWpython-rt = CSWpython CATALOGNAME_CSWidle = idle CATALOGNAME_CSWpython = python 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 Dec 22 18:49:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Dec 2009 17:49:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7714] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 7714 http://gar.svn.sourceforge.net/gar/?rev=7714&view=rev Author: wahwah Date: 2009-12-22 17:49:40 +0000 (Tue, 22 Dec 2009) Log Message: ----------- python: Removing ENABLE_CHECK = 0, setting CSWpython-rt to ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-12-22 17:48:23 UTC (rev 7713) +++ csw/mgar/pkg/python/trunk/Makefile 2009-12-22 17:49:40 UTC (rev 7714) @@ -111,7 +111,7 @@ PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* -ENABLE_CHECK = 0 +ARCHALL_CSWpython-rt = 1 REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk REQUIRED_PKGS_CSWpython = CSWbdb47 CSWbzip2 CSWgdbm CSWggettextrt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 23 00:12:19 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Dec 2009 23:12:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7715] csw/mgar/pkg/rlwrap/trunk Message-ID: Revision: 7715 http://gar.svn.sourceforge.net/gar/?rev=7715&view=rev Author: chninkel Date: 2009-12-22 23:12:18 +0000 (Tue, 22 Dec 2009) Log Message: ----------- rlwrap: updated to 0.34 Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile csw/mgar/pkg/rlwrap/trunk/checksums csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2009-12-22 17:49:40 UTC (rev 7714) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2009-12-22 23:12:18 UTC (rev 7715) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = rlwrap -GARVERSION = 0.33 +GARVERSION = 0.34 CATEGORIES = utils DESCRIPTION = A readline wrapper Modified: csw/mgar/pkg/rlwrap/trunk/checksums =================================================================== --- csw/mgar/pkg/rlwrap/trunk/checksums 2009-12-22 17:49:40 UTC (rev 7714) +++ csw/mgar/pkg/rlwrap/trunk/checksums 2009-12-22 23:12:18 UTC (rev 7715) @@ -1,2 +1,2 @@ -ada93921f64eaa8153db0307bc11795f changelog.CSW -831f375ca6c9d7ac77bebff616bd03a6 rlwrap-0.33.tar.gz +4fc3209edf432acc97c2457887e525e4 changelog.CSW +c0972f1803db4d45a047da6301ad1633 rlwrap-0.34.tar.gz Modified: csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2009-12-22 17:49:40 UTC (rev 7714) +++ csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2009-12-22 23:12:18 UTC (rev 7715) @@ -1,3 +1,9 @@ +rlwrap (0.34,REV=2009.12.29) unstable + + * New upstream release. + + -- Yann Rouillard Wed, 23 Dec 2009 00:09:01 +0100 + rlwrap (0.33,REV=2009.12.02) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 23 00:15:55 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Dec 2009 23:15:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7716] csw/mgar/pkg/cadaver/trunk Message-ID: Revision: 7716 http://gar.svn.sourceforge.net/gar/?rev=7716&view=rev Author: chninkel Date: 2009-12-22 23:15:55 +0000 (Tue, 22 Dec 2009) Log Message: ----------- cadaver: updated to 0.23.3 Modified Paths: -------------- csw/mgar/pkg/cadaver/trunk/Makefile csw/mgar/pkg/cadaver/trunk/checksums csw/mgar/pkg/cadaver/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cadaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/cadaver/trunk/Makefile 2009-12-22 23:12:18 UTC (rev 7715) +++ csw/mgar/pkg/cadaver/trunk/Makefile 2009-12-22 23:15:55 UTC (rev 7716) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = cadaver -GARVERSION = 0.23.2 +GARVERSION = 0.23.3 CATEGORIES = net DESCRIPTION = WebDAV commandline tool Modified: csw/mgar/pkg/cadaver/trunk/checksums =================================================================== --- csw/mgar/pkg/cadaver/trunk/checksums 2009-12-22 23:12:18 UTC (rev 7715) +++ csw/mgar/pkg/cadaver/trunk/checksums 2009-12-22 23:15:55 UTC (rev 7716) @@ -1,3 +1,3 @@ -5ac79e41f3b7b4f68bf4003beed5dc26 download/cadaver-0.23.2.tar.gz -7a78f71995cd40263b04470976eba5a6 download/CSWcadav.prototype -0db916e7303fe1fac02ba69acbd41ce9 download/changelog.CSW +7a78f71995cd40263b04470976eba5a6 CSWcadav.prototype +502ecd601e467f8b16056d2acca39a6f cadaver-0.23.3.tar.gz +54a9c550b382e7b53ecdacd0b07a2f1b changelog.CSW Modified: csw/mgar/pkg/cadaver/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2009-12-22 23:12:18 UTC (rev 7715) +++ csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2009-12-22 23:15:55 UTC (rev 7716) @@ -1,36 +1,44 @@ -cadaver (0.23.2,REV=2009.04.07) unstable +cadaver (0.23.3,rev=2009.12.23) unstable - * New upstream version. - * Dropped destdir.patch as DESTDIR support has been added upstream. + * new upstream version. - -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 + -- Yann rouillard Wed, 23 Dec 2009 00:07:23 +0100 +cadaver (0.23.2,rev=2009.04.07) unstable + + * new upstream version. + * dropped destdir.patch as destdir support has been added upstream. + + -- Yann rouillard Mar, 14 Jul 2009 21:34:36 +0100 + cadaver (0.22.5,REV=2009.02.15) unstable * Changed gettext dependancy to follow gettext package split (Closes: #3134). - -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 + -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 cadaver (0.22.5,REV=2007.08.21) unstable * Replaced "? ? ?" with "0755 root bin" in the prototype. * Added missing dependancies gnutls, libgcrypt and libgpg_error. + -- Yann Rouillard + cadaver (0.22.5,REV=2007.07.28) unstable * Depends on openssl_rt rather than openssl. - -- Yann Rouillard Sat, 28 Jul 2007 17:30:07 +0200 + -- Yann Rouillard Sat, 28 Jul 2007 17:30:07 +0200 cadaver (0.22.5,REV=2007.03.10) unstable * New upstream version. - -- Yann Rouillard Sat, 10 Mar 2007 00:15:32 +0100 + -- Yann Rouillard Sat, 10 Mar 2007 00:15:32 +0100 cadaver (0.22.3) unstable * New upstream version. - -- Yann Rouillard Tue, 11 Jul 2006 12:25:32 +0200 + -- Yann Rouillard Tue, 11 Jul 2006 12:25:32 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 23 00:24:19 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Dec 2009 23:24:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7717] csw/mgar/pkg/bash/trunk Message-ID: Revision: 7717 http://gar.svn.sourceforge.net/gar/?rev=7717&view=rev Author: chninkel Date: 2009-12-22 23:24:19 +0000 (Tue, 22 Dec 2009) Log Message: ----------- bash: fixed source url Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2009-12-22 23:15:55 UTC (rev 7716) +++ csw/mgar/pkg/bash/trunk/Makefile 2009-12-22 23:24:19 UTC (rev 7717) @@ -29,6 +29,8 @@ REQUIRED_PKGS = CSWggettextrt REQUIRED_PKGS += CSWiconv +SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/bash/bashtop.html + SPKG_CLASSES = none build ###### Upstream and opencsw files information ####### Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2009-12-22 23:15:55 UTC (rev 7716) +++ csw/mgar/pkg/bash/trunk/checksums 2009-12-22 23:24:19 UTC (rev 7717) @@ -35,6 +35,6 @@ d3e77d2a0a051478aca8c30d13ded834 bash40-033 05a54807fd388e71bac8912ad530ac6d bash40-034 fc3d8fdb83ccc407ab7f6d1b7ac6a221 bash40-035 -52c58cea6ccac9d7e51fb63adffbbfb3 changelog.CSW +fd14570004ad0895c04ca969609712ed changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-12-22 23:15:55 UTC (rev 7716) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-12-22 23:24:19 UTC (rev 7717) @@ -1,3 +1,9 @@ +bash (4.0.35,REV=2009.12.23) unstable + + * Fixed Source url info (bug #4087). + + -- Yann Rouillard Wed, 23 Dec 2009 00:22:40 +0100 + bash (4.0.35,REV=2009.11.01) unstable * Added bash patches bash40-034 to bash40-035. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 23 00:25:15 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Dec 2009 23:25:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7718] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 7718 http://gar.svn.sourceforge.net/gar/?rev=7718&view=rev Author: chninkel Date: 2009-12-22 23:25:15 +0000 (Tue, 22 Dec 2009) Log Message: ----------- cyrus_imapd: updated to 2.3.16 Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW Removed Paths: ------------- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-12-22 23:24:19 UTC (rev 7717) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-12-22 23:25:15 UTC (rev 7718) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = cyrus_imapd -GARVERSION = 2.3.15 +GARVERSION = 2.3.16 CATEGORIES = server DESCRIPTION = Pop and Imap server from the Cyrus mail system @@ -49,8 +49,7 @@ ###### Upstream and opencsw files information ####### -#MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(GARVERSION)/ -MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.14/ +MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(GARVERSION)/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(shell echo $(GARNAME) | tr '_' '-')-(\d+(?:\.\d+)*).tar.gz @@ -78,8 +77,7 @@ # University of Athens patchs to allow autocreation of mailboxes # and autocreation of sub-lolders for filter rules -#PATCHFILES = cyrus-imapd-$(GARVERSION)-autocreate-0.10-0.diff cyrus-imapd-$(GARVERSION)-autosieve-0.6.0.diff -PATCHFILES = cyrus-imapd-2.3.15-autocreate-0.10-0.diff cyrus-imapd-2.3.14-autosieve-0.6.0.diff +PATCHFILES = cyrus-imapd-$(GARVERSION)-autocreate-0.10-0.diff cyrus-imapd-$(GARVERSION)-autosieve-0.6.0.diff # This patch makes cyrus more tolerant with mails containing # invalid From headers Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-12-22 23:24:19 UTC (rev 7717) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-12-22 23:25:15 UTC (rev 7718) @@ -7,20 +7,20 @@ 9cbebaeeafa6eb3320eafa594c253bc1 compile_et 1c2b850f7a264704eefec741a75977ab cswcyrus 628c5cf5f5b01f9e173e090ee0c969aa cswcyrus.xml -4f010ee86b24f737c9de9fffa0d194e4 cyrus-imapd-2.3.14-autosieve-0.6.0.diff -318f1d2bd48bb4a7c2db5fb9f82c9e3d cyrus-imapd-2.3.15-autocreate-0.10-0.diff -d89cb1b55023188938f332b7ef120fae cyrus-imapd-2.3.15.tar.gz +98b88f89e72bbabfd3da35fc94809247 cyrus-imapd-2.3.16-autocreate-0.10-0.diff +bb5171a5824f600b8a41cb00ab36cf02 cyrus-imapd-2.3.16-autosieve-0.6.0.diff +6a37feb1985974eee8a4a4b2932dd54c cyrus-imapd-2.3.16.tar.gz b4c99489eacf0fb7befeef5e3098a5c1 cyrus-imapd-2.3.7-nobarenewlinescheck.patch 6127a7b62ec4679a54985f6a2d915e52 cyrus-imapd-acceptinvalidfrom.patch fdb3416ec41f3a56d1594ca25a6dcd7d cyrus.conf -1228b6378951f1b5434bd785973cab34 cyrus_imapd.changelog.CSW -da92e9f3f78942431ad5ca9f9c842083 cyrus_imapd_utils.changelog.CSW +5fd9ad3890fa606394ff28d7f761bc5c cyrus_imapd.changelog.CSW +75e91c95ff7fa59482d20058036a6f5b cyrus_imapd_utils.changelog.CSW 5375c25c8bc325a90553d0be87a64a04 et_c.awk d1d86e61463a1dfefccbadedb11a8604 et_h.awk 79211aee56db01e15566ced1ba4078da i.services 908dbf764d3ccd541c4de881ac81a6ae imapd.conf 14bb6e8c6d6914351f80df293982e88a install-upgrade -fc47edab821dfac970ca342b7f20bde8 pm_cyrus.changelog.CSW +f5b73bbd54935e6c082b6a64e2668b78 pm_cyrus.changelog.CSW 149ac6b6d82ef9ef4bb1b314f1a1cac4 r.services dce627f9a464ae4efe8a66c8dbd358d5 restore_allowplaintext_default.patch 6dfee20f7c02139350caf9f75199e587 services Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff 2009-12-22 23:24:19 UTC (rev 7717) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-2.3.15-autocreate-0.10-0.diff 2009-12-22 23:25:15 UTC (rev 7718) @@ -1,2399 +0,0 @@ -diff -Naur cyrus-imapd-2.3.15.orig/imap/autosieve.c cyrus-imapd-2.3.15/imap/autosieve.c ---- cyrus-imapd-2.3.15.orig/imap/autosieve.c 1970-01-01 01:00:00.000000000 +0100 -+++ cyrus-imapd-2.3.15/imap/autosieve.c 2009-09-09 16:13:03.000000000 +0200 -@@ -0,0 +1,590 @@ -+#include -+#include -+#include -+ -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "global.h" -+#include "util.h" -+#include "xmalloc.h" -+#include "xstrlcpy.h" -+#include "xstrlcat.h" -+#include "mailbox.h" -+#include "imap_err.h" -+#include "sieve_interface.h" -+#include "script.h" -+ -+#define TIMSIEVE_FAIL -1 -+#define TIMSIEVE_OK 0 -+#define MAX_FILENAME 1024 -+ -+static int get_script_name(char *sievename, size_t buflen, const char *filename); -+static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir); -+int autoadd_sieve(char *userid, const char *source_script); -+ -+//static void fatal(const char *s, int code); -+static void foo(void); -+static int sieve_notify(void *ac __attribute__((unused)), -+ void *interp_context __attribute__((unused)), -+ void *script_context __attribute__((unused)), -+ void *message_context __attribute__((unused)), -+ const char **errmsg __attribute__((unused))); -+static int mysieve_error(int lineno, const char *msg, -+ void *i __attribute__((unused)), void *s); -+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret); -+ -+ -+sieve_vacation_t vacation2 = { -+ 0, /* min response */ -+ 0, /* max response */ -+ (sieve_callback *) &foo, /* autorespond() */ -+ (sieve_callback *) &foo /* send_response() */ -+}; -+ -+ -+/* -+ * Find the name of the sieve script -+ * given the source script and compiled script names -+ */ -+static int get_script_name(char *sievename, size_t buflen, const char *filename) -+{ -+ char *p; -+ int r; -+ -+ p = strrchr(filename, '/'); -+ if (p == NULL) -+ p = (char *) filename; -+ else -+ p++; -+ -+ r = strlcpy(sievename, p, buflen) - buflen; -+ return (r >= 0 || r == -buflen ? 1 : 0); -+} -+ -+ -+/* -+ * Find the directory where the sieve scripts of the user -+ * reside -+ */ -+static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir) -+{ -+ char *user = NULL, *domain = NULL; -+ -+ /* Setup the user and the domain */ -+ if(config_virtdomains && (domain = strchr(userid, '@'))) { -+ user = (char *) xmalloc((domain - userid +1) * sizeof(char)); -+ strlcpy(user, userid, domain - userid + 1); -+ domain++; -+ } else -+ user = userid; -+ -+ /* Find the dir path where the sieve scripts of the user will reside */ -+ if (config_virtdomains && domain) { -+ if(snprintf(sieve_script_dir, buflen, "%s%s%c/%s/%c/%s/", -+ sieve_dir, FNAME_DOMAINDIR, dir_hash_c(domain, config_fulldirhash), domain, dir_hash_c(user,config_fulldirhash), user) >= buflen) { -+ free(user); -+ return 1; -+ } -+ } else { -+ if(snprintf(sieve_script_dir, buflen, "%s/%c/%s/", -+ sieve_dir, dir_hash_c(user,config_fulldirhash), user) >= buflen) -+ return 1; -+ } -+ -+ /* Free the xmalloced user memory, reserved above */ -+ if(user != userid) -+ free(user); -+ -+ return 0; -+} -+ -+int autoadd_sieve(char *userid, const char *source_script) -+{ -+ sieve_script_t *s = NULL; -+ bytecode_info_t *bc = NULL; -+ char *err = NULL; -+ FILE *in_stream, *out_fp; -+ int out_fd, in_fd, r, k; -+ int do_compile = 0; -+ const char *sieve_dir = NULL; -+ const char *compiled_source_script = NULL; -+ char sievename[MAX_FILENAME]; -+ char sieve_script_name[MAX_FILENAME]; -+ char sieve_script_dir[MAX_FILENAME]; -+ char sieve_bcscript_name[MAX_FILENAME]; -+ char sieve_default[MAX_FILENAME]; -+ char sieve_tmpname[MAX_FILENAME]; -+ char sieve_bctmpname[MAX_FILENAME]; -+ char sieve_bclink_name[MAX_FILENAME]; -+ char buf[4096]; -+ mode_t oldmask; -+ struct stat statbuf; -+ -+ /* We don't support using the homedirectory, like timsieved */ -+ if (config_getswitch(IMAPOPT_SIEVEUSEHOMEDIR)) { -+ syslog(LOG_WARNING,"autocreate_sieve: autocreate_sieve does not work with sieveusehomedir option in imapd.conf"); -+ return 1; -+ } -+ -+ /* Check if sievedir is defined in imapd.conf */ -+ if(!(sieve_dir = config_getstring(IMAPOPT_SIEVEDIR))) { -+ syslog(LOG_WARNING, "autocreate_sieve: sievedir option is not defined. Check imapd.conf"); -+ return 1; -+ } -+ -+ /* Check if autocreate_sieve_compiledscript is defined in imapd.conf */ -+ if(!(compiled_source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) { -+ syslog(LOG_WARNING, "autocreate_sieve: autocreate_sieve_compiledscript option is not defined. Compiling it"); -+ do_compile = 1; -+ } -+ -+ if(get_script_dir(sieve_script_dir, sizeof(sieve_script_dir), userid, sieve_dir)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Cannot find sieve scripts directory"); -+ return 1; -+ } -+ -+ if (get_script_name(sievename, sizeof(sievename), source_script)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve script %s", source_script); -+ return 1; -+ } -+ -+ if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s%s.script.NEW",sieve_script_dir, sievename) >= sizeof(sieve_tmpname)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_bctmpname, sizeof(sieve_bctmpname), "%s%s.bc.NEW",sieve_script_dir, sievename) >= sizeof(sieve_bctmpname)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_script_name, sizeof(sieve_script_name), "%s%s.script",sieve_script_dir, sievename) >= sizeof(sieve_script_name)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_bcscript_name, sizeof(sieve_bcscript_name), "%s%s.bc",sieve_script_dir, sievename) >= sizeof(sieve_bcscript_name)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_default, sizeof(sieve_default), "%s%s",sieve_script_dir,"defaultbc") >= sizeof(sieve_default)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_bclink_name, sizeof(sieve_bclink_name), "%s.bc", sievename) >= sizeof(sieve_bclink_name)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ -+ /* Check if a default sieve filter alrady exists */ -+ if(!stat(sieve_default,&statbuf)) { -+ syslog(LOG_WARNING,"autocreate_sieve: Default sieve script already exists"); -+ fclose(in_stream); -+ return 1; -+ } -+ -+ /* Open the source script. if there is a problem with that exit */ -+ in_stream = fopen(source_script, "r"); -+ if(!in_stream) { -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to open sieve script %s. Check permissions",source_script); -+ return 1; -+ } -+ -+ -+ /* -+ * At this point we start the modifications of the filesystem -+ */ -+ -+ /* Create the directory where the sieve scripts will reside */ -+ r = cyrus_mkdir(sieve_script_dir, 0755); -+ if(r == -1) { -+ /* If this fails we just leave */ -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to create directory %s. Check permissions",sieve_script_name); -+ return 1; -+ } -+ -+ /* -+ * We open the file that will be used as the bc file. If this file exists, overwrite it -+ * since something bad has happened. We open the file here so that this error checking is -+ * done before we try to open the rest of the files to start copying etc. -+ */ -+ out_fd = open(sieve_bctmpname, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); -+ if(out_fd < 0) { -+ if(errno == EEXIST) { -+ syslog(LOG_WARNING,"autocreate_sieve: File %s already exists. Probaly left over. Ignoring",sieve_bctmpname); -+ } else if (errno == EACCES) { -+ syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_bctmpname); -+ fclose(in_stream); -+ return 1; -+ } else { -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s. Unknown error",sieve_bctmpname); -+ fclose(in_stream); -+ return 1; -+ } -+ } -+ -+ if(!do_compile && compiled_source_script && (in_fd = open(compiled_source_script, O_RDONLY)) != -1) { -+ while((r = read(in_fd, buf, sizeof(buf))) > 0) { -+ if((k=write(out_fd, buf,r)) < 0) { -+ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_bctmpname, errno); -+ close(out_fd); -+ close(in_fd); -+ fclose(in_stream); -+ unlink(sieve_bctmpname); -+ return 1; -+ } -+ } -+ -+ if(r == 0) { /* EOF */ -+ close(out_fd); -+ close(in_fd); -+ } else if (r < 0) { -+ syslog(LOG_WARNING, "autocreate_sieve: Error reading compiled script file: %s. Will try to compile it", -+ compiled_source_script); -+ close(in_fd); -+ do_compile = 1; -+ if(lseek(out_fd, 0, SEEK_SET)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Major IO problem. Aborting"); -+ return 1; -+ } -+ } -+ close(in_fd); -+ } else { -+ if(compiled_source_script) -+ syslog(LOG_WARNING,"autocreate_sieve: Problem opening compiled script file: %s. Compiling it", compiled_source_script); -+ do_compile = 1; -+ } -+ -+ -+ /* Because we failed to open a precompiled bc sieve script, we compile one */ -+ if(do_compile) { -+ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) { -+ if(err && *err) { -+ syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script %s.",err); -+ free(err); -+ } else -+ syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script"); -+ -+ unlink(sieve_bctmpname); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ /* generate the bytecode */ -+ if(sieve_generate_bytecode(&bc, s) == TIMSIEVE_FAIL) { -+ syslog(LOG_WARNING,"autocreate_sieve: problem compiling sieve script"); -+ /* removing the copied script and cleaning up memory */ -+ unlink(sieve_bctmpname); -+ sieve_script_free(&s); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ if(sieve_emit_bytecode(out_fd, bc) == TIMSIEVE_FAIL) { -+ syslog(LOG_WARNING,"autocreate_sieve: problem emiting sieve script"); -+ /* removing the copied script and cleaning up memory */ -+ unlink(sieve_bctmpname); -+ sieve_free_bytecode(&bc); -+ sieve_script_free(&s); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ /* clean up the memory */ -+ sieve_free_bytecode(&bc); -+ sieve_script_free(&s); -+ } -+ -+ close(out_fd); -+ rewind(in_stream); -+ -+ /* Copy the initial script */ -+ oldmask = umask(077); -+ if((out_fp = fopen(sieve_tmpname, "w")) == NULL) { -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to open %s destination sieve script", sieve_tmpname); -+ unlink(sieve_bctmpname); -+ umask(oldmask); -+ fclose(in_stream); -+ return 1; -+ } -+ umask(oldmask); -+ -+ while((r = fread(buf,sizeof(char), sizeof(buf), in_stream))) { -+ if( fwrite(buf,sizeof(char), r, out_fp) != r) { -+ syslog(LOG_WARNING,"autocreate_sieve: Problem writing to sieve script file: %s",sieve_tmpname); -+ fclose(out_fp); -+ unlink(sieve_tmpname); -+ unlink(sieve_bctmpname); -+ fclose(in_stream); -+ return 1; -+ } -+ } -+ -+ if(feof(in_stream)) { -+ fclose(out_fp); -+ } else { /* ferror */ -+ fclose(out_fp); -+ unlink(sieve_tmpname); -+ unlink(sieve_bctmpname); -+ fclose(in_stream); -+ return 1; -+ } -+ -+ /* Renaming the necessary stuff */ -+ if(rename(sieve_tmpname, sieve_script_name)) { -+ unlink(sieve_tmpname); -+ unlink(sieve_bctmpname); -+ return 1; -+ } -+ -+ if(rename(sieve_bctmpname, sieve_bcscript_name)) { -+ unlink(sieve_bctmpname); -+ unlink(sieve_bcscript_name); -+ return 1; -+ } -+ -+ /* end now with the symlink */ -+ if(symlink(sieve_bclink_name, sieve_default)) { -+ if(errno != EEXIST) { -+ syslog(LOG_WARNING, "autocreate_sieve: problem making the default link."); -+ /* Lets delete the files */ -+ unlink(sieve_script_name); -+ unlink(sieve_bcscript_name); -+ } -+ } -+ -+ /* -+ * If everything has succeeded AND we have compiled the script AND we have requested -+ * to generate the global script so that it is not compiled each time then we create it. -+ */ -+ if(do_compile && -+ config_getswitch(IMAPOPT_GENERATE_COMPILED_SIEVE_SCRIPT)) { -+ -+ if(!compiled_source_script) { -+ syslog(LOG_WARNING, "autocreate_sieve: To save a compiled sieve script, autocreate_sieve_compiledscript must have been defined in imapd.conf"); -+ return 0; -+ } -+ -+ if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script) >= sizeof(sieve_tmpname)) -+ return 0; -+ -+ /* -+ * Copy everything from the newly created bc sieve sieve script. -+ */ -+ if((in_fd = open(sieve_bcscript_name, O_RDONLY))<0) { -+ return 0; -+ } -+ -+ if((out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0) { -+ if(errno == EEXIST) { -+ /* Someone is already doing this so just bail out. */ -+ syslog(LOG_WARNING, "autocreate_sieve: %s already exists. Some other instance processing it, or it is left over", sieve_tmpname); -+ close(in_fd); -+ return 0; -+ } else if (errno == EACCES) { -+ syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_tmpname); -+ close(in_fd); -+ return 0; -+ } else { -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s",sieve_tmpname); -+ close(in_fd); -+ return 0; -+ } -+ } -+ -+ while((r = read(in_fd, buf, sizeof(buf))) > 0) { -+ if((k = write(out_fd,buf,r)) < 0) { -+ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno); -+ close(out_fd); -+ close(in_fd); -+ unlink(sieve_tmpname); -+ return 0; -+ } -+ } -+ -+ if(r == 0 ) { /*EOF */ -+ close(out_fd); -+ close(in_fd); -+ } else if (r < 0) { -+ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno); -+ close(out_fd); -+ close(in_fd); -+ unlink(sieve_tmpname); -+ return 0; -+ } -+ -+ /* Rename the temporary created sieve script to its final name. */ -+ if(rename(sieve_tmpname, compiled_source_script)) { -+ if(errno != EEXIST) { -+ unlink(sieve_tmpname); -+ unlink(compiled_source_script); -+ } -+ return 0; -+ } -+ -+ syslog(LOG_NOTICE, "autocreate_sieve: Compiled sieve script was successfully saved in %s", compiled_source_script); -+ } -+ -+ return 0; -+} -+ -+/*static void fatal(const char *s, int code) -+{ -+ printf("Fatal error: %s (%d)\r\n", s, code); -+ exit(1); -+}*/ -+ -+/* to make larry's stupid functions happy :) */ -+static void foo(void) -+{ -+ fatal("stub function called", 0); -+} -+ -+static int sieve_notify(void *ac __attribute__((unused)), -+ void *interp_context __attribute__((unused)), -+ void *script_context __attribute__((unused)), -+ void *message_context __attribute__((unused)), -+ const char **errmsg __attribute__((unused))) -+{ -+ fatal("stub function called", 0); -+ return SIEVE_FAIL; -+} -+ -+static int mysieve_error(int lineno, const char *msg, -+ void *i __attribute__((unused)), void *s) -+{ -+ char buf[1024]; -+ char **errstr = (char **) s; -+ -+ snprintf(buf, 80, "line %d: %s\r\n", lineno, msg); -+ *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30); -+ syslog(LOG_DEBUG, "%s", buf); -+ strcat(*errstr, buf); -+ -+ return SIEVE_OK; -+} -+ -+/* end the boilerplate */ -+ -+/* returns TRUE or FALSE */ -+int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret) -+{ -+ sieve_interp_t *i; -+ sieve_script_t *s; -+ int res; -+ -+ res = sieve_interp_alloc(&i, NULL); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_interp_alloc() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_redirect(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_redirect() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_discard(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_discard() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_reject(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_reject() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_fileinto(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_fileinto() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_keep(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_keep() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_imapflags(i, NULL); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_imapflags() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_size(i, (sieve_get_size *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_size() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_header(i, (sieve_get_header *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_header() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_envelope(i, (sieve_get_envelope *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_envelope() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_vacation(i, &vacation2); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_vacation() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_notify(i, &sieve_notify); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_notify() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_parse_error(i, &mysieve_error); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_parse_error() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ rewind(stream); -+ -+ *errstr = (char *) xmalloc(20 * sizeof(char)); -+ strcpy(*errstr, "script errors:\r\n"); -+ -+ res = sieve_script_parse(i, stream, errstr, &s); -+ -+ if (res == SIEVE_OK) { -+ if(ret) { -+ *ret = s; -+ } else { -+ sieve_script_free(&s); -+ } -+ free(*errstr); -+ *errstr = NULL; -+ } -+ -+ /* free interpreter */ -+ sieve_interp_free(&i); -+ -+ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL; -+} -+ -+/* -+ * Btw the initial date of this patch is Sep, 02 2004 which is the birthday of -+ * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present -+ */ -+ -diff -Naur cyrus-imapd-2.3.15.orig/imap/compile_sieve.c cyrus-imapd-2.3.15/imap/compile_sieve.c ---- cyrus-imapd-2.3.15.orig/imap/compile_sieve.c 1970-01-01 01:00:00.000000000 +0100 -+++ cyrus-imapd-2.3.15/imap/compile_sieve.c 2009-09-09 16:13:03.000000000 +0200 -@@ -0,0 +1,365 @@ -+/* This tool compiles the sieve script from a command -+line so that it can be used wby the autoadd patch */ -+#include -+#include -+ -+#include -+#include -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "global.h" -+ -+#include "util.h" -+#include "xmalloc.h" -+#include "xstrlcpy.h" -+#include "xstrlcat.h" -+#include "mailbox.h" -+#include "imap_err.h" -+#include "sieve_interface.h" -+#include "script.h" -+ -+#include -+ -+#define TIMSIEVE_FAIL -1 -+#define TIMSIEVE_OK 0 -+#define MAX_FILENAME_SIZE 100 -+ -+/* Needed by libconfig */ -+const int config_need_data = 0; -+ -+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret); -+ -+/*static void fatal(const char *s, int code) -+{ -+ printf("Fatal error: %s (%d)\r\n", s, code); -+ -+ exit(1); -+}*/ -+ -+void usage(void) -+{ -+ fprintf(stderr, -+ "Usage:\n\tcompile_sieve [-C ] [-i -o ]\n"); -+ exit(-1); -+} -+ -+ -+int main (int argc, char **argv) -+{ -+ -+ sieve_script_t *s = NULL; -+ bytecode_info_t *bc = NULL; -+ char *err = NULL; -+ FILE *in_stream; -+ int out_fd, opt; -+ char *source_script = NULL; -+ char *compiled_source_script = NULL; -+ char *alt_config = NULL; -+ extern char *optarg; -+ char sieve_tmpname[MAX_MAILBOX_NAME+1]; -+ -+ if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE); -+ -+ while((opt = getopt(argc, argv, "C:i:o:")) != EOF) { -+ switch (opt) { -+ case 'C': /* alt config file */ -+ alt_config = optarg; -+ break; -+ case 'i': /* input script file */ -+ source_script = optarg; -+ break; -+ case 'o': /* output script file */ -+ compiled_source_script = optarg; -+ break; -+ default: -+ usage(); -+ break; -+ } -+ } -+ -+ if(source_script && !compiled_source_script) { -+ fprintf(stderr, "No output file was defined\n"); -+ usage(); -+ } else if (!source_script && compiled_source_script) { -+ fprintf(stderr, "No input file was defined\n"); -+ usage(); -+ } -+ -+ /* -+ * If no has been defined, then read them from -+ * the configuration file. -+ */ -+ if (!source_script && !compiled_source_script) { -+ cyrus_init(alt_config, "compile_sieve", 0); -+ -+ /* Initially check if we want to have the sieve script created */ -+ if(!(source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT))) { -+ fprintf(stderr,"autocreate_sieve_script option not defined. Check imapd.conf\n"); -+ return 1; -+ } -+ -+ /* Check if we have an already compiled sieve script*/ -+ if(!(compiled_source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) { -+ fprintf(stderr, "autocreate_sieve_compiledscript option not defined. Check imapd.conf\n"); -+ return 1; -+ } -+ -+ if(!strrchr(source_script,'/') || !strrchr(compiled_source_script,'/')) { -+ /* -+ * At this point the only think that is inconsistent is the directory -+ * that was created. But if the user will have any sieve scripts then -+ * they will eventually go there, so no big deal -+ */ -+ fprintf(stderr, -+ "In imapd.conf the full path of the filenames must be defined\n"); -+ return 1; -+ } -+ } -+ -+ printf("input file : %s, output file : %s\n", source_script, compiled_source_script); -+ -+ -+ if(strlen(compiled_source_script) + sizeof(".NEW") + 1 > sizeof(sieve_tmpname)) { -+ fprintf(stderr, "Filename %s is too big\n", compiled_source_script); -+ return 1; -+ } -+ -+ snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script); -+ -+ in_stream = fopen(source_script,"r"); -+ -+ if(!in_stream) { -+ fprintf(stderr,"Unable to open %s source sieve script\n",source_script); -+ return 1; -+ } -+ -+ /* -+ * We open the file that will be used as the bc file. If this file exists, overwrite it -+ * since something bad has happened. We open the file here so that this error checking is -+ * done before we try to open the rest of the files to start copying etc. -+ */ -+ out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); -+ if(out_fd < 0) { -+ if(errno == EEXIST) { -+ fprintf(stderr, "File %s already exists\n", sieve_tmpname); -+ } else if (errno == EACCES) { -+ fprintf(stderr,"No access to create file %s. Please check that you have the correct permissions\n", -+ sieve_tmpname); -+ } else { -+ fprintf(stderr,"Unable to create %s. Please check that you have the correct permissions\n", -+ sieve_tmpname); -+ } -+ -+ fclose(in_stream); -+ return 1; -+ } -+ -+ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) { -+ if(err && *err) { -+ fprintf(stderr, "Error while parsing script %s\n",err); -+ free(err); -+ } -+ else -+ fprintf(stderr,"Error while parsing script\n"); -+ unlink(sieve_tmpname); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ -+ /* generate the bytecode */ -+ if(sieve_generate_bytecode(&bc,s) == TIMSIEVE_FAIL) { -+ fprintf(stderr,"Error occured while compiling sieve script\n"); -+ /* removing the copied script and cleaning up memory */ -+ unlink(sieve_tmpname); -+ sieve_script_free(&s); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ if(sieve_emit_bytecode(out_fd,bc) == TIMSIEVE_FAIL) { -+ fprintf(stderr, "Error occured while emitting sieve script\n"); -+ unlink(sieve_tmpname); -+ sieve_free_bytecode(&bc); -+ sieve_script_free(&s); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ /* clean up the memory */ -+ sieve_free_bytecode(&bc); -+ sieve_script_free(&s); -+ -+ close(out_fd); -+ -+ if(rename(sieve_tmpname, compiled_source_script)) { -+ if(errno != EEXIST) { -+ unlink(sieve_tmpname); -+ unlink(compiled_source_script); -+ return 1; -+ } -+ } -+ return 0; -+} -+ -+ -+/* to make larry's stupid functions happy :) */ -+static void foo(void) -+{ -+ fatal("stub function called", 0); -+} -+ -+extern sieve_vacation_t vacation2;/* = { -+ 0, / min response / -+ 0, / max response / -+ (sieve_callback *) &foo, / autorespond() / -+ (sieve_callback *) &foo / send_response() / -+}; */ -+ -+static int sieve_notify(void *ac __attribute__((unused)), -+ void *interp_context __attribute__((unused)), -+ void *script_context __attribute__((unused)), -+ void *message_context __attribute__((unused)), -+ const char **errmsg __attribute__((unused))) -+{ -+ fatal("stub function called", 0); -+ return SIEVE_FAIL; -+} -+ -+static int mysieve_error(int lineno, const char *msg, -+ void *i __attribute__((unused)), void *s) -+{ -+ char buf[1024]; -+ char **errstr = (char **) s; -+ -+ snprintf(buf, 80, "line %d: %s\r\n", lineno, msg); -+ *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30); -+ fprintf(stderr, "%s\n", buf); -+ strcat(*errstr, buf); -+ -+ return SIEVE_OK; -+} -+ -+/* end the boilerplate */ -+ -+/* returns TRUE or FALSE */ -+int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret) -+{ -+ sieve_interp_t *i; -+ sieve_script_t *s; -+ int res; -+ -+ res = sieve_interp_alloc(&i, NULL); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_interp_alloc() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_redirect(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_redirect() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_discard(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_discard() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_reject(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_reject() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_fileinto(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_fileinto() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_keep(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_keep() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_imapflags(i, NULL); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_imapflags() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_size(i, (sieve_get_size *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_size() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_header(i, (sieve_get_header *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_header() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_envelope(i, (sieve_get_envelope *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_envelope() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_vacation(i, &vacation2); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_vacation() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_notify(i, &sieve_notify); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_notify() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_parse_error(i, &mysieve_error); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_parse_error() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ rewind(stream); -+ -+ *errstr = (char *) xmalloc(20 * sizeof(char)); -+ strcpy(*errstr, "script errors:\r\n"); -+ -+ res = sieve_script_parse(i, stream, errstr, &s); -+ -+ if (res == SIEVE_OK) { -+ if(ret) { -+ *ret = s; -+ } else { -+ sieve_script_free(&s); -+ } -+ free(*errstr); -+ *errstr = NULL; -+ } -+ -+ /* free interpreter */ -+ sieve_interp_free(&i); -+ -+ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL; -+} -+ -+ -+ -+ -+ -+ -diff -Naur cyrus-imapd-2.3.15.orig/imap/imapd.c cyrus-imapd-2.3.15/imap/imapd.c ---- cyrus-imapd-2.3.15.orig/imap/imapd.c 2009-07-29 17:51:21.000000000 +0200 -+++ cyrus-imapd-2.3.15/imap/imapd.c 2009-09-09 16:13:03.000000000 +0200 -@@ -211,6 +211,7 @@ - void motd_file(int fd); - void shut_down(int code); - void fatal(const char *s, int code); -+void autocreate_inbox(void); - - void cmdloop(void); - void cmd_login(char *tag, char *user); -@@ -2003,6 +2004,43 @@ - } - - /* -+ * Autocreate Inbox and subfolders upon login -+ */ -+void autocreate_inbox() -+{ -+ char inboxname[MAX_MAILBOX_NAME+1]; -+ int autocreatequota; -+ int r; -+ -+ /* -+ * Exlude admin's accounts -+ */ -+ if (imapd_userisadmin || imapd_userisproxyadmin) -+ return; -+ -+ /* -+ * Exclude anonymous -+ */ -+ if (!strcmp(imapd_userid, "anonymous")) -+ return; -+ -+ if ((autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) { -+ /* This is actyally not required -+ as long as the lenght of userid is ok */ -+ r = (*imapd_namespace.mboxname_tointernal) (&imapd_namespace, -+ "INBOX", imapd_userid, inboxname); -+ if (!r) -+ r = mboxlist_lookup(inboxname, NULL, NULL); -+ -+ if (r == IMAP_MAILBOX_NONEXISTENT) { -+ mboxlist_autocreateinbox(&imapd_namespace, imapd_userid, -+ imapd_authstate, inboxname, autocreatequota); -+ } -+ } -+} -+ -+ -+/* - * Perform a LOGIN command - */ - void cmd_login(char *tag, char *user) -@@ -2179,6 +2217,9 @@ - strcspn(imapd_userid, "@") : 0); - - freebuf(&passwdbuf); -+ -+ autocreate_inbox(); -+ - return; - } - -@@ -2336,6 +2377,8 @@ - config_virtdomains ? - strcspn(imapd_userid, "@") : 0); - -+ autocreate_inbox(); -+ - return; - } - -diff -Naur cyrus-imapd-2.3.15.orig/imap/lmtpd.c cyrus-imapd-2.3.15/imap/lmtpd.c ---- cyrus-imapd-2.3.15.orig/imap/lmtpd.c 2009-04-23 19:10:06.000000000 +0200 -+++ cyrus-imapd-2.3.15/imap/lmtpd.c 2009-09-09 16:13:03.000000000 +0200 -@@ -117,6 +117,8 @@ - static FILE *spoolfile(message_data_t *msgdata); - static void removespool(message_data_t *msgdata); - -+static int autocreate_inbox(const char *user, const char *domain); -+ - /* current namespace */ - static struct namespace lmtpd_namespace; - -@@ -977,6 +979,86 @@ - exit(code); - } - -+ -+/* -+ * Autocreate Inbox and subfolders upon login -+ */ -+int autocreate_inbox(const char *user, const char *domain) -+{ -+ struct auth_state *auth_state; -+ char inboxname[MAX_MAILBOX_NAME+1]; -+ char *rcpt_userid = NULL; -+ int autocreatequota; -+ int r = 0; -+ -+ if (user == NULL) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ if (domain != NULL) { -+ int k; -+ -+ rcpt_userid = (char *) xmalloc((strlen(user) + strlen(domain) + 2) * sizeof(char)); -+ k = strlcpy(rcpt_userid, user, strlen(user) + 1); -+ *(rcpt_userid + k) = '@'; -+ strlcpy(rcpt_userid + k + 1, domain, strlen(domain) + 1); -+ } else { -+ rcpt_userid = (char *) user; -+ } -+ -+ -+ /* -+ * Exclude anonymous -+ */ -+ if (!strcmp(rcpt_userid, "anonymous")) { -+ if (rcpt_userid != user) { -+ free(rcpt_userid); -+ } -+ -+ return IMAP_MAILBOX_NONEXISTENT; -+ } -+ -+ /* -+ * Check for autocreatequota and createonpost -+ */ -+ if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA)) || -+ !(config_getswitch(IMAPOPT_CREATEONPOST))) { -+ -+ if (rcpt_userid != user) { -+ free(rcpt_userid); -+ } -+ -+ return IMAP_MAILBOX_NONEXISTENT; -+ } -+ -+ -+ /* -+ * Exclude admin's accounts -+ */ -+ auth_state = auth_newstate(rcpt_userid); -+ -+ if (global_authisa(auth_state, IMAPOPT_ADMINS)) { -+ if (rcpt_userid != user) { -+ free(rcpt_userid); -+ } -+ -+ return IMAP_MAILBOX_NONEXISTENT; -+ } -+ -+ r = (*lmtpd_namespace.mboxname_tointernal) (&lmtpd_namespace, -+ "INBOX", rcpt_userid, inboxname); -+ -+ if (!r) -+ r = mboxlist_autocreateinbox(&lmtpd_namespace, rcpt_userid, -+ auth_state, inboxname, autocreatequota); -+ -+ if (rcpt_userid != user) { -+ free(rcpt_userid); -+ } -+ -+ return r; -+} -+ -+ - static int verify_user(const char *user, const char *domain, char *mailbox, - quota_t quotacheck, struct auth_state *authstate) - { -@@ -1020,6 +1102,15 @@ - */ - r = mlookup(namebuf, &server, &acl, NULL); - -+ /* If user mailbox does not exist, then invoke autocreate inbox function */ -+ if (r == IMAP_MAILBOX_NONEXISTENT) { -+ r = autocreate_inbox(user, domain); -+ -+ /* Try to locate the mailbox again */ -+ if (!r) -+ r = mlookup(namebuf, &server, &acl, NULL); -+ } -+ - if (r == IMAP_MAILBOX_NONEXISTENT && !user && - config_getswitch(IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH) && - /* see if we have a mailbox whose name is close */ -@@ -1046,6 +1137,7 @@ - aclcheck, (quotacheck < 0) - || config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ? - quotacheck : 0); -+ - } - } - -diff -Naur cyrus-imapd-2.3.15.orig/imap/Makefile.in cyrus-imapd-2.3.15/imap/Makefile.in ---- cyrus-imapd-2.3.15.orig/imap/Makefile.in 2009-03-30 18:04:56.000000000 +0200 -+++ cyrus-imapd-2.3.15/imap/Makefile.in 2009-09-09 16:28:02.000000000 +0200 -@@ -101,7 +101,7 @@ - convert_code.o duplicate.o saslclient.o saslserver.o signals.o \ - annotate.o search_engines.o squat.o squat_internal.o mbdump.o \ - imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \ -- sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ -+ sync_log.o autosieve.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ - statuscache_db.o - - IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o -@@ -118,7 +118,7 @@ - fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \ - cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \ - ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \ -- unexpunge cyr_df @IMAP_PROGS@ -+ unexpunge cyr_df compile_sieve @IMAP_PROGS@ - - BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \ - lmtpstats.c lmtpstats.h xversion.h mupdate_err.c mupdate_err.h \ -@@ -183,9 +183,9 @@ - mupdate_err.h: mupdate_err.c - - ### Services --idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) -+idled: idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o idled \ -- idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) -+ idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - - lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \ - libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) -@@ -199,166 +199,170 @@ - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) -+imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o imapd \ - $(SERVICE) $(IMAPDOBJS) mutex_fake.o \ -- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) -+imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \ - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) -+imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \ - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \ -- libimap.a $(DEPLIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o mupdate \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ - mutex_pthread.o tls.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread - - mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ -- libimap.a $(DEPLIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ -- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ mutex_pthread.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread - - pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \ -- $(DEPLIBS) $(SERVICE) -+ $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \ -- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \ -- mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE) -+ mutex_fake.o nntp_err.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \ - smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \ -- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) -+fud: fud.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) -+smmapd: smmapd.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - sync_server: sync_server.o sync_support.o sync_commit.o \ -- imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) -+ imapparse.o tls.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o \ - sync_server sync_server.o sync_support.o sync_commit.o \ - imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - ### Command Line Utilities --arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS) -+arbitron: arbitron.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS) -+cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS) -+cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS) -+cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS) -+chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS) -+deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \ -- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) -+ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) -+ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $@ ctl_deliver.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS) -+ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) -+ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS) -+cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) -+fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $@ fetchnews.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS) -+squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \ -- $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS) -+mbpath: mbpath.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \ -- $(DEPLIBS) $(LIBS) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS) -+ipurge: ipurge.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cyr_virusscan: cyr_virusscan.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) -+cyr_virusscan: cyr_virusscan.o index.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyr_virusscan cyr_virusscan.o index.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -lclamav -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) -lclamav - --cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) -+cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) -+cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- cyr_df cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ cyr_df cyr_df.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) -+mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ mbexamine mbexamine.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) -+reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ reconstruct reconstruct.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS) -+quota: quota.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) -+tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS) -+unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS) -- $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) -+make_md5: make_md5.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) -+ $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) -- $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) -+make_sha1: make_sha1.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) -+ $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - - sync_client: sync_client.o sync_support.o \ -- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) -+ backend.o tls.o imapparse.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ - sync_client sync_client.o sync_support.o \ -- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) -+ backend.o tls.o imapparse.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - - sync_reset: sync_reset.o sync_support.o sync_commit.o \ -- libimap.a mutex_fake.o $(DEPLIBS) -+ libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ - sync_reset sync_reset.o sync_support.o sync_commit.o \ -- libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) -+ libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) -+ -+compile_sieve: compile_sieve.o libimap.a $(DEPLIBS) $(SIEVE_LIBS) -+ $(CC) $(LDFLAGS) -o compile_sieve compile_sieve.o $(CLIOBJS) \ -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - - ### Other Misc Targets - -diff -Naur cyrus-imapd-2.3.15.orig/imap/mboxlist.c cyrus-imapd-2.3.15/imap/mboxlist.c ---- cyrus-imapd-2.3.15.orig/imap/mboxlist.c 2009-07-28 04:46:23.000000000 +0200 -+++ cyrus-imapd-2.3.15/imap/mboxlist.c 2009-09-09 16:13:03.000000000 +0200 -@@ -83,6 +83,12 @@ - #include "quota.h" - #include "sync_log.h" - -+#ifdef USE_SIEVE -+extern int autoadd_sieve(char *userid, -+ const char *source_script); -+#endif -+ -+ - #define DB config_mboxlist_db - #define SUBDB config_subscription_db - -@@ -100,11 +106,29 @@ - static int mboxlist_changequota(const char *name, int matchlen, int maycreate, - void *rock); - -+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate, -+ void *rock); -+ -+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace, -+ char *userid, char *auth_userid, -+ struct auth_state *auth_state); -+ - struct change_rock { - struct quota *quota; - struct txn **tid; - }; - -+/* -+ * Struct needed to be passed as void *rock to -+ * mboxlist_autochangesub(); -+ */ -+struct changesub_rock_st { -+ char *userid; -+ char *auth_userid; -+ struct auth_state *auth_state; -+}; -+ -+ - #define FNAME_SUBSSUFFIX ".sub" - - /* -@@ -3413,3 +3437,349 @@ - - return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED); - } -+ -+/* -+ * Automatically subscribe user to *ALL* shared folders, -+ * one has permissions to be subscribed to. -+ * INBOX subfolders are excluded. -+ */ -+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate, -+ void *rock) { -+ -+ struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock; -+ char *userid = changesub_rock->userid; -+ char *auth_userid = changesub_rock->auth_userid; -+ struct auth_state *auth_state = changesub_rock->auth_state; -+ int r; -+ -+ -+ if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */ -+ (strlen(name) > 5 && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */ -+ (strlen(name) > 4 && !strncmp(name, "user.", 5))) /* Exclude other users' folders */ -+ return 0; -+ -+ -+ r = mboxlist_changesub(name, userid, auth_state, 1, 0); -+ -+ if (r) { -+ syslog(LOG_WARNING, -+ "autosubscribe: User %s to folder %s, subscription failed: %s", -+ auth_userid, name, error_message(r)); -+ } else { -+ syslog(LOG_NOTICE, -+ "autosubscribe: User %s to folder %s, subscription succeeded", -+ auth_userid, name); -+ } -+ -+ return 0; -+} -+ -+#define SEP '|' -+ -+/* -+ * Automatically subscribe user to a shared folder. -+ * Subscription is done successfully, if the shared -+ * folder exists and the user has the necessary -+ * permissions. -+ */ -+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace, -+ char *userid, char *auth_userid, -+ struct auth_state *auth_state) { -+ -+ const char *sub ; -+ char *p, *q, *next_sub; -+ char folder[MAX_MAILBOX_NAME+1], name[MAX_MAILBOX_NAME+1], mailboxname[MAX_MAILBOX_NAME+1]; -+ int len; -+ int r = 0; -+ int subscribe_all_sharedfolders = 0; -+ -+ subscribe_all_sharedfolders = config_getswitch(IMAPOPT_AUTOSUBSCRIBE_ALL_SHAREDFOLDERS); -+ -+ /* -+ * If subscribeallsharedfolders is set to yes in imapd.conf, then -+ * subscribe user to every shared folder one has the apropriate -+ * permissions. -+ */ -+ if(subscribe_all_sharedfolders) { -+ char pattern[MAX_MAILBOX_PATH+1]; -+ struct changesub_rock_st changesub_rock; -+ -+ strcpy(pattern, "*"); -+ changesub_rock.userid = userid; -+ changesub_rock.auth_userid = auth_userid; -+ changesub_rock.auth_state = auth_state; -+ -+ r = mboxlist_findall(namespace, pattern, 0, userid, -+ auth_state, mboxlist_autochangesub, &changesub_rock); -+ -+ return r; -+ } -+ -+ if ((sub=config_getstring(IMAPOPT_AUTOSUBSCRIBESHAREDFOLDERS)) == NULL) -+ return r; -+ -+ next_sub = (char *) sub; -+ while (*next_sub) { -+ for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++); -+ for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++); -+ for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--); -+ if (!*p ) continue; -+ -+ len = q - p + 1; -+ /* Check for folder length */ -+ if (len > sizeof(folder)-1) -+ continue; -+ -+ if (!r) { -+ strncpy(folder, p, len); -+ folder[len] = '\0'; -+ -+ strlcpy(name, namespace->prefix[NAMESPACE_SHARED], sizeof(name)); -+ len = strlcat(name, folder, sizeof(name)); -+ -+ r = (namespace->mboxname_tointernal) (namespace, name, userid, -+ mailboxname); -+ } -+ -+ if (!r) -+ r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 0); -+ -+ if (!r) { -+ syslog(LOG_NOTICE, "autosubscribe: User %s to %s succeeded", -+ userid, folder); -+ } else { -+ syslog(LOG_WARNING, "autosubscribe: User %s to %s failed: %s", -+ userid, folder, error_message(r)); -+ r = 0; -+ } -+ } -+ -+ return r; -+} -+ -+ -+ -+int mboxlist_autocreateinbox(struct namespace *namespace, -+ char *userid, -+ struct auth_state *auth_state, -+ char *mailboxname, int autocreatequota) { -+ char name [MAX_MAILBOX_NAME+1]; -+ char folder [MAX_MAILBOX_NAME+1]; -+ char *auth_userid = NULL; -+ char *partition = NULL; -+ const char *crt; -+ const char *sub; -+ char *p, *q, *next_crt, *next_sub; -+ int len; -+ int r = 0; -+ int numcrt = 0; -+ int numsub = 0; -+#ifdef USE_SIEVE -+ const char *source_script; -+#endif -+ -+ -+ -+ auth_userid = auth_canonuser(auth_state); -+ if (auth_userid == NULL) { -+ /* -+ * Couldn't get cannon userid -+ */ -+ syslog(LOG_ERR, -+ "autocreateinbox: Could not get canonified userid for user %s", userid); -+ return IMAP_PARTITION_UNKNOWN; -+ } -+ -+ /* Added this for debug information. */ -+ syslog(LOG_DEBUG, "autocreateinbox: autocreate inbox for user %s was called", auth_userid); -+ -+ /* -+ * While this is not needed for admins -+ * and imap_admins accounts, it would be -+ * better to separate *all* admins and -+ * proxyservers from normal accounts -+ * (accounts that have mailboxes). -+ * UOA Specific note(1): Even if we do not -+ * exclude these servers-classes here, -+ * UOA specific code, will neither return -+ * role, nor create INBOX, because none of these -+ * administrative accounts belong to the -+ * mailRecipient objectclass, or have imapPartition. -+ * UOA Specific note(2): Another good reason for doing -+ * this, is to prevent the code, from getting into -+ * cyrus_ldap.c because of the continues MSA logins to LMTPd. -+ */ -+ -+ /* -+ * admins and the coresponding imap -+ * service, had already been excluded. -+ */ -+ -+ /* -+ * Do we really need group membership -+ * for admins or service_admins? -+ */ -+ if (global_authisa(auth_state, IMAPOPT_ADMINS)) return 0; -+ -+ /* -+ * Do we really need group membership -+ * for proxyservers? -+ */ -+ if (global_authisa(auth_state, IMAPOPT_PROXYSERVERS)) return 0; -+ -+ /* -+ * Check if user belongs to the autocreate_users group. This option -+ * controls for whom the mailbox may be automatically created. Default -+ * value for this option is 'anyone'. So, if not declared, all mailboxes -+ * will be created. -+ */ -+ if (!global_authisa(auth_state, IMAPOPT_AUTOCREATE_USERS)) { -+ syslog(LOG_DEBUG, "autocreateinbox: User %s does not belong to the autocreate_users. No mailbox is created", -+ auth_userid); -+ return IMAP_MAILBOX_NONEXISTENT; -+ } -+ -+#if 0 -+ /* -+ * Get Partition info or return. -+ * (Here you should propably use -+ * you own "get_partition(char *userid)" -+ * function. Otherwise all new INBOXes will be -+ * created into whatever partition has been declared -+ * as default in your imapd.conf) -+ */ -+ -+ partition = get_partition(userid); -+ if (partition == NULL) { -+ /* -+ * Couldn't get partition info -+ */ -+ syslog(LOG_ERR, -+ "Could not get imapPartition info for user %s", userid); -+ return IMAP_PARTITION_UNKNOWN; -+ } -+#endif -+ -+ r = mboxlist_createmailbox(mailboxname, MAILBOX_FORMAT_NORMAL, NULL, -+ 1, userid, auth_state, 0, 0, 0); -+ -+ if (!r && autocreatequota > 0) -+ r = mboxlist_setquota(mailboxname, autocreatequota, 0); -+ -+ if (!r) -+ r = mboxlist_changesub(mailboxname, userid, -+ auth_state, 1, 1); -+ -+ if (!r) { -+ syslog(LOG_NOTICE, "autocreateinbox: User %s, INBOX was successfully created in partition %s", -+ auth_userid, partition == NULL ? "default" : partition); -+ } else { -+ syslog(LOG_ERR, "autocreateinbox: User %s, INBOX failed. %s", -+ auth_userid, error_message(r)); -+ } -+ -+#if 0 -+ /* Allocated from get_partition, and not needed any more */ -+ free_partition(partition); -+#endif -+ -+ if (r) return r; -+ -+ /* INBOX's subfolders */ -+ if ((crt=config_getstring(IMAPOPT_AUTOCREATEINBOXFOLDERS))) -+ sub=config_getstring(IMAPOPT_AUTOSUBSCRIBEINBOXFOLDERS); -+ -+ /* Roll through crt */ -+ next_crt = (char *) crt; -+ while (next_crt!=NULL && *next_crt) { -+ for (p = next_crt ; isspace((int) *p) || *p == SEP ; p++); -+ for (next_crt = p ; *next_crt && *next_crt != SEP ; next_crt++); -+ for (q = next_crt ; q > p && (isspace((int) *q) || *q == SEP || !*q); q--); -+ -+ if (!*p) continue; -+ -+ len = q - p + 1; -+ -+ /* First time we check for length */ -+ if (len > sizeof(folder) - 5) -+ r = IMAP_MAILBOX_BADNAME; -+ -+ if (!r) { -+ strncpy(folder, p, len); -+ folder[len] = '\0'; -+ -+ strlcpy(name, namespace->prefix[NAMESPACE_INBOX], sizeof(name)); -+ len = strlcat(name, folder, sizeof(name)); -+ } -+ -+ if (!r) -+ r = (namespace->mboxname_tointernal) (namespace, name, userid, -+ mailboxname); -+ if (!r) -+ r = mboxlist_createmailbox(mailboxname, MAILBOX_FORMAT_NORMAL, NULL, -+ 1, userid, auth_state, 0, 0, 0); -+ -+ if (!r) { -+ numcrt++; -+ syslog(LOG_NOTICE, "autocreateinbox: User %s, subfolder %s creation succeeded.", -+ auth_userid, name); -+ } else { -+ syslog(LOG_WARNING, "autocreateinbox: User %s, subfolder %s creation failed. %s", -+ auth_userid, name, error_message(r)); -+ r=0; -+ continue; -+ } -+ -+ /* Roll through sub */ -+ next_sub = (char *) sub; -+ while (next_sub!=NULL && *next_sub) { -+ for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++); -+ for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++); -+ for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--); -+ if (!*p ) continue; -+ -+ len = q - p + 1; -+ -+ if (len != strlen(folder) || strncmp(folder, p, len)) -+ continue; -+ -+ r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 1); -+ -+ if (!r) { -+ numsub++; -+ syslog(LOG_NOTICE,"autocreateinbox: User %s, subscription to %s succeeded", -+ auth_userid, name); -+ } else -+ syslog(LOG_WARNING, "autocreateinbox: User %s, subscription to %s failed. %s", -+ auth_userid, name, error_message(r)); -+ -+ break; -+ } -+ } -+ -+ if (crt!=NULL && *crt) -+ syslog(LOG_INFO, "User %s, Inbox subfolders, created %d, subscribed %d", -+ auth_userid, numcrt, numsub); -+ -+ /* -+ * Check if shared folders are available for subscription. -+ */ -+ mboxlist_autosubscribe_sharedfolders(namespace, userid, auth_userid, auth_state); -+ -+#ifdef USE_SIEVE -+ /* -+ * Here the autocreate sieve script feature is iniated from. -+ */ -+ source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT); -+ -+ if (source_script) { -+ if (!autoadd_sieve(userid, source_script)) -+ syslog(LOG_NOTICE, "autocreate_sieve: User %s, default sieve script creation succeeded", auth_userid); -+ else -+ syslog(LOG_WARNING, "autocreate_sieve: User %s, default sieve script creation failed", auth_userid); -+ } -+#endif -+ -+ return r; -+} -+ -diff -Naur cyrus-imapd-2.3.15.orig/imap/mboxlist.h cyrus-imapd-2.3.15/imap/mboxlist.h ---- cyrus-imapd-2.3.15.orig/imap/mboxlist.h 2009-05-05 03:20:03.000000000 +0200 -+++ cyrus-imapd-2.3.15/imap/mboxlist.h 2009-09-09 16:13:03.000000000 +0200 -@@ -216,4 +216,8 @@ - int mboxlist_abort(struct txn *tid); - - int mboxlist_delayed_delete_isenabled(void); -+int mboxlist_autocreateinbox(struct namespace *namespace,char *userid, -+ struct auth_state *auth_state, char *mailboxname, -+ int autocreatequota); -+ - #endif -diff -Naur cyrus-imapd-2.3.15.orig/imap/pop3d.c cyrus-imapd-2.3.15/imap/pop3d.c ---- cyrus-imapd-2.3.15.orig/imap/pop3d.c 2009-04-23 19:10:07.000000000 +0200 -+++ cyrus-imapd-2.3.15/imap/pop3d.c 2009-09-09 16:13:03.000000000 +0200 -@@ -173,6 +173,8 @@ - static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* */ - static void cmd_apop(char *response); - -+static int autocreate_inbox(char *inboxname, char *userid); -+ - static void cmd_auth(char *arg); - static void cmd_capa(void); - static void cmd_pass(char *pass); -@@ -1246,6 +1248,7 @@ - popd_userid = xstrdup(userbuf); - prot_printf(popd_out, "+OK Name is a valid mailbox\r\n"); - } -+ - } - - void cmd_pass(char *pass) -@@ -1549,6 +1552,43 @@ - } - - /* -+ * Autocreate Inbox and subfolders upon login -+ */ -+int autocreate_inbox(char *inboxname, char *auth_userid) -+{ -+ struct auth_state *auth_state; -+ int autocreatequota; -+ int r; -+ -+ if (inboxname == NULL || auth_userid == NULL) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ /* -+ * Exclude anonymous -+ */ -+ if (!strcmp(popd_userid, "anonymous")) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ /* -+ * Check for autocreatequota -+ */ -+ if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ /* -+ * Exclude admin's accounts -+ */ -+ auth_state = auth_newstate(popd_userid); -+ if (global_authisa(auth_state, IMAPOPT_ADMINS)) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ r = mboxlist_autocreateinbox(&popd_namespace, auth_userid, -+ auth_state, inboxname, autocreatequota); -+ return r; -+} -+ -+ -+/* - * Complete the login process by opening and locking the user's inbox - */ - int openinbox(void) -@@ -1577,6 +1617,12 @@ - - if (!r) r = mboxlist_detail(inboxname, &type, NULL, NULL, - &server, &acl, NULL); -+ -+ /* Try once again after autocreate_inbox */ -+ if (r == IMAP_MAILBOX_NONEXISTENT && !(r = autocreate_inbox(inboxname, userid))) -+ r = mboxlist_detail(inboxname, &type, NULL, NULL, -+ &server, &acl, NULL); -+ - if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) && - (!acl || - !((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) { -diff -Naur cyrus-imapd-2.3.15.orig/lib/auth.c cyrus-imapd-2.3.15/lib/auth.c ---- cyrus-imapd-2.3.15.orig/lib/auth.c 2008-03-24 18:43:08.000000000 +0100 -+++ cyrus-imapd-2.3.15/lib/auth.c 2009-09-09 16:13:03.000000000 +0200 -@@ -118,3 +118,11 @@ - - auth->freestate(auth_state); - } -+ -+char *auth_canonuser(struct auth_state *auth_state) -+{ -+ struct auth_mech *auth = auth_fromname(); -+ -+ return auth->auth_canonuser(auth_state); -+} -+ -diff -Naur cyrus-imapd-2.3.15.orig/lib/auth.h cyrus-imapd-2.3.15/lib/auth.h ---- cyrus-imapd-2.3.15.orig/lib/auth.h 2008-03-24 18:43:08.000000000 +0100 -+++ cyrus-imapd-2.3.15/lib/auth.h 2009-09-09 16:13:03.000000000 +0200 -@@ -55,6 +55,7 @@ - const char *identifier); - struct auth_state *(*newstate)(const char *identifier); - void (*freestate)(struct auth_state *auth_state); -+ char *(*auth_canonuser)(struct auth_state *auth_state); - }; - - extern struct auth_mech *auth_mechs[]; -@@ -77,5 +78,6 @@ - const char *identifier); - struct auth_state *auth_newstate(const char *identifier); - void auth_freestate(struct auth_state *auth_state); -+char *auth_canonuser(struct auth_state *auth_state); - - #endif /* INCLUDED_AUTH_H */ -diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_krb5.c cyrus-imapd-2.3.15/lib/auth_krb5.c ---- cyrus-imapd-2.3.15.orig/lib/auth_krb5.c 2008-03-24 18:43:08.000000000 +0100 -+++ cyrus-imapd-2.3.15/lib/auth_krb5.c 2009-09-09 16:13:03.000000000 +0200 -@@ -199,6 +199,14 @@ - free(auth_state); - } - -+static char *mycanonuser(struct auth_state *auth_state) -+{ -+ if (auth_state) -+ return auth_state->userid; -+ -+ return NULL; -+} -+ - #else /* HAVE_GSSAPI_H */ - - static int mymemberof( -@@ -230,6 +238,13 @@ - fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG); - } - -+static char *mycanonuser( -+ struct auth_state *auth_state __attribute__((unused))) -+{ -+ fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG); -+ return NULL; -+} -+ - #endif - - struct auth_mech auth_krb5 = -@@ -240,4 +255,5 @@ - &mymemberof, - &mynewstate, - &myfreestate, -+ &mycanonuser, - }; -diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_krb.c cyrus-imapd-2.3.15/lib/auth_krb.c ---- cyrus-imapd-2.3.15.orig/lib/auth_krb.c 2009-03-31 06:11:21.000000000 +0200 -+++ cyrus-imapd-2.3.15/lib/auth_krb.c 2009-09-09 16:13:03.000000000 +0200 -@@ -341,6 +341,15 @@ - free((char *)auth_state); - } - -+static char *mycanonuser(struct auth_state *auth_state) -+{ -+ if (auth_state) -+ return auth_state->userid; -+ -+ return NULL; -+} -+ -+ - #else /* HAVE_KRB */ - - static int mymemberof( -@@ -372,6 +381,13 @@ - fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG); - } - -+static char *mycanonuser( -+ struct auth_state *auth_state __attribute__((unused))) -+{ -+ fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG); -+} -+ -+ - #endif - - struct auth_mech auth_krb = -@@ -382,4 +398,5 @@ - &mymemberof, - &mynewstate, - &myfreestate, -+ &mycanonuser, - }; -diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_pts.c cyrus-imapd-2.3.15/lib/auth_pts.c ---- cyrus-imapd-2.3.15.orig/lib/auth_pts.c 2008-03-24 18:43:08.000000000 +0100 -+++ cyrus-imapd-2.3.15/lib/auth_pts.c 2009-09-09 16:13:03.000000000 +0200 -@@ -512,6 +512,14 @@ - free(auth_state); - } - -+static char *mycanonuser(struct auth_state *auth_state) -+{ -+ if (auth_state) -+ return auth_state->userid.id; -+ -+ return NULL; -+} -+ - struct auth_mech auth_pts = - { - "pts", /* name */ -@@ -520,4 +528,5 @@ - &mymemberof, - &mynewstate, - &myfreestate, -+ &mycanonuser, - }; -diff -Naur cyrus-imapd-2.3.15.orig/lib/auth_unix.c cyrus-imapd-2.3.15/lib/auth_unix.c ---- cyrus-imapd-2.3.15.orig/lib/auth_unix.c 2009-03-31 06:11:22.000000000 +0200 -+++ cyrus-imapd-2.3.15/lib/auth_unix.c 2009-09-09 16:13:03.000000000 +0200 -@@ -315,6 +315,16 @@ - free((char *)auth_state); - } - -+static char *mycanonuser(auth_state) -+ struct auth_state *auth_state; -+{ -+ if (auth_state) -+ return auth_state->userid; -+ -+ return NULL; -+} -+ -+ - - struct auth_mech auth_unix = - { -@@ -324,4 +334,5 @@ - &mymemberof, - &mynewstate, - &myfreestate, -+ &mycanonuser, - }; -diff -Naur cyrus-imapd-2.3.15.orig/lib/imapoptions cyrus-imapd-2.3.15/lib/imapoptions ---- cyrus-imapd-2.3.15.orig/lib/imapoptions 2009-06-29 19:21:06.000000000 +0200 -+++ cyrus-imapd-2.3.15/lib/imapoptions 2009-09-09 16:13:03.000000000 +0200 -@@ -198,6 +198,55 @@ - /* Number of seconds to wait before returning a timeout failure when - performing a client connection (e.g., in a murder environment) */ - -+{ "createonpost", 0, SWITCH } -+/* If yes, when lmtpd receives an incoming mail for an INBOX that does not exist, -+ then the INBOX is automatically created by lmtpd. */ -+ -+{ "autocreateinboxfolders", NULL, STRING } -+/* If a user does not have an INBOX created then the INBOX as well as some INBOX -+ subfolders are created under two conditions. -+ 1. The user logins via the IMAP or the POP3 protocol. (autocreatequota option must have a nonzero value) -+ 2. A message arrives for the user through the LMTPD protocol.(createonpost option must be yes) -+ autocreateinboxfolders is a list of INBOX's subfolders separated by a "|", that -+ are automatically created by the server under the previous two situations. */ -+ -+{ "autosubscribeinboxfolders", NULL, STRING } -+/* A list of folder names, separated by "|", that the users get automatically subscribed to, -+ when their INBOX is created. These folder names must have been included in the -+ autocreateinboxfolders option of the imapd.conf. */ -+ -+{ "autosubscribesharedfolders", NULL, STRING } -+/* A list of shared folders (bulletin boards), separated by "|", that the users get -+ automatically subscribed to, after their INBOX is created. The shared folder must -+ have been created and the user must have the required permissions to get subscribed -+ to it. Otherwise, subscribing to the shared folder fails. */ -+ -+{ "autosubscribe_all_sharedfolders", 0, SWITCH } -+/* If set to yes, the user is automatically subscribed to all shared folders, one has permission -+ to subscribe to. */ -+ -+{ "autocreate_sieve_script", NULL, STRING } -+/* The full path of a file that contains a sieve script. This script automatically becomes a -+ user's initial default sieve filter script. When this option is not defined, no default -+ sieve filter is created. The file must be readable by the cyrus daemon. */ -+ -+{ "autocreate_sieve_compiledscript", NULL, STRING } -+/* The full path of a file that contains a compiled in bytecode sieve script. This script -+ automatically becomes a user's initial default sieve filter script. If this option is -+ not specified, or the filename doesn't exist then the script defined by -+ autocreate_sieve_script is compiled on the fly and installed as the user's default -+ sieve script */ -+ -+{ "generate_compiled_sieve_script", 0, SWITCH } -+/* If set to yes and no compiled sieve script file exists, the sieve script which is -+ compiled on the fly will be saved in the file name that autocreate_sieve_compiledscript -+ option points to. In order a compiled script to be generated, autocreate_sieve_script and -+ autocreate_sieve_compiledscript must have valid values */ -+ -+{ "autocreate_users", "anyone", STRING } -+/* A space separated list of users and/or groups that are allowed their INBOX to be -+ automatically created. */ -+ - { "configdirectory", NULL, STRING } - /* The pathname of the IMAP configuration directory. This field is - required. */ -diff -Naur cyrus-imapd-2.3.15.orig/notifyd/Makefile.in cyrus-imapd-2.3.15/notifyd/Makefile.in ---- cyrus-imapd-2.3.15.orig/notifyd/Makefile.in 2008-03-24 20:59:32.000000000 +0100 -+++ cyrus-imapd-2.3.15/notifyd/Makefile.in 2009-09-09 16:13:03.000000000 +0200 -@@ -71,10 +71,11 @@ - SERVICE=../master/service.o - - IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ -+SIEVE_LIBS = @SIEVE_LIBS@ - IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@ - LIB_WRAP = @LIB_WRAP@ - LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS) --DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ -+DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ - - PURIFY=/usr/local/bin/purify - PUREOPT=-best-effort -diff -Naur cyrus-imapd-2.3.15.orig/notifyd/notifyd.c cyrus-imapd-2.3.15/notifyd/notifyd.c ---- cyrus-imapd-2.3.15.orig/notifyd/notifyd.c 2008-03-24 20:59:32.000000000 +0100 -+++ cyrus-imapd-2.3.15/notifyd/notifyd.c 2009-09-09 16:13:03.000000000 +0200 -@@ -96,7 +96,7 @@ - - #define NOTIFY_MAXSIZE 8192 - --int do_notify() -+static int do_notify() - { - struct sockaddr_un sun_data; - socklen_t sunlen = sizeof(sun_data); -diff -Naur cyrus-imapd-2.3.15.orig/ptclient/Makefile.in cyrus-imapd-2.3.15/ptclient/Makefile.in ---- cyrus-imapd-2.3.15.orig/ptclient/Makefile.in 2008-03-24 19:34:22.000000000 +0100 -+++ cyrus-imapd-2.3.15/ptclient/Makefile.in 2009-09-09 16:13:03.000000000 +0200 -@@ -57,10 +57,11 @@ - AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@ - AFS_LIBS = @AFS_LIBS@ - IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ -+SIEVE_LIBS = @SIEVE_LIBS@ - LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@ - LIB_SASL = @LIB_SASL@ - LIB_WRAP = @LIB_WRAP@ --DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ -+DEPLIBS = ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ - UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o - - LDAP_LIBS=@LDAP_LIBS@ -diff -Naur cyrus-imapd-2.3.15.orig/README.autocreate cyrus-imapd-2.3.15/README.autocreate ---- cyrus-imapd-2.3.15.orig/README.autocreate 1970-01-01 01:00:00.000000000 +0100 -+++ cyrus-imapd-2.3.15/README.autocreate 2009-09-09 16:13:03.000000000 +0200 -@@ -0,0 +1,211 @@ -+Cyrus IMAP autocreate Inbox patch -+---------------------------------- -+ -+NOTE : This patch has been created at the University of Athens. For more info, as well -+as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr/ -+ -+The design of Cyrus IMAP server does not predict the automatic creation of users' -+INBOX folders. The creation of a user's INBOX is considered to be an external task, -+that has to be completed as part of the user email account creation procedure. -+Hence, to create a new email account the site administrator has to: -+ -+ a) Include the new account in the user database for the authentication procedure -+ (e.g. sasldb, shadow, mysql, ldap). -+ b) Create the corresponding INBOX folder. -+ -+Alternatively, the user, if succesfully authenticated, may create his own INBOX folder, -+as long as the configuration of the site allows it (see "autocreatequota" in imapd.conf). -+Unlike what not careful readers may think, enabling the "autocreatequota" option, doesn't -+lead to the automatic INBOX folder creation by Cyrus IMAP server. -+In fact, "autocreate" means that the IMAP clients are allowed to automatically create -+the user INBOX. -+ -+This patch adds the functionality of automatic creation of the users' INBOX folders into -+the Cyrus IMAP server. It is implemented as two features, namely the "create on login" -+and "create on post". -+ -+ -+ -+Create on login -+=============== -+This feauture provides automatic creation of a user's INBOX folder when all of the -+following requirements are met: -+ -+i) The user has succesfully passed the authentication procedure. -+ -+ii) The user's authorisation ID (typically the same as the user's -+authentication ID) doesn't belong to the imap_admins or admins -+accounts (see imapd.conf). -+ -+iii) The "autocreatequota" option in the imap configuration file -+has been set to a non zero value. -+ -+iv) The corresponding to the user's authorisation ID INBOX folder -+does not exist. -+ -+The user's first login is the most typical case when all four requirements are met. -+Note that if the authenticated ID is allowed to proxy to another account for which -+all of the above requirements are met, the corresponding INBOX folder for that account -+will be created. -+ -+ -+ -+Create on post -+============== -+This feauture provides automatic creation of a user's INBOX folder when all of the -+following requirements are met. -+ -+i) An email message addressed to the user has been received. -+ -+ii) The recipient is not any of the imap_admins or admins accounts. -+Note that passing emails to admins or imap_admins accounts from -+the MTA to LMTP should be avoided in any case. -+ -+iii) The recipient's INBOX does not exist. -+ -+iv) The "autocreatequota" option in the imap configuration file -+has been set to a non zero value. -+ -+v) The "createonpost" option in the imap configuration file -+has been switched on. -+ -+ -+Besides the automatic creation of INBOX folder, additional functionalities are -+provided: -+ -+ (A) Automatic creation of INBOX subfolders controlled by "autocreateinboxfolders" -+configuration option. eg -+ -+autocreateinboxfolders: sent|drafts|spam|templates -+ -+ (B) Automatic subscription of INBOX subfolders controlled by "autosubscribeinboxfolders" -+configuration option. eg -+ -+autosubscribeinboxfolders: sent|spam -+ -+Obviously, only subscription to subfolders included in the "autocreateinboxfolder" -+list is meaningful. -+ -+ (C) Automatic subscription to shared folders (bulletin boards). The user gets -+automatically subscribed to the shared folders declared in the "autosubscribesharedfolders" -+configuration option in imapd.conf. -+eg autosubscribesharedfolders: public_folder | public_folder.subfolder -+ -+In order the above action to succeed, the shared folder has to pre-exist the INBOX creation -+and the user must have the appropriate permissions in order to be able to subscribe to the -+shared folder. -+ -+* A new config option has been added. 'autosubscribe_all_sharedfolders' is a yes/no -+option. When set to yes, the user is automatically subscribed to all shared folders one -+has permission to subscribe to. Please, note that when this option is set to yes, then -+'autosubscribesharedfolders' option is overriden. -+ -+ (D) Automatic creation of a predefined default sieve script. -+ -+This is very useful when a default sieve script is used for every user. Usually, a -+default anti-spam script may me be written in a file and copied to each user -+sieve scripts upon the INBOX creation. The imapd.conf options that have been added -+are 'autocreate_sieve_script', 'autocreate_sieve_compiledscript' and -+'generate_compiled_sieve_script'. -+ -+autocreate_sieve_script configuration option refers to the full path of the file -+that contains the sieve script. The default value is null and if no file is defined, -+then no default script is created upon INBOX creation. (The feature is disabled) -+eg autocreate_sieve_script: /etc/default_sieve_script -+ -+autocreate_sieve_compiledscript configuration option refers to the full path of the -+file that contains the bytecode compiled sieve script. If this filename is defined -+in imapd.conf and the file exists, then it is automatically copied in the user's sieve -+directory. If it is not defined, then a bytecode sieve script gets on the fly compiled -+by the daemon. -+eg autocreate_sieve_compiledscript: /etc/default_sieve_script.bc -+ -+generate_compiled_sieve_script is a boolean option that triggers the compilation of the -+source sieve script to bytecode sieve script. The file that the bytecode script will -+be saved is pointed by autocreate_sieve_compiledscript. -+ -+Ways of compiling a sieve script : -+1. Compile a sieve script using the standard sievec utility, distributed by CMU -+2. Compile a sieve script using the compile_sieve utility, released by UoA. This -+ tool is almost identical to the sievec utility, with the difference that it -+ reads the input and output file from autocreate_sieve_script and -+ autocreate_sieve_compiledscript options in imapd.conf -+3. Let cyrus create a compiled sieve script using a source script. Cyrus can be -+ instructed to save the compiled script any time a compiled script does not exist. -+ -+NOTES : -+1. In order this functionality to work, the following requirements must have been met: -+ - 'sieveusehomedir' option must be 'no' in the configuration (default). -+ - 'sievedir' option must have a valid value. -+2. Currently, this patch checks the validity of the source script while generating a -+ bytecode compiled script, but not the validity of the bytecode sieve script file. -+ The administrator should make sure that the provided files contain a valid sieve -+ script as well as the compiled script is updated every time the source script changes. -+ -+ -+ (E) The administrator may control for which users and/or groups may the INBOXes -+automatically be created. The autocreate_users option restricts the groups -+for which the patch will create the mailboxes. -+ -+The default value of autocreate_users is anyone. So, if not set at all, the patch will -+work for all users. However, one may set: -+ -+autocreate_users: user1 user2 group:group1 group:group2 -+ -+In that case, the INBOX will be created only for user1, user2 and the users that belong -+to group1 and group2. -+ -+More refined control per service is provided by the options imap_autocreate_users, -+pop3_autocreate_users and lmtp_autocreate_users. These options override the -+autocreate_users option and offer per service control. -+ -+Example: -+One may want to restrict the create on post functionality only for a specific group -+of users. To achieve this, the following lines must be added in the imapd.conf file: -+ -+createonpost: yes -+lmtp_autocreate_users: group:groupname -+ -+ -+ -+Issues to be considered -+======================= -+ -+I) In order to use the create on post feauture one should be absolutely sure that: -+a) The MTA checks the validity of the email recipient before sending the email to -+LMTP. This is an RFC821 requirement. This usually expands to "the mta should be -+able to use the account database as user mailbox database". -+b) Only authorised accounts/services can talk to LMTP. -+ -+II) Especially in the case of imap logins, the current patch implementation checks -+for the INBOX folder existence upon login, causing an extra mailbox lookup in most -+of the cases. -+A better approach would be to chase the "IMAP_MAILBOX_NONEXISTENT" error code and -+check if the error is associated with an INBOX folder. However, this would mess up -+Cyrus code. The way it was implemented may not have been the most performance -+optimised, but it produces a much cleaner and simple patch. -+ -+ -+ -+Virtual Domains Support -+======================= -+ -+Virtual domains are supported by all versions of the patch for cyrus-imapd-2.2.1-BETA and -+later. However, it is not possible to declare different INBOX subfolders to be created or -+shared folders to be subscribed to for every domain. -+ -+ -+ -+Things to be done -+================= -+ -+1. Support MUPDATE -+ -+It is within the developers' intentions to support the mupdate protocol, but serious -+design issues on future cyrus releases have to resolved first. -+ -+2. Select different attributes (quota, partition, sieve filter, etc) depending on the group -+a user belongs to. -+ -+For more information and updates please visit http://email.uoa.gr/projects/cyrus/autocreate -+ Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-12-22 23:24:19 UTC (rev 7717) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-12-22 23:25:15 UTC (rev 7718) @@ -1,3 +1,9 @@ +cyrus_imapd (2.3.16,REV=2009.12.23) unstable + + * New upstream version. + + -- Yann Rouillard Wed, 23 Dec 2009 00:10:44 +0100 + cyrus_imapd (2.3.15,REV=2009.10.11) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-12-22 23:24:19 UTC (rev 7717) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-12-22 23:25:15 UTC (rev 7718) @@ -1,3 +1,9 @@ +cyrus_imapd_utils (2.3.16,REV=2009.12.23) unstable + + * New upstream version. + + -- Yann Rouillard Wed, 23 Dec 2009 00:10:44 +0100 + cyrus_imapd_utils (2.3.15,REV=2009.10.11) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-12-22 23:24:19 UTC (rev 7717) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-12-22 23:25:15 UTC (rev 7718) @@ -1,3 +1,9 @@ +pm_cyrus (2.3.16,REV=2009.12.23) unstable + + * New upstream version. + + -- Yann Rouillard Wed, 23 Dec 2009 00:10:44 +0100 + pm_cyrus (2.3.15,REV=2009.10.11) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 23 00:28:06 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 22 Dec 2009 23:28:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7719] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 7719 http://gar.svn.sourceforge.net/gar/?rev=7719&view=rev Author: chninkel Date: 2009-12-22 23:28:06 +0000 (Tue, 22 Dec 2009) Log Message: ----------- lftp: updated to 4.0.5 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2009-12-22 23:25:15 UTC (rev 7718) +++ csw/mgar/pkg/lftp/trunk/Makefile 2009-12-22 23:28:06 UTC (rev 7719) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = lftp -GARVERSION = 4.0.4 +GARVERSION = 4.0.5 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-12-22 23:25:15 UTC (rev 7718) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-12-22 23:28:06 UTC (rev 7719) @@ -1,3 +1,3 @@ 5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype -e813870b518281ca71c398a9b05494e6 changelog.CSW -08461f56eb149382dfd120f461f49b5f lftp-4.0.4.tar.gz +31fd702308b4cd4042d3ddb043f83a9c changelog.CSW +73ea519c9e9cdfa47b714c5c91093a0d lftp-4.0.5.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-12-22 23:25:15 UTC (rev 7718) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-12-22 23:28:06 UTC (rev 7719) @@ -1,3 +1,9 @@ +lftp (4.0.5,REV=2009.12.23) unstable + + * New upstream release. + + -- Yann Rouillard Wed, 23 Dec 2009 00:13:55 +0100 + lftp (4.0.4,REV=2009.12.02) unstable * New upstream release. @@ -2,9 +8,15 @@ - -- Yann Rouillard Wed, 02 Dec 2009 21:47:50 +0100 + -- Yann Rouillard Wed, 02 Dec 2009 21:47:50 +0100 +lftp (4.0.4,REV=2009.12.02) unstable + + * New upstream release. + + -- Yann Rouillard Wed, 02 Dec 2009 21:47:50 +0100 + lftp (4.0.3,REV=2009.11.01) unstable * New upstream release. - -- Yann Rouillard Sun, 01 Nov 2009 01:23:45 +0100 + -- Yann Rouillard Sun, 01 Nov 2009 01:23:45 +0100 @@ -14,94 +26,94 @@ * New upstream release. - -- Yann Rouillard Fri, 11 Oct 2009 00:45:36 +0200 + -- Yann Rouillard Fri, 11 Oct 2009 00:45:36 +0200 lftp (3.7.15,REV=2009.07.25) unstable * New upstream release. - -- Yann Rouillard Sat, 25 Jul 2009 13:10:19 +0200 + -- Yann Rouillard Sat, 25 Jul 2009 13:10:19 +0200 lftp (3.7.14,REV=2009.05.16) unstable * New upstream release. - -- Yann Rouillard Sat, 16 May 2009 15:40:33 +0200 + -- Yann Rouillard Sat, 16 May 2009 15:40:33 +0200 lftp (3.7.13,REV=2009.05.09) unstable * New upstream release. - -- Yann Rouillard Fri, 09 May 2009 17:17:30 +0200 + -- Yann Rouillard Fri, 09 May 2009 17:17:30 +0200 lftp (3.7.11,REV=2009.03.29) unstable * Now uses cswpreserveconf class from cswclassutils to handle lftp.conf configuration file. - -- Yann Rouillard Sun, 29 Mar 2009 16:16:22 +0200 + -- Yann Rouillard Sun, 29 Mar 2009 16:16:22 +0200 lftp (3.7.11,REV=2009.03.27) unstable * Fixed double CSWcommon dependancy. - -- Yann Rouillard Wed, 25 Mar 2009 23:08:42 +0100 + -- Yann Rouillard Wed, 25 Mar 2009 23:08:42 +0100 lftp (3.7.11,REV=2009.03.21) unstable * New upstream version. - -- Yann Rouillard Sat, 21 Mar 2009 12:55:58 +0100 + -- Yann Rouillard Sat, 21 Mar 2009 12:55:58 +0100 lftp (3.7.8,REV=2009.02.15) unstable * Changed gettext dependancy to follow gettext package split (Closes: #3099). - -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 + -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 lftp (3.7.8,REV=2009.01.24) unstable * New upstream version. - -- Yann Rouillard Sat, 24 Jan 2009 16:14:12 +0100 + -- Yann Rouillard Sat, 24 Jan 2009 16:14:12 +0100 lftp (3.7.7,REV=2008.12.12) unstable * New upstream version. - -- Yann Rouillard Sat, 13 Dec 2008 11:53:59 +0100 + -- Yann Rouillard Sat, 13 Dec 2008 11:53:59 +0100 lftp (3.7.6,REV=2008.11.30) unstable * New upstream version. - -- Yann Rouillard Sun, 30 Nov 2008 22:43:16 +0100 + -- Yann Rouillard Sun, 30 Nov 2008 22:43:16 +0100 lftp (3.7.4,REV=2008.10.04) unstable * New upstream version. - -- Yann Rouillard Fri, 04 Oct 2008 23:41:47 +0200 + -- Yann Rouillard Fri, 04 Oct 2008 23:41:47 +0200 lftp (3.7.3,REV=2008.06.02) unstable * New upstream version. - -- Yann Rouillard Mon, 02 Jun 2008 22:08:32 +0200 + -- Yann Rouillard Mon, 02 Jun 2008 22:08:32 +0200 lftp (3.6.3,REV=2008.02.16) unstable * New upstream version. - -- Yann Rouillard Sat, 16 Feb 2008 10:58:45 +0100 + -- Yann Rouillard Sat, 16 Feb 2008 10:58:45 +0100 lftp (3.6.2,REV=2008.01.21) unstable * New upstream version. * Removed files/xstring_char_cast_bugfix.patch: bug fixed upstream. - -- Yann Rouillard Mon, 21 Jan 2008 23:54:26 +0100 + -- Yann Rouillard Mon, 21 Jan 2008 23:54:26 +0100 lftp (3.6.1,REV=2007.12.21) unstable @@ -109,51 +121,51 @@ * Added files/xstring_char_cast_bugfix.patch: workaround a cast problem - -- Yann Rouillard Fri, 21 Dec 2007 23:20:29 +0100 + -- Yann Rouillard Fri, 21 Dec 2007 23:20:29 +0100 lftp (3.5.13,REV=2007.08.24) unstable * New upstream version. * Removed static libraries files. - -- Yann Rouillard Fri, 24 Aug 2007 01:50:48 +0200 + -- Yann Rouillard Fri, 24 Aug 2007 01:50:48 +0200 lftp (3.5.12,REV=2007.08.17) unstable * New upstream version. - -- Yann Rouillard Fri, 17 Aug 2007 20:17:39 +0200 + -- Yann Rouillard Fri, 17 Aug 2007 20:17:39 +0200 lftp (3.5.11) unstable * Depends on openssl_rt rather than openssl. - -- Yann Rouillard Sat, 28 Jul 2007 17:30:07 +0200 + -- Yann Rouillard Sat, 28 Jul 2007 17:30:07 +0200 lftp (3.5.11) unstable * New upstream version. - -- Yann Rouillard Wed, 06 May 2007 04:42:47 +0200 + -- Yann Rouillard Wed, 06 May 2007 04:42:47 +0200 lftp (3.5.10) unstable * New upstream version. - -- Yann Rouillard Wed, 11 Apr 2007 00:30:58 +0200 + -- Yann Rouillard Wed, 11 Apr 2007 00:30:58 +0200 lftp (3.5.9) unstable * New upstream version. - -- Yann Rouillard Mon, 15 Jan 2007 23:48:35 +0100 + -- Yann Rouillard Mon, 15 Jan 2007 23:48:35 +0100 lftp (3.5.6) unstable * New upstream version. * Removed MakeRef_macro.patch not necessary anymore. - -- Yann Rouillard Mon, 4 Dec 2006 23:07:36 +0100 + -- Yann Rouillard Mon, 4 Dec 2006 23:07:36 +0100 lftp (3.5.4) unstable @@ -162,7 +174,7 @@ * Added MakeRef_macro.patch to fixed a incorrect macro call which caused segmentation fault with sftp protocol. - -- Yann Rouillard Sat, 19 Aug 2006 20:24:04 +0200 + -- Yann Rouillard Sat, 19 Aug 2006 20:24:04 +0200 lftp (3.5.2) unstable 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 Dec 23 10:13:34 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Dec 2009 09:13:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7720] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 7720 http://gar.svn.sourceforge.net/gar/?rev=7720&view=rev Author: wahwah Date: 2009-12-23 09:13:34 +0000 (Wed, 23 Dec 2009) Log Message: ----------- mysql5: Porting changes from the 5.1-optcsw branch to prevent the two from diverging too much. Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-22 23:28:06 UTC (rev 7719) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-23 09:13:34 UTC (rev 7720) @@ -3,10 +3,16 @@ # $Id$ GARNAME = mysql5 -GARVERSION = 5.1.40 +BASE_VERSION = 5.1 +PATCHLEVEL = 40 +GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server +# Useful when making a series of builds on the same day +GARFLAVOR ?= DBG + DISTNAME = mysql-$(GARVERSION) +SPKG_SOURCEURL = http://www.mysql.com/ DESCRIPTION = Multithreaded SQL database server define BLURB @@ -14,24 +20,32 @@ (Structured Query Language) database server. endef -GARFLAVOR = DBG - # Change prefix to /opt/csw/mysql5 prefix = /opt/csw/mysql5 +localstatedir = /var/opt/csw/mysql5 sysconfdir = /etc/opt/csw/mysql5 -localstatedir = /var/opt/csw/mysql5 + +# Where to put the init script global_sysconfdir = /etc/opt/csw +# Where to link the binaries global_bindir = /opt/csw/bin -INITSMF = $(global_sysconfdir)/init\.d/cswmysql5 +INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION) +PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel +PACKAGES += CSWmysql5rt CSWmysql5test + 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 -PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel -PACKAGES += CSWmysql5rt CSWmysql5test +SPKG_DESC_CSWmysql5 = Multithreaded SQL database +SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking +SPKG_DESC_CSWmysql5client = MySQL 5 client binaries +SPKG_DESC_CSWmysql5devel = MySQL 5 header files +SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files +SPKG_DESC_CSWmysql5test = MySQL 5 testing files CATALOGNAME_CSWmysql5 = $(GARNAME) CATALOGNAME_CSWmysql5bench = $(GARNAME)bench @@ -46,13 +60,6 @@ INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test -SPKG_DESC_CSWmysql5 = Multithreaded SQL database -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking -SPKG_DESC_CSWmysql5client = MySQL 5 client binaries -SPKG_DESC_CSWmysql5devel = MySQL 5 header files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files -SPKG_DESC_CSWmysql5test = MySQL 5 testing files - # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSWmysql5client_programs = myisamlog @@ -72,8 +79,21 @@ CSWmysql5client_programs += perror CSWmysql5client_programs += replace +# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared +# library not found. EXTRA_LIB was tried too, but did not work, as the -R path +# ended up with having two $ISALIST tokens. +# +# Without this setting it looks for: +# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 +# The library is at: +# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql + CSWmysql5devel_programs += mysql_config +# Enable 64 bits build +BUILD64 = 1 + PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5client = $(bindir) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) @@ -97,7 +117,7 @@ REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog DISTFILES += CSWmysql5.preinstall @@ -115,20 +135,11 @@ EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared -# library not found. EXTRA_LIB was tried too, but did not work, as the -R path -# ended up with having two $ISALIST tokens. -# -# Without this setting it looks for: -# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 -# The library is at: -# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 -EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql - # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler -CONFIGURE_ARGS += --without-docs +# Why not have a docs package? +# CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile CONFIGURE_ARGS += --with-charset=utf8 CONFIGURE_ARGS += --with-extra-charsets=all @@ -146,46 +157,48 @@ # TEST_SCRIPTS = TEST_TARGETS = check -# Enable 64 bits build -BUILD64 = 1 USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup -PROTOTYPE_MODIFIERS = ownmysql -PROTOTYPE_FILES_ownmysql = /var/opt/csw/mysql5 -PROTOTYPE_USER_ownmysql = mysql -PROTOTYPE_GROUP_ownmysql = mysql -PROTOTYPE_PERMS_ownmysql = 0700 -PROTOTYPE_CLASS_ownmysql = ugfiles +PROTOTYPE_MODIFIERS = dbdir +PROTOTYPE_FILES_dbdir = $(localstatedir) +PROTOTYPE_USER_dbdir = mysql +PROTOTYPE_GROUP_dbdir = mysql +PROTOTYPE_PERMS_dbdir = 0700 +PROTOTYPE_CLASS_dbdir = ugfiles SPKG_CLASSES = none ugfiles include gar/category.mk +CFLAGS := $(filter-out -I%,$(CFLAGS)) + pre-configure-modulated: # To work around the libtool version mismatch problem. cd $(WORKSRC) && autoreconf --force --install --symlink -post-install-modulated: - ginstall -m 755 -d $(DESTDIR)$(localstatedir) - ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc +post-merge: + ginstall -m 755 -d $(PKGROOT)$(localstatedir) + ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ - $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW - ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql - ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW + ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/cswmysql5 $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql + ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 # A symlink for mysql5 include files - ginstall -m 755 -d $(DESTDIR)/opt/csw/include - ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql + ginstall -m 755 -d $(PKGROOT)/opt/csw/include + ln -s ../mysql5/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries - ginstall -m 755 -d $(DESTDIR)$(global_bindir) - for f in $(DESTDIR)$(bindir)/*; do \ - ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + ginstall -m 755 -d $(PKGROOT)$(global_bindir) + for f in $(PKGROOT)$(bindir)/*; do \ + ln -s ../mysql5/bin/`basename $$f` \ + $(PKGROOT)$(global_bindir)/`basename $$f`; \ done + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 23 10:31:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Dec 2009 09:31:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7721] csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Message-ID: Revision: 7721 http://gar.svn.sourceforge.net/gar/?rev=7721&view=rev Author: wahwah Date: 2009-12-23 09:31:15 +0000 (Wed, 23 Dec 2009) Log Message: ----------- mysql5: Making the mysql-5.1.x branch more similar to the trunk Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2009-12-23 09:13:34 UTC (rev 7720) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2009-12-23 09:31:15 UTC (rev 7721) @@ -3,10 +3,16 @@ # $Id$ GARNAME = mysql5 -GARVERSION = 5.1.40 +BASE_VERSION = 5.1 +PATCHLEVEL = 40 +GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server +# Useful when making a series of builds on the same day +GARFLAVOR ?= DBG + DISTNAME = mysql-$(GARVERSION) +SPKG_SOURCEURL = http://www.mysql.com/ DESCRIPTION = Multithreaded SQL database server define BLURB @@ -14,24 +20,32 @@ (Structured Query Language) database server. endef -GARFLAVOR = DBG - # Change prefix to /opt/csw/mysql5 prefix = /opt/csw/mysql5 +localstatedir = /var/opt/csw/mysql5 sysconfdir = /etc/opt/csw/mysql5 -localstatedir = /var/opt/csw/mysql5 + +# Where to put the init script global_sysconfdir = /etc/opt/csw +# Where to link the binaries global_bindir = /opt/csw/bin -INITSMF = $(global_sysconfdir)/init\.d/cswmysql5 +INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION) +PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel +PACKAGES += CSWmysql5rt CSWmysql5test + 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 -PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel -PACKAGES += CSWmysql5rt CSWmysql5test +SPKG_DESC_CSWmysql5 = Multithreaded SQL database +SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking +SPKG_DESC_CSWmysql5client = MySQL 5 client binaries +SPKG_DESC_CSWmysql5devel = MySQL 5 header files +SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files +SPKG_DESC_CSWmysql5test = MySQL 5 testing files CATALOGNAME_CSWmysql5 = $(GARNAME) CATALOGNAME_CSWmysql5bench = $(GARNAME)bench @@ -46,13 +60,6 @@ INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test -SPKG_DESC_CSWmysql5 = Multithreaded SQL database -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking -SPKG_DESC_CSWmysql5client = MySQL 5 client binaries -SPKG_DESC_CSWmysql5devel = MySQL 5 header files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files -SPKG_DESC_CSWmysql5test = MySQL 5 testing files - # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSWmysql5client_programs = myisamlog @@ -72,8 +79,32 @@ CSWmysql5client_programs += perror CSWmysql5client_programs += replace +# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared +# library not found. EXTRA_LIB was tried too, but did not work, as the -R path +# ended up with having two $ISALIST tokens. +# +# Without this setting it looks for: +# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 +# The library is at: +# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql + +COMMON_CFLAGS = -mt -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt + +EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) +EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_CFLAGS) +EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) + +EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) +EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_CFLAGS) +EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) + + CSWmysql5devel_programs += mysql_config +# Enable 64 bits build +BUILD64 = 1 + PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5client = $(bindir) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) @@ -97,7 +128,7 @@ REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog DISTFILES += CSWmysql5.preinstall @@ -112,25 +143,17 @@ # MySQL-5.1.40 doesn't compile without setting EXTRA_INC. EXTRA_INC = /opt/csw/include EXTRA_LIB = /opt/csw/lib -EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared -# library not found. EXTRA_LIB was tried too, but did not work, as the -R path -# ended up with having two $ISALIST tokens. -# -# Without this setting it looks for: -# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 -# The library is at: -# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 -EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql - # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler -CONFIGURE_ARGS += --without-docs +# Why not have a docs package? +# CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile -CONFIGURE_ARGS += --with-extra-charsets=all +#CONFIGURE_ARGS += --with-extra-charsets=all +CONFIGURE_ARGS += --with-extra-charsets=complex CONFIGURE_ARGS += --with-low-memory CONFIGURE_ARGS += --with-pthread CONFIGURE_ARGS += --with-readline @@ -138,49 +161,62 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb CONFIGURE_ARGS += --with-comment +CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc +CONFIGURE_ARGS += --with-big-tables +CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TODO: Make the tests pass. They don't at the moment. -# TEST_SCRIPTS = +SKIPTEST ?= 1 +TEST_SCRIPTS = custom TEST_TARGETS = check -# Enable 64 bits build -BUILD64 = 1 USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup -PROTOTYPE_MODIFIERS = ownmysql -PROTOTYPE_FILES_ownmysql = /var/opt/csw/mysql5 -PROTOTYPE_USER_ownmysql = mysql -PROTOTYPE_GROUP_ownmysql = mysql -PROTOTYPE_PERMS_ownmysql = 0700 -PROTOTYPE_CLASS_ownmysql = ugfiles +PROTOTYPE_MODIFIERS = dbdir +PROTOTYPE_FILES_dbdir = $(localstatedir) +PROTOTYPE_USER_dbdir = mysql +PROTOTYPE_GROUP_dbdir = mysql +PROTOTYPE_PERMS_dbdir = 0700 +PROTOTYPE_CLASS_dbdir = ugfiles SPKG_CLASSES = none ugfiles include gar/category.mk -post-install-modulated: - ginstall -m 755 -d $(DESTDIR)$(localstatedir) - ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc +CFLAGS := $(filter-out -I%,$(CFLAGS)) + +test-custom: + alias sh=/usr/bin/bash; cd $(WORKSRC)/mysql-test; perl mysql-test-run.pl --mem --big-test --force --skip-test=archive-big --skip-test=/gis/ + +pre-configure-modulated: + # To work around the libtool version mismatch problem. + cd $(WORKSRC) && autoreconf --force --install --symlink + +post-merge: + ginstall -m 755 -d $(PKGROOT)$(localstatedir) + ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ - $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW - ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql - ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW + ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/cswmysql5 $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql + ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 # A symlink for mysql5 include files - ginstall -m 755 -d $(DESTDIR)/opt/csw/include - ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql + ginstall -m 755 -d $(PKGROOT)/opt/csw/include + ln -s ../mysql5/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries - ginstall -m 755 -d $(DESTDIR)$(global_bindir) - for f in $(DESTDIR)$(bindir)/*; do \ - ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + ginstall -m 755 -d $(PKGROOT)$(global_bindir) + for f in $(PKGROOT)$(bindir)/*; do \ + ln -s ../mysql5/bin/`basename $$f` \ + $(PKGROOT)$(global_bindir)/`basename $$f`; \ done + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 23 15:38:35 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Dec 2009 14:38:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7722] csw/mgar/gar/v2-checkpkg/ Message-ID: Revision: 7722 http://gar.svn.sourceforge.net/gar/?rev=7722&view=rev Author: wahwah Date: 2009-12-23 14:38:35 +0000 (Wed, 23 Dec 2009) Log Message: ----------- Branching gar to experiment with checkpkg. Added Paths: ----------- csw/mgar/gar/v2-checkpkg/ Property changes on: csw/mgar/gar/v2-checkpkg ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 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 Dec 23 15:59:17 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Dec 2009 14:59:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7723] csw/mgar/gar/v2-checkpkg/bin Message-ID: Revision: 7723 http://gar.svn.sourceforge.net/gar/?rev=7723&view=rev Author: wahwah Date: 2009-12-23 14:59:16 +0000 (Wed, 23 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: First sketch -- runs executables from the checkpkg.d directory. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Property Changed: ---------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-23 14:38:35 UTC (rev 7722) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-23 14:59:16 UTC (rev 7723) @@ -1,6 +1,13 @@ #!/bin/ksh -p - -# checkpkg 1.50 (diff to 1.46a: check multiple package files) +# +# $Id$ +# +# checkpkg 1.51 +# +# diff to 1.46a +# - check multiple package files +# - checkpkg.d plugin support +# # This script examines a package that has been put together # for submittal to the CSW archive at opencsw.org # @@ -443,13 +450,12 @@ exit 1 fi -# Verify that there are no double depends +# Verify that there are no multiple depends repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" if [[ "$repeated_depends" -gt 1 ]]; then cat $EXTRACTDIR/$pkgname/install/depend - print ERROR: $pkgname has double depends - exit 1 + errmsg "$pkgname has multiple depends" fi #to retain a record of all packages currently being examined from $@ @@ -530,7 +536,35 @@ fi fi +# Plugin section. +# +# Plugins should live in checkpkg.d subdirectory in the same directory in which +# checkpkg is. Each plugin file name should be an executable and begin with +# "checkpkg-". +echo "Running the experimental plugin infrastructure." +checkpkg_scriptname=`basename $0` +checkpkg_basedir=${0%/${checkpkg_scriptname}} +plugindir=${checkpkg_basedir}/checkpkg.d +echo "plugindir: '$plugindir'" +if [[ -d "$plugindir" ]]; then + # echo plugin dir exists + for plugin in "${plugindir}"/checkpkg-*; do + if [[ -x "${plugin}" ]]; then + echo "Executing: '${plugin} -e \"${EXTRACTDIR}\" -p \"${pkgname}\"'" + ${plugin} -e "${EXTRACTDIR}" -p "${pkgname}" + if [[ "$?" -ne 0 ]]; then + errmsg "Plugin ${plugin} has returned an error." + fi + else + echo "'${plugin}' is not executable" + fi + done +else + echo plugin dir does not exist +fi +# End of plugin section + cleanup print "" Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py 2009-12-23 14:59:16 UTC (rev 7723) @@ -0,0 +1,17 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import checkpkg +import os.path + +def main(): + options, args = checkpkg.GetOptions() + pkgpath = os.path.join(options.extractdir, options.pkgname) + if not os.path.isdir(pkgpath): + raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) + print ("Dummy plugin says the package %s is extracted to %s" + % (options.pkgname, options.extractdir)) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-23 14:59:16 UTC (rev 7723) @@ -0,0 +1,16 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ +# +# A check for dependencies between shared libraries. + +import checkpkg +import os.path + +def main(): + options, args = checkpkg.GetOptions() + pkgpath = os.path.join(options.extractdir, options.pkgname) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-23 14:59:16 UTC (rev 7723) @@ -0,0 +1,22 @@ +# This is a checkpkg library, common for all checkpkg tests written in Python. + +import optparse + +class Error(Exception): + pass + +class ConfigurationError(Error): + pass + +def GetOptions(): + parser = optparse.OptionParser() + parser.add_option("-e", dest="extractdir", + help="The directory into which the package has been extracted") + parser.add_option("-p", dest="pkgname", + help="The pkgname, e.g. CSWfoo") + (options, args) = parser.parse_args() + if not options.extractdir: + raise ConfigurationError("ERROR: -e option is missing.") + if not options.pkgname: + raise ConfigurationError("ERROR: -p option is missing.") + return options, args Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Dec 24 00:20:57 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 23 Dec 2009 23:20:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7724] csw/mgar/pkg Message-ID: Revision: 7724 http://gar.svn.sourceforge.net/gar/?rev=7724&view=rev Author: skayser Date: 2009-12-23 23:20:56 +0000 (Wed, 23 Dec 2009) Log Message: ----------- mkrdns: initial commit Added Paths: ----------- csw/mgar/pkg/mkrdns/ csw/mgar/pkg/mkrdns/branches/ csw/mgar/pkg/mkrdns/tags/ csw/mgar/pkg/mkrdns/trunk/ csw/mgar/pkg/mkrdns/trunk/Makefile csw/mgar/pkg/mkrdns/trunk/checksums csw/mgar/pkg/mkrdns/trunk/files/ csw/mgar/pkg/mkrdns/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/mkrdns/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/mkrdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/mkrdns/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mkrdns/trunk/Makefile 2009-12-23 23:20:56 UTC (rev 7724) @@ -0,0 +1,38 @@ +GARNAME = mkrdns +GARVERSION = 3.3 +REAL_VERSION = $(subst .,_,$(GARVERSION)) +CATEGORIES = utils + +DESCRIPTION = An automatic reverse DNS zone generator +define BLURB + Have you ever gotten tired of having to change both the forward and + reverse zone maps when adding, removing, or changing hosts in DNS? If + so, then mkrdns is for you! mkrdns automates the tedious procedure of + editing both forward and reverse zones when making changes to your zones + with likely no changes to your current configuration file. +endef + +MASTER_SITES = http://sites.google.com/a/kluge.net/mkrdns/ +DISTNAME = $(GARNAME)-$(REAL_VERSION) +DISTFILES = $(DISTNAME).gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\_\d+)*).gz + +# Regular download ends up with a file name including heaps of +# redirect-related query variables, we need sth. more plain +WGET_OPTS = -O $(PARTIALDIR)/$(DISTNAME).gz + +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +install-custom: + mkdir -p $(DESTDIR)$(mandir)/man8 + cp $(WORKDIR)/$(DISTNAME) $(WORKDIR)/mkrdns + pod2man --section=8 $(WORKDIR)/mkrdns > $(DESTDIR)$(mandir)/man8/mkrdns.8 + ginstall -m755 -D $(WORKDIR)/mkrdns $(DESTDIR)$(bindir)/mkrdns + ginstall -m644 -D $(FILEDIR)/changelog.CSW $(DOCDEST)/changelog.CSW + @$(MAKECOOKIE) Added: csw/mgar/pkg/mkrdns/trunk/checksums =================================================================== --- csw/mgar/pkg/mkrdns/trunk/checksums (rev 0) +++ csw/mgar/pkg/mkrdns/trunk/checksums 2009-12-23 23:20:56 UTC (rev 7724) @@ -0,0 +1 @@ +474ffb39d1eb615d0e9d8a7d52a27953 mkrdns-3_3.gz Added: csw/mgar/pkg/mkrdns/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mkrdns/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/mkrdns/trunk/files/changelog.CSW 2009-12-23 23:20:56 UTC (rev 7724) @@ -0,0 +1,5 @@ +mkrdns (3.3,REV=2009.12.23) + + * Initial release. + + -- Sebastian Kayser Wed, 23 Dec 2009 23:57:13 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Dec 24 00:39:22 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 23 Dec 2009 23:39:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7725] csw/mgar/pkg/netsnmp/tags Message-ID: Revision: 7725 http://gar.svn.sourceforge.net/gar/?rev=7725&view=rev Author: hson Date: 2009-12-23 23:39:22 +0000 (Wed, 23 Dec 2009) Log Message: ----------- netsnmp: 5.4.2.1 before working on 5.5 Modified Paths: -------------- csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1,REV=2009.12.23/Makefile Added Paths: ----------- csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1,REV=2009.12.23/ Modified: csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1,REV=2009.12.23/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2009-04-05 21:20:49 UTC (rev 4203) +++ csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1,REV=2009.12.23/Makefile 2009-12-23 23:39:22 UTC (rev 7725) @@ -2,9 +2,12 @@ GARVERSION = 5.4.2.1 CATEGORIES = apps -DESCRIPTION = Brief description +DESCRIPTION = A suite of applications used to implement SNMP define BLURB - Long description + Simple Network Management Protocol (SNMP) is a widely used protocol for monitoring + the health and welfare of network equipment (eg. routers), computer equipment and + even devices like UPSs. Net-SNMP is a suite of applications used to implement + SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. The suite includes: endef SF_PROJ = net-snmp @@ -14,16 +17,26 @@ DISTNAME = $(SF_PROJ)-$(GARVERSION) SPKG_SOURCEURL = http://www.net-snmp.org/ +SPKG_DESC_CSWnetsnmp-py = NetSNMP Python Bindings +PACKAGES = CSWnetsnmp CSWnetsnmp-py +CATALOGNAME_CSWnetsnmp = netsnmp +CATALOGNAME_CSWnetsnmp-py = netsnmp_py + PREREQUISITE_PKGS = CSWpysetuptools -REQUIRED_PKGS += CSWosslrt CSWtcpwrap CSWpython +REQUIRED_PKGS_CSWnetsnmp += CSWosslrt CSWtcpwrap CSWperl +REQUIRED_PKGS_CSWnetsnmp-py += CSWnetsnmp CSWpython +PKGFILES_CSWnetsnmp-py = $(libdir)/python.* # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=12694 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +#BUILD64 = 1 +#NO_ISAEXEC = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-snmp-version=1 CONFIGURE_ARGS += --with-sys-contact=unknown @@ -48,20 +61,22 @@ EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod +#TEST_TARGET = + include gar/category.mk post-install-isa-sparcv8: - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -) - @ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 - @ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 - @ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 - @ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 - @ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 + @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/old_libs_s.tar.gz |tar xf -) + @( if [ ! -r work/solaris8-sparc/install-isa-sparcv8/opt/csw/lib/libnetsnmp.so.10 ] ; then ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 ] ; then ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 ] ; then ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 ] ; then ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 ] ; then ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 ; fi ) post-install-isa-i386: - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_i.tar.gz |tar xf -) - @ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 - @ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 - @ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 - @ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 - @ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 + @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/old_libs_i.tar.gz |tar xf -) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 ] ; then ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 ] ; then ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 ] ; then ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 ] ; then ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 ] ; then ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 ; 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 Thu Dec 24 00:40:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Dec 2009 23:40:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7726] csw/mgar/pkg/pysvn/trunk Message-ID: Revision: 7726 http://gar.svn.sourceforge.net/gar/?rev=7726&view=rev Author: wahwah Date: 2009-12-23 23:40:15 +0000 (Wed, 23 Dec 2009) Log Message: ----------- checkpkg.d: analyzing .so dependencies of single packages passes the smoke test Modified Paths: -------------- csw/mgar/pkg/pysvn/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/pysvn/trunk/ Property changes on: csw/mgar/pkg/pysvn/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/pysvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysvn/trunk/Makefile 2009-12-23 23:39:22 UTC (rev 7725) +++ csw/mgar/pkg/pysvn/trunk/Makefile 2009-12-23 23:40:15 UTC (rev 7726) @@ -33,15 +33,15 @@ PATCHFILES += 0008-gid-in-two-more-places.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWexpat -REQUIRED_PKGS += CSWgcc3core -REQUIRED_PKGS += CSWgcc3corert -REQUIRED_PKGS += CSWgcc3g++ -REQUIRED_PKGS += CSWgcc3g++rt -REQUIRED_PKGS += CSWgcc4corert -REQUIRED_PKGS += CSWgcc4g++rt -REQUIRED_PKGS += CSWneon -REQUIRED_PKGS += CSWsvn +# REQUIRED_PKGS = CSWexpat +# REQUIRED_PKGS += CSWgcc3core +# REQUIRED_PKGS += CSWgcc3corert +# REQUIRED_PKGS += CSWgcc3g++ +# REQUIRED_PKGS += CSWgcc3g++rt +# REQUIRED_PKGS += CSWgcc4corert +# REQUIRED_PKGS += CSWgcc4g++rt +# REQUIRED_PKGS += CSWneon +# REQUIRED_PKGS += CSWsvn PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel CSWbash INCOMPATIBELE_PKGS = CSWpyxml 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 Dec 24 00:44:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Dec 2009 23:44:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7727] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7727 http://gar.svn.sourceforge.net/gar/?rev=7727&view=rev Author: wahwah Date: 2009-12-23 23:44:47 +0000 (Wed, 23 Dec 2009) Log Message: ----------- checkpkg.d: analyzing .so dependencies of single packages passes the smoke test (this time for real) Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Property Changed: ---------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-23 23:40:15 UTC (rev 7726) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-23 23:44:47 UTC (rev 7727) @@ -5,12 +5,198 @@ # A check for dependencies between shared libraries. import checkpkg +import os import os.path +import copy +import re +import subprocess +import logging +DUMP_BIN = "/usr/ccs/bin/dump" +NEEDED_SONAMES = "needed sonames" +RUNPATH = "runpath" + def main(): + logging.basicConfig(level=logging.DEBUG) options, args = checkpkg.GetOptions() - pkgpath = os.path.join(options.extractdir, options.pkgname) + checker = checkpkg.CheckpkgBase(options.extractdir, options.pkgname) + binaries = checker.ListBinaries() + ws_re = re.compile(r"\s+") + # if [[ "$goodarch" = "yes" ]] ; then + # # man ld.so.1 for more info on this hack + # export LD_NOAUXFLTR=1 + # + # listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/elflist + # # have to do this for ldd to work. arrg. + # if [ -s "$EXTRACTDIR/elflist" ] ; then + # chmod 0755 `cat $EXTRACTDIR/elflist` + # + # cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | + # sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist + # + # + # + # print libraries used are: + # cat $EXTRACTDIR/liblist + # print "cross-referencing with depend file (May take a while)" + # else + # print No dynamic libraries in the package + # fi + # fi + + env = copy.copy(os.environ) + env["LD_NOAUXFLTR"] = "1" + binaries_by_name = {} + # Assembling a data structure with the data about binaries. + # { + # : {NEEDED_SONAMES: [...], + # RUNPATH: [...]}, + # : ..., + # ... + # } + # + for binary in binaries: + binary_base_name = binary.split("/")[-1] + if binary_base_name not in binaries_by_name: + binaries_by_name[binary_base_name] = {} + binary_data = binaries_by_name[binary_base_name] + args = [DUMP_BIN, "-Lv", binary] + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = dump_proc.communicate() + ret = dump_proc.wait() + for line in stdout.splitlines(): + fields = re.split(ws_re, line) + logging.debug("%s says: %s", DUMP_BIN, fields) + if len(fields) < 3: + continue + if fields[1] == "NEEDED": + if NEEDED_SONAMES not in binary_data: + binary_data[NEEDED_SONAMES] = [] + binary_data[NEEDED_SONAMES].append(fields[2]) + elif fields[1] == "RUNPATH": + if RUNPATH not in binary_data: + binary_data[RUNPATH] = [] + binary_data[RUNPATH].extend(fields[2].split(":")) + # Adding the default runtime path search option. + binary_data[RUNPATH].append("/usr/lib") + print binaries_by_name + # Building indexes + runpath_by_needed_soname = {} + # {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], + # ... + # } + needed_sonames = set() + binaries_by_soname = {} + for binary_name, data in binaries_by_name.iteritems(): + for soname in data[NEEDED_SONAMES]: + needed_sonames.add(soname) + if soname not in runpath_by_needed_soname: + runpath_by_needed_soname[soname] = [] + runpath_by_needed_soname[soname].extend(data[RUNPATH]) + if soname not in binaries_by_soname: + binaries_by_soname[soname] = [] + binaries_by_soname[soname].append(binary_name) + + pkgmap = checkpkg.SystemPkgmap() + paths_by_soname = pkgmap.paths_by_soname + + logging.debug("Determining soname-file relationships.") + # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog + lines_by_soname = {} + for soname in needed_sonames: + if soname in paths_by_soname: + logging.debug("%s found", repr(soname)) + # Finding the first matching path + for runpath in runpath_by_needed_soname[soname]: + if runpath in paths_by_soname[soname]: + logging.debug("%s found in %s", runpath, paths_by_soname[soname]) + logging.debug("line found: %s", repr(paths_by_soname[soname][runpath])) + lines_by_soname[soname] = paths_by_soname[soname][runpath] + break + else: + logging.debug("%s not found in the soname list!", soname) + for soname in needed_sonames: + if soname in binaries: + print "%s is provided by the package itself" % soname + elif soname in lines_by_soname: + print ("%s is required by %s and provided by %s" + % (soname, + binaries_by_soname[soname], + repr(lines_by_soname[soname]))) + else: + print ("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname])) + + # for lib in `cat $EXTRACTDIR/liblist` ; do + # grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap + # if [[ $? -eq 0 ]] ; then + # echo $lib provided by package itself + # continue + # else + # grep "[/=]$lib[ =]" $SETLIBS + # if [[ $? -eq 0 ]]; then + # echo "$lib provided by package set being evaluated." + # continue + # fi + # fi + # + # libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | + # sed 's/^.* \([^ ]*\)$/\1/' |sort -u` + # + # if [[ -z "$libpkg" ]] ; then + # echo "$lib $pkgname" >> $SETLIBS.missing + # print Cannot find package providing $lib. Storing for delayed validation. + # else + # print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs + # fi + # done + # + # sort -u $EXTRACTDIR/libpkgs >$EXTRACTDIR/libpkgs.x + # mv $EXTRACTDIR/libpkgs.x $EXTRACTDIR/libpkgs + # + # diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs >/dev/null + # if [[ $? -ne 0 ]] ; then + # print SUGGESTION: you may want to add some or all of the following as depends: + # print ' (Feel free to ignore SUNW or SPRO packages)' + # diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs | fgrep '>' + # fi + # + # + # + # if [[ "$basedir" != "" ]] ; then + # print + # if [[ -f $EXTRACTDIR/elflist ]] ; then + # print "Checking relocation ability..." + # xargs strings < $EXTRACTDIR/elflist| grep /opt/csw + # if [[ $? -eq 0 ]] ; then + # errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them + # else + # print trivial check passed + # fi + # else + # echo No relocation check done for non-binary relocatable package. + # fi + # fi + # + # ... + # + # if [ -s $SETLIBS.missing ]; then + # print "Doing late evaluations of package library dependencies." + # while read ldep; do + # lib=`echo $ldep | nawk '{print $1}'` + # [ "$lib" = "libm.so.2" ] && continue + # pkg=`echo $ldep | nawk '{print $2}'` + # /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null + # if [ $? -ne 0 ]; then + # errmsg "Couldn't find a package providing $lib" + # else + # print "A package in the set being evaluated provides $lib" + # fi + # done < $SETLIBS.missing + # fi + + if __name__ == '__main__': - main() + main() Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-23 23:40:15 UTC (rev 7726) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-23 23:44:47 UTC (rev 7727) @@ -1,22 +1,125 @@ -# This is a checkpkg library, common for all checkpkg tests written in Python. +# $Id$ +# +# This is the checkpkg library, common for all checkpkg tests written in +# Python. import optparse +import os +import os.path +import logging +import subprocess +import cPickle +import re +SYSTEM_PKGMAP = "/var/sadm/install/contents" + class Error(Exception): pass + class ConfigurationError(Error): pass + +class PackageError(Error): + pass + + def GetOptions(): parser = optparse.OptionParser() parser.add_option("-e", dest="extractdir", help="The directory into which the package has been extracted") parser.add_option("-p", dest="pkgname", help="The pkgname, e.g. CSWfoo") + parser.add_option("-d", "--debug", dest="debug", + default=False, action="store_true", + help="Turn on debugging messages") (options, args) = parser.parse_args() if not options.extractdir: raise ConfigurationError("ERROR: -e option is missing.") if not options.pkgname: raise ConfigurationError("ERROR: -p option is missing.") return options, args + + +class CheckpkgBase(object): + + def __init__(self, extractdir, pkgname): + self.extractdir = extractdir + self.pkgname = pkgname + self.pkgpath = os.path.join(self.extractdir, self.pkgname) + + def ListBinaries(self): + # ######################################### + # # find all executables and dynamic libs,and list their filenames. + # listbinaries() { + # if [ ! -d $1 ] ; then + # print errmsg $1 not a directory + # rm -rf $EXTRACTDIR + # exit 1 + # fi + # + # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' + # } + find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" + if not os.path.isdir(self.pkgpath): + raise PackageError("%s does not exist or is not a directory" + % self.pkgpath) + find_proc = subprocess.Popen(find_tmpl % self.pkgpath, + shell=True, stdout=subprocess.PIPE) + stdout, stderr = find_proc.communicate() + ret = find_proc.wait() + if ret: + logging.error("The find command returned an error.") + return stdout.splitlines() + +class SystemPkgmap(object): + """A class to hold and manipulate the /var/sadm/install/contents file.""" + + PICKLE_NAME = "var-sadm-install-contents.pickle" + WS_RE = re.compile(r"\s+") + def __init__(self): + """There is no need to re-parse it each time. + + Read it slowly the first time and cache it for later.""" + self.checkpkg_dir = os.path.join(os.environ["HOME"], ".checkpkg") + self.pickle_path = os.path.join(self.checkpkg_dir, self.PICKLE_NAME) + if os.path.exists(self.pickle_path): + logging.debug("Unpickling %s, please wait.", self.pickle_path) + pickle_fd = open(self.pickle_path, "r") + self.paths_by_soname = cPickle.load(pickle_fd) + pickle_fd.close() + else: + # The original checkpkg code to port is in the comments. + # + # egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | + # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + stop_pkgs = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] + system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") + + stop_re = re.compile("(%s)" % "|".join(stop_pkgs)) + + # Creating a data structure: + # soname - {: , : , ...} + logging.debug("Building in-memory data structure for the %s file", + SYSTEM_PKGMAP) + paths_by_soname = {} + for line in system_pkgmap_fd: + if stop_re.search(line): + continue + fields = re.split(self.WS_RE, line) + pkgmap_entry_path = fields[0].split("=")[0] + pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) + if pkgmap_entry_base_name not in paths_by_soname: + paths_by_soname[pkgmap_entry_base_name] = {} + paths_by_soname[pkgmap_entry_base_name][pkgmap_entry_dir] = line + logging.debug("The data structure contains %s files", + len(paths_by_soname)) + self.paths_by_soname = paths_by_soname + if not os.path.exists(self.checkpkg_dir): + logging.debug("Creating %s", self.checkpkg_dir) + os.mkdir(self.checkpkg_dir) + logging.debug("Pickling to %s", self.pickle_path) + pickle_fd = open(self.pickle_path, "w") + cPickle.dump(self.paths_by_soname, pickle_fd) + pickle_fd.close() Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-23 23:44:47 UTC (rev 7727) @@ -0,0 +1,8 @@ +#!/opt/csw/bin/python2.6 + +import unittest + + + +if __name__ == '__main__': + unittest.main() Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Dec 24 00:53:20 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 23 Dec 2009 23:53:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7728] csw/mgar/pkg/netsnmp/tags Message-ID: Revision: 7728 http://gar.svn.sourceforge.net/gar/?rev=7728&view=rev Author: hson Date: 2009-12-23 23:53:20 +0000 (Wed, 23 Dec 2009) Log Message: ----------- netsnmp: Build fails with comma in dirname Added Paths: ----------- csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1/ Removed Paths: ------------- csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1,REV=2009.12.23/ 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 Dec 24 02:13:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 01:13:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7729] csw/mgar/gar/v2-checkpkg/bin Message-ID: Revision: 7729 http://gar.svn.sourceforge.net/gar/?rev=7729&view=rev Author: wahwah Date: 2009-12-24 01:13:45 +0000 (Thu, 24 Dec 2009) Log Message: ----------- checkpkg.d: checking multiple packages Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-23 23:53:20 UTC (rev 7728) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 01:13:45 UTC (rev 7729) @@ -35,11 +35,17 @@ if [[ -d "$EXTRACTDIR" ]] ; then rm -rf $EXTRACTDIR fi - if [[ "$TMPARCHIVE" != "" ]] ; then - [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE - fi + cleantmparchives } +cleantmparchives() { + for TMPARCHIVE in $tmparchives; do + if [[ "$TMPARCHIVE" != "" ]]; then + [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE + fi + done +} + cleanupset(){ if [ "`echo $SETINF*`" != "$SETINF*" ]; then rm $SETINF* @@ -61,6 +67,22 @@ exit 1 } +set_variables_for_individual_package_check() { + f=$1 + file $f |sed 's/^.*://' |grep gzip >/dev/null + if [ $? -eq 0 ] ; then + TMPARCHIVE=/tmp/`basename $f` + if [[ -f $TMPARCHIVE ]] ; then + print ERROR: $TMPARCHIVE already exists + + fi + gzcat $f >$TMPARCHIVE || exit 1 + f=$TMPARCHIVE + fi + pkgname=`nawk 'NR == 2 {print $1; exit;}' $f` + pkgnames="$pkgnames $pkgname" +} + if [[ "$1" == "-e" ]] ; then quit_on_warn=1; shift @@ -75,8 +97,16 @@ SETINF=/tmp/checkpkg.$$.`date +%Y%m%d%H%M%S` SETLIBS=$SETINF.libs SETDEPS=$SETINF.deps +pkgnames="" +tmparchives="" +EXTRACTDIR=/tmp/dissect.$$ +if [ -d $EXTRACTDIR ] ; then + print ERROR: $EXTRACTDIR already exists + exit 1 +fi + for f in "$@" do @@ -89,9 +119,6 @@ case $f in - cswutils-*) - : - ;; *) print Examining $f @@ -118,30 +145,13 @@ done esac -print Extracting files for more detailed inspection... +print Extracting all files for more detailed inspection... -file $f |sed 's/^.*://' |grep gzip >/dev/null -if [ $? -eq 0 ] ; then - TMPARCHIVE=/tmp/`basename $f` - if [[ -f $TMPARCHIVE ]] ; then - print ERROR: $TMPARCHIVE already exists - - fi - gzcat $f >$TMPARCHIVE || exit 1 - f=$TMPARCHIVE -fi +set_variables_for_individual_package_check "$f" -pkgname=`nawk 'NR == 2 {print $1; exit;}' $f` - -EXTRACTDIR=/tmp/dissect.$$ - -if [ -d $EXTRACTDIR ] ; then - print ERROR: $EXTRACTDIR already exists - exit 1 -fi - mkdir $EXTRACTDIR +# FIXME: This doesn't support multiple packages TMPFILE=$EXTRACTDIR/pkginfo @@ -311,7 +321,6 @@ print Extracing pkg for examination of files... pkgtrans $f $EXTRACTDIR $pkgname - ############################################################# # We now have the package expanded, in "directory" form, in # $EXTRACTDIR/$pkgname @@ -542,6 +551,15 @@ # checkpkg is. Each plugin file name should be an executable and begin with # "checkpkg-". +tmparchives="$tmparchives $TMPARCHIVE" +done + +# All packages have been extracted. + +# Now running all the plugin checks + +set_variables_for_individual_package_check "$f" + echo "Running the experimental plugin infrastructure." checkpkg_scriptname=`basename $0` checkpkg_basedir=${0%/${checkpkg_scriptname}} @@ -551,8 +569,8 @@ # echo plugin dir exists for plugin in "${plugindir}"/checkpkg-*; do if [[ -x "${plugin}" ]]; then - echo "Executing: '${plugin} -e \"${EXTRACTDIR}\" -p \"${pkgname}\"'" - ${plugin} -e "${EXTRACTDIR}" -p "${pkgname}" + echo "Executing: ${plugin} -e \"${EXTRACTDIR}\" ${pkgnames}" + ${plugin} -e "${EXTRACTDIR}" ${pkgnames} if [[ "$?" -ne 0 ]]; then errmsg "Plugin ${plugin} has returned an error." fi @@ -565,11 +583,13 @@ fi # End of plugin section -cleanup +# Not doing the cleanup now +# cleanup print "" -done +# Cleaning up after all packages +cleanup if [ -s $SETDEPS.missing ]; then print "Doing late evaluations of package dependencies." Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py 2009-12-23 23:53:20 UTC (rev 7728) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py 2009-12-24 01:13:45 UTC (rev 7729) @@ -6,11 +6,14 @@ def main(): options, args = checkpkg.GetOptions() - pkgpath = os.path.join(options.extractdir, options.pkgname) - if not os.path.isdir(pkgpath): - raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) - print ("Dummy plugin says the package %s is extracted to %s" - % (options.pkgname, options.extractdir)) + if not os.path.isdir(options.extractdir): + raise checkpkg.PackageError("The extract base directory doesn't exist: %s" % options.extractdir) + for pkgname in args: + pkgpath = os.path.join(options.extractdir, pkgname) + if not os.path.isdir(pkgpath): + raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) + print ("Dummy plugin says the package %s is extracted to %s" + % (pkgname, options.extractdir)) if __name__ == '__main__': Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-23 23:53:20 UTC (rev 7728) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 01:13:45 UTC (rev 7729) @@ -19,8 +19,16 @@ def main(): logging.basicConfig(level=logging.DEBUG) options, args = checkpkg.GetOptions() - checker = checkpkg.CheckpkgBase(options.extractdir, options.pkgname) - binaries = checker.ListBinaries() + pkgnames = args + checkers = [] + for pkgname in pkgnames: + checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) + checkers.append(checker) + binaries = [] + for checker in checkers: + binaries.extend(checker.ListBinaries()) + # Make them unique + binaries = set(binaries) ws_re = re.compile(r"\s+") # if [[ "$goodarch" = "yes" ]] ; then @@ -128,6 +136,9 @@ else: print ("%s is required by %s, but we don't know what provides it." % (soname, binaries_by_soname[soname])) + # TODO: extract package names from the pkgmap lines + # TODO: print per-package deps (requires the transition: pkgname -> soname -> + # pkgname) # for lib in `cat $EXTRACTDIR/liblist` ; do # grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-23 23:53:20 UTC (rev 7728) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 01:13:45 UTC (rev 7729) @@ -29,16 +29,12 @@ parser = optparse.OptionParser() parser.add_option("-e", dest="extractdir", help="The directory into which the package has been extracted") - parser.add_option("-p", dest="pkgname", - help="The pkgname, e.g. CSWfoo") parser.add_option("-d", "--debug", dest="debug", default=False, action="store_true", help="Turn on debugging messages") (options, args) = parser.parse_args() if not options.extractdir: raise ConfigurationError("ERROR: -e option is missing.") - if not options.pkgname: - raise ConfigurationError("ERROR: -p option is missing.") return options, args 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 Dec 24 02:26:58 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Dec 2009 01:26:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7730] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 7730 http://gar.svn.sourceforge.net/gar/?rev=7730&view=rev Author: bdwalton Date: 2009-12-24 01:26:58 +0000 (Thu, 24 Dec 2009) Log Message: ----------- drop rc2 patchlevel as 1.6.6 has just been released Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-12-24 01:13:45 UTC (rev 7729) +++ csw/mgar/pkg/git/trunk/Makefile 2009-12-24 01:26:58 UTC (rev 7730) @@ -1,6 +1,6 @@ GARNAME = git GARVERSION = 1.6.6 -PATCHLEVEL = rc2 +# PATCHLEVEL = rc2 CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) 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 Dec 24 10:51:16 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 09:51:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7731] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 7731 http://gar.svn.sourceforge.net/gar/?rev=7731&view=rev Author: wahwah Date: 2009-12-24 09:51:14 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mysql5: Providing a symlink for the backward compatibility of shared libraries, see http://www.opencsw.org/bugtrack/view.php?id=4098 Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-24 01:26:58 UTC (rev 7730) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-24 09:51:14 UTC (rev 7731) @@ -132,8 +132,8 @@ # MySQL-5.1.40 doesn't compile without setting EXTRA_INC. EXTRA_INC = /opt/csw/include EXTRA_LIB = /opt/csw/lib -EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) @@ -150,11 +150,15 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb CONFIGURE_ARGS += --with-comment +CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc +CONFIGURE_ARGS += --with-big-tables +CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TODO: Make the tests pass. They don't at the moment. -# TEST_SCRIPTS = +SKIPTEST ?= 1 +TEST_SCRIPTS = custom TEST_TARGETS = check @@ -173,9 +177,16 @@ CFLAGS := $(filter-out -I%,$(CFLAGS)) +test-custom: + alias sh=/usr/bin/bash; \ + cd $(WORKSRC)/mysql-test; \ + perl mysql-test-run.pl --mem --big-test --force \ + --skip-test=archive-big --skip-test=/gis/ + pre-configure-modulated: # To work around the libtool version mismatch problem. cd $(WORKSRC) && autoreconf --force --install --symlink + @$(MAKECOOKIE) post-merge: ginstall -m 755 -d $(PKGROOT)$(localstatedir) @@ -200,5 +211,10 @@ ln -s ../mysql5/bin/`basename $$f` \ $(PKGROOT)$(global_bindir)/`basename $$f`; \ done + # /opt/csw/mysql5/lib/sparc9/mysql -- by GAR, it's logical + # /opt/csw/mysql5/lib/mysql/sparcv9 -- expected by other packages + gln -s ../$(ISA_DEFAULT64)/mysql $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT64) + # For other applications to link against gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64 @$(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 Thu Dec 24 11:42:58 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 10:42:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7732] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 7732 http://gar.svn.sourceforge.net/gar/?rev=7732&view=rev Author: wahwah Date: 2009-12-24 10:42:58 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mysql5: updated PKGFILES_CSWmysql5rt to include symlinks Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-24 09:51:14 UTC (rev 7731) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-24 10:42:58 UTC (rev 7732) @@ -108,7 +108,8 @@ PKGFILES_CSWmysql5devel += $(prefix)/include.* PKGFILES_CSWmysql5devel += /opt/csw/include/mysql -PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* +PKGFILES_CSWmysql5rt = $(libdir) +PKGFILES_CSWmysql5rt += $(libdir)/.* PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* REQUIRED_PKGS_CSWmysql5bench = CSWmysql5 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 Dec 24 11:55:18 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 10:55:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7733] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7733 http://gar.svn.sourceforge.net/gar/?rev=7733&view=rev Author: wahwah Date: 2009-12-24 10:55:18 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Checking multiple packages works to some extent, basic text reporting works, need to improve text reporting and error code returning Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 10:42:58 UTC (rev 7732) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 10:55:18 UTC (rev 7733) @@ -25,9 +25,13 @@ checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) checkers.append(checker) binaries = [] + binaries_by_pkgname = {} for checker in checkers: - binaries.extend(checker.ListBinaries()) - # Make them unique + pkg_binary_paths = checker.ListBinaries() + binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] + binaries_by_pkgname[checker.pkgname] = binaries_base + binaries.extend(pkg_binary_paths) + # Make the binaries unique binaries = set(binaries) ws_re = re.compile(r"\s+") @@ -55,7 +59,7 @@ env = copy.copy(os.environ) env["LD_NOAUXFLTR"] = "1" - binaries_by_name = {} + needed_sonames_by_binary = {} # Assembling a data structure with the data about binaries. # { # : {NEEDED_SONAMES: [...], @@ -66,16 +70,17 @@ # for binary in binaries: binary_base_name = binary.split("/")[-1] - if binary_base_name not in binaries_by_name: - binaries_by_name[binary_base_name] = {} - binary_data = binaries_by_name[binary_base_name] + if binary_base_name not in needed_sonames_by_binary: + needed_sonames_by_binary[binary_base_name] = {} + binary_data = needed_sonames_by_binary[binary_base_name] args = [DUMP_BIN, "-Lv", binary] dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE) stdout, stderr = dump_proc.communicate() ret = dump_proc.wait() for line in stdout.splitlines(): fields = re.split(ws_re, line) - logging.debug("%s says: %s", DUMP_BIN, fields) + # TODO: Make it a unit test + # logging.debug("%s says: %s", DUMP_BIN, fields) if len(fields) < 3: continue if fields[1] == "NEEDED": @@ -88,7 +93,8 @@ binary_data[RUNPATH].extend(fields[2].split(":")) # Adding the default runtime path search option. binary_data[RUNPATH].append("/usr/lib") - print binaries_by_name + # TODO: make it a unit test + # print needed_sonames_by_binary # Building indexes runpath_by_needed_soname = {} @@ -97,7 +103,7 @@ # } needed_sonames = set() binaries_by_soname = {} - for binary_name, data in binaries_by_name.iteritems(): + for binary_name, data in needed_sonames_by_binary.iteritems(): for soname in data[NEEDED_SONAMES]: needed_sonames.add(soname) if soname not in runpath_by_needed_soname: @@ -115,28 +121,48 @@ lines_by_soname = {} for soname in needed_sonames: if soname in paths_by_soname: - logging.debug("%s found", repr(soname)) + # logging.debug("%s found", repr(soname)) # Finding the first matching path for runpath in runpath_by_needed_soname[soname]: if runpath in paths_by_soname[soname]: - logging.debug("%s found in %s", runpath, paths_by_soname[soname]) - logging.debug("line found: %s", repr(paths_by_soname[soname][runpath])) + # logging.debug("%s found in %s", runpath, paths_by_soname[soname]) + # logging.debug("line found: %s", repr(paths_by_soname[soname][runpath])) lines_by_soname[soname] = paths_by_soname[soname][runpath] break else: logging.debug("%s not found in the soname list!", soname) + pkgs_by_soname = {} + for soname, line in lines_by_soname.iteritems(): + # TODO: Find all the packages, not just the last field. + fields = re.split(ws_re, line.strip()) + # For now, we'll assume that the last field is the package. + pkgname = fields[-1] + pkgs_by_soname[soname] = pkgname for soname in needed_sonames: if soname in binaries: - print "%s is provided by the package itself" % soname + print "%s is provided by the package itself" % soname elif soname in lines_by_soname: print ("%s is required by %s and provided by %s" % (soname, binaries_by_soname[soname], - repr(lines_by_soname[soname]))) + repr(pkgs_by_soname[soname]))) else: - print ("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname])) - # TODO: extract package names from the pkgmap lines + print ("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname])) + dependent_pkgs = {} + for pkgname in binaries_by_pkgname: + # logging.debug("Reporting package %s", pkgname) + dependencies = set() + for binary in binaries_by_pkgname[pkgname]: + if binary in needed_sonames_by_binary: + for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: + dependencies.add(pkgs_by_soname[soname]) + else: + logging.warn("%s not found in needed_sonames_by_binary (%s)", + binary, needed_sonames_by_binary.keys()) + logging.info("%s depends on %s", pkgname, dependencies) + + # binaries_by_pkgname --> needed_sonames_by_binary --> pkgs_by_soname # TODO: print per-package deps (requires the transition: pkgname -> soname -> # pkgname) Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 10:42:58 UTC (rev 7732) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 10:55:18 UTC (rev 7733) @@ -35,7 +35,8 @@ (options, args) = parser.parse_args() if not options.extractdir: raise ConfigurationError("ERROR: -e option is missing.") - return options, args + # Using set() to make the arguments unique. + return options, set(args) class CheckpkgBase(object): 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 Dec 24 12:00:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 11:00:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7734] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 7734 http://gar.svn.sourceforge.net/gar/?rev=7734&view=rev Author: wahwah Date: 2009-12-24 11:00:24 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mysql5: Adding CSWosslrt as a dependency of CSWmysql5rt Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-24 10:55:18 UTC (rev 7733) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-24 11:00:24 UTC (rev 7734) @@ -117,6 +117,7 @@ REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl +REQUIRED_PKGS_CSWmysql5rt = CSWosslrt MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 24 12:15:12 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 11:15:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7735] csw/mgar/pkg/pysvn/trunk/Makefile Message-ID: Revision: 7735 http://gar.svn.sourceforge.net/gar/?rev=7735&view=rev Author: wahwah Date: 2009-12-24 11:15:12 +0000 (Thu, 24 Dec 2009) Log Message: ----------- pysvn: better dependencies, based on the new checkpkg output Modified Paths: -------------- csw/mgar/pkg/pysvn/trunk/Makefile Modified: csw/mgar/pkg/pysvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysvn/trunk/Makefile 2009-12-24 11:00:24 UTC (rev 7734) +++ csw/mgar/pkg/pysvn/trunk/Makefile 2009-12-24 11:15:12 UTC (rev 7735) @@ -33,15 +33,11 @@ PATCHFILES += 0008-gid-in-two-more-places.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# REQUIRED_PKGS = CSWexpat -# REQUIRED_PKGS += CSWgcc3core -# REQUIRED_PKGS += CSWgcc3corert -# REQUIRED_PKGS += CSWgcc3g++ -# REQUIRED_PKGS += CSWgcc3g++rt -# REQUIRED_PKGS += CSWgcc4corert -# REQUIRED_PKGS += CSWgcc4g++rt -# REQUIRED_PKGS += CSWneon -# REQUIRED_PKGS += CSWsvn +REQUIRED_PKGS = CSWexpat +REQUIRED_PKGS += CSWgcc4corert +REQUIRED_PKGS += CSWgcc4g++rt +REQUIRED_PKGS += CSWneon +REQUIRED_PKGS += CSWsvn PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel CSWbash INCOMPATIBELE_PKGS = CSWpyxml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 24 12:16:31 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 24 Dec 2009 11:16:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7736] csw/mgar/pkg Message-ID: Revision: 7736 http://gar.svn.sourceforge.net/gar/?rev=7736&view=rev Author: rthurner Date: 2009-12-24 11:16:30 +0000 (Thu, 24 Dec 2009) Log Message: ----------- genshi,pysqlite2 - remove python-rt dependency for python-2.6.4 release Modified Paths: -------------- csw/mgar/pkg/genshi/trunk/Makefile csw/mgar/pkg/pysqlite2/trunk/Makefile Modified: csw/mgar/pkg/genshi/trunk/Makefile =================================================================== --- csw/mgar/pkg/genshi/trunk/Makefile 2009-12-24 11:15:12 UTC (rev 7735) +++ csw/mgar/pkg/genshi/trunk/Makefile 2009-12-24 11:16:30 UTC (rev 7736) @@ -19,7 +19,7 @@ SPKG_CLASSES = none cswpycompile REQUIRED_PKGS += CSWcswclassutils -REQUIRED_PKGS_CSWgenshi = CSWpython-rt +REQUIRED_PKGS_CSWgenshi = CSWpython CATALOGNAME_CSWgenshi = genshi SPKG_DESC_CSWgenshi = $(DESCRIPTION) Modified: csw/mgar/pkg/pysqlite2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-12-24 11:15:12 UTC (rev 7735) +++ csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-12-24 11:16:30 UTC (rev 7736) @@ -1,5 +1,5 @@ GARNAME = pysqlite -GARVERSION = 2.5.5 +GARVERSION = 2.5.6 CATEGORIES = lang RELVER = $(shell echo $(GARVERSION) |gsed 's/\(^[0-9].*\)\.[0-9]*/\1/') @@ -13,7 +13,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWpysqlite2 -REQUIRED_PKGS_CSWpysqlite2 = CSWpython-rt CSWsqlite3rt +REQUIRED_PKGS_CSWpysqlite2 = CSWpython CSWsqlite3rt CATALOGNAME_CSWpysqlite2 = pysqlite2 SPKG_DESC_CSWpysqlite2 = SQLite3 support for Python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 24 12:39:18 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 24 Dec 2009 11:39:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7737] csw/mgar/pkg/genshi/trunk/Makefile Message-ID: Revision: 7737 http://gar.svn.sourceforge.net/gar/?rev=7737&view=rev Author: rthurner Date: 2009-12-24 11:39:18 +0000 (Thu, 24 Dec 2009) Log Message: ----------- genshi - remove now unnecessary dependency to classutils Modified Paths: -------------- csw/mgar/pkg/genshi/trunk/Makefile Modified: csw/mgar/pkg/genshi/trunk/Makefile =================================================================== --- csw/mgar/pkg/genshi/trunk/Makefile 2009-12-24 11:16:30 UTC (rev 7736) +++ csw/mgar/pkg/genshi/trunk/Makefile 2009-12-24 11:39:18 UTC (rev 7737) @@ -17,7 +17,6 @@ EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' SPKG_CLASSES = none cswpycompile -REQUIRED_PKGS += CSWcswclassutils REQUIRED_PKGS_CSWgenshi = CSWpython CATALOGNAME_CSWgenshi = genshi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 24 12:51:54 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 24 Dec 2009 11:51:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7738] csw/mgar/pkg/pysqlite2/trunk Message-ID: Revision: 7738 http://gar.svn.sourceforge.net/gar/?rev=7738&view=rev Author: rthurner Date: 2009-12-24 11:51:53 +0000 (Thu, 24 Dec 2009) Log Message: ----------- pysqlite2 - upgrade to google distribution site, also checksum upgrade Modified Paths: -------------- csw/mgar/pkg/pysqlite2/trunk/Makefile csw/mgar/pkg/pysqlite2/trunk/checksums Modified: csw/mgar/pkg/pysqlite2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-12-24 11:39:18 UTC (rev 7737) +++ csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-12-24 11:51:53 UTC (rev 7738) @@ -9,7 +9,7 @@ SQLite support for Python endef -MASTER_SITES = http://oss.itsystementwicklung.de/download/pysqlite/$(RELVER)/$(GARVERSION)/ +MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWpysqlite2 @@ -20,7 +20,6 @@ EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' SPKG_CLASSES = none cswpycompile -REQUIRED_PKGS += CSWcswclassutils # We define upstream file regex so we can be notifed of # new upstream software release Modified: csw/mgar/pkg/pysqlite2/trunk/checksums =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/checksums 2009-12-24 11:39:18 UTC (rev 7737) +++ csw/mgar/pkg/pysqlite2/trunk/checksums 2009-12-24 11:51:53 UTC (rev 7738) @@ -1 +1 @@ -4f9fcd12a4860160b1f332066c64ee58 download/pysqlite-2.5.5.tar.gz +1b2f338c8d6db971e34edb799a92e2ee pysqlite-2.5.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 24 13:32:36 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 24 Dec 2009 12:32:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7739] csw/mgar/gar Message-ID: Revision: 7739 http://gar.svn.sourceforge.net/gar/?rev=7739&view=rev Author: rthurner Date: 2009-12-24 12:32:36 +0000 (Thu, 24 Dec 2009) Log Message: ----------- kde - upgrade to the current 3.5 version Modified Paths: -------------- csw/mgar/gar/v1/categories/kde/category.mk csw/mgar/gar/v2/categories/kde/category.mk Modified: csw/mgar/gar/v1/categories/kde/category.mk =================================================================== --- csw/mgar/gar/v1/categories/kde/category.mk 2009-12-24 11:51:53 UTC (rev 7738) +++ csw/mgar/gar/v1/categories/kde/category.mk 2009-12-24 12:32:36 UTC (rev 7739) @@ -1,7 +1,7 @@ # KDE KDE_ROOT = http://download.kde.org -KDE_VERSION = 3.5.2 +KDE_VERSION = 3.5.10 KDE_DIST = stable KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ Modified: csw/mgar/gar/v2/categories/kde/category.mk =================================================================== --- csw/mgar/gar/v2/categories/kde/category.mk 2009-12-24 11:51:53 UTC (rev 7738) +++ csw/mgar/gar/v2/categories/kde/category.mk 2009-12-24 12:32:36 UTC (rev 7739) @@ -1,7 +1,7 @@ # KDE KDE_ROOT = http://download.kde.org -KDE_VERSION = 3.5.2 +KDE_VERSION = 3.5.10 KDE_DIST = stable KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 24 15:01:29 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 24 Dec 2009 14:01:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7740] csw/mgar/pkg/apr/trunk/Makefile Message-ID: Revision: 7740 http://gar.svn.sourceforge.net/gar/?rev=7740&view=rev Author: rthurner Date: 2009-12-24 14:01:28 +0000 (Thu, 24 Dec 2009) Log Message: ----------- apr - now ipv6 is installed, all tests succeed Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2009-12-24 12:32:36 UTC (rev 7739) +++ csw/mgar/pkg/apr/trunk/Makefile 2009-12-24 14:01:28 UTC (rev 7740) @@ -22,9 +22,7 @@ CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-other-child -# ipv6 tests fail -# TEST_TARGET = check -TEST_TARGET = +TEST_TARGET = check include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 24 16:41:02 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 15:41:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7741] csw/mgar/gar/v2-checkpkg/bin Message-ID: Revision: 7741 http://gar.svn.sourceforge.net/gar/?rev=7741&view=rev Author: wahwah Date: 2009-12-24 15:41:02 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Dependency reporting done, error code returning done. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 14:01:28 UTC (rev 7740) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 15:41:02 UTC (rev 7741) @@ -83,6 +83,11 @@ pkgnames="$pkgnames $pkgname" } +if [[ "$1" == "-d" ]] ; then + DEBUG=1 + shift +fi + if [[ "$1" == "-e" ]] ; then quit_on_warn=1; shift @@ -422,7 +427,7 @@ #cat $EXTRACTDIR/elflist| xargs ldd 2>/dev/null |fgrep '.so' | # sed 's:^.*=>[^/]*::' | nawk '{print $1}' |sort -u >$EXTRACTDIR/liblist - cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | + cat $EXTRACTDIR/elflist| xargs /usr/ccs/bin/dump -Lv |nawk '$2=="NEEDED"{print $3}' | sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist @@ -564,13 +569,16 @@ checkpkg_scriptname=`basename $0` checkpkg_basedir=${0%/${checkpkg_scriptname}} plugindir=${checkpkg_basedir}/checkpkg.d +if [[ "${DEBUG}" != "" ]]; then + extra_options="--debug" +fi echo "plugindir: '$plugindir'" if [[ -d "$plugindir" ]]; then # echo plugin dir exists for plugin in "${plugindir}"/checkpkg-*; do if [[ -x "${plugin}" ]]; then - echo "Executing: ${plugin} -e \"${EXTRACTDIR}\" ${pkgnames}" - ${plugin} -e "${EXTRACTDIR}" ${pkgnames} + echo "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" + ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} if [[ "$?" -ne 0 ]]; then errmsg "Plugin ${plugin} has returned an error." fi @@ -581,11 +589,10 @@ else echo plugin dir does not exist fi +# echo "Profiling." +# python -m cProfile gar/bin/checkpkg.d/checkpkg-libs.py --debug -e "${EXTRACTDIR}" ${pkgnames} # End of plugin section -# Not doing the cleanup now -# cleanup - print "" # Cleaning up after all packages Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 14:01:28 UTC (rev 7740) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 15:41:02 UTC (rev 7741) @@ -11,14 +11,20 @@ import re import subprocess import logging +import sys DUMP_BIN = "/usr/ccs/bin/dump" NEEDED_SONAMES = "needed sonames" RUNPATH = "runpath" +TYPICAL_DEPENDENCIES = set(["CSWcommon", "CSWcswclassutils"]) def main(): - logging.basicConfig(level=logging.DEBUG) options, args = checkpkg.GetOptions() + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + result_ok = True pkgnames = args checkers = [] for pkgname in pkgnames: @@ -31,39 +37,18 @@ binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] binaries_by_pkgname[checker.pkgname] = binaries_base binaries.extend(pkg_binary_paths) - # Make the binaries unique + # Making the binaries unique binaries = set(binaries) ws_re = re.compile(r"\s+") - # if [[ "$goodarch" = "yes" ]] ; then - # # man ld.so.1 for more info on this hack - # export LD_NOAUXFLTR=1 - # - # listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/elflist - # # have to do this for ldd to work. arrg. - # if [ -s "$EXTRACTDIR/elflist" ] ; then - # chmod 0755 `cat $EXTRACTDIR/elflist` - # - # cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | - # sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist - # - # - # - # print libraries used are: - # cat $EXTRACTDIR/liblist - # print "cross-referencing with depend file (May take a while)" - # else - # print No dynamic libraries in the package - # fi - # fi - + # man ld.so.1 for more info on this hack env = copy.copy(os.environ) env["LD_NOAUXFLTR"] = "1" needed_sonames_by_binary = {} # Assembling a data structure with the data about binaries. # { - # : {NEEDED_SONAMES: [...], - # RUNPATH: [...]}, + # : { NEEDED_SONAMES: [...], + # RUNPATH: [...]}, # : ..., # ... # } @@ -74,7 +59,7 @@ needed_sonames_by_binary[binary_base_name] = {} binary_data = needed_sonames_by_binary[binary_base_name] args = [DUMP_BIN, "-Lv", binary] - dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) stdout, stderr = dump_proc.communicate() ret = dump_proc.wait() for line in stdout.splitlines(): @@ -114,23 +99,19 @@ binaries_by_soname[soname].append(binary_name) pkgmap = checkpkg.SystemPkgmap() - paths_by_soname = pkgmap.paths_by_soname - - logging.debug("Determining soname-file relationships.") + logging.debug("Determining the soname-package relationships.") # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog lines_by_soname = {} for soname in needed_sonames: - if soname in paths_by_soname: - # logging.debug("%s found", repr(soname)) - # Finding the first matching path + try: for runpath in runpath_by_needed_soname[soname]: - if runpath in paths_by_soname[soname]: - # logging.debug("%s found in %s", runpath, paths_by_soname[soname]) - # logging.debug("line found: %s", repr(paths_by_soname[soname][runpath])) - lines_by_soname[soname] = paths_by_soname[soname][runpath] + if runpath in pkgmap.GetPkgmapLineByBasename(soname): + # logging.debug("%s found in %s", runpath, pkgmap.GetPkgmapLineByBasename(soname)) + # logging.debug("line found: %s", repr(pkgmap.GetPkgmapLineByBasename(soname)[runpath])) + lines_by_soname[soname] = pkgmap.GetPkgmapLineByBasename(soname)[runpath] break - else: - logging.debug("%s not found in the soname list!", soname) + except KeyError, e: + logging.debug("KeyError: %s", soname, e) pkgs_by_soname = {} for soname, line in lines_by_soname.iteritems(): # TODO: Find all the packages, not just the last field. @@ -138,8 +119,10 @@ # For now, we'll assume that the last field is the package. pkgname = fields[-1] pkgs_by_soname[soname] = pkgname + + # A shared object dependency/provisioning report, plus checking. for soname in needed_sonames: - if soname in binaries: + if soname in needed_sonames_by_binary: print "%s is provided by the package itself" % soname elif soname in lines_by_soname: print ("%s is required by %s and provided by %s" @@ -149,91 +132,49 @@ else: print ("%s is required by %s, but we don't know what provides it." % (soname, binaries_by_soname[soname])) + result_ok = False + dependent_pkgs = {} - for pkgname in binaries_by_pkgname: + for checker in checkers: + orphan_sonames = set() + pkgname = checker.pkgname # logging.debug("Reporting package %s", pkgname) - dependencies = set() + declared_dependencies = checker.GetDependencies() + so_dependencies = set() for binary in binaries_by_pkgname[pkgname]: if binary in needed_sonames_by_binary: for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: - dependencies.add(pkgs_by_soname[soname]) + if soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) + else: + orphan_sonames.add(soname) else: logging.warn("%s not found in needed_sonames_by_binary (%s)", binary, needed_sonames_by_binary.keys()) - logging.info("%s depends on %s", pkgname, dependencies) + declared_dependencies_set = set(declared_dependencies) + print "You can consider including the following packages in the dependencies:" + for dep_pkgname in sorted(so_dependencies.difference(declared_dependencies_set)): + print " ", dep_pkgname, + if dep_pkgname.startswith("SUNW"): + print "(it's safe to ignore this one)", + print + + surplus_dependencies = declared_dependencies_set.difference(so_dependencies) + surplus_dependencies = surplus_dependencies.difference(TYPICAL_DEPENDENCIES) + if surplus_dependencies: + print "The following packages might be unnecessary dependencies:" + for dep_pkgname in surplus_dependencies: + print " ", dep_pkgname + if orphan_sonames: + print "The following sonames don't belong to any package:" + for soname in sorted(orphan_sonames): + print " ", soname - # binaries_by_pkgname --> needed_sonames_by_binary --> pkgs_by_soname - # TODO: print per-package deps (requires the transition: pkgname -> soname -> - # pkgname) + if result_ok: + sys.exit(0) + else: + sys.exit(1) - # for lib in `cat $EXTRACTDIR/liblist` ; do - # grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap - # if [[ $? -eq 0 ]] ; then - # echo $lib provided by package itself - # continue - # else - # grep "[/=]$lib[ =]" $SETLIBS - # if [[ $? -eq 0 ]]; then - # echo "$lib provided by package set being evaluated." - # continue - # fi - # fi - # - # libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | - # sed 's/^.* \([^ ]*\)$/\1/' |sort -u` - # - # if [[ -z "$libpkg" ]] ; then - # echo "$lib $pkgname" >> $SETLIBS.missing - # print Cannot find package providing $lib. Storing for delayed validation. - # else - # print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs - # fi - # done - # - # sort -u $EXTRACTDIR/libpkgs >$EXTRACTDIR/libpkgs.x - # mv $EXTRACTDIR/libpkgs.x $EXTRACTDIR/libpkgs - # - # diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs >/dev/null - # if [[ $? -ne 0 ]] ; then - # print SUGGESTION: you may want to add some or all of the following as depends: - # print ' (Feel free to ignore SUNW or SPRO packages)' - # diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs | fgrep '>' - # fi - # - # - # - # if [[ "$basedir" != "" ]] ; then - # print - # if [[ -f $EXTRACTDIR/elflist ]] ; then - # print "Checking relocation ability..." - # xargs strings < $EXTRACTDIR/elflist| grep /opt/csw - # if [[ $? -eq 0 ]] ; then - # errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them - # else - # print trivial check passed - # fi - # else - # echo No relocation check done for non-binary relocatable package. - # fi - # fi - # - # ... - # - # if [ -s $SETLIBS.missing ]; then - # print "Doing late evaluations of package library dependencies." - # while read ldep; do - # lib=`echo $ldep | nawk '{print $1}'` - # [ "$lib" = "libm.so.2" ] && continue - # pkg=`echo $ldep | nawk '{print $2}'` - # /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null - # if [ $? -ne 0 ]; then - # errmsg "Couldn't find a package providing $lib" - # else - # print "A package in the set being evaluated provides $lib" - # fi - # done < $SETLIBS.missing - # fi - if __name__ == '__main__': main() Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 14:01:28 UTC (rev 7740) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 15:41:02 UTC (rev 7741) @@ -12,6 +12,7 @@ import re SYSTEM_PKGMAP = "/var/sadm/install/contents" +WS_RE = re.compile(r"\s+") class Error(Exception): pass @@ -40,6 +41,9 @@ class CheckpkgBase(object): + """This class has functionality overlapping with DirectoryFormatPackage + from the opencsw.py library. The classes should be merged. + """ def __init__(self, extractdir, pkgname): self.extractdir = extractdir @@ -50,73 +54,92 @@ # ######################################### # # find all executables and dynamic libs,and list their filenames. # listbinaries() { - # if [ ! -d $1 ] ; then - # print errmsg $1 not a directory - # rm -rf $EXTRACTDIR - # exit 1 - # fi + # if [ ! -d $1 ] ; then + # print errmsg $1 not a directory + # rm -rf $EXTRACTDIR + # exit 1 + # fi # - # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' + # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' # } find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" if not os.path.isdir(self.pkgpath): - raise PackageError("%s does not exist or is not a directory" - % self.pkgpath) + raise PackageError("%s does not exist or is not a directory" + % self.pkgpath) find_proc = subprocess.Popen(find_tmpl % self.pkgpath, shell=True, stdout=subprocess.PIPE) stdout, stderr = find_proc.communicate() ret = find_proc.wait() if ret: - logging.error("The find command returned an error.") + logging.error("The find command returned an error.") return stdout.splitlines() + def GetDependencies(self): + fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") + depends = {} + for line in fd: + fields = re.split(WS_RE, line) + if fields[0] == "P": + depends[fields[1]] = " ".join(fields[1:]) + fd.close() + return depends + + + class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file.""" PICKLE_NAME = "var-sadm-install-contents.pickle" - WS_RE = re.compile(r"\s+") + STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] + CHECKPKG_DIR = ".checkpkg" + def __init__(self): """There is no need to re-parse it each time. Read it slowly the first time and cache it for later.""" - self.checkpkg_dir = os.path.join(os.environ["HOME"], ".checkpkg") + self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) self.pickle_path = os.path.join(self.checkpkg_dir, self.PICKLE_NAME) if os.path.exists(self.pickle_path): - logging.debug("Unpickling %s, please wait.", self.pickle_path) - pickle_fd = open(self.pickle_path, "r") - self.paths_by_soname = cPickle.load(pickle_fd) - pickle_fd.close() + logging.info("Unpickling %s, this can take up to 30s.", self.pickle_path) + pickle_fd = open(self.pickle_path, "r") + self.pkmap_lines_by_basename = cPickle.load(pickle_fd) + pickle_fd.close() else: # The original checkpkg code to port is in the comments. # # egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - stop_pkgs = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") - stop_re = re.compile("(%s)" % "|".join(stop_pkgs)) + stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) # Creating a data structure: # soname - {: , : , ...} logging.debug("Building in-memory data structure for the %s file", SYSTEM_PKGMAP) - paths_by_soname = {} + pkmap_lines_by_basename = {} for line in system_pkgmap_fd: if stop_re.search(line): continue - fields = re.split(self.WS_RE, line) + fields = re.split(WS_RE, line) pkgmap_entry_path = fields[0].split("=")[0] pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - if pkgmap_entry_base_name not in paths_by_soname: - paths_by_soname[pkgmap_entry_base_name] = {} - paths_by_soname[pkgmap_entry_base_name][pkgmap_entry_dir] = line + if pkgmap_entry_base_name not in pkmap_lines_by_basename: + pkmap_lines_by_basename[pkgmap_entry_base_name] = {} + pkmap_lines_by_basename[pkgmap_entry_base_name][pkgmap_entry_dir] = line logging.debug("The data structure contains %s files", - len(paths_by_soname)) - self.paths_by_soname = paths_by_soname + len(pkmap_lines_by_basename)) + self.pkmap_lines_by_basename = pkmap_lines_by_basename if not os.path.exists(self.checkpkg_dir): - logging.debug("Creating %s", self.checkpkg_dir) - os.mkdir(self.checkpkg_dir) + logging.debug("Creating %s", self.checkpkg_dir) + os.mkdir(self.checkpkg_dir) logging.debug("Pickling to %s", self.pickle_path) pickle_fd = open(self.pickle_path, "w") - cPickle.dump(self.paths_by_soname, pickle_fd) + cPickle.dump(self.pkmap_lines_by_basename, pickle_fd) pickle_fd.close() + + def GetPkgmapLineByBasename(self, filename): + if filename in self.pkmap_lines_by_basename: + return self.pkmap_lines_by_basename[filename] + else: + raise KeyError, "%s not found in self.pkmap_lines_by_basename" % filename This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 24 17:36:20 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 24 Dec 2009 16:36:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7742] csw/mgar/pkg/qt4/trunk Message-ID: Revision: 7742 http://gar.svn.sourceforge.net/gar/?rev=7742&view=rev Author: rthurner Date: 2009-12-24 16:36:19 +0000 (Thu, 24 Dec 2009) Log Message: ----------- qt4 - upgrade to gar-v2, first try. also upgrade to qt-4.6.0 Modified Paths: -------------- csw/mgar/pkg/qt4/trunk/Makefile csw/mgar/pkg/qt4/trunk/checksums Modified: csw/mgar/pkg/qt4/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4/trunk/Makefile 2009-12-24 15:41:02 UTC (rev 7741) +++ csw/mgar/pkg/qt4/trunk/Makefile 2009-12-24 16:36:19 UTC (rev 7742) @@ -1,33 +1,37 @@ GARNAME = qt4 -GARVERSION = 4.3.3 +GARVERSION = 4.6.0 CATEGORIES = lib DESCRIPTION = TrollTech C++ application framework define BLURB - Qt is a comprehensive cross-platform C++ application framework. Qt 4.3 - introduces new features and many improvements over the 3.x series. See - http://doc.trolltech.com/4.3/qt4-intro.html for details. + Qt is a comprehensive cross-platform C++ application framework. Qt 4 + introduces new features and many improvements over the 3.x series. endef -MASTER_SITES = ftp://ftp.trolltech.com/qt/source/ -DISTFILES = qt-x11-opensource-src-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWqt4,depend prototype-sparc prototype-i386) -DISTFILES += $(call admfiles,CSWqt4-devel,depend prototype-sparc prototype-i386) -DISTFILES += $(call admfiles,CSWqt4-docs,prototype) +MASTER_SITES = http://get.qt.nokia.com/qt/source/ +DISTFILES = qt-everywhere-opensource-src-$(GARVERSION).tar.gz +#DISTFILES += $(call admfiles,CSWqt4,depend prototype-sparc prototype-i386) +#DISTFILES += $(call admfiles,CSWqt4-devel,depend prototype-sparc prototype-i386) +#DISTFILES += $(call admfiles,CSWqt4-docs,prototype) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = qt-x11-opensource-src-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = qt-everywhere-opensource-src-(\d+(?:\.\d+)*).tar.gz -ifndef DO64 -PLATFORM=solaris-cc -else -PLATFORM=solaris-cc-64 -endif +# The PACKAGES variable tell GAR which packages to build +#PACKAGES = CSWqt4 CSWqt4-devel -WORKSRC = $(WORKDIR)/qt-x11-opensource-src-$(GARVERSION) +WORKSRC = $(WORKDIR)/qt-everywhere-opensource-src-$(GARVERSION) +REQUIRED_PKGS_CSWqt4 = CSWfconfig CSWftype2 CSWggettext CSWglib2 CSWjpeg CSWlibxrender CSWpng CSWtiff CSWzlib +#REQUIRED_PKGS_CSWqt4-devel = CSWqt4 -PREREQUISITE_PKGS = CSWpkgconfig CSWfconfig CSWlibdbusdev +#ifndef DO64 +#PLATFORM=solaris-cc +#else +#PLATFORM=solaris-cc-64 +#endif +#PREREQUISITE_PKGS = CSWpkgconfig CSWfconfig CSWlibdbusdev + CONFIGURE_ARGS = -prefix $(prefix) \ -bindir $(bindir) \ -libdir $(libdir) \ @@ -41,13 +45,13 @@ -demosdir $(sharedstatedir)/qt4/demos \ -I$(includedir) \ -L$(libdir) \ - -platform $(PLATFORM) \ -confirm-license \ + -opensource \ -verbose # SKIPTEST = 1 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) +#INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) SRC_CLEAN_TARGET = confclean Modified: csw/mgar/pkg/qt4/trunk/checksums =================================================================== --- csw/mgar/pkg/qt4/trunk/checksums 2009-12-24 15:41:02 UTC (rev 7741) +++ csw/mgar/pkg/qt4/trunk/checksums 2009-12-24 16:36:19 UTC (rev 7742) @@ -1,11 +1 @@ -19678fe35170559cd6a6fa531c57799c download/qt-x11-opensource-src-4.3.3.tar.gz -1971c2c7513b65cd7a8d33b9a637a908 download/CSWqt4.gspec -abca6ced15fc6cc1f47ca35ebe1af99b download/CSWqt4.depend -46107c5b0ec8d00a3a19008f251e98f3 download/CSWqt4.prototype-sparc -bc95d6a21e682b5b410919a192dd4648 download/CSWqt4.prototype-i386 -c7ea9cb16a10cd68abf79b0e678fd6e1 download/CSWqt4-devel.gspec -11a7ff5c7eed0535b6862f87652543c6 download/CSWqt4-devel.depend -bd96ed7a6599ea24019d3ad5289d1f45 download/CSWqt4-devel.prototype-sparc -9c5efb8ab82e7c54a74d15e80497d999 download/CSWqt4-devel.prototype-i386 -a4448803a657c547f6423d6c54f78540 download/CSWqt4-docs.gspec -8124363ef956332860628abab54504d4 download/CSWqt4-docs.prototype +2a7b5126f2450d8525af355fc4c12ad6 qt-everywhere-opensource-src-4.6.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 24 18:16:17 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 17:16:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7743] csw/mgar/gar/v2-checkpkg/bin Message-ID: Revision: 7743 http://gar.svn.sourceforge.net/gar/?rev=7743&view=rev Author: wahwah Date: 2009-12-24 17:16:17 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: sqlite3 backend for the system-wide pkgmap cache, much faster Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 16:36:19 UTC (rev 7742) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 17:16:17 UTC (rev 7743) @@ -26,7 +26,6 @@ LOCAL_ARCH=`uname -p` - # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -67,6 +66,12 @@ exit 1 } +debugmsg() { + if [[ "${DEBUG}" != "" ]]; then + print "DEBUG: $*" > /dev/fd/2 + fi +} + set_variables_for_individual_package_check() { f=$1 file $f |sed 's/^.*://' |grep gzip >/dev/null @@ -566,33 +571,38 @@ set_variables_for_individual_package_check "$f" echo "Running the experimental plugin infrastructure." +test_suite_ok=1 checkpkg_scriptname=`basename $0` checkpkg_basedir=${0%/${checkpkg_scriptname}} plugindir=${checkpkg_basedir}/checkpkg.d if [[ "${DEBUG}" != "" ]]; then extra_options="--debug" fi -echo "plugindir: '$plugindir'" +debugmsg "plugindir: '$plugindir'" if [[ -d "$plugindir" ]]; then # echo plugin dir exists for plugin in "${plugindir}"/checkpkg-*; do if [[ -x "${plugin}" ]]; then - echo "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" + debugmsg "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} if [[ "$?" -ne 0 ]]; then - errmsg "Plugin ${plugin} has returned an error." + print "TEST: ${plugin} [FAIL]" + test_suite_ok=0 + else + print "TEST: ${plugin} [OK]" fi else - echo "'${plugin}' is not executable" + debugmsg "'${plugin}' is not executable" fi done else - echo plugin dir does not exist + debugmsg "plugin dir does not exist" fi -# echo "Profiling." -# python -m cProfile gar/bin/checkpkg.d/checkpkg-libs.py --debug -e "${EXTRACTDIR}" ${pkgnames} -# End of plugin section +if [[ ${test_suite_ok} -ne 1 ]]; then + errmsg "One or more tests have failed." +fi + print "" # Cleaning up after all packages Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py 2009-12-24 16:36:19 UTC (rev 7742) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py 2009-12-24 17:16:17 UTC (rev 7743) @@ -3,6 +3,7 @@ import checkpkg import os.path +import logging def main(): options, args = checkpkg.GetOptions() @@ -12,8 +13,8 @@ pkgpath = os.path.join(options.extractdir, pkgname) if not os.path.isdir(pkgpath): raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) - print ("Dummy plugin says the package %s is extracted to %s" - % (pkgname, options.extractdir)) + logging.debug("Dummy plugin says the package %s is extracted to %s", + pkgname, options.extractdir) if __name__ == '__main__': Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 16:36:19 UTC (rev 7742) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-24 17:16:17 UTC (rev 7743) @@ -121,18 +121,21 @@ pkgs_by_soname[soname] = pkgname # A shared object dependency/provisioning report, plus checking. - for soname in needed_sonames: - if soname in needed_sonames_by_binary: - print "%s is provided by the package itself" % soname - elif soname in lines_by_soname: - print ("%s is required by %s and provided by %s" - % (soname, - binaries_by_soname[soname], - repr(pkgs_by_soname[soname]))) - else: - print ("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname])) - result_ok = False + if needed_sonames: + print "Analysis of sonames needed by the package set:" + for soname in needed_sonames: + if soname in needed_sonames_by_binary: + print "%s is provided by the package itself" % soname + elif soname in lines_by_soname: + print ("%s is required by %s and provided by %s" + % (soname, + binaries_by_soname[soname], + repr(pkgs_by_soname[soname]))) + else: + print ("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname])) + result_ok = False + print dependent_pkgs = {} for checker in checkers: @@ -152,12 +155,12 @@ logging.warn("%s not found in needed_sonames_by_binary (%s)", binary, needed_sonames_by_binary.keys()) declared_dependencies_set = set(declared_dependencies) - print "You can consider including the following packages in the dependencies:" - for dep_pkgname in sorted(so_dependencies.difference(declared_dependencies_set)): - print " ", dep_pkgname, - if dep_pkgname.startswith("SUNW"): - print "(it's safe to ignore this one)", - print + missing_deps = so_dependencies.difference(declared_dependencies_set) + if missing_deps: + print "SUGGESTION: you may want to add some or all of the following as depends:" + print " (Feel free to ignore SUNW or SPRO packages)" + for dep_pkgname in sorted(missing_deps): + print ">", dep_pkgname surplus_dependencies = declared_dependencies_set.difference(so_dependencies) surplus_dependencies = surplus_dependencies.difference(TYPICAL_DEPENDENCIES) Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 16:36:19 UTC (rev 7742) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-24 17:16:17 UTC (rev 7743) @@ -10,6 +10,7 @@ import subprocess import cPickle import re +import sqlite3 SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") @@ -89,26 +90,38 @@ class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file.""" - PICKLE_NAME = "var-sadm-install-contents.pickle" STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] CHECKPKG_DIR = ".checkpkg" + SQLITE3_DBNAME = "var-sadm-install-contents-cache" def __init__(self): """There is no need to re-parse it each time. Read it slowly the first time and cache it for later.""" self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) - self.pickle_path = os.path.join(self.checkpkg_dir, self.PICKLE_NAME) - if os.path.exists(self.pickle_path): - logging.info("Unpickling %s, this can take up to 30s.", self.pickle_path) - pickle_fd = open(self.pickle_path, "r") - self.pkmap_lines_by_basename = cPickle.load(pickle_fd) - pickle_fd.close() + self.db_path = os.path.join(self.checkpkg_dir, self.SQLITE3_DBNAME) + if os.path.exists(self.db_path): + logging.debug("Connecting to the %s database.", self.db_path) + self.conn = sqlite3.connect(self.db_path) else: - # The original checkpkg code to port is in the comments. - # + logging.info("Building a cache of /var/sadm/install/contents.") + if not os.path.exists(self.checkpkg_dir): + logging.debug("Creating %s", self.checkpkg_dir) + os.mkdir(self.checkpkg_dir) + self.conn = sqlite3.connect(self.db_path) + c = self.conn.cursor() + c.execute(""" + CREATE TABLE systempkgmap ( + id INTEGER PRIMARY KEY, + basename TEXT, + path TEXT, + line TEXT + ); + """) + # egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) @@ -117,29 +130,23 @@ # soname - {: , : , ...} logging.debug("Building in-memory data structure for the %s file", SYSTEM_PKGMAP) - pkmap_lines_by_basename = {} for line in system_pkgmap_fd: if stop_re.search(line): continue fields = re.split(WS_RE, line) pkgmap_entry_path = fields[0].split("=")[0] pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - if pkgmap_entry_base_name not in pkmap_lines_by_basename: - pkmap_lines_by_basename[pkgmap_entry_base_name] = {} - pkmap_lines_by_basename[pkgmap_entry_base_name][pkgmap_entry_dir] = line - logging.debug("The data structure contains %s files", - len(pkmap_lines_by_basename)) - self.pkmap_lines_by_basename = pkmap_lines_by_basename - if not os.path.exists(self.checkpkg_dir): - logging.debug("Creating %s", self.checkpkg_dir) - os.mkdir(self.checkpkg_dir) - logging.debug("Pickling to %s", self.pickle_path) - pickle_fd = open(self.pickle_path, "w") - cPickle.dump(self.pkmap_lines_by_basename, pickle_fd) - pickle_fd.close() + sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" + c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line)) + logging.info("Creating an index.") + sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" + self.conn.execute(sql) def GetPkgmapLineByBasename(self, filename): - if filename in self.pkmap_lines_by_basename: - return self.pkmap_lines_by_basename[filename] - else: - raise KeyError, "%s not found in self.pkmap_lines_by_basename" % filename + sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" + c = self.conn.cursor() + c.execute(sql, [filename]) + lines = {} + for row in c: + lines[row[0]] = row[1] + return lines 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 Dec 24 18:18:42 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 17:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7744] csw/mgar/gar/v2-checkpkg/bin/checkpkg Message-ID: Revision: 7744 http://gar.svn.sourceforge.net/gar/?rev=7744&view=rev Author: wahwah Date: 2009-12-24 17:18:41 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: sqlite3 backend for the system-wide pkgmap cache, much faster Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 17:16:17 UTC (rev 7743) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 17:18:41 UTC (rev 7744) @@ -499,47 +499,6 @@ fi done -egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - - - -for lib in `cat $EXTRACTDIR/liblist` ; do - grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap - if [[ $? -eq 0 ]] ; then - echo $lib provided by package itself - continue - else - grep "[/=]$lib[ =]" $SETLIBS - if [[ $? -eq 0 ]]; then - echo "$lib provided by package set being evaluated." - continue - fi - fi - - libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | - sed 's/^.* \([^ ]*\)$/\1/' |sort -u` - - if [[ -z "$libpkg" ]] ; then - echo "$lib $pkgname" >> $SETLIBS.missing - print Cannot find package providing $lib. Storing for delayed validation. - else - print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs - fi -done - -sort -u $EXTRACTDIR/libpkgs >$EXTRACTDIR/libpkgs.x -mv $EXTRACTDIR/libpkgs.x $EXTRACTDIR/libpkgs - -diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs >/dev/null -if [[ $? -ne 0 ]] ; then - print SUGGESTION: you may want to add some or all of the following as depends: - print ' (Feel free to ignore SUNW or SPRO packages)' - diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs | fgrep '>' -fi - - - if [[ "$basedir" != "" ]] ; then print if [[ -f $EXTRACTDIR/elflist ]] ; then @@ -622,19 +581,4 @@ done < $SETDEPS.missing fi -if [ -s $SETLIBS.missing ]; then - print "Doing late evaluations of package library dependencies." - while read ldep; do - lib=`echo $ldep | nawk '{print $1}'` - [ "$lib" = "libm.so.2" ] && continue - pkg=`echo $ldep | nawk '{print $2}'` - /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null - if [ $? -ne 0 ]; then - errmsg "Couldn't find a package providing $lib" - else - print "A package in the set being evaluated provides $lib" - fi - done < $SETLIBS.missing -fi - cleanupset 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 Dec 24 18:29:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 17:29:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7745] csw/mgar/gar/v2-checkpkg/bin/checkpkg Message-ID: Revision: 7745 http://gar.svn.sourceforge.net/gar/?rev=7745&view=rev Author: wahwah Date: 2009-12-24 17:29:41 +0000 (Thu, 24 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: delayed log file display from plugins Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 17:18:41 UTC (rev 7744) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-24 17:29:41 UTC (rev 7745) @@ -538,12 +538,16 @@ extra_options="--debug" fi debugmsg "plugindir: '$plugindir'" +log_files="" if [[ -d "$plugindir" ]]; then # echo plugin dir exists for plugin in "${plugindir}"/checkpkg-*; do if [[ -x "${plugin}" ]]; then debugmsg "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" - ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} + plugin_base_name=`basename ${plugin}` + plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" + log_files="${log_files} ${plugin_log}" + ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then print "TEST: ${plugin} [FAIL]" test_suite_ok=0 @@ -558,8 +562,22 @@ debugmsg "plugin dir does not exist" fi +echo +for log_file in ${log_files}; do + if [[ -s "${log_file}" ]]; then + echo "LOG START: ${log_file}" + echo + cat "${log_file}" + echo + echo "LOG END: ${log_file}" + fi +done +echo + if [[ ${test_suite_ok} -ne 1 ]]; then errmsg "One or more tests have failed." +else + print "All tests were successful." fi print "" 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 Dec 24 18:53:03 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Dec 2009 17:53:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7746] csw/mgar/gar/v2-migrateconf/ Message-ID: Revision: 7746 http://gar.svn.sourceforge.net/gar/?rev=7746&view=rev Author: wahwah Date: 2009-12-24 17:53:02 +0000 (Thu, 24 Dec 2009) Log Message: ----------- Deleting an old branch (v2-migrateconf). Removed Paths: ------------- csw/mgar/gar/v2-migrateconf/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Dec 25 02:03:50 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 25 Dec 2009 01:03:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7747] csw/mgar/pkg/wireshark/trunk/Makefile Message-ID: Revision: 7747 http://gar.svn.sourceforge.net/gar/?rev=7747&view=rev Author: hson Date: 2009-12-25 01:03:49 +0000 (Fri, 25 Dec 2009) Log Message: ----------- wireshark: Changes to get it to build Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2009-12-24 17:53:02 UTC (rev 7746) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2009-12-25 01:03:49 UTC (rev 7747) @@ -20,22 +20,25 @@ #SED = /opt/csw/bin/gsed #EXTRA_COMMON_EXPORTS = SED -#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 -EXTRA_INC += /opt/csw/include/gtk-2.0 -EXTRA_INC += /opt/csw/lib/gtk-2.0/include -EXTRA_INC += /opt/csw/include/glib-2.0 -EXTRA_INC += /opt/csw/lib/glib-2.0/include -EXTRA_INC += /opt/csw/include/cairo -EXTRA_INC += /opt/csw/include/pango-1.0 -EXTRA_INC += /opt/csw/include/atk-1.0 +#EXTRA_INC += /opt/csw/include/gtk-2.0 +#EXTRA_INC += /opt/csw/lib/gtk-2.0/include +#EXTRA_INC += /opt/csw/include/glib-2.0 +#EXTRA_INC += /opt/csw/lib/glib-2.0/include +#EXTRA_INC += /opt/csw/include/cairo +#EXTRA_INC += /opt/csw/include/pango-1.0 +#EXTRA_INC += /opt/csw/include/atk-1.0 -EXTRA_LINKER_FLAGS = -lgtk-x11-2.0 -lX11 /usr/openwin/lib/libXext.so +#EXTRA_LINKER_FLAGS = -lgtk-x11-2.0 -lX11 /usr/openwin/lib/libXext.so +EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Dec 25 13:21:37 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 25 Dec 2009 12:21:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7748] csw/mgar/pkg/wireshark/trunk/Makefile Message-ID: Revision: 7748 http://gar.svn.sourceforge.net/gar/?rev=7748&view=rev Author: hson Date: 2009-12-25 12:21:36 +0000 (Fri, 25 Dec 2009) Log Message: ----------- wireshark: Add some package dependencies Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2009-12-25 01:03:49 UTC (rev 7747) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2009-12-25 12:21:36 UTC (rev 7748) @@ -12,6 +12,10 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +REQUIRED_PKGS += CSWgcrypt CSWgeoip CSWggettextrt CSWglib2 CSWgnutls +REQUIRED_PKGS += CSWgpgerr CSWgtk2 CSWkrb5lib CSWlibpcap CSWlibxext +REQUIRED_PKGS += CSWlua CSWpango CSWpcrert CSWzlib + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 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 Dec 26 00:23:04 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 25 Dec 2009 23:23:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7749] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 7749 http://gar.svn.sourceforge.net/gar/?rev=7749&view=rev Author: chninkel Date: 2009-12-25 23:23:03 +0000 (Fri, 25 Dec 2009) Log Message: ----------- cyrus_imapd: fixed berkeleydb problem at compile time Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-12-25 12:21:36 UTC (rev 7748) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-12-25 23:23:03 UTC (rev 7749) @@ -102,6 +102,7 @@ CONFIGURE_ARGS += --with-cyrus-prefix=$(prefix) CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/cyrus +CONFIGURE_ARGS += --with-bdb=db-4.2 CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb42/lib CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb42/include CONFIGURE_ARGS += --with-openssl=$(prefix) Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-12-25 12:21:36 UTC (rev 7748) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-12-25 23:23:03 UTC (rev 7749) @@ -13,14 +13,14 @@ b4c99489eacf0fb7befeef5e3098a5c1 cyrus-imapd-2.3.7-nobarenewlinescheck.patch 6127a7b62ec4679a54985f6a2d915e52 cyrus-imapd-acceptinvalidfrom.patch fdb3416ec41f3a56d1594ca25a6dcd7d cyrus.conf -5fd9ad3890fa606394ff28d7f761bc5c cyrus_imapd.changelog.CSW -75e91c95ff7fa59482d20058036a6f5b cyrus_imapd_utils.changelog.CSW +20ed8433b045ef9c55a5c4e05a228ce7 cyrus_imapd.changelog.CSW +51011023b9b2474a6d5d7aefae54b812 cyrus_imapd_utils.changelog.CSW 5375c25c8bc325a90553d0be87a64a04 et_c.awk d1d86e61463a1dfefccbadedb11a8604 et_h.awk 79211aee56db01e15566ced1ba4078da i.services 908dbf764d3ccd541c4de881ac81a6ae imapd.conf 14bb6e8c6d6914351f80df293982e88a install-upgrade -f5b73bbd54935e6c082b6a64e2668b78 pm_cyrus.changelog.CSW +9178809b3f1f7698725346d56c37049a pm_cyrus.changelog.CSW 149ac6b6d82ef9ef4bb1b314f1a1cac4 r.services dce627f9a464ae4efe8a66c8dbd358d5 restore_allowplaintext_default.patch 6dfee20f7c02139350caf9f75199e587 services Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-12-25 12:21:36 UTC (rev 7748) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-12-25 23:23:03 UTC (rev 7749) @@ -1,4 +1,4 @@ -cyrus_imapd (2.3.16,REV=2009.12.23) unstable +cyrus_imapd (2.3.16,REV=2009.12.26) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-12-25 12:21:36 UTC (rev 7748) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-12-25 23:23:03 UTC (rev 7749) @@ -1,4 +1,4 @@ -cyrus_imapd_utils (2.3.16,REV=2009.12.23) unstable +cyrus_imapd_utils (2.3.16,REV=2009.12.26) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-12-25 12:21:36 UTC (rev 7748) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-12-25 23:23:03 UTC (rev 7749) @@ -1,4 +1,4 @@ -pm_cyrus (2.3.16,REV=2009.12.23) unstable +pm_cyrus (2.3.16,REV=2009.12.26) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Dec 26 03:01:07 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 26 Dec 2009 02:01:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7750] csw/mgar/pkg/libgsf/trunk Message-ID: Revision: 7750 http://gar.svn.sourceforge.net/gar/?rev=7750&view=rev Author: hson Date: 2009-12-26 02:01:07 +0000 (Sat, 26 Dec 2009) Log Message: ----------- libgsf: Added second fixme script, remove some unused stuff Modified Paths: -------------- csw/mgar/pkg/libgsf/trunk/Makefile csw/mgar/pkg/libgsf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libgsf/trunk/files/fixme2.sh Modified: csw/mgar/pkg/libgsf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsf/trunk/Makefile 2009-12-25 23:23:03 UTC (rev 7749) +++ csw/mgar/pkg/libgsf/trunk/Makefile 2009-12-26 02:01:07 UTC (rev 7750) @@ -21,9 +21,6 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -#NPATH = /opt/csw/gnu:$(PATH) - CONFIGURE_ARGS = $(DIRPATHS) #CONFIGURE_ARGS = "PATH=$(NPATH)" $(DIRPATHS) #CONFIGURE_ARGS += --enable-gtk-doc=no @@ -31,6 +28,8 @@ TEST_TARGET = check +EXTRA_LD_OPTIONS = -L../gsf/.libs -L../../gsf/.libs + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) @@ -38,6 +37,7 @@ post-configure-$(MODULATION): @(echo "~~~ Fixing Libtool ~~~") @$(FILEDIR)/fixme.sh $(WORKSRC) +# @$(FILEDIR)/fixme2.sh $(WORKSRC) $(DONADA) post-install-isa-sparcv8: Modified: csw/mgar/pkg/libgsf/trunk/checksums =================================================================== --- csw/mgar/pkg/libgsf/trunk/checksums 2009-12-25 23:23:03 UTC (rev 7749) +++ csw/mgar/pkg/libgsf/trunk/checksums 2009-12-26 02:01:07 UTC (rev 7750) @@ -1 +1,2 @@ 7d6fa1c26ebb58dcf2128c3b9c7d1a2a download/libgsf-1.14.11.tar.gz +34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh Added: csw/mgar/pkg/libgsf/trunk/files/fixme2.sh =================================================================== --- csw/mgar/pkg/libgsf/trunk/files/fixme2.sh (rev 0) +++ csw/mgar/pkg/libgsf/trunk/files/fixme2.sh 2009-12-26 02:01:07 UTC (rev 7750) @@ -0,0 +1,29 @@ +#!/bin/bash +#################################################### +# +# fixme2.sh +# Intended to patch libtool so relink isn't +# performend during install +# +# Loosely based on Mike Watters fixme.sh +# +# Author: Roger Hakansson hson at opencsw.org +# Initial Version: 0.1 +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed 's/test "$mode" != relink && rpath/rpath/' ${lt} > ${lt}.new + gmv ${lt}.new ${lt} + gchmod +x ${lt} +done Property changes on: csw/mgar/pkg/libgsf/trunk/files/fixme2.sh ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Dec 26 11:01:27 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 26 Dec 2009 10:01:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7751] csw/mgar/pkg/ntop/trunk Message-ID: Revision: 7751 http://gar.svn.sourceforge.net/gar/?rev=7751&view=rev Author: hson Date: 2009-12-26 10:01:26 +0000 (Sat, 26 Dec 2009) Log Message: ----------- ntop: Update to 3.3.10 plus some patches to get closer to a build Modified Paths: -------------- csw/mgar/pkg/ntop/trunk/Makefile csw/mgar/pkg/ntop/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ntop/trunk/files/configure.in.diff csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff Modified: csw/mgar/pkg/ntop/trunk/Makefile =================================================================== --- csw/mgar/pkg/ntop/trunk/Makefile 2009-12-26 02:01:07 UTC (rev 7750) +++ csw/mgar/pkg/ntop/trunk/Makefile 2009-12-26 10:01:26 UTC (rev 7751) @@ -1,5 +1,5 @@ GARNAME = ntop -GARVERSION = 3.3.9 +GARVERSION = 3.3.10 CATEGORIES = net DESCRIPTION = A network traffic usage monitor. @@ -15,7 +15,8 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# PATCHFILES = intdef.diff +PATCHFILES = configure.in.diff +PATCHFILES += configureextra_opencsw.diff # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=17233 @@ -23,6 +24,18 @@ UFILES_REGEX = (\d+(?:\.\d+)*) CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-pcap-lib=/opt/csw/lib +CONFIGURE_ARGS += --with-pcap-include=/opt/csw/include +CONFIGURE_ARGS += --with-gdbm-lib=/opt/csw/lib +CONFIGURE_ARGS += --with-gdbm-include=/opt/csw/include +CONFIGURE_ARGS += --with-zlib-lib=/opt/csw/lib +CONFIGURE_ARGS += --with-zlib-include=/opt/csw/include +CONFIGURE_ARGS += --with-ossl-lib=/opt/csw/lib +CONFIGURE_ARGS += --with-ossl-include=/opt/csw/include include gar/category.mk +pre-configure-modulated: + ( cd $(WORKSRC) ; ./autogen.sh --noconfig) + @$(MAKECOOKIE) + Modified: csw/mgar/pkg/ntop/trunk/checksums =================================================================== --- csw/mgar/pkg/ntop/trunk/checksums 2009-12-26 02:01:07 UTC (rev 7750) +++ csw/mgar/pkg/ntop/trunk/checksums 2009-12-26 10:01:26 UTC (rev 7751) @@ -1 +1,3 @@ -0c22038e0f2aa003110437b5a5d5a6a5 download/ntop-3.3.9.tar.gz +1615818e06d4a503b6a52426e88aaed4 configure.in.diff +257b92864fc22a475e23191c60dd100c configureextra_opencsw.diff +6e2ffa90d5f935c8f03d88a5dd19a866 ntop-3.3.10.tar.gz Added: csw/mgar/pkg/ntop/trunk/files/configure.in.diff =================================================================== --- csw/mgar/pkg/ntop/trunk/files/configure.in.diff (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/configure.in.diff 2009-12-26 10:01:26 UTC (rev 7751) @@ -0,0 +1,44 @@ +--- ntop-3.3.10.old/configure.in 2009-05-06 16:55:22.000000000 +0200 ++++ ntop-3.3.10/configure.in 2009-12-24 02:57:08.602866458 +0100 +@@ -274,6 +274,15 @@ + [ --with-pcap-root=DIR LBNL pcap located in DIR], + PCAP_ROOT="$withval", + PCAP_ROOT=) ++AC_ARG_WITH( pcap-lib, ++ [ --with-pcap-lib=DIR or libpcap located in DIR], ++ PCAP_LIB="$withval", ++ PCAP_LIB=) ++AC_ARG_WITH( pcap-include, ++ [ --with-pcap-include=DIR or pcap.h located in DIR], ++ PCAP_INCLUDE="$withval", ++ PCAP_INCLUDE=) ++ + AC_ARG_WITH( gdbm-root, + [ --with-gdbm-root=DIR gdbm located in DIR], + GDBM_DIRECTORY="$withval", +@@ -670,6 +679,7 @@ + INCS="${INCS} -I/usr/include/pcap" + AC_MSG_RESULT([found in $PCAP_ROOT]) + else ++ NTOP_APPENDS([${PCAP_INCLUDE}], [${PCAP_LIB}], [pcap]) + AC_CHECK_LIB(pcap, pcap_lookupdev, , [ + AC_MSG_RESULT([ *** FATAL ERROR *** ]) + AC_MSG_RESULT([ It looks that you don't have the libpcap distribution installed.]) +@@ -1659,7 +1669,7 @@ + wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz + fi + +-tar xvfz $LUA_VERSION.tar.gz ++gtar xvfz $LUA_VERSION.tar.gz + cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp + cat /tmp/lua.temp > $LUA_VERSION/src/Makefile + #rm -f /tmp/lua.temp +@@ -1968,7 +1978,7 @@ + else + wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz + fi +-tar xvfz GeoIP.tar.gz ++gtar xvfz GeoIP.tar.gz + GEO_DIR=`find $PWD -type d -name "GeoIP-*"` + cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd .. + # OSX Fix Added: csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff =================================================================== --- csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff 2009-12-26 10:01:26 UTC (rev 7751) @@ -0,0 +1,51 @@ +diff -ru ntop-3.3.10.old/configureextra/SOLARIS10 ntop-3.3.10/configureextra/SOLARIS10 +--- ntop-3.3.10.old/configureextra/SOLARIS10 2007-05-03 23:31:40.000000000 +0200 ++++ ntop-3.3.10/configureextra/SOLARIS10 2009-12-24 02:31:19.464874160 +0100 +@@ -5,9 +5,9 @@ + # + + echo " Setting Solaris 10 specific flag values" +-LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}" ++LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib ${LDFLAGS}" + LIBS="-lnsl -lsocket ${LIBS}" +-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include" ++CPPFLAGS="${CPPFLAGS} -I/opt/csw/include" + + . configureextra/functions + +@@ -28,4 +28,4 @@ + echo "- ln -s libpcap.so.0.X.Y libpcap.so" + echo "- rm libpcap.a" + echo "" +-echo "*************************************************" +\ No newline at end of file ++echo "*************************************************" +diff -ru ntop-3.3.10.old/configureextra/SOLARIS8 ntop-3.3.10/configureextra/SOLARIS8 +--- ntop-3.3.10.old/configureextra/SOLARIS8 2005-09-29 10:42:23.000000000 +0200 ++++ ntop-3.3.10/configureextra/SOLARIS8 2009-12-24 02:33:36.592681360 +0100 +@@ -1,8 +1,9 @@ + #!/bin/sh + + echo " Setting Solaris 8 specific flag values" +-LDFLAGS="-L/usr/local/lib" ++LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib ${LDFLAGS}" + LIBS="-lnsl -lsocket ${LIBS}" ++CPPFLAGS="${CPPFLAGS} -I/opt/csw/include" + + . configureextra/functions + +diff -ru ntop-3.3.10.old/configureextra/SOLARIS9 ntop-3.3.10/configureextra/SOLARIS9 +--- ntop-3.3.10.old/configureextra/SOLARIS9 2003-12-02 13:03:47.000000000 +0100 ++++ ntop-3.3.10/configureextra/SOLARIS9 2009-12-24 02:33:21.611018077 +0100 +@@ -1,9 +1,9 @@ + #!/bin/sh + + echo " Setting Solaris 9 specific flag values" +-LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}" ++LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib ${LDFLAGS}" + LIBS="-lnsl -lsocket ${LIBS}" +-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include" ++CPPFLAGS="${CPPFLAGS} -I/opt/csw/include" + + . configureextra/functions + 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 Dec 26 22:18:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 26 Dec 2009 21:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7752] csw/mgar/pkg/libgcrypt/trunk Message-ID: Revision: 7752 http://gar.svn.sourceforge.net/gar/?rev=7752&view=rev Author: dmichelsen Date: 2009-12-26 21:18:41 +0000 (Sat, 26 Dec 2009) Log Message: ----------- libgcrypt: Update to 1.4.5 and dynamic gspec Modified Paths: -------------- csw/mgar/pkg/libgcrypt/trunk/Makefile csw/mgar/pkg/libgcrypt/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libgcrypt/trunk/files/CSWgcrypt.gspec Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/Makefile 2009-12-26 10:01:26 UTC (rev 7751) +++ csw/mgar/pkg/libgcrypt/trunk/Makefile 2009-12-26 21:18:41 UTC (rev 7752) @@ -1,5 +1,5 @@ GARNAME = libgcrypt -GARVERSION = 1.4.4 +GARVERSION = 1.4.5 CATEGORIES = lib DESCRIPTION = GNU libgcrypt @@ -9,10 +9,12 @@ MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libgcrypt/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWgcrypt,) -SPKG_SOURCEURL = http://www.gnupg.org/download/ +PACKAGES = CSWgcrypt +CATALOGNAME = llibgcrypt +SPKG_SOURCEURL = http://www.gnupg.org/related_software/libraries.en.html#lib-libgcrypt + REQUIRED_PKGS = CSWgpgerr BUILD64 = 1 Modified: csw/mgar/pkg/libgcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/checksums 2009-12-26 10:01:26 UTC (rev 7751) +++ csw/mgar/pkg/libgcrypt/trunk/checksums 2009-12-26 21:18:41 UTC (rev 7752) @@ -1,2 +1 @@ -34105aa927e23c217741966496b97e67 download/libgcrypt-1.4.4.tar.bz2 -94730391b2ab2e9b63227d133dc2547b download/CSWgcrypt.gspec +cc2017ad09b4543f8b3b5e9a53cfd89d libgcrypt-1.4.5.tar.bz2 Deleted: csw/mgar/pkg/libgcrypt/trunk/files/CSWgcrypt.gspec =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/files/CSWgcrypt.gspec 2009-12-26 10:01:26 UTC (rev 7751) +++ csw/mgar/pkg/libgcrypt/trunk/files/CSWgcrypt.gspec 2009-12-26 21:18:41 UTC (rev 7752) @@ -1,4 +0,0 @@ -%var bitname libgcrypt -%var pkgname CSWgcrypt -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING 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 Dec 27 15:23:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Dec 2009 14:23:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7753] csw/mgar/gar/v2-checkpkg/bin Message-ID: Revision: 7753 http://gar.svn.sourceforge.net/gar/?rev=7753&view=rev Author: wahwah Date: 2009-12-27 14:23:13 +0000 (Sun, 27 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Handling self-provided dependencies, added more tests and test data Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py csw/mgar/gar/v2-checkpkg/bin/mkpackage Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51rt.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-26 21:18:41 UTC (rev 7752) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-27 14:23:13 UTC (rev 7753) @@ -14,11 +14,11 @@ import sys DUMP_BIN = "/usr/ccs/bin/dump" -NEEDED_SONAMES = "needed sonames" RUNPATH = "runpath" -TYPICAL_DEPENDENCIES = set(["CSWcommon", "CSWcswclassutils"]) +SONAME = "soname" def main(): + errors = [] options, args = checkpkg.GetOptions() if options.debug: logging.basicConfig(level=logging.DEBUG) @@ -32,22 +32,32 @@ checkers.append(checker) binaries = [] binaries_by_pkgname = {} + sonames_by_pkgname = {} + pkg_by_any_filename = {} for checker in checkers: pkg_binary_paths = checker.ListBinaries() binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] binaries_by_pkgname[checker.pkgname] = binaries_base binaries.extend(pkg_binary_paths) + for f in checker.GetAllFilenames(): + pkg_by_any_filename[f] = checker.pkgname # Making the binaries unique binaries = set(binaries) ws_re = re.compile(r"\s+") + # TODO: map from binaries_by_pkgname to sonames_by_pkgname + # + # Essentially, we must look at libfoo.so.1.2.3 and map it to libfoo.so.1, + # whatever soname it has + # man ld.so.1 for more info on this hack env = copy.copy(os.environ) env["LD_NOAUXFLTR"] = "1" needed_sonames_by_binary = {} + filenames_by_soname = {} # Assembling a data structure with the data about binaries. # { - # : { NEEDED_SONAMES: [...], + # : { checkpkg.NEEDED_SONAMES: [...], # RUNPATH: [...]}, # : ..., # ... @@ -69,15 +79,19 @@ if len(fields) < 3: continue if fields[1] == "NEEDED": - if NEEDED_SONAMES not in binary_data: - binary_data[NEEDED_SONAMES] = [] - binary_data[NEEDED_SONAMES].append(fields[2]) + if checkpkg.NEEDED_SONAMES not in binary_data: + binary_data[checkpkg.NEEDED_SONAMES] = [] + binary_data[checkpkg.NEEDED_SONAMES].append(fields[2]) elif fields[1] == "RUNPATH": if RUNPATH not in binary_data: binary_data[RUNPATH] = [] binary_data[RUNPATH].extend(fields[2].split(":")) # Adding the default runtime path search option. binary_data[RUNPATH].append("/usr/lib") + elif fields[1] == "SONAME": + binary_data[SONAME] = fields[2] + if SONAME in binary_data: + filenames_by_soname[binary_data[SONAME]] = binary_base_name # TODO: make it a unit test # print needed_sonames_by_binary @@ -89,7 +103,7 @@ needed_sonames = set() binaries_by_soname = {} for binary_name, data in needed_sonames_by_binary.iteritems(): - for soname in data[NEEDED_SONAMES]: + for soname in data[checkpkg.NEEDED_SONAMES]: needed_sonames.add(soname) if soname not in runpath_by_needed_soname: runpath_by_needed_soname[soname] = [] @@ -104,79 +118,102 @@ lines_by_soname = {} for soname in needed_sonames: try: + # This is the critical part of the algorithm: it iterates over the + # runpath and finds the first matching one. + # + # TODO: Expand $ISALIST to whatever the 'isalist' command outputs for + # better matching. for runpath in runpath_by_needed_soname[soname]: - if runpath in pkgmap.GetPkgmapLineByBasename(soname): - # logging.debug("%s found in %s", runpath, pkgmap.GetPkgmapLineByBasename(soname)) - # logging.debug("line found: %s", repr(pkgmap.GetPkgmapLineByBasename(soname)[runpath])) - lines_by_soname[soname] = pkgmap.GetPkgmapLineByBasename(soname)[runpath] + soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + if runpath in soname_runpath_data: + lines_by_soname[soname] = soname_runpath_data[runpath] break except KeyError, e: - logging.debug("KeyError: %s", soname, e) - pkgs_by_soname = {} + logging.debug("couldn't find %s in the needed sonames list: %s", + soname, e) + pkgs_by_filename = {} for soname, line in lines_by_soname.iteritems(): # TODO: Find all the packages, not just the last field. fields = re.split(ws_re, line.strip()) # For now, we'll assume that the last field is the package. pkgname = fields[-1] - pkgs_by_soname[soname] = pkgname + pkgs_by_filename[soname] = pkgname # A shared object dependency/provisioning report, plus checking. if needed_sonames: print "Analysis of sonames needed by the package set:" for soname in needed_sonames: - if soname in needed_sonames_by_binary: + if soname in filenames_by_soname: print "%s is provided by the package itself" % soname elif soname in lines_by_soname: print ("%s is required by %s and provided by %s" % (soname, binaries_by_soname[soname], - repr(pkgs_by_soname[soname]))) + repr(pkgs_by_filename[soname]))) else: print ("%s is required by %s, but we don't know what provides it." % (soname, binaries_by_soname[soname])) - result_ok = False + errors.append(checkpkg.Error("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname]))) print + # Data needed for this section: + # - pkgname + # - declared dependencies + # - binaries_by_pkgname + # - needed_sonames_by_binary + # - pkgs_by_filename dependent_pkgs = {} for checker in checkers: orphan_sonames = set() pkgname = checker.pkgname - # logging.debug("Reporting package %s", pkgname) + print "%s:" % pkgname declared_dependencies = checker.GetDependencies() - so_dependencies = set() - for binary in binaries_by_pkgname[pkgname]: - if binary in needed_sonames_by_binary: - for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: - if soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) - else: - logging.warn("%s not found in needed_sonames_by_binary (%s)", - binary, needed_sonames_by_binary.keys()) - declared_dependencies_set = set(declared_dependencies) - missing_deps = so_dependencies.difference(declared_dependencies_set) + missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( + pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_filename, + filenames_by_soname, + pkg_by_any_filename) + + save_testing_data = True + if save_testing_data: + test_fd = open("/var/tmp/checkpkg-dep-testing-data-%s.py" % pkgname, "w") + sanitized_pkgname = pkgname.replace("-", "_") + print >>test_fd, "# Testing data for %s" % pkgname + print >>test_fd, "DATA_PKGNAME =" % sanitized_pkgname, repr(pkgname) + print >>test_fd, "DATA_DECLARED_DEPENDENCIES =" % sanitized_pkgname, repr(declared_dependencies) + print >>test_fd, "DATA_BINARIES_BY_PKGNAME =" % sanitized_pkgname, repr(binaries_by_pkgname) + print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =" % sanitized_pkgname, repr(needed_sonames_by_binary) + print >>test_fd, "DATA_PKGS_BY_FILENAME =" % sanitized_pkgname, repr(pkgs_by_filename) + print >>test_fd, "DATA_FILENAMES_BY_SONAME =" % sanitized_pkgname, repr(filenames_by_soname) + print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =" % sanitized_pkgname, repr(pkg_by_any_filename) + test_fd.close() + if missing_deps: print "SUGGESTION: you may want to add some or all of the following as depends:" print " (Feel free to ignore SUNW or SPRO packages)" for dep_pkgname in sorted(missing_deps): print ">", dep_pkgname - - surplus_dependencies = declared_dependencies_set.difference(so_dependencies) - surplus_dependencies = surplus_dependencies.difference(TYPICAL_DEPENDENCIES) - if surplus_dependencies: + if surplus_deps: print "The following packages might be unnecessary dependencies:" - for dep_pkgname in surplus_dependencies: - print " ", dep_pkgname + for dep_pkgname in surplus_deps: + print "? ", dep_pkgname if orphan_sonames: print "The following sonames don't belong to any package:" for soname in sorted(orphan_sonames): - print " ", soname + errors.append(checkpkg.Error("The following soname does't belong to " + "any package: %s" % soname)) + print "! ", soname - if result_ok: + if errors: + for error in errors: + logging.error(error) + sys.exit(1) + else: sys.exit(0) - else: - sys.exit(1) if __name__ == '__main__': Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-26 21:18:41 UTC (rev 7752) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-27 14:23:13 UTC (rev 7753) @@ -14,6 +14,9 @@ SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") +NEEDED_SONAMES = "needed sonames" +# Don't report these as unnecessary. +TYPICAL_DEPENDENCIES = set(["CSWcommon", "CSWcswclassutils", "CSWisaexec"]) class Error(Exception): pass @@ -51,6 +54,11 @@ self.pkgname = pkgname self.pkgpath = os.path.join(self.extractdir, self.pkgname) + def CheckPkgpathExists(self): + if not os.path.isdir(self.pkgpath): + raise PackageError("%s does not exist or is not a directory" + % self.pkgpath) + def ListBinaries(self): # ######################################### # # find all executables and dynamic libs,and list their filenames. @@ -63,10 +71,8 @@ # # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' # } + self.CheckPkgpathExists() find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" - if not os.path.isdir(self.pkgpath): - raise PackageError("%s does not exist or is not a directory" - % self.pkgpath) find_proc = subprocess.Popen(find_tmpl % self.pkgpath, shell=True, stdout=subprocess.PIPE) stdout, stderr = find_proc.communicate() @@ -75,6 +81,13 @@ logging.error("The find command returned an error.") return stdout.splitlines() + def GetAllFilenames(self): + self.CheckPkgpathExists() + file_basenames = [] + for root, dirs, files in os.walk(self.pkgpath): + file_basenames.extend(files) + return file_basenames + def GetDependencies(self): fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") depends = {} @@ -150,3 +163,69 @@ for row in c: lines[row[0]] = row[1] return lines + +def SharedObjectDependencies(pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + so_dependencies = set() + orphan_sonames = set() + self_provided = set() + for binary in binaries_by_pkgname[pkgname]: + if binary in needed_sonames_by_binary: + for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: + if soname in filenames_by_soname: + filename = filenames_by_soname[soname] + pkg = pkg_by_any_filename[filename] + self_provided.add(soname) + so_dependencies.add(pkg) + elif soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) + else: + orphan_sonames.add(soname) + else: + logging.warn("%s not found in needed_sonames_by_binary (%s)", + binary, needed_sonames_by_binary.keys()) + return so_dependencies, self_provided, orphan_sonames + + +def AnalyzeDependencies(pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + """ + missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies(...) + """ + so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( + pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename) + guessed_deps = set() + patterns = ( + (r".*\.py", u"CSWpython"), + (r".*\.pl", u"CSWperl"), + (r".*\.rb", u"CSWruby"), + ) + for pattern, dep_pkgname in patterns: + # If any file name matches, add the dep, go to the next pattern/pkg + # combination. + tmp_re = re.compile("^%s$" % pattern) + for f in pkg_by_any_filename: + if re.match(tmp_re, f): + if pkgname == pkg_by_any_filename[f]: + guessed_deps.add(dep_pkgname) + break + auto_dependencies = so_dependencies.union(guessed_deps) + declared_dependencies_set = set(declared_dependencies) + missing_deps = auto_dependencies.difference(declared_dependencies_set) + surplus_deps = declared_dependencies_set.difference(auto_dependencies) + surplus_deps = surplus_deps.difference(TYPICAL_DEPENDENCIES) + return missing_deps, surplus_deps, orphan_sonames Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-26 21:18:41 UTC (rev 7752) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-27 14:23:13 UTC (rev 7753) @@ -1,8 +1,83 @@ #!/opt/csw/bin/python2.6 +# $Id$ import unittest +import checkpkg +import checkpkg_test_data_CSWmysql51rt as d1 +import checkpkg_test_data_CSWmysql51client as d2 +import checkpkg_test_data_CSWmysql51 as d3 +class DependenciesUnitTest_1(unittest.TestCase): + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d1.DATA_PKGNAME, + d1.DATA_DECLARED_DEPENDENCIES, + d1.DATA_BINARIES_BY_PKGNAME, + d1.DATA_NEEDED_SONAMES_BY_BINARY, + d1.DATA_PKGS_BY_FILENAME, + d1.DATA_FILENAMES_BY_SONAME, + d1.DATA_PKG_BY_ANY_FILENAME, + ) + def testSurplusDeps(self): + # set(['CSWmysql51rt', 'CSWosslrt', 'CSWncurses', 'CSWzlib']) + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + # expected = set([u'SUNWlmsx', u'SUNWlibCx', u'CSWosslrt', u'SUNWcsl', u'SUNWcslx']) + self.assertEquals(set([u'SUNWlibC', u'SUNWcsl', u'SUNWlibms']), self.missing_deps) + + +class DependenciesUnitTest_2(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d2.DATA_PKGNAME, + d2.DATA_DECLARED_DEPENDENCIES, + d2.DATA_BINARIES_BY_PKGNAME, + d2.DATA_NEEDED_SONAMES_BY_BINARY, + d2.DATA_PKGS_BY_FILENAME, + d2.DATA_FILENAMES_BY_SONAME, + d2.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + self.assertEquals(set([u'SUNWlibC', u'SUNWcsl', u'SUNWlibms']), self.missing_deps) + + +class DependenciesUnitTest_3(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d3.DATA_PKGNAME, + d3.DATA_DECLARED_DEPENDENCIES, + d3.DATA_BINARIES_BY_PKGNAME, + d3.DATA_NEEDED_SONAMES_BY_BINARY, + d3.DATA_PKGS_BY_FILENAME, + d3.DATA_FILENAMES_BY_SONAME, + d3.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([u'CSWmysql51client']), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set(['CSWmysql51rt', u'SUNWcsl', u'SUNWlibms', u'SUNWlibC']) + self.assertEquals(expected, self.missing_deps) + + if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51.py 2009-12-27 14:23:13 UTC (rev 7753) @@ -0,0 +1,9 @@ +# Testing data for CSWmysql51 +# $Id$ +DATA_PKGNAME = 'CSWmysql51' +DATA_DECLARED_DEPENDENCIES = {'CSWcswclassutils': 'CSWcswclassutils cswclassutils - CSW class action utilities ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWmysql51client': 'CSWmysql51client mysql51client - MySQL 5.1 client binaries ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWzlib': 'CSWzlib zlib - Zlib Data Compression Library ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} +DATA_BINARIES_BY_PKGNAME = {'CSWmysql51': ['mysqlslap', 'resolve_stack_dump', 'mysql_tzinfo_to_sql', 'resolveip', 'mysql_waitpid', 'my_print_defaults', 'mysql_upgrade', 'innochecksum', 'myisam_ftdump', 'myisamchk', 'mysqltest', 'resolve_stack_dump', 'mysql_waitpid', 'resolveip', 'my_print_defaults', 'mysqlslap', 'myisamchk', 'innochecksum', 'mysqltest', 'myisam_ftdump', 'mysql_upgrade', 'mysql_tzinfo_to_sql', 'mysqlmanager', 'mysqld', 'mysqlmanager', 'mysqld'], 'CSWmysql51rt': ['libmysqlclient_r.so.16.0.0', 'ha_example.so.0.0.0', 'ha_innodb_plugin.so.0.0.0', 'libmysqlclient.so.16.0.0', 'libmysqlclient_r.so.16.0.0', 'ha_example.so.0.0.0', 'ha_innodb_plugin.so.0.0.0', 'libmysqlclient.so.16.0.0'], 'CSWmysql51test': ['my_safe_process'], 'CSWmysql51client': ['myisampack', 'mysql_client_test', 'mysql', 'mysqlimport', 'mysqladmin', 'mysqldump', 'mysqlbinlog', 'mysqlcheck', 'mysqlshow', 'replace', 'myisamlog', 'perror', 'myisampack', 'mysqldump', 'perror', 'mysqlcheck', 'mysql', 're place', 'mysqladmin', 'mysqlimport', 'mysqlbinlog', 'mysql_client_test', 'mysqlshow', 'myisamlog'], 'CSWmysql51bench': [], 'CSWmysql51devel': []} +DATA_NEEDED_SONAMES_BY_BINARY = {'ha_example.so.0.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'soname': 'ha_example.so.0', 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'li bc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1']}, 'mysql_waitpid': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'replace': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw /mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'myisamchk': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc. so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqldump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'mysql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/op t/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libncursesw.so.5', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libncursesw.so.5', ' libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'myisam_ftdump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'myisamlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISA LIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqlimport': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed soname s': ['libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'mysqlcheck': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'mysqlmanager': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'ne eded sonames': ['libpthread.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqladmin': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/ mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqlshow': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/op t/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'libmysqlclient.so.16.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'soname': 'libmysqlclient.so.16', 'needed sonam es': ['librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1']}, 'mysql_upgrade': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt .so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'innochecksum': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqlbinlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libs sl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'myisampack': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'my_safe_process': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studi o/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'my_print_defaults': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so .1']}, 'mysql_tzinfo_to_sql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', ' libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqld': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libz.so.1', 'libdl.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libmtmalloc.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'lib nsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libz.so.1', 'libdl.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libmtmalloc.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqlslap': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmy sqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'ha_innodb_plugin.so.0.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'soname': 'ha_innodb_plugin.so.0', 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1']}, 'perror': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'libmysqlclient_r.so.16.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', ' /opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'soname': 'libmysqlclient_r.so.16', 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8']}, 'mysqltest': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/s parcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'resolve_stack_dump': {'runpath': ['/opt/csw/ lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'resolveip': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['li bz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysql_client_test': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libmysqlclient_r.so.16', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libmysqlclient_r.so.16', 'libpthread.so.1', 'librt.so.1', ' libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}} +DATA_PKGS_BY_FILENAME = {'libresolv.so.2': u'SUNWcsl', 'libthread.so.1': u'SUNWcsl', 'libmtmalloc.so.1': u'SUNWcsl', 'libnsl.so.1': u'SUNWcsl', 'libCstd.so.1': u'SUNWlibC', 'libCrun.so.1': u'SUNWlibC', 'libssl.so.0.9.8': u'CSWosslrt', 'librt.so.1': u'SUNWcsl', 'libz.so.1': u'CSWzlib', 'libncursesw.so.5': u'CSWncurses', 'libsocket.so.1': u'SUNWcsl', 'libm.so.1': u'SUNWlibms', 'libpthread.so.1': u'SUNWcsl', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libdl.so.1': u'SUNWcsl', 'libc.so.1': u'SUNWcsl'} +DATA_FILENAMES_BY_SONAME = {'ha_example.so.0': 'ha_example.so.0.0.0', 'libmysqlclient_r.so.16': 'libmysqlclient_r.so.16.0.0', 'libmysqlclient.so.16': 'libmysqlclient.so.16.0.0', 'ha_innodb_plugin.so.0': 'ha_innodb_plugin.so.0.0.0'} @@ 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 idogan23 at users.sourceforge.net Sun Dec 27 15:58:34 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 27 Dec 2009 14:58:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7754] csw/mgar/pkg/ldns/trunk Message-ID: Revision: 7754 http://gar.svn.sourceforge.net/gar/?rev=7754&view=rev Author: idogan23 Date: 2009-12-27 14:58:33 +0000 (Sun, 27 Dec 2009) Log Message: ----------- ldns: bump version to 1.6.3 Modified Paths: -------------- csw/mgar/pkg/ldns/trunk/Makefile csw/mgar/pkg/ldns/trunk/checksums Modified: csw/mgar/pkg/ldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile 2009-12-27 14:23:13 UTC (rev 7753) +++ csw/mgar/pkg/ldns/trunk/Makefile 2009-12-27 14:58:33 UTC (rev 7754) @@ -1,5 +1,5 @@ GARNAME = ldns -GARVERSION = 1.6.1 +GARVERSION = 1.6.3 CATEGORIES = lib DESCRIPTION = A library for programs conforming to DNS RFCs and drafts Modified: csw/mgar/pkg/ldns/trunk/checksums =================================================================== --- csw/mgar/pkg/ldns/trunk/checksums 2009-12-27 14:23:13 UTC (rev 7753) +++ csw/mgar/pkg/ldns/trunk/checksums 2009-12-27 14:58:33 UTC (rev 7754) @@ -1,2 +1,2 @@ -b5516aacfa819947cbfb6d0c34f0c546 download/CSWldns.doxyparse.diff -a44dafecdcc49aaea5d20ae15bc738c0 download/ldns-1.6.1.tar.gz +b5516aacfa819947cbfb6d0c34f0c546 CSWldns.doxyparse.diff +4234fc56f087d852b2f6d1e6ccd9b7da ldns-1.6.3.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 Sun Dec 27 18:41:15 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 27 Dec 2009 17:41:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7755] csw/mgar/pkg/cpan/Mail-Tools/trunk/ Message-ID: Revision: 7755 http://gar.svn.sourceforge.net/gar/?rev=7755&view=rev Author: idogan23 Date: 2009-12-27 17:41:15 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Mail-Tools: switched to mGar v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Mail-Tools/trunk/ Property changes on: csw/mgar/pkg/cpan/Mail-Tools/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Dec 27 18:46:05 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 27 Dec 2009 17:46:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7756] csw/mgar/pkg/cpan/Mail-Tools/trunk Message-ID: Revision: 7756 http://gar.svn.sourceforge.net/gar/?rev=7756&view=rev Author: idogan23 Date: 2009-12-27 17:46:05 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Mail-Tools: bump version to 2.05 Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile csw/mgar/pkg/cpan/Mail-Tools/trunk/checksums Modified: csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile 2009-12-27 17:41:15 UTC (rev 7755) +++ csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile 2009-12-27 17:46:05 UTC (rev 7756) @@ -1,5 +1,5 @@ GARNAME = MailTools -GARVERSION = 2.04 +GARVERSION = 2.05 CATEGORIES = cpan AUTHOR = MARKOV Modified: csw/mgar/pkg/cpan/Mail-Tools/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Mail-Tools/trunk/checksums 2009-12-27 17:41:15 UTC (rev 7755) +++ csw/mgar/pkg/cpan/Mail-Tools/trunk/checksums 2009-12-27 17:46:05 UTC (rev 7756) @@ -1,3 +1,3 @@ -b25a30ea397a053d8859a08747e5d2e8 download/CSWpmmailtools.gspec -738cde725b5cfcfc3a0608cd5b359acc download/CSWpmmailtools.prototype -d21ea4f375d1e5f3da6b0a4e8ba1e2c6 download/MailTools-2.04.tar.gz +b25a30ea397a053d8859a08747e5d2e8 CSWpmmailtools.gspec +738cde725b5cfcfc3a0608cd5b359acc CSWpmmailtools.prototype +86a51c5a81a55e555c7a84dfdf6ab270 MailTools-2.05.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 Sun Dec 27 19:50:18 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 27 Dec 2009 18:50:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7757] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 7757 http://gar.svn.sourceforge.net/gar/?rev=7757&view=rev Author: idogan23 Date: 2009-12-27 18:50:18 +0000 (Sun, 27 Dec 2009) Log Message: ----------- unbound: bump version to 1.4.1 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 2009-12-27 17:46:05 UTC (rev 7756) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-12-27 18:50:18 UTC (rev 7757) @@ -1,5 +1,5 @@ GARNAME = unbound -GARVERSION = 1.3.4 +GARVERSION = 1.4.1 CATEGORIES = server DESCRIPTION = A validating, recursive, and caching DNS resolver Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2009-12-27 17:46:05 UTC (rev 7756) +++ csw/mgar/pkg/unbound/trunk/checksums 2009-12-27 18:50:18 UTC (rev 7757) @@ -1,3 +1,3 @@ -75867432e238f5afd48dfe5d138097e9 download/cswunbound -601effee1051487655f66790762b66fd download/cswusergroup -d1eb5efed0c36c10dbaf3f805ff3a4bd download/unbound-1.3.4.tar.gz +75867432e238f5afd48dfe5d138097e9 cswunbound +601effee1051487655f66790762b66fd cswusergroup +1e03ef9618e4bca02005bd99bc6af75c unbound-1.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 27 21:41:24 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Dec 2009 20:41:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7758] csw/mgar/pkg Message-ID: Revision: 7758 http://gar.svn.sourceforge.net/gar/?rev=7758&view=rev Author: wbonnet Date: 2009-12-27 20:41:23 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/lutefisk/ csw/mgar/pkg/lutefisk/branches/ csw/mgar/pkg/lutefisk/tags/ csw/mgar/pkg/lutefisk/trunk/ csw/mgar/pkg/lutefisk/trunk/Makefile csw/mgar/pkg/lutefisk/trunk/checksums csw/mgar/pkg/lutefisk/trunk/files/ csw/mgar/pkg/lutefisk/trunk/files/license csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_tilbehor Property changes on: csw/mgar/pkg/lutefisk/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/lutefisk/trunk/Makefile =================================================================== --- csw/mgar/pkg/lutefisk/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lutefisk/trunk/Makefile 2009-12-27 20:41:23 UTC (rev 7758) @@ -0,0 +1,55 @@ +GARNAME = lutefisk +GARVERSION = 0.1 +CATEGORIES = utils + +DESCRIPTION = provides statistics about +define BLURB + Lutefisk is a reporting tool used to send upstream information about the usage of packages. Lutefisk is made of two scripts, smor and tilbehor, each script is a hook called by the package management tools, like pkgutil. + Smor is the package statistics tool. The following informations are sent upstream when a package is downloaded. Package name, arch, OS version both for package and machine running the package tool and source used (current, stable, etc.). + Tilbehor is the mirror statistics tool. The following informations are sent upstream when a package is downloaded. Base URL of the mirror used, arch, OS version of the machine running the package tool and source used (current, stable, etc.). + The use of this tools is completly anonymous. Only the day of the installation taken in account. Especially no time are recorded, and no personal information (such as IP adress) are stored. +endef + +MASTER_SITES = + +DISTFILES = lutefisk_med_tilbehor lutefisk_med_smor license + +# We define upstream file regex so we can be notifed of new upstream software release +# UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +PACKAGES = CSWlutefisktilbehor CSWlutefisksmor +ARCHALL = 1 +LICENSE = license + +CATALOGNAME_CSWlutefisktilbehor = lutefisktilbehor +CATALOGNAME_CSWlutefisksmor = lutefisksmor + +# Defines package description +SPKG_DESC_CSWlutefisksmor = Lutefisk med smor $(DESCRIPTION) packages use +SPKG_DESC_CSWlutefisktilbehor = Lutefisk med tilbehor $(DESCRIPTION) mirrors use + +# Defines dependencies +REQUIRED_PKGS_CSWlutefisktilbehor = CSWwget CSWgawk +REQUIRED_PKGS_CSWlutefisksmor = CSWwget CSWgawk CSWgsed + +# Defines package content +PKGFILES_CSWlutefisktilbehor = .*/lutefisk_med_tilbehor +# PKGFILES_CSWlutefisksmor = .*/lutefisk_med_smor + +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)/etc/opt/csw/pkg-hooks/postfetch.d/ + @gcp $(FILEDIR)/lutefisk_med_tilbehor $(DESTDIR)/etc/opt/csw/pkg-hooks/postfetch.d/ + @gcp $(FILEDIR)/lutefisk_med_smor $(DESTDIR)/etc/opt/csw/pkg-hooks/postfetch.d/ Added: csw/mgar/pkg/lutefisk/trunk/checksums =================================================================== --- csw/mgar/pkg/lutefisk/trunk/checksums (rev 0) +++ csw/mgar/pkg/lutefisk/trunk/checksums 2009-12-27 20:41:23 UTC (rev 7758) @@ -0,0 +1,3 @@ +2d3c4c77372ffd3bc0c077db001e21d6 license +bdd0326be5c948db0266f980cd89c4cb lutefisk_med_smor +c08752237fb6a0c435fc3a868b7ad2da lutefisk_med_tilbehor Added: csw/mgar/pkg/lutefisk/trunk/files/license =================================================================== --- csw/mgar/pkg/lutefisk/trunk/files/license (rev 0) +++ csw/mgar/pkg/lutefisk/trunk/files/license 2009-12-27 20:41:23 UTC (rev 7758) @@ -0,0 +1,22 @@ +The contents of this file are subject to the COMMON DEVELOPMENT AND +DISTRIBUTION LICENSE (CDDL) (the "License"); you may not use this +file except in compliance with the License. + +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +for the specific language governing rights and limitations under the +License. + +Alternatively, the contents of this file may be used under the terms of +either the GNU General Public License Version 3 or later (the "GPL"), +in which case the provisions of the GPL are applicable instead +of those above. If you wish to allow use of your version of this file only +under the terms of either the GPL, and not to allow others to +use your version of this file under the terms of the CDDL, indicate your +decision by deleting the provisions above and replace them with the notice +and other provisions required by the GPL. If you do not delete +the provisions above, a recipient may use your version of this file under +the terms of any one of the CDDL, or the GPL. + +Copyright 2009 OpenCSW (http://www.opencsw.org). All rights reserved. +Use is subject to license terms. Property changes on: csw/mgar/pkg/lutefisk/trunk/files/license ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor =================================================================== --- csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor (rev 0) +++ csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor 2009-12-27 20:41:23 UTC (rev 7758) @@ -0,0 +1,38 @@ +#!/bin/sh +# +# The contents of this file are subject to the COMMON DEVELOPMENT AND +# DISTRIBUTION LICENSE (CDDL) (the "License"); you may not use this +# file except in compliance with the License. +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPL"), +# in which case the provisions of the GPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL, and not to allow others to +# use your version of this file under the terms of the CDDL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the CDDL, or the GPL. + +# Copyright 2009 OpenCSW (http://www.opencsw.org). All rights reserved. +# Use is subject to license terms. +# +# +# Contributors list : +# +# William Bonnet wbonnet at opencsw.org +# + +packageTemp=`echo $1 | tr / \ | gawk '{ print $NF }` +packageName=`echo ${packageTemp} | tr - \ | gawk '{ print $1 }` +packageOsVersion=`echo ${packageTemp} | tr - \ | gawk '{ print $3 }' | gsed -e s/SunOS//` +packageArch=`echo ${packageTemp} | tr - \ | gawk '{ print $4 }` +targetOsVersion=`uname -r | gsed -e s/SunOS//` + +wget "http://www-mockup.opencsw.org/tools/statistics/packageSurvey.php?packageName=${packageName}&packageArch=${packageArch}&packageOsVersion=${packageOsVersion}&targetOsVersion=${targetOsVersion}" -O /dev/null Property changes on: csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_tilbehor =================================================================== --- csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_tilbehor (rev 0) +++ csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_tilbehor 2009-12-27 20:41:23 UTC (rev 7758) @@ -0,0 +1,37 @@ +#!/bin/sh +# +# The contents of this file are subject to the COMMON DEVELOPMENT AND +# DISTRIBUTION LICENSE (CDDL) (the "License"); you may not use this +# file except in compliance with the License. +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPL"), +# in which case the provisions of the GPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL, and not to allow others to +# use your version of this file under the terms of the CDDL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the CDDL, or the GPL. + +# Copyright 2009 OpenCSW (http://www.opencsw.org). All rights reserved. +# Use is subject to license terms. +# +# +# Contributors list : +# +# William Bonnet wbonnet at opencsw.org +# + +mirrorName=`echo $1 | gawk -F/ '{ a = "" ; for (i=1; i <= NF - 5; i++) a = a $i "/" ; i = NF -4 ; a = a $i ; print a }'` +mirrorOsVersion=`echo $1 | tr / \ | gawk '{ i = NF -1 ; print $i }` +mirrorArch=`echo $1 | tr / \ | gawk '{ i = NF - 2 ; print $i }` +mirrorSource=`echo $1 | tr / \ | gawk '{ i = NF - 3 ; print $i }` + +wget "http://www-mockup.opencsw.org/tools/statistics/mirrorSurvey.php?mirrorName=${mirrorName}&mirrorArch=${mirrorArch}&mirrorOsVersion=${mirrorOsVersion}&mirrorSource=${mirrorSource}" -O /dev/null Property changes on: csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_tilbehor ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 27 22:17:00 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Dec 2009 21:17:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7759] csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor Message-ID: Revision: 7759 http://gar.svn.sourceforge.net/gar/?rev=7759&view=rev Author: wbonnet Date: 2009-12-27 21:17:00 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Add source to package stats Modified Paths: -------------- csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor Modified: csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor =================================================================== --- csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor 2009-12-27 20:41:23 UTC (rev 7758) +++ csw/mgar/pkg/lutefisk/trunk/files/lutefisk_med_smor 2009-12-27 21:17:00 UTC (rev 7759) @@ -34,5 +34,6 @@ packageOsVersion=`echo ${packageTemp} | tr - \ | gawk '{ print $3 }' | gsed -e s/SunOS//` packageArch=`echo ${packageTemp} | tr - \ | gawk '{ print $4 }` targetOsVersion=`uname -r | gsed -e s/SunOS//` +packageSource=`echo $1 | tr / \ | gawk '{ i = NF - 3 ; print $i }` -wget "http://www-mockup.opencsw.org/tools/statistics/packageSurvey.php?packageName=${packageName}&packageArch=${packageArch}&packageOsVersion=${packageOsVersion}&targetOsVersion=${targetOsVersion}" -O /dev/null +wget "http://www-mockup.opencsw.org/tools/statistics/packageSurvey.php?packageName=${packageName}&packageArch=${packageArch}&packageOsVersion=${packageOsVersion}&targetOsVersion=${targetOsVersion}&packageSource=${packageSource}" -O /dev/null This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 27 22:23:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Dec 2009 21:23:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7760] csw/mgar/pkg/lutefisk/trunk/checksums Message-ID: Revision: 7760 http://gar.svn.sourceforge.net/gar/?rev=7760&view=rev Author: wbonnet Date: 2009-12-27 21:23:13 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Update checksums Modified Paths: -------------- csw/mgar/pkg/lutefisk/trunk/checksums Modified: csw/mgar/pkg/lutefisk/trunk/checksums =================================================================== --- csw/mgar/pkg/lutefisk/trunk/checksums 2009-12-27 21:17:00 UTC (rev 7759) +++ csw/mgar/pkg/lutefisk/trunk/checksums 2009-12-27 21:23:13 UTC (rev 7760) @@ -1,3 +1,3 @@ 2d3c4c77372ffd3bc0c077db001e21d6 license -bdd0326be5c948db0266f980cd89c4cb lutefisk_med_smor +7bf2ec2be3df056be6db7a9e1ad127cd lutefisk_med_smor c08752237fb6a0c435fc3a868b7ad2da lutefisk_med_tilbehor This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 27 22:29:08 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Dec 2009 21:29:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7761] csw/mgar/pkg/lutefisk/trunk/Makefile Message-ID: Revision: 7761 http://gar.svn.sourceforge.net/gar/?rev=7761&view=rev Author: wbonnet Date: 2009-12-27 21:29:08 +0000 (Sun, 27 Dec 2009) Log Message: ----------- Fix description Modified Paths: -------------- csw/mgar/pkg/lutefisk/trunk/Makefile Modified: csw/mgar/pkg/lutefisk/trunk/Makefile =================================================================== --- csw/mgar/pkg/lutefisk/trunk/Makefile 2009-12-27 21:23:13 UTC (rev 7760) +++ csw/mgar/pkg/lutefisk/trunk/Makefile 2009-12-27 21:29:08 UTC (rev 7761) @@ -29,8 +29,8 @@ CATALOGNAME_CSWlutefisksmor = lutefisksmor # Defines package description -SPKG_DESC_CSWlutefisksmor = Lutefisk med smor $(DESCRIPTION) packages use -SPKG_DESC_CSWlutefisktilbehor = Lutefisk med tilbehor $(DESCRIPTION) mirrors use +SPKG_DESC_CSWlutefisksmor = Lutefisk med smor $(DESCRIPTION) OpenCSW packages use +SPKG_DESC_CSWlutefisktilbehor = Lutefisk med tilbehor $(DESCRIPTION) OpenCSW mirrors use # Defines dependencies REQUIRED_PKGS_CSWlutefisktilbehor = CSWwget CSWgawk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Dec 28 00:04:42 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 27 Dec 2009 23:04:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7762] csw/mgar/pkg Message-ID: Revision: 7762 http://gar.svn.sourceforge.net/gar/?rev=7762&view=rev Author: hson Date: 2009-12-27 23:04:42 +0000 (Sun, 27 Dec 2009) Log Message: ----------- pxlib: Initial commit Added Paths: ----------- csw/mgar/pkg/pxlib/ csw/mgar/pkg/pxlib/branches/ csw/mgar/pkg/pxlib/tags/ csw/mgar/pkg/pxlib/trunk/ csw/mgar/pkg/pxlib/trunk/Makefile csw/mgar/pkg/pxlib/trunk/files/ Property changes on: csw/mgar/pkg/pxlib/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pxlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/pxlib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pxlib/trunk/Makefile 2009-12-27 23:04:42 UTC (rev 7762) @@ -0,0 +1,26 @@ +GARNAME = pxlib +GARVERSION = 0.6.3 +CATEGORIES = lib + +DESCRIPTION = Library to read and write Paradox databases +define BLURB + pxlib is a simply and still small C library to read and write Paradox DB + files. It supports all versions starting from 3.0. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +SPKG_SOURCEURL = http://pxlib.sourceforge.net + +LICENSE = COPYING + +#REQUIRED_PKGS += CSWggettextrt + +UPSTREAM_MASTER_SITES = http://sourceforge.net/projects/pxlib/files +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 28 00:27:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Dec 2009 23:27:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7763] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7763 http://gar.svn.sourceforge.net/gar/?rev=7763&view=rev Author: wahwah Date: 2009-12-27 23:27:30 +0000 (Sun, 27 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: More unit tests, dep guessing by name (for -devel packages) Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51devel.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-27 23:04:42 UTC (rev 7762) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-27 23:27:30 UTC (rev 7763) @@ -3,6 +3,10 @@ # $Id$ # # A check for dependencies between shared libraries. +# +# This is currently more of a prototype than a mature program, but it has some +# unit tests and it appears to be working. The main problem is that it's not +# divided into smaller testable sections. import checkpkg import os @@ -39,17 +43,12 @@ binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] binaries_by_pkgname[checker.pkgname] = binaries_base binaries.extend(pkg_binary_paths) - for f in checker.GetAllFilenames(): - pkg_by_any_filename[f] = checker.pkgname + for filename in checker.GetAllFilenames(): + pkg_by_any_filename[filename] = checker.pkgname # Making the binaries unique binaries = set(binaries) ws_re = re.compile(r"\s+") - # TODO: map from binaries_by_pkgname to sonames_by_pkgname - # - # Essentially, we must look at libfoo.so.1.2.3 and map it to libfoo.so.1, - # whatever soname it has - # man ld.so.1 for more info on this hack env = copy.copy(os.environ) env["LD_NOAUXFLTR"] = "1" @@ -124,7 +123,7 @@ # TODO: Expand $ISALIST to whatever the 'isalist' command outputs for # better matching. for runpath in runpath_by_needed_soname[soname]: - soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) if runpath in soname_runpath_data: lines_by_soname[soname] = soname_runpath_data[runpath] break @@ -140,6 +139,7 @@ pkgs_by_filename[soname] = pkgname # A shared object dependency/provisioning report, plus checking. + # TODO: Rewrite this using cheetah if needed_sonames: print "Analysis of sonames needed by the package set:" for soname in needed_sonames: @@ -157,12 +157,6 @@ % (soname, binaries_by_soname[soname]))) print - # Data needed for this section: - # - pkgname - # - declared dependencies - # - binaries_by_pkgname - # - needed_sonames_by_binary - # - pkgs_by_filename dependent_pkgs = {} for checker in checkers: orphan_sonames = set() @@ -178,20 +172,22 @@ filenames_by_soname, pkg_by_any_filename) - save_testing_data = True - if save_testing_data: - test_fd = open("/var/tmp/checkpkg-dep-testing-data-%s.py" % pkgname, "w") + if options.debug: + data_file_name = "/var/tmp/checkpkg-dep-testing-data-%s.py" % pkgname + logging.warn("Saving test data to %s." % repr(data_file_name)) + test_fd = open(data_file_name, "w") sanitized_pkgname = pkgname.replace("-", "_") print >>test_fd, "# Testing data for %s" % pkgname - print >>test_fd, "DATA_PKGNAME =" % sanitized_pkgname, repr(pkgname) - print >>test_fd, "DATA_DECLARED_DEPENDENCIES =" % sanitized_pkgname, repr(declared_dependencies) - print >>test_fd, "DATA_BINARIES_BY_PKGNAME =" % sanitized_pkgname, repr(binaries_by_pkgname) - print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =" % sanitized_pkgname, repr(needed_sonames_by_binary) - print >>test_fd, "DATA_PKGS_BY_FILENAME =" % sanitized_pkgname, repr(pkgs_by_filename) - print >>test_fd, "DATA_FILENAMES_BY_SONAME =" % sanitized_pkgname, repr(filenames_by_soname) - print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =" % sanitized_pkgname, repr(pkg_by_any_filename) + print >>test_fd, "DATA_PKGNAME =", repr(pkgname) + print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) + print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) + print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) + print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) + print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) + print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) test_fd.close() + # TODO: Rewrite this using cheetah templates. if missing_deps: print "SUGGESTION: you may want to add some or all of the following as depends:" print " (Feel free to ignore SUNW or SPRO packages)" @@ -207,6 +203,7 @@ errors.append(checkpkg.Error("The following soname does't belong to " "any package: %s" % soname)) print "! ", soname + print if errors: for error in errors: @@ -218,3 +215,5 @@ if __name__ == '__main__': main() + +# vim:set sw=2 ts=2 sts=2 expandtab: Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-27 23:04:42 UTC (rev 7762) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-27 23:27:30 UTC (rev 7763) @@ -18,6 +18,7 @@ # Don't report these as unnecessary. TYPICAL_DEPENDENCIES = set(["CSWcommon", "CSWcswclassutils", "CSWisaexec"]) + class Error(Exception): pass @@ -85,7 +86,7 @@ self.CheckPkgpathExists() file_basenames = [] for root, dirs, files in os.walk(self.pkgpath): - file_basenames.extend(files) + file_basenames.extend(files) return file_basenames def GetDependencies(self): @@ -99,7 +100,6 @@ return depends - class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file.""" @@ -191,6 +191,46 @@ return so_dependencies, self_provided, orphan_sonames +def GuessDepsByFilename(pkgname, pkg_by_any_filename): + """Guesses dependencies based on filename regexes.""" + guessed_deps = set() + patterns = ( + (r".*\.py", u"CSWpython"), + (r".*\.pl", u"CSWperl"), + (r".*\.rb", u"CSWruby"), + ) + for pattern, dep_pkgname in patterns: + # If any file name matches, add the dep, go to the next pattern/pkg + # combination. + pattern_re = re.compile("^%s$" % pattern) + for filename in pkg_by_any_filename: + if (re.match(pattern_re, filename) + and + pkgname == pkg_by_any_filename[filename]): + guessed_deps.add(dep_pkgname) + break + return guessed_deps + + +def GuessDepsByPkgname(pkgname, pkg_by_any_filename): + # More guessed dependencies: If one package is a substring of another, it + # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. + # However, the rt (runtime) packages should not want to depend on the main + # package. + guessed_deps = set() + all_other_pkgs = set(pkg_by_any_filename.values()) + for other_pkg in all_other_pkgs: + other_pkg = unicode(other_pkg) + if pkgname == other_pkg: + continue + if pkgname.startswith(other_pkg): + endings = ["devel", "test", "bench", "dev"] + for ending in endings: + if pkgname.endswith(ending): + guessed_deps.add(other_pkg) + return guessed_deps + + def AnalyzeDependencies(pkgname, declared_dependencies, binaries_by_pkgname, @@ -198,34 +238,45 @@ pkgs_by_soname, filenames_by_soname, pkg_by_any_filename): - """ - missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies(...) - """ - so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( - pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename) - guessed_deps = set() - patterns = ( - (r".*\.py", u"CSWpython"), - (r".*\.pl", u"CSWperl"), - (r".*\.rb", u"CSWruby"), - ) - for pattern, dep_pkgname in patterns: - # If any file name matches, add the dep, go to the next pattern/pkg - # combination. - tmp_re = re.compile("^%s$" % pattern) - for f in pkg_by_any_filename: - if re.match(tmp_re, f): - if pkgname == pkg_by_any_filename[f]: - guessed_deps.add(dep_pkgname) - break - auto_dependencies = so_dependencies.union(guessed_deps) - declared_dependencies_set = set(declared_dependencies) - missing_deps = auto_dependencies.difference(declared_dependencies_set) - surplus_deps = declared_dependencies_set.difference(auto_dependencies) - surplus_deps = surplus_deps.difference(TYPICAL_DEPENDENCIES) - return missing_deps, surplus_deps, orphan_sonames + """Gathers and merges dependency results from other functions. + + declared_dependencies: Dependencies that the package in question claims to + have. + + binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names + (without paths) + + needed_sonames_by_binary: A dictionary mapping binary file name to + a dictionary containing: "needed sonames", + "soname", "rpath". Based on examining the binary + files within the packages. + + pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the + contents of the system wide pkgmap + (/var/sadm/install/contents) + + filenames_by_soname: A dictionary mapping shared library sonames to filenames, + based on files within packages + + pkg_by_any_filename: Mapping from file names to packages names, based on the + contents of the packages under examination. + """ + declared_dependencies_set = set(declared_dependencies) + + so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( + pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename) + auto_dependencies = reduce(lambda x, y: x.union(y), + [ + so_dependencies, + GuessDepsByFilename(pkgname, pkg_by_any_filename), + GuessDepsByPkgname(pkgname, pkg_by_any_filename), + ]) + missing_deps = auto_dependencies.difference(declared_dependencies_set) + surplus_deps = declared_dependencies_set.difference(auto_dependencies) + surplus_deps = surplus_deps.difference(TYPICAL_DEPENDENCIES) + return missing_deps, surplus_deps, orphan_sonames Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-27 23:04:42 UTC (rev 7762) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-27 23:27:30 UTC (rev 7763) @@ -6,6 +6,7 @@ import checkpkg_test_data_CSWmysql51rt as d1 import checkpkg_test_data_CSWmysql51client as d2 import checkpkg_test_data_CSWmysql51 as d3 +import checkpkg_test_data_CSWmysql51devel as d4 class DependenciesUnitTest_1(unittest.TestCase): @@ -21,15 +22,14 @@ ) def testSurplusDeps(self): - # set(['CSWmysql51rt', 'CSWosslrt', 'CSWncurses', 'CSWzlib']) self.assertEquals(set([]), self.surplus_deps) def testOrphanSonames(self): self.assertEquals(set([]), self.orphan_sonames) def testMissingDeps(self): - # expected = set([u'SUNWlmsx', u'SUNWlibCx', u'CSWosslrt', u'SUNWcsl', u'SUNWcslx']) - self.assertEquals(set([u'SUNWlibC', u'SUNWcsl', u'SUNWlibms']), self.missing_deps) + expected = set([u'SUNWcsl', u'SUNWlibms', u'SUNWlibC']) + self.assertEquals(expected, self.missing_deps) class DependenciesUnitTest_2(unittest.TestCase): @@ -52,7 +52,8 @@ self.assertEquals(set([]), self.orphan_sonames) def testMissingDeps(self): - self.assertEquals(set([u'SUNWlibC', u'SUNWcsl', u'SUNWlibms']), self.missing_deps) + expected = set([u'SUNWlibC', u'SUNWcsl', u'SUNWlibms']) + self.assertEquals(expected, self.missing_deps) class DependenciesUnitTest_3(unittest.TestCase): @@ -79,5 +80,91 @@ self.assertEquals(expected, self.missing_deps) +class DependenciesUnitTest_4(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d4.DATA_PKGNAME, + d4.DATA_DECLARED_DEPENDENCIES, + d4.DATA_BINARIES_BY_PKGNAME, + d4.DATA_NEEDED_SONAMES_BY_BINARY, + d4.DATA_PKGS_BY_FILENAME, + d4.DATA_FILENAMES_BY_SONAME, + d4.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class GuessDepsUnitTest(unittest.TestCase): + + def testGuessDepsByFilename1(self): + expected = set([u"CSWpython"]) + pkgname = u"CSWfoo" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) + + def testGuessDepsByFilename2(self): + expected = set([]) + pkgname = u"CSWfoo" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWbar", + } + self.assertEqual(expected, + checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname1(self): + expected = set([u"CSWfoo"]) + pkgname = u"CSWfoo-devel" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/bin/barfoo": u"CSWfoobar", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname2(self): + expected = set([]) + pkgname = u"CSWzfoo-devel" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/bin/barfoo": u"CSWfoobar", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname3(self): + self.assertEqual(set([u"CSWmysql51"]), + checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", + d4.DATA_PKG_BY_ANY_FILENAME)) + + def testGuessDepsByPkgname4(self): + data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', + 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) + data2 = dict(((x, x) for x in data1)) + self.assertEqual(set([u"CSWmysql51"]), checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) + + def testGuessDepsByPkgname4(self): + data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', + 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) + data2 = dict(((x, x) for x in data1)) + self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) + + if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51devel.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51devel.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51devel.py 2009-12-27 23:27:30 UTC (rev 7763) @@ -0,0 +1,9 @@ +# Testing data for CSWmysql51devel +# $Id$ +DATA_PKGNAME = 'CSWmysql51devel' +DATA_DECLARED_DEPENDENCIES = {'CSWmysql51': 'CSWmysql51 mysql51 - Multithreaded SQL database ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages '} +DATA_BINARIES_BY_PKGNAME = {'CSWmysql51': ['mysqlslap', 'resolve_stack_dump', 'mysql_tzinfo_to_sql', 'resolveip', 'mysql_waitpid', 'my_print_defaults', 'mysql_upgrade', 'innochecksum', 'myisam_ftdump', 'myisamchk', 'mysqltest', 'resolve_stack_dump', 'mysql_waitpid', 'resolveip', 'my_print_defaults', 'mysqlslap', 'myisamchk', 'innochecksum', 'mysqltest', 'myisam_ftdump', 'mysql_upgrade', 'mysql_tzinfo_to_sql', 'mysqlmanager', 'mysqld', 'mysqlmanager', 'mysqld'], 'CSWmysql51rt': ['libmysqlclient_r.so.16.0.0', 'ha_example.so.0.0.0', 'ha_innodb_plugin.so.0.0.0', 'libmysqlclient.so.16.0.0', 'libmysqlclient_r.so.16.0.0', 'ha_example.so.0.0.0', 'ha_innodb_plugin.so.0.0.0', 'libmysqlclient.so.16.0.0'], 'CSWmysql51test': ['my_safe_process'], 'CSWmysql51client': ['myisampack', 'mysql_client_test', 'mysql', 'mysqlimport', 'mysqladmin', 'mysqldump', 'mysqlbinlog', 'mysqlcheck', 'mysqlshow', 'replace', 'myisamlog', 'perror', 'myisampack', 'mysqldump', 'perror', 'mysqlcheck', 'mysql', 're place', 'mysqladmin', 'mysqlimport', 'mysqlbinlog', 'mysql_client_test', 'mysqlshow', 'myisamlog'], 'CSWmysql51bench': [], 'CSWmysql51devel': []} +DATA_NEEDED_SONAMES_BY_BINARY = {'ha_example.so.0.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'soname': 'ha_example.so.0', 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'li bc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1']}, 'mysql_waitpid': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'replace': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw /mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'myisamchk': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc. so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqldump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'mysql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/op t/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libncursesw.so.5', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libncursesw.so.5', ' libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'myisam_ftdump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'myisamlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISA LIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqlimport': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed soname s': ['libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'mysqlcheck': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'mysqlmanager': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'ne eded sonames': ['libpthread.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqladmin': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/ mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqlshow': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/op t/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'libmysqlclient.so.16.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'soname': 'libmysqlclient.so.16', 'needed sonam es': ['librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1']}, 'mysql_upgrade': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt .so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'innochecksum': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqlbinlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libs sl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'myisampack': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'my_safe_process': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studi o/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'my_print_defaults': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so .1']}, 'mysql_tzinfo_to_sql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', ' libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqld': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libz.so.1', 'libdl.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libmtmalloc.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'lib nsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libz.so.1', 'libdl.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libmtmalloc.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqlslap': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmy sqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}, 'ha_innodb_plugin.so.0.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/sparcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib'], 'soname': 'ha_innodb_plugin.so.0', 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1']}, 'perror': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'libmysqlclient_r.so.16.0.0': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', ' /opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'soname': 'libmysqlclient_r.so.16', 'needed sonames': ['libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8']}, 'mysqltest': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', '/opt/studio/SOS11/SUNWspro/lib/v9', '/opt/SUNWspro/lib/v9', '/usr/ccs/lib/s parcv9', '/lib/sparcv9', '/usr/lib/sparcv9', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib/v8', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib/v8', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1', 'libpthread.so.1', 'libmysqlclient_r.so.16', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'resolve_stack_dump': {'runpath': ['/opt/csw/ lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'resolveip': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/usr/lib'], 'needed sonames': ['li bz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1', 'libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysql_client_test': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib', '/opt/csw/lib', '/opt/csw/mysql51/lib/$ISALIST/mysql', '/opt/csw/mysql51/lib/mysql', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql51/lib/$ISALIST', '/opt/csw/mysql51/lib/64', '/opt/csw/mysql51/lib/64/$ISALIST/mysql', '/opt/csw/mysql51/lib/64/mysql', '/usr/lib'], 'needed sonames': ['libmysqlclient_r.so.16', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1', 'libmysqlclient_r.so.16', 'libpthread.so.1', 'librt.so.1', ' libresolv.so.2', 'libc.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libz.so.1', 'libthread.so.1']}} +DATA_PKGS_BY_FILENAME = {'libresolv.so.2': u'SUNWcsl', 'libthread.so.1': u'SUNWcsl', 'libmtmalloc.so.1': u'SUNWcsl', 'libnsl.so.1': u'SUNWcsl', 'libCstd.so.1': u'SUNWlibC', 'libCrun.so.1': u'SUNWlibC', 'libssl.so.0.9.8': u'CSWosslrt', 'librt.so.1': u'SUNWcsl', 'libz.so.1': u'CSWzlib', 'libncursesw.so.5': u'CSWncurses', 'libsocket.so.1': u'SUNWcsl', 'libm.so.1': u'SUNWlibms', 'libpthread.so.1': u'SUNWcsl', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libdl.so.1': u'SUNWcsl', 'libc.so.1': u'SUNWcsl'} +DATA_FILENAMES_BY_SONAME = {'ha_example.so.0': 'ha_example.so.0.0.0', 'libmysqlclient_r.so.16': 'libmysqlclient_r.so.16.0.0', 'libmysqlclient.so.16': 'libmysqlclient.so.16.0.0', 'ha_innodb_plugin.so.0': 'ha_innodb_plugin.so.0.0.0'} @@ 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 wahwah at users.sourceforge.net Mon Dec 28 00:29:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Dec 2009 23:29:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7764] csw/mgar/pkg/mysql5/trunk Message-ID: Revision: 7764 http://gar.svn.sourceforge.net/gar/?rev=7764&view=rev Author: wahwah Date: 2009-12-27 23:29:27 +0000 (Sun, 27 Dec 2009) Log Message: ----------- mysql5: use mysql51 for the package base name of MySQL 5.1 Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile csw/mgar/pkg/mysql5/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.postinstall csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.preinstall csw/mgar/pkg/mysql5/trunk/files/cswmysql51 Removed Paths: ------------- csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall csw/mgar/pkg/mysql5/trunk/files/cswmysql5 Property Changed: ---------------- csw/mgar/pkg/mysql5/trunk/ Property changes on: csw/mgar/pkg/mysql5/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-git + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-27 23:27:30 UTC (rev 7763) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-12-27 23:29:27 UTC (rev 7764) @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = mysql5 +GARNAME = mysql51 BASE_VERSION = 5.1 PATCHLEVEL = 40 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) @@ -20,10 +20,10 @@ (Structured Query Language) database server. endef -# Change prefix to /opt/csw/mysql5 -prefix = /opt/csw/mysql5 -localstatedir = /var/opt/csw/mysql5 -sysconfdir = /etc/opt/csw/mysql5 +# Change prefix to /opt/csw/$(GARNAME) +prefix = /opt/csw/$(GARNAME) +localstatedir = /var/opt/csw/$(GARNAME) +sysconfdir = /etc/opt/csw/$(GARNAME) # Where to put the init script global_sysconfdir = /etc/opt/csw @@ -32,111 +32,120 @@ INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION) -PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel -PACKAGES += CSWmysql5rt CSWmysql5test +PACKAGES = CSW$(GARNAME) CSW$(GARNAME)bench CSW$(GARNAME)client CSW$(GARNAME)devel +PACKAGES += CSW$(GARNAME)rt CSW$(GARNAME)test 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 -SPKG_DESC_CSWmysql5 = Multithreaded SQL database -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking -SPKG_DESC_CSWmysql5client = MySQL 5 client binaries -SPKG_DESC_CSWmysql5devel = MySQL 5 header files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files -SPKG_DESC_CSWmysql5test = MySQL 5 testing files +SPKG_DESC_CSW$(GARNAME) = Multithreaded SQL database +SPKG_DESC_CSW$(GARNAME)bench = MySQL $(BASE_VERSION) benchmarking +SPKG_DESC_CSW$(GARNAME)client = MySQL $(BASE_VERSION) client binaries +SPKG_DESC_CSW$(GARNAME)devel = MySQL $(BASE_VERSION) header files +SPKG_DESC_CSW$(GARNAME)rt = MySQL $(BASE_VERSION) runtime files +SPKG_DESC_CSW$(GARNAME)test = MySQL $(BASE_VERSION) testing files -CATALOGNAME_CSWmysql5 = $(GARNAME) -CATALOGNAME_CSWmysql5bench = $(GARNAME)bench -CATALOGNAME_CSWmysql5client = $(GARNAME)client -CATALOGNAME_CSWmysql5devel = $(GARNAME)devel -CATALOGNAME_CSWmysql5rt = $(GARNAME)rt -CATALOGNAME_CSWmysql5test = $(GARNAME)test +CATALOGNAME_CSW$(GARNAME) = $(GARNAME) +CATALOGNAME_CSW$(GARNAME)bench = $(GARNAME)bench +CATALOGNAME_CSW$(GARNAME)client = $(GARNAME)client +CATALOGNAME_CSW$(GARNAME)devel = $(GARNAME)devel +CATALOGNAME_CSW$(GARNAME)rt = $(GARNAME)rt +CATALOGNAME_CSW$(GARNAME)test = $(GARNAME)test -INCOMPATIBLE_PKGS_CSWmysql5bench = CSWmysql4bench -INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client -INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 -INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel -INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test - # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. -CSWmysql5client_programs = myisamlog -CSWmysql5client_programs += myisampack -CSWmysql5client_programs += mysql -CSWmysql5client_programs += mysqlaccess -CSWmysql5client_programs += mysqladmin -CSWmysql5client_programs += mysqlbin -CSWmysql5client_programs += mysqlbinlog -CSWmysql5client_programs += mysqlcheck -CSWmysql5client_programs += mysql_client_test -CSWmysql5client_programs += mysqldump -CSWmysql5client_programs += mysqlhotcopy -CSWmysql5client_programs += mysqlimport -CSWmysql5client_programs += mysqlshow -CSWmysql5client_programs += mysql_zap -CSWmysql5client_programs += perror -CSWmysql5client_programs += replace +CSW$(GARNAME)client_programs = myisamlog +CSW$(GARNAME)client_programs += myisampack +CSW$(GARNAME)client_programs += mysql +CSW$(GARNAME)client_programs += mysqlaccess +CSW$(GARNAME)client_programs += mysqladmin +CSW$(GARNAME)client_programs += mysqlbin +CSW$(GARNAME)client_programs += mysqlbinlog +CSW$(GARNAME)client_programs += mysqlcheck +CSW$(GARNAME)client_programs += mysql_client_test +CSW$(GARNAME)client_programs += mysqldump +CSW$(GARNAME)client_programs += mysqlhotcopy +CSW$(GARNAME)client_programs += mysqlimport +CSW$(GARNAME)client_programs += mysqlshow +CSW$(GARNAME)client_programs += mysql_zap +CSW$(GARNAME)client_programs += perror +CSW$(GARNAME)client_programs += replace # Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared # library not found. EXTRA_LIB was tried too, but did not work, as the -R path # ended up with having two $ISALIST tokens. # # Without this setting it looks for: -# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 +# /opt/csw/$(GARNAME)/lib/amd64/libmysqlclient.so.15 # The library is at: -# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +# /opt/csw/$(GARNAME)/lib/amd64/mysql/libmysqlclient.so.15 EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql -CSWmysql5devel_programs += mysql_config +CSW$(GARNAME)devel_programs += mysql_config # Enable 64 bits build BUILD64 = 1 -PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* -PKGFILES_CSWmysql5client = $(bindir) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 -PKGFILES_CSWmysql5devel += $(prefix)/include.* -PKGFILES_CSWmysql5devel += /opt/csw/include/mysql +PKGFILES_CSW$(GARNAME)bench = $(prefix)/sql-bench.* +PKGFILES_CSW$(GARNAME)client = $(bindir) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSW$(GARNAME)devel += $(prefix)/include.* +PKGFILES_CSW$(GARNAME)devel += /opt/csw/include/mysql -PKGFILES_CSWmysql5rt = $(libdir) -PKGFILES_CSWmysql5rt += $(libdir)/.* -PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* +PKGFILES_CSW$(GARNAME)rt = $(libdir) +PKGFILES_CSW$(GARNAME)rt += $(libdir)/.* +PKGFILES_CSW$(GARNAME)test = $(prefix)/mysql-test.* -REQUIRED_PKGS_CSWmysql5bench = CSWmysql5 -REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt -REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt -REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 -REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl -REQUIRED_PKGS_CSWmysql5rt = CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME) = CSW$(GARNAME)client +REQUIRED_PKGS_CSW$(GARNAME) += CSW$(GARNAME)rt +REQUIRED_PKGS_CSW$(GARNAME) += CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME) += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)rt = CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME)rt += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)bench = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)bench += CSWperl +REQUIRED_PKGS_CSW$(GARNAME)client = CSW$(GARNAME)rt +REQUIRED_PKGS_CSW$(GARNAME)client += CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME)client += CSWncurses +REQUIRED_PKGS_CSW$(GARNAME)client += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)devel = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)test = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)test += CSWperl MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz -DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog -DISTFILES += CSWmysql5.preinstall -DISTFILES += CSWmysql5.postinstall +DISTFILES += csw$(GARNAME) quick_start-csw README.CSW ChangeLog +DISTFILES += CSW$(GARNAME).preinstall +DISTFILES += CSW$(GARNAME).postinstall DISTFILES += cswusergroup UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWncurses CSWzlib +# TODO: Do the proper prerequsite pkgs. PREREQUISITE_PKGS = $(REQUIRED_PKGS) # MySQL-5.1.40 doesn't compile without setting EXTRA_INC. EXTRA_INC = /opt/csw/include EXTRA_LIB = /opt/csw/lib -# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# The following EXTRA_CFLAGS are necessary to compile on Solaris 8. Otherwise +# the following problem occurs: +# +# "handler/i_s.cc", line 159: Error: The function "localtime_r" must have a +# prototype. +EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ + # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler @@ -164,7 +173,7 @@ TEST_TARGETS = check -USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup +USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup PROTOTYPE_MODIFIERS = dbdir PROTOTYPE_FILES_dbdir = $(localstatedir) @@ -180,13 +189,17 @@ CFLAGS := $(filter-out -I%,$(CFLAGS)) test-custom: - alias sh=/usr/bin/bash; \ - cd $(WORKSRC)/mysql-test; \ + alias sh=/usr/bin/bash; \ + cd $(WORKSRC)/mysql-test; \ perl mysql-test-run.pl --mem --big-test --force \ --skip-test=archive-big --skip-test=/gis/ pre-configure-modulated: - # To work around the libtool version mismatch problem. + # To work around the following libtool version mismatch problem: + # libtool: Version mismatch error. This is libtool 2.2.6, but the + # libtool: definition of this LT_INIT comes from libtool 2.2.6b. + # libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6 + # http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html cd $(WORKSRC) && autoreconf --force --install --symlink @$(MAKECOOKIE) @@ -196,27 +209,30 @@ ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc - ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ + ln -sf ../../../$(GARNAME)/share/mysql/doc/README.CSW \ $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswmysql5 $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/csw$(GARNAME) $(PKGROOT)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql - ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 + ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) # A symlink for mysql5 include files ginstall -m 755 -d $(PKGROOT)/opt/csw/include - ln -s ../mysql5/include/mysql $(PKGROOT)/opt/csw/include/mysql + # I believe this is broken: + ln -s ../$(GARNAME)/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries ginstall -m 755 -d $(PKGROOT)$(global_bindir) for f in $(PKGROOT)$(bindir)/*; do \ - ln -s ../mysql5/bin/`basename $$f` \ + ln -s ../$(GARNAME)/bin/`basename $$f` \ $(PKGROOT)$(global_bindir)/`basename $$f`; \ done - # /opt/csw/mysql5/lib/sparc9/mysql -- by GAR, it's logical - # /opt/csw/mysql5/lib/mysql/sparcv9 -- expected by other packages + # /opt/csw/$(GARNAME)/lib/sparc9/mysql -- by GAR, it's logical + # /opt/csw/$(GARNAME)/lib/mysql/sparcv9 -- expected by other packages gln -s ../$(ISA_DEFAULT64)/mysql $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT64) # For other applications to link against gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64 + gln -s . $(PKGROOT)$(libdir)/$(ISA_DEFAULT) + gln -s . $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT) @$(MAKECOOKIE) Modified: csw/mgar/pkg/mysql5/trunk/checksums =================================================================== --- csw/mgar/pkg/mysql5/trunk/checksums 2009-12-27 23:27:30 UTC (rev 7763) +++ csw/mgar/pkg/mysql5/trunk/checksums 2009-12-27 23:29:27 UTC (rev 7764) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -558bd157ae37f9d109c6ad02a8f5b049 CSWmysql5.postinstall -a02c82ada9e610d6c6375856161575ec CSWmysql5.preinstall +c8c2ef6365a9bd9b71fac6198d3eeef8 CSWmysql51.postinstall +a652ccff001c328178f4b0ed9bfebbd6 CSWmysql51.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW -45f5ca05ed0c61f21951bd2a7122c036 cswmysql5 +0974c28c048437612c6a0ace93460d3b cswmysql51 67228e1f096fe08a94f4267439a4ec36 cswusergroup 32e7373c16271606007374396e6742ad mysql-5.1.40.tar.gz 60bc6bed72839668ef6496fd31a01ad3 quick_start-csw Deleted: csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall 2009-12-27 23:27:30 UTC (rev 7763) +++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall 2009-12-27 23:29:27 UTC (rev 7764) @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -MYSQLDATADIR=/var/opt/csw/mysql5 -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/trunk/files/CSWmysql5.preinstall =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall 2009-12-27 23:27:30 UTC (rev 7763) +++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall 2009-12-27 23:29:27 UTC (rev 7764) @@ -1,40 +0,0 @@ -#!/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 Copied: csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.postinstall (from rev 7746, csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.postinstall) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.postinstall (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.postinstall 2009-12-27 23:29:27 UTC (rev 7764) @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $Id$ +# + +MYSQLDATADIR=/var/opt/csw/mysql5 +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/trunk/files/CSWmysql51.preinstall (from rev 7746, csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.preinstall) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql51.preinstall 2009-12-27 23:29:27 UTC (rev 7764) @@ -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/trunk/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/cswmysql5 2009-12-27 23:27:30 UTC (rev 7763) +++ csw/mgar/pkg/mysql5/trunk/files/cswmysql5 2009-12-27 23:29:27 UTC (rev 7764) @@ -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/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 -MYSQLHOME=/opt/csw/mysql5 -MYSQL_VAR=/var/opt/csw/mysql5 -MYSQLD_DATADIR=$MYSQL_VAR -MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid -CONFFILE=$MYSQL_VAR/my.cnf - -# -# Source configuration -[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc -[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc - -# To get started quickly, copy a sample configuration file from -# $MYSQLHOME/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 [ 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/mysql5/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 Copied: csw/mgar/pkg/mysql5/trunk/files/cswmysql51 (from rev 7746, csw/mgar/pkg/mysql5/trunk/files/cswmysql5) =================================================================== --- csw/mgar/pkg/mysql5/trunk/files/cswmysql51 (rev 0) +++ csw/mgar/pkg/mysql5/trunk/files/cswmysql51 2009-12-27 23:29:27 UTC (rev 7764) @@ -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/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 +MYSQLHOME=/opt/csw/mysql5 +MYSQL_VAR=/var/opt/csw/mysql5 +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +CONFFILE=$MYSQL_VAR/my.cnf + +# +# Source configuration +[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc +[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc + +# To get started quickly, copy a sample configuration file from +# $MYSQLHOME/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 [ 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/mysql5/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 hson at users.sourceforge.net Mon Dec 28 04:16:06 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 28 Dec 2009 03:16:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7765] csw/mgar/pkg Message-ID: Revision: 7765 http://gar.svn.sourceforge.net/gar/?rev=7765&view=rev Author: hson Date: 2009-12-28 03:16:06 +0000 (Mon, 28 Dec 2009) Log Message: ----------- gobject-introspection: Initial commit Added Paths: ----------- csw/mgar/pkg/gobject-introspection/ csw/mgar/pkg/gobject-introspection/branches/ csw/mgar/pkg/gobject-introspection/tags/ csw/mgar/pkg/gobject-introspection/trunk/ csw/mgar/pkg/gobject-introspection/trunk/Makefile csw/mgar/pkg/gobject-introspection/trunk/checksums csw/mgar/pkg/gobject-introspection/trunk/files/ Property changes on: csw/mgar/pkg/gobject-introspection/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/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2009-12-28 03:16:06 UTC (rev 7765) @@ -0,0 +1,51 @@ +GARNAME = gobject-introspection +GARVERSION = 0.6.7 +CATEGORIES = gnome + +DESCRIPTION = Package for extending API for GObject based libraries +define BLURB + GObject-introspection is a package which will collect and extend the API + metadata for GObject based libraries. The main motivation of this work is to + centralize all introspection information required to write a language binding. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +#PACKAGES = CSWgobjectintrospection CSWgobjectintrospectiondevel CSWjsonglibdoc +#CATALOGNAME_CSWgobjectintrospection = gobject_introspection +#CATALOGNAME_CSWgobjectintrospectiondevel = gobject_introspection_devel +#CATALOGNAME_CSWgobjectintrospectiondoc = gobject_introspection_doc + +PREREQUISITE_PKGS += CSWbison CSWlibffi + +REQUIRED_PKGS += CSWgcc4corert + +UFILES_REGEX = $(GARNAME)-(\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 + +NO_ISAEXEC = 1 +NOISALIST = 1 +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +SHELL = /opt/csw/bin/bash + +#PKGFILES_CSWgobjectintrospectiondevel = $(PKGFILES_DEVEL) +#PKGFILES_CSWgobjectintrospectiondoc = $(sharedstatedir)/gtk-doc/.* + +#ARCHALL_CSWgobjectintrospectiondoc = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +#PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gobject-introspection/trunk/checksums =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/checksums (rev 0) +++ csw/mgar/pkg/gobject-introspection/trunk/checksums 2009-12-28 03:16:06 UTC (rev 7765) @@ -0,0 +1 @@ +41205c14cbd86632806578448e29bd30 gobject-introspection-0.6.7.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Dec 28 04:20:56 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 28 Dec 2009 03:20:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7766] csw/mgar/pkg Message-ID: Revision: 7766 http://gar.svn.sourceforge.net/gar/?rev=7766&view=rev Author: hson Date: 2009-12-28 03:20:55 +0000 (Mon, 28 Dec 2009) Log Message: ----------- json-glib: Initial commit Added Paths: ----------- csw/mgar/pkg/json-glib/ csw/mgar/pkg/json-glib/branches/ csw/mgar/pkg/json-glib/tags/ csw/mgar/pkg/json-glib/trunk/ csw/mgar/pkg/json-glib/trunk/Makefile csw/mgar/pkg/json-glib/trunk/checksums csw/mgar/pkg/json-glib/trunk/files/ Property changes on: csw/mgar/pkg/json-glib/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/json-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/json-glib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/json-glib/trunk/Makefile 2009-12-28 03:20:55 UTC (rev 7766) @@ -0,0 +1,69 @@ +GARNAME = json-glib +GARVERSION = 0.9.2 +CATEGORIES = gnome + +DESCRIPTION = Library providing serialization and deserialization support for the JSON format +define BLURB + JSON-GLib is a C library based on GLib and released under the terms of the + GNU Lesser General Public License version 2.1. It provides a parser and a + generator GObject classes and various wrappers for the complex data types + employed by JSON, such as arrays and objects. + + JSON-GLib uses GLib native data types and the generic value container GValue + for ease of development. It also provides integration with the GObject + classes for direct serialization into, and deserialization from, JSON data + streams. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +PACKAGES = CSWjsonglib CSWjsonglibdevel CSWjsonglibdoc +CATALOGNAME_CSWjsonglib = json_glib +CATALOGNAME_CSWjsonglibdevel = json_glib_devel +CATALOGNAME_CSWjsonglibdoc = json_glib_doc + +SPKG_DESC_CSWjsonglib += Library providing serialization and deserialization support for the JSON format +SPKG_DESC_CSWjsonglibdevel += Library providing serialization and deserialization support for the JSON format develiper package +SPKG_DESC_CSWjsonglibdoc += Library providing serialization and deserialization support for the JSON format documentation + +#PREREQUISITE_PKGS += CSWlibxcbdevel CSWlibpthreadstubs CSWlibxaudevel +#PREREQUISITE_PKGS += CSWxproto CSWrenderproto CSWkbproto CSWpython-devel + +#REQUIRED_PKGS += CSWbonobo2 CSWgconf2 CSWggettextrt CSWglib2 CSWgnomekeyring +#REQUIRED_PKGS += CSWgnomevfs2 CSWgtk2 CSWlibart CSWlibatk CSWlibbonoboui +#REQUIRED_PKGS += CSWlibcairo CSWlibglade2 CSWlibgnome CSWlibgnomecanvas +#REQUIRED_PKGS += CSWlibgnomeui CSWlibgoffice CSWlibgsf CSWlibpopt CSWlibxml2 +#REQUIRED_PKGS += CSWorbit2 CSWpango CSWperl CSWzlib +REQUIRED_PKGS_CSWjsonglib += CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWjsonglibdevel += CSWjsonglib +REQUIRED_PKGS_CSWjsonglibdoc += CSWjsonglib + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://live.gnome.org/JsonGlib + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +NO_ISAEXEC = 1 +NOISALIST = 1 +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +SHELL = /opt/csw/bin/bash + +PKGFILES_CSWjsonglibdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWjsonglibdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWjsonglibdoc = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +#PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/json-glib/trunk/checksums =================================================================== --- csw/mgar/pkg/json-glib/trunk/checksums (rev 0) +++ csw/mgar/pkg/json-glib/trunk/checksums 2009-12-28 03:20:55 UTC (rev 7766) @@ -0,0 +1 @@ +0865f0f97697f4c7f218309615bb0d0d json-glib-0.9.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 28 05:03:28 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 28 Dec 2009 04:03:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7767] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 7767 http://gar.svn.sourceforge.net/gar/?rev=7767&view=rev Author: rthurner Date: 2009-12-28 04:03:24 +0000 (Mon, 28 Dec 2009) Log Message: ----------- postgres - upgrade to 8.4.2, checksums as well Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-28 03:20:55 UTC (rev 7766) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-12-28 04:03:24 UTC (rev 7767) @@ -4,7 +4,7 @@ GARNAME = postgresql BASE_VERSION = 8.4 -PATCHLEVEL = 1 +PATCHLEVEL = 2 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2009-12-28 03:20:55 UTC (rev 7766) +++ csw/mgar/pkg/postgresql/trunk/checksums 2009-12-28 04:03:24 UTC (rev 7767) @@ -1,5 +1,5 @@ -6e4e2a7755acf94bc83200a308e21ef3 README-CSW.txt -e6f5d88d673c79e3948bf0fde2ba282f cswpostgres.tmpl -9e1e49d76fee70cb8e2d49304695ec89 cswusergroup.tmpl -f2015af17bacbbfe140daf0d1067f9c9 postgresql-8.4.1.tar.bz2 -8237c74666058f607f5418e3b57c74a9 postgresql.conf.tmpl +d738227e2f1f742d2f2d4ab56496c5c6 download/postgresql-8.4.2.tar.bz2 +e6f5d88d673c79e3948bf0fde2ba282f download/cswpostgres.tmpl +9e1e49d76fee70cb8e2d49304695ec89 download/cswusergroup.tmpl +8237c74666058f607f5418e3b57c74a9 download/postgresql.conf.tmpl +6e4e2a7755acf94bc83200a308e21ef3 download/README-CSW.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 28 06:28:35 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 28 Dec 2009 05:28:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7768] csw/mgar/pkg Message-ID: Revision: 7768 http://gar.svn.sourceforge.net/gar/?rev=7768&view=rev Author: rthurner Date: 2009-12-28 05:28:34 +0000 (Mon, 28 Dec 2009) Log Message: ----------- xz - first checkin. does not compile yet on solaris Added Paths: ----------- csw/mgar/pkg/xz/ csw/mgar/pkg/xz/branches/ csw/mgar/pkg/xz/tags/ csw/mgar/pkg/xz/trunk/ csw/mgar/pkg/xz/trunk/Makefile csw/mgar/pkg/xz/trunk/checksums csw/mgar/pkg/xz/trunk/files/ Property changes on: csw/mgar/pkg/xz/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/xz/trunk/Makefile =================================================================== --- csw/mgar/pkg/xz/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xz/trunk/Makefile 2009-12-28 05:28:34 UTC (rev 7768) @@ -0,0 +1,32 @@ +GARNAME = xz +GARVERSION = 4.999.9beta +CATEGORIES = utils + +DESCRIPTION = XZ Utils is free data compression software with high compression ratio +define BLURB + XZ Utils is free general-purpose data compression software with high compression + ratio. XZ Utils were written for POSIX-like systems (GNU/Linux, *BSDs, etc.), but + also work on some not-so-POSIX systems like Windows. XZ is based on the LZMA2 + algorithm. The implementation is much more heavywight than lzip. +endef + +MASTER_SITES = http://tukaani.org/xz/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +#REQUIRED_PKGS = CSWgcc3core CSWgcc3corert CSWgcc4corert CSWggettextrt +REQUIRED_PKGS = CSWgcc4corert CSWggettextrt + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) + +# not able to figure out which target runs the tests in "tests" +TEST_TARGET = + +include gar/category.mk Added: csw/mgar/pkg/xz/trunk/checksums =================================================================== --- csw/mgar/pkg/xz/trunk/checksums (rev 0) +++ csw/mgar/pkg/xz/trunk/checksums 2009-12-28 05:28:34 UTC (rev 7768) @@ -0,0 +1 @@ +f2073579b6da2fe35d453adee1aaf1b2 xz-4.999.9beta.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 28 06:29:29 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 28 Dec 2009 05:29:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7769] csw/mgar/pkg Message-ID: Revision: 7769 http://gar.svn.sourceforge.net/gar/?rev=7769&view=rev Author: rthurner Date: 2009-12-28 05:29:29 +0000 (Mon, 28 Dec 2009) Log Message: ----------- pxz - first check in. does not extract with gar, as download is in xz format. Added Paths: ----------- csw/mgar/pkg/pxz/ csw/mgar/pkg/pxz/branches/ csw/mgar/pkg/pxz/tags/ csw/mgar/pkg/pxz/trunk/ csw/mgar/pkg/pxz/trunk/Makefile csw/mgar/pkg/pxz/trunk/checksums csw/mgar/pkg/pxz/trunk/files/ Property changes on: csw/mgar/pkg/pxz/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/pxz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pxz/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pxz/trunk/Makefile 2009-12-28 05:29:29 UTC (rev 7769) @@ -0,0 +1,25 @@ +GARNAME = pxz +GARVERSION = 4.999.9beta.20091201git +CATEGORIES = utils + +DESCRIPTION = pxz is a lossless data compressor based on the LZMA algorithm. +define BLURB + Parallel XZ is a compression utility that takes advantage of running LZMA compression + of different parts of an input file on multiple cores and processors simultaneously. + Its primary goal is to utilize all resources to speed up compression time with minimal + possible influence on compression ratio. +endef + +MASTER_SITES = http://jnovy.fedorapeople.org/pxz/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.xz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/pxz/trunk/checksums =================================================================== --- csw/mgar/pkg/pxz/trunk/checksums (rev 0) +++ csw/mgar/pkg/pxz/trunk/checksums 2009-12-28 05:29:29 UTC (rev 7769) @@ -0,0 +1 @@ +4ae3926185978f5c95c9414dc4634451 pxz-4.999.9beta.20091201git.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 28 06:30:41 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 28 Dec 2009 05:30:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7770] csw/mgar/pkg Message-ID: Revision: 7770 http://gar.svn.sourceforge.net/gar/?rev=7770&view=rev Author: rthurner Date: 2009-12-28 05:30:41 +0000 (Mon, 28 Dec 2009) Log Message: ----------- plzip - first check in. does not yet compile on solaris as a header file is claimed missing. Added Paths: ----------- csw/mgar/pkg/plzip/ csw/mgar/pkg/plzip/branches/ csw/mgar/pkg/plzip/tags/ csw/mgar/pkg/plzip/trunk/ csw/mgar/pkg/plzip/trunk/Makefile csw/mgar/pkg/plzip/trunk/checksums csw/mgar/pkg/plzip/trunk/files/ Property changes on: csw/mgar/pkg/plzip/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/plzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/plzip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/plzip/trunk/Makefile 2009-12-28 05:30:41 UTC (rev 7770) @@ -0,0 +1,28 @@ +GARNAME = plzip +GARVERSION = 0.1 +CATEGORIES = utils + +DESCRIPTION = plzip is a lossless data compressor based on the LZMA algorithm. +define BLURB + Lzip is a lossless data compressor based on the LZMA algorithm, with very safe + integrity checking and a user interface similar to the one of gzip or bzip2. Lzip + decompresses almost as fast as gzip and compresses better than bzip2, which makes + it well suited for software distribution and data archiving. + Currently only compression is performed in parallel. Parallel decompression is + planned to be implemented soon. +endef + +MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/plzip/trunk/checksums =================================================================== --- csw/mgar/pkg/plzip/trunk/checksums (rev 0) +++ csw/mgar/pkg/plzip/trunk/checksums 2009-12-28 05:30:41 UTC (rev 7770) @@ -0,0 +1 @@ +8e736e5d24ca40046a2c52a5b4bebb62 plzip-0.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 Mon Dec 28 09:36:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 08:36:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7771] csw/mgar/pkg/libevent/tags/libevent-1.4.12, REV=2009. 11.04/ Message-ID: Revision: 7771 http://gar.svn.sourceforge.net/gar/?rev=7771&view=rev Author: dmichelsen Date: 2009-12-28 08:36:51 +0000 (Mon, 28 Dec 2009) Log Message: ----------- Tag released version 1.4.12,REV=2009.11.04 Added Paths: ----------- csw/mgar/pkg/libevent/tags/libevent-1.4.12,REV=2009.11.04/ 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 Dec 28 09:39:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 08:39:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7772] csw/mgar/pkg/libevent/trunk Message-ID: Revision: 7772 http://gar.svn.sourceforge.net/gar/?rev=7772&view=rev Author: dmichelsen Date: 2009-12-28 08:39:20 +0000 (Mon, 28 Dec 2009) Log Message: ----------- libevent: Update to 1.4.13 Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/Makefile csw/mgar/pkg/libevent/trunk/checksums Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2009-12-28 08:36:51 UTC (rev 7771) +++ csw/mgar/pkg/libevent/trunk/Makefile 2009-12-28 08:39:20 UTC (rev 7772) @@ -1,15 +1,15 @@ GARNAME = libevent -GARVERSION = 1.4.12 +GARVERSION = 1.4.13 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 1.1a 1.4.12 +MODULATIONS_GARVERSION = 1.1a 1.4.13 SKIP_MODULATIONS = isa-sparcv9-garversion-1.1a SKIP_MODULATIONS += isa-amd64-garversion-1.1a DISTVERSION-1.1a = 1.1a -DISTVERSION-1.4.12 = 1.4.12-stable +DISTVERSION-1.4.13 = 1.4.13-stable DESCRIPTION = Event notification library define BLURB @@ -53,9 +53,9 @@ MERGE_SCRIPTS_isa-extra-garversion-1.1a = copy-relocated-only MERGE_DIRS_isa-extra-garversion-1.1a = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-1.4.12 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-1.4.12 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.4.12 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-1.4.13 = copy-all +MERGE_SCRIPTS_isa-extra-garversion-1.4.13 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.4.13 = $(libdir) PKGFILES_CSWlibevent-devel = $(PKGFILES_DEVEL) PKGFILES_CSWlibevent-devel += $(bindir)/.* Modified: csw/mgar/pkg/libevent/trunk/checksums =================================================================== --- csw/mgar/pkg/libevent/trunk/checksums 2009-12-28 08:36:51 UTC (rev 7771) +++ csw/mgar/pkg/libevent/trunk/checksums 2009-12-28 08:39:20 UTC (rev 7772) @@ -1,2 +1,2 @@ 6cc776458ecaf9247550863702a44d7c libevent-1.1a.tar.gz -77b0d8b9885496871bb083165b35ba11 libevent-1.4.12-stable.tar.gz +0b3ea18c634072d12b3c1ee734263664 libevent-1.4.13-stable.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 Dec 28 09:44:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 08:44:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7773] csw/mgar/pkg/memcached/tags/memcached-1.4.3, REV=2009 .11.24/ Message-ID: Revision: 7773 http://gar.svn.sourceforge.net/gar/?rev=7773&view=rev Author: dmichelsen Date: 2009-12-28 08:44:07 +0000 (Mon, 28 Dec 2009) Log Message: ----------- memcached: Tag memcached-1.4.3,REV=2009.11.24 Added Paths: ----------- csw/mgar/pkg/memcached/tags/memcached-1.4.3,REV=2009.11.24/ 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 Dec 28 09:55:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 08:55:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7774] csw/mgar/pkg/memcached/trunk Message-ID: Revision: 7774 http://gar.svn.sourceforge.net/gar/?rev=7774&view=rev Author: dmichelsen Date: 2009-12-28 08:55:16 +0000 (Mon, 28 Dec 2009) Log Message: ----------- memcached: Update to 1.4.4 Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile csw/mgar/pkg/memcached/trunk/checksums Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2009-12-28 08:44:07 UTC (rev 7773) +++ csw/mgar/pkg/memcached/trunk/Makefile 2009-12-28 08:55:16 UTC (rev 7774) @@ -1,5 +1,5 @@ GARNAME = memcached -GARVERSION = 1.4.3 +GARVERSION = 1.4.4 CATEGORIES = net DESCRIPTION = Distributed memory object caching system Modified: csw/mgar/pkg/memcached/trunk/checksums =================================================================== --- csw/mgar/pkg/memcached/trunk/checksums 2009-12-28 08:44:07 UTC (rev 7773) +++ csw/mgar/pkg/memcached/trunk/checksums 2009-12-28 08:55:16 UTC (rev 7774) @@ -1 +1 @@ -83c6cc6bad9612536b5acbbbddab3eb3 memcached-1.4.3.tar.gz +5ca5b24de347e97ac1f48f3785b4178a memcached-1.4.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 28 13:50:00 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Dec 2009 12:50:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7775] csw/mgar/pkg Message-ID: Revision: 7775 http://gar.svn.sourceforge.net/gar/?rev=7775&view=rev Author: wahwah Date: 2009-12-28 12:49:59 +0000 (Mon, 28 Dec 2009) Log Message: ----------- mox: initial commit Modified Paths: -------------- csw/mgar/pkg/mox/trunk/Makefile csw/mgar/pkg/mox/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mox/ Modified: csw/mgar/pkg/mox/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-28 08:55:16 UTC (rev 7774) +++ csw/mgar/pkg/mox/trunk/Makefile 2009-12-28 12:49:59 UTC (rev 7775) @@ -2,184 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = mox +GARVERSION = 0.5.0 +CATEGORIES = python +DESCRIPTION = a mock object framework for Python define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://code.google.com/p/pymox/ +MASTER_SITES = http://pymox.googlecode.com/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## +TEST_SCRIPTS = # Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/mox/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-12-28 08:55:16 UTC (rev 7774) +++ csw/mgar/pkg/mox/trunk/checksums 2009-12-28 12:49:59 UTC (rev 7775) @@ -0,0 +1 @@ +4203ea4f03c7dcec0a1ceb1290a8b615 mox-0.5.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 28 13:52:55 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Dec 2009 12:52:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7776] csw/mgar/pkg/mox/trunk/Makefile Message-ID: Revision: 7776 http://gar.svn.sourceforge.net/gar/?rev=7776&view=rev Author: wahwah Date: 2009-12-28 12:52:46 +0000 (Mon, 28 Dec 2009) Log Message: ----------- mox: ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/mox/trunk/Makefile Modified: csw/mgar/pkg/mox/trunk/Makefile =================================================================== --- csw/mgar/pkg/mox/trunk/Makefile 2009-12-28 12:49:59 UTC (rev 7775) +++ csw/mgar/pkg/mox/trunk/Makefile 2009-12-28 12:52:46 UTC (rev 7776) @@ -6,6 +6,7 @@ GARVERSION = 0.5.0 CATEGORIES = python DESCRIPTION = a mock object framework for Python +ARCHALL = 1 define BLURB endef SPKG_SOURCEURL = http://code.google.com/p/pymox/ 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 Dec 28 14:12:00 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 28 Dec 2009 13:12:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7777] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 7777 http://gar.svn.sourceforge.net/gar/?rev=7777&view=rev Author: bonivart Date: 2009-12-28 13:11:46 +0000 (Mon, 28 Dec 2009) Log Message: ----------- spamassassin: update to rc1 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-28 12:52:46 UTC (rev 7776) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-28 13:11:46 UTC (rev 7777) @@ -11,9 +11,9 @@ endef #MASTER_SITES = http://apache.jumper.nu/spamassassin/source/ -MASTER_SITES = http://people.apache.org/~wtogami/devel/ +MASTER_SITES = http://people.apache.org/~wtogami/devel/3.3.0-rc1/ #DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz -DISTFILES = $(SPKG_NAME)-$(GARVERSION)-beta1.tar.gz +DISTFILES = $(SPKG_NAME)-$(GARVERSION)-rc1.tar.gz DISTFILES += COPYING REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha1 @@ -68,13 +68,11 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" - @echo "LICENSE = $(WORKSRC)/LICENSE" - @ls -l $(WORKSRC)/LICENSE @rm -rf $(DESTDIR) - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME) - @ginstall -d $(DESTDIR)$(sysconfdir)/CSWspamassassin - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME) + @ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/CSWspamassassin + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/CSWspamassassin.cswspamd $(DESTDIR)/etc/opt/csw/init.d/cswspamd @ginstall -m 644 $(FILEDIR)/CSWspamassassin.cswusergroup $(DESTDIR)$(sysconfdir)/CSWspamassassin/cswusergroup @cp $(FILEDIR)/CSWspamassassin.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-28 12:52:46 UTC (rev 7776) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-28 13:11:46 UTC (rev 7777) @@ -1,2 +1,2 @@ 3b83ef96387f14655fc854ddc3c6bd57 COPYING -530fb1bd28977271f30b348bc2b68db1 Mail-SpamAssassin-3.3.0-beta1.tar.gz +e5f1498a02b79ead743504e1f4f0fa89 Mail-SpamAssassin-3.3.0-rc1.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 Dec 28 14:16:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 13:16:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7778] csw/mgar/pkg/unrar/tags/unrar-3.9.6, REV=2009.11.05/ Message-ID: Revision: 7778 http://gar.svn.sourceforge.net/gar/?rev=7778&view=rev Author: dmichelsen Date: 2009-12-28 13:16:26 +0000 (Mon, 28 Dec 2009) Log Message: ----------- unrar: Tag unrar-3.9.6,REV=2009.11.05 Added Paths: ----------- csw/mgar/pkg/unrar/tags/unrar-3.9.6,REV=2009.11.05/ 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 Dec 28 14:20:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 13:20:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7779] csw/mgar/pkg/unrar/trunk Message-ID: Revision: 7779 http://gar.svn.sourceforge.net/gar/?rev=7779&view=rev Author: dmichelsen Date: 2009-12-28 13:20:17 +0000 (Mon, 28 Dec 2009) Log Message: ----------- unrar: Update to 3.9.7 Modified Paths: -------------- csw/mgar/pkg/unrar/trunk/Makefile csw/mgar/pkg/unrar/trunk/checksums Modified: csw/mgar/pkg/unrar/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrar/trunk/Makefile 2009-12-28 13:16:26 UTC (rev 7778) +++ csw/mgar/pkg/unrar/trunk/Makefile 2009-12-28 13:20:17 UTC (rev 7779) @@ -1,5 +1,5 @@ GARNAME = unrar -GARVERSION = 3.9.6 +GARVERSION = 3.9.7 CATEGORIES = utils DESCRIPTION = RAR archive extractor Modified: csw/mgar/pkg/unrar/trunk/checksums =================================================================== --- csw/mgar/pkg/unrar/trunk/checksums 2009-12-28 13:16:26 UTC (rev 7778) +++ csw/mgar/pkg/unrar/trunk/checksums 2009-12-28 13:20:17 UTC (rev 7779) @@ -1,2 +1,2 @@ 594b777453751ee331ef241160f31499 unrar.1 -07d7c5dd3d3b778fc1870a981c43a3d3 unrarsrc-3.9.6.tar.gz +3222f3e6a8c1b79b4f60086d2af3727a unrarsrc-3.9.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 28 15:07:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Dec 2009 14:07:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7780] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7780 http://gar.svn.sourceforge.net/gar/?rev=7780&view=rev Author: wahwah Date: 2009-12-28 14:07:39 +0000 (Mon, 28 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: expanding $ISALIST, not reporting itself as a dependency Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-28 13:20:17 UTC (rev 7779) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-28 14:07:39 UTC (rev 7780) @@ -21,6 +21,17 @@ RUNPATH = "runpath" SONAME = "soname" +def GetIsalist(): + args = ["isalist"] + isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = isalist_proc.communicate() + ret = isalist_proc.wait() + if ret: + logging.error("Calling isalist has failed.") + isalist = re.split(r"\s+", stdout.strip()) + return isalist + + def main(): errors = [] options, args = checkpkg.GetOptions() @@ -67,6 +78,10 @@ if binary_base_name not in needed_sonames_by_binary: needed_sonames_by_binary[binary_base_name] = {} binary_data = needed_sonames_by_binary[binary_base_name] + if checkpkg.NEEDED_SONAMES not in binary_data: + binary_data[checkpkg.NEEDED_SONAMES] = [] + if RUNPATH not in binary_data: + binary_data[RUNPATH] = [] args = [DUMP_BIN, "-Lv", binary] dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) stdout, stderr = dump_proc.communicate() @@ -78,12 +93,8 @@ if len(fields) < 3: continue if fields[1] == "NEEDED": - if checkpkg.NEEDED_SONAMES not in binary_data: - binary_data[checkpkg.NEEDED_SONAMES] = [] binary_data[checkpkg.NEEDED_SONAMES].append(fields[2]) elif fields[1] == "RUNPATH": - if RUNPATH not in binary_data: - binary_data[RUNPATH] = [] binary_data[RUNPATH].extend(fields[2].split(":")) # Adding the default runtime path search option. binary_data[RUNPATH].append("/usr/lib") @@ -93,7 +104,8 @@ filenames_by_soname[binary_data[SONAME]] = binary_base_name # TODO: make it a unit test # print needed_sonames_by_binary - + isalist = GetIsalist() + # Building indexes runpath_by_needed_soname = {} # {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], @@ -108,28 +120,14 @@ runpath_by_needed_soname[soname] = [] runpath_by_needed_soname[soname].extend(data[RUNPATH]) if soname not in binaries_by_soname: - binaries_by_soname[soname] = [] - binaries_by_soname[soname].append(binary_name) + binaries_by_soname[soname] = set() + binaries_by_soname[soname].add(binary_name) pkgmap = checkpkg.SystemPkgmap() logging.debug("Determining the soname-package relationships.") # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog - lines_by_soname = {} - for soname in needed_sonames: - try: - # This is the critical part of the algorithm: it iterates over the - # runpath and finds the first matching one. - # - # TODO: Expand $ISALIST to whatever the 'isalist' command outputs for - # better matching. - for runpath in runpath_by_needed_soname[soname]: - soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) - if runpath in soname_runpath_data: - lines_by_soname[soname] = soname_runpath_data[runpath] - break - except KeyError, e: - logging.debug("couldn't find %s in the needed sonames list: %s", - soname, e) + lines_by_soname = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) pkgs_by_filename = {} for soname, line in lines_by_soname.iteritems(): # TODO: Find all the packages, not just the last field. @@ -172,7 +170,7 @@ filenames_by_soname, pkg_by_any_filename) - if options.debug: + if options.debug or True: data_file_name = "/var/tmp/checkpkg-dep-testing-data-%s.py" % pkgname logging.warn("Saving test data to %s." % repr(data_file_name)) test_fd = open(data_file_name, "w") @@ -185,6 +183,7 @@ print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) + print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) test_fd.close() # TODO: Rewrite this using cheetah templates. Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-28 13:20:17 UTC (rev 7779) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-28 14:07:39 UTC (rev 7780) @@ -111,6 +111,7 @@ """There is no need to re-parse it each time. Read it slowly the first time and cache it for later.""" + self.cache = {} self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) self.db_path = os.path.join(self.checkpkg_dir, self.SQLITE3_DBNAME) if os.path.exists(self.db_path): @@ -156,12 +157,15 @@ self.conn.execute(sql) def GetPkgmapLineByBasename(self, filename): + if filename in self.cache: + return self.cache[filename] sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" c = self.conn.cursor() c.execute(sql, [filename]) lines = {} for row in c: lines[row[0]] = row[1] + self.cache[filename] = lines return lines def SharedObjectDependencies(pkgname, @@ -277,6 +281,37 @@ GuessDepsByPkgname(pkgname, pkg_by_any_filename), ]) missing_deps = auto_dependencies.difference(declared_dependencies_set) + # Don't report itself as a suggested dependency. + missing_deps = missing_deps.difference(set([pkgname])) surplus_deps = declared_dependencies_set.difference(auto_dependencies) surplus_deps = surplus_deps.difference(TYPICAL_DEPENDENCIES) return missing_deps, surplus_deps, orphan_sonames + + +def ExpandRunpath(runpath, isalist): + if '$ISALIST' in runpath: + runpath_expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] + else: + runpath_expanded_list = [runpath] + return runpath_expanded_list + + +def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): + lines_by_soname = {} + for soname in needed_sonames: + # This is the critical part of the algorithm: it iterates over the + # runpath and finds the first matching one. + runpath_found = False + for runpath in runpath_by_needed_soname[soname]: + runpath_list = ExpandRunpath(runpath, isalist) + soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + for runpath_expanded in runpath_list: + if runpath_expanded in soname_runpath_data: + lines_by_soname[soname] = soname_runpath_data[runpath_expanded] + runpath_found = True + # This break only goes out of the inner loop, + # need another one below to finish the outer loop. + break + if runpath_found: + break + return lines_by_soname Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-28 13:20:17 UTC (rev 7779) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-28 14:07:39 UTC (rev 7780) @@ -2,11 +2,13 @@ # $Id$ import unittest +import mox import checkpkg import checkpkg_test_data_CSWmysql51rt as d1 import checkpkg_test_data_CSWmysql51client as d2 import checkpkg_test_data_CSWmysql51 as d3 import checkpkg_test_data_CSWmysql51devel as d4 +import checkpkg_test_data_CSWlibpq_84 as d5 class DependenciesUnitTest_1(unittest.TestCase): @@ -104,6 +106,31 @@ self.assertEquals(expected, self.missing_deps) +class DependenciesUnitTest_5(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d5.DATA_PKGNAME, + d5.DATA_DECLARED_DEPENDENCIES, + d5.DATA_BINARIES_BY_PKGNAME, + d5.DATA_NEEDED_SONAMES_BY_BINARY, + d5.DATA_PKGS_BY_FILENAME, + d5.DATA_FILENAMES_BY_SONAME, + d5.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + # This tends to report itself... + expected = set([u'SUNWgss', u'SUNWcsl', u'SUNWlibms']) + self.assertEquals(expected, self.missing_deps) + + class GuessDepsUnitTest(unittest.TestCase): def testGuessDepsByFilename1(self): @@ -166,5 +193,52 @@ self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) +class GetLinesBySonameUnitTest(unittest.TestCase): + + def setUp(self): + self.pkgmap_mocker = mox.Mox() + + def testExpandRunpath(self): + isalist = ["foo", "bar"] + runpath = "/opt/csw/lib/$ISALIST" + expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"] + self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) + + def test_1(self): + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"} + # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def test_2(self): + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"} + # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + if __name__ == '__main__': - unittest.main() + unittest.main() Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py 2009-12-28 14:07:39 UTC (rev 7780) @@ -0,0 +1,10 @@ +# Testing data for CSWlibpq-84 +# $Id$ +DATA_PKGNAME = 'CSWlibpq-84' +DATA_DECLARED_DEPENDENCIES = {'CSWlibxml2': 'CSWlibxml2 libxml2 - XML Parser Library ', 'CSWkrb5lib': 'CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries ', 'CSWlibxslt': 'CSWlibxslt libxslt - XSLT engine runtime package ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWzlib': 'CSWzlib zlib - Zlib Data Compression Library ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} +DATA_BINARIES_BY_PKGNAME = {'CSWpostgresql-84-doc': [], 'CSWpostgresql': [], 'CSWpostgresql-84': ['vacuumdb', 'clusterdb', 'vacuumlo', 'initdb', 'reindexdb', 'createdb', 'pg_dump', 'pg_resetxlog', 'pg_config', 'pg_ctl', 'createlang', 'pg_standby', 'oid2name', 'droplang', 'dropdb', 'pgbench', 'createuser', 'pg_controldata', 'postgres', 'pg_dumpall', 'psql', 'dropuser', 'pg_restore', 'ecpg', 'oid2name', 'pg_ctl', 'droplang', 'pg_controldata', 'postgres', 'pg_dump', 'dropuser', 'dropdb', 'initdb', 'vacuumdb', 'pg_config', 'pg_resetxlog', 'createlang', 'createdb', 'vacuumlo', 'pg_standby', 'pgbench', 'reindexdb', 'pg_restore', 'clusterdb', 'ecpg', 'createuser', 'psql', 'pg_dumpall', 'pg_regress', 'pg_regress'], 'CSWpostgresql-84-dev': [], 'CSWlibpq-84': ['fuzzystrmatch.so', 'utf8_and_iso8859.so', 'seg.so', 'utf8_and_gbk.so', 'utf8_and_euc_jis_2004.so', 'cyrillic_and_mic.so', 'btree_gist.so', 'utf8_and_euc_jp.so', 'utf8_and_big5.so', 'cube.so', 'citext.so', 'insert_username.so', 'tsearch2.so', 'pg_stat_statements.so', 'utf8_and_ascii.so', 'lo.so', 'pgxml.so', 'utf8_and_euc_kr.so', 'dict_int.so', 'sslinfo.so', 'btree_gin.so', 'test_parser.so', 'euc_tw_and_big5.so', 'pgcrypto.so', 'latin2_and_win1250.so', 'auto_explain.so', 'tablefunc.so', 'dict_xsyn.so', 'latin_and_mic.so', 'dict_snowball.so', 'euc_jis_2004_and_shift_jis_2004.so', 'chkpass.so', 'utf8_and_shift_jis_2004.so', 'refint.so', 'pgstattuple.so', 'pg_trgm.so', 'utf8_and_uhc.so', 'pgrowlocks.so', 'utf8_and_cyrillic.so', 'pg_freespacemap.so', 'ltree.so', 'libpgtypes.so.3.1', 'libpq.so.5.2', '_int.so', 'utf8_and_win.so', 'pg_buffercache.so', 'euc_jp_and_sjis.so', 'utf8_and_johab.so', 'isn.so', 'timetravel.so', 'earthdistance.so', 'plpgsql.so', 'euc_kr_and_mic.so', 'dblink.so', 'hstore.so', 'pageinspect.so', 'libecpg.so.6.1', 'adminpack.so', 'utf8_and_euc_cn.so', 'utf8_and_sjis.so', 'euc_cn_and_mic.so', 'utf8_and_euc_tw.so', 'autoinc.so', 'libecpg_compat.so.3.1', 'test_parser.so', 'utf8_and_gbk.s o', 'utf8_and_euc_tw.so', 'ltree.so', 'timetravel.so', 'euc_cn_and_mic.so', 'utf8_and_euc_cn.so', 'pgrowlocks.so', 'latin_and_mic.so', 'dict_snowball.so', 'cube.so', 'utf8_and_euc_jis_2004.so', 'utf8_and_shift_jis_2004.so', 'libpgtypes.so.3.1', 'dict_xsyn.so', 'utf8_and_gb18030.so', 'tablefunc.so', 'citext.so', 'isn.so', 'fuzzystrmatch.so', 'pg_freespacemap.so', 'sslinfo.so', 'pg_buffercache.so', 'utf8_and_johab.so', 'euc_jp_and_sjis.so', 'libecpg_compat.so.3.1', 'auto_explain.so', 'btree_gin.so', 'euc_kr_and_mic.so', 'chkpass.so', 'utf8_and_big5.so', 'utf8_and_iso8859_1.so', 'tsearch2.so', 'pg_trgm.so', 'utf8_and_ascii.so', 'btree_gist.so', 'utf8_and_sjis.so', 'euc_jis_2004_and_shift_jis_2004.so', 'utf8_and_win.so', '_int.so', 'libecpg.so.6.1', 'utf8_and_uhc.so', 'pageinspect.so', 'utf8_and_euc_kr.so', 'utf8_and_iso8859.so', 'moddatetime.so', 'pg_stat_statements.so', 'utf8_and_cyrillic.so', 'euc_tw_and_big5.so', 'ascii_and_mic.so', 'libpq.so.5.2', 'cyrillic_and_mic.so', 'db link.so', 'hstore.so', 'plpgsql.so', 'pgxml.so', 'pgcrypto.so', 'lo.so', 'pgstattuple.so', 'autoinc.so', 'dict_int.so', 'earthdistance.so', 'adminpack.so', 'seg.so', 'utf8_and_euc_jp.so', 'latin2_and_win1250.so', 'refint.so', 'insert_username.so', 'ascii_and_mic.so', 'utf8_and_gb18030.so', 'utf8_and_iso8859_1.so', 'moddatetime.so']} +DATA_NEEDED_SONAMES_BY_BINARY = {'ascii_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pgxml.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libxslt.so.1', 'libxml2.so.2']}, 'pg_restore': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'dropdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/l ib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_freespacemap.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/ lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'tsearch2.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'libecpg.so.6.1': {'soname': 'libecpg.so.6', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpgtypes.so.3', 'libpq.so.5', 'libm.so.1', 'libpgtypes.so.3', 'libpq.so.5', 'libm.so.1']}, 'initdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/6 4', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_euc_tw.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/ $ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'ltree.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'postgres': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'li bpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'btree_gist.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'moddatetime.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/ postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'hstore.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'dict_xsyn.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'citext.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/ csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pgbench': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0 .9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_johab.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'cube.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libm.so.1', 'libm.so.1']}, 'pgcrypto.so': {'runpath': ['/opt/csw/lib/$ ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libcrypto.so.0.9.8', 'libz.so.1', 'libcrypto.so.0.9.8', 'libz.so.1']}, 'pg_stat_statements.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'pg_dumpall': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8 .4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'earthdistance.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/p ostgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'auto_explain.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'cyrillic_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'lo.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/post gresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'dict_int.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'adminpack.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/us r/lib'], 'needed sonames': []}, 'euc_tw_and_big5.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_ascii.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'tablefunc.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/po stgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'dict_snowball.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'libecpg_compat.so.3.1': {'soname': 'libecpg_compat.so.3', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libecpg.so.6', 'libpgtypes.so.3', 'libpq.so.5', 'libm.so.1', 'libecpg.so.6', 'libpgtypes.so.3', 'libpq.so.5', 'libm.so.1']}, 'u tf8_and_gbk.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pgrowlocks.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'createdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_buffercache.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'insert_username.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'euc_kr_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'droplang': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIS T', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'latin_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonam es': []}, 'euc_jis_2004_and_shift_jis_2004.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'utf8_and_euc_kr.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_shift_jis_2004.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISAL IST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'pg_trgm.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'autoinc.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'isn.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/ lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'euc_jp_and_sjis.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_big5.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'libpq.so.5.2': {'soname': 'libpq.so.5', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALI ST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libnsl.so.1', 'libsocket.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libnsl.so.1', 'libsocket.so.1']}, 'pg_regress': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb 5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_sjis.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'pgstattuple.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'chkpass.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'ecpg': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'dropuser': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket. so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_iso8859_1.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, '_int.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgres ql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'reindexdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'btree_gin.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'utf8_and_iso8859.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pageinspect.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/l ib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'latin2_and_win1250.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'createuser': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1' , 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'createlang': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm. so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_uhc.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'utf8_and_gb18030.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_win.so': {'runpath': ['/ opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'test_parser.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'psql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgres ql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_standby': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/l ib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_controldata': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcry pto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'refint.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'euc_cn_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib /postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'clusterdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'dblink.so': {'runpath': ['/o pt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libpq.so.5']}, 'vacuumdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1' , 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_resetxlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl .so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'oid2name': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt. so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'vacuumlo': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_config': {'runpath': ['/opt/csw/l ib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_euc_jis_2004.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/c sw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'seg.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'pg_ctl': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['lib pq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_euc_jp.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'libpgtypes.so.3.1': {'soname': 'libpgtypes.so.3', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/po stgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libm.so.1', 'libm.so.1']}, 'utf8_and_cyrillic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'timetravel.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_euc_cn.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'plpgsql.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pg_dump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/l ib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'fuzzystrmatch.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []} , 'sslinfo.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8']}} +DATA_PKGS_BY_FILENAME = {'libxslt.so.1': u'CSWlibxslt', 'libgss.so.1': u'SUNWgss', 'libpam.so.1': u'SUNWcsl', 'libnsl.so.1': u'SUNWcsl', 'libreadline.so.6': u'CSWreadline', 'libssl.so.0.9.8': u'CSWosslrt', 'librt.so.1': u'SUNWcsl', 'libz.so.1': u'CSWzlib', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libm.so.1': u'SUNWlibms', 'libxml2.so.2': u'CSWlibxml2', 'libc.so.1': u'SUNWcsl', 'libgssapi_krb5.so.2': u'CSWkrb5lib', 'libsocket.so.1': u'SUNWcsl', 'libdl.so.1': u'SUNWcsl'} +DATA_FILENAMES_BY_SONAME = {'libpgtypes.so.3': 'libpgtypes.so.3.1', 'libpq.so.5': 'libpq.so.5.2', 'libecpg.so.6': 'libecpg.so.6.1', 'libecpg_compat.so.3': 'libecpg_compat.so.3.1'} @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 28 15:09:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Dec 2009 14:09:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7781] csw/mgar/pkg/texinfo/trunk Message-ID: Revision: 7781 http://gar.svn.sourceforge.net/gar/?rev=7781&view=rev Author: dmichelsen Date: 2009-12-28 14:09:26 +0000 (Mon, 28 Dec 2009) Log Message: ----------- texinfo: Make postinstall sparse-root aware Modified Paths: -------------- csw/mgar/pkg/texinfo/trunk/checksums csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall Modified: csw/mgar/pkg/texinfo/trunk/checksums =================================================================== --- csw/mgar/pkg/texinfo/trunk/checksums 2009-12-28 14:07:39 UTC (rev 7780) +++ csw/mgar/pkg/texinfo/trunk/checksums 2009-12-28 14:09:26 UTC (rev 7781) @@ -1,3 +1,3 @@ -e125eda2f15f31ec8d4b0d34be449aae CSWtexinfo.postinstall +cedd1943a435e39a6d147680e0693bd1 CSWtexinfo.postinstall f5860ae7b0ff06605975c93e2f59fc07 mkdirentries 71ba711519209b5fb583fed2b3d86fcb texinfo-4.13a.tar.gz Modified: csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall =================================================================== --- csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall 2009-12-28 14:07:39 UTC (rev 7780) +++ csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall 2009-12-28 14:09:26 UTC (rev 7781) @@ -2,11 +2,18 @@ BASE=${PKG_INSTALL_ROOT}/opt/csw -echo "Registering existing texinfo-files..." +# Does it exist and is writable or can at least be created? +# This must be tested as we may be inside a sparse zone without +# write access to $BASE. +if test -f ${BASE}/share/info/dir -a -w ${BASE}/share/info/dir || \ + touch ${BASE}/share/info/dir 2>/dev/null; then -FILES=`ls $BASE/share/info/*.info $BASE/share/info/*.info-*` + echo "Registering existing texinfo-files..." + FILES=`ls ${BASE}/share/info/*.info ${BASE}/share/info/*.info-*` + for i in $FILES; do + ${BASE}/bin/install-info $i ${BASE}/share/info/dir 2> /dev/null + done +else + echo "Skip registering pages as ${BASE}/share/info/dir is not writable" +fi -for i in $FILES; do - /opt/csw/bin/install-info $i $BASE/share/info/dir 2> /dev/null -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 Mon Dec 28 15:18:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Dec 2009 14:18:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7782] csw/mgar/pkg/mox/trunk/Makefile Message-ID: Revision: 7782 http://gar.svn.sourceforge.net/gar/?rev=7782&view=rev Author: wahwah Date: 2009-12-28 14:18:44 +0000 (Mon, 28 Dec 2009) Log Message: ----------- mox: Changing the catalog name to py_mox and pkgname to CSWpy-mox Modified Paths: -------------- csw/mgar/pkg/mox/trunk/Makefile Modified: csw/mgar/pkg/mox/trunk/Makefile =================================================================== --- csw/mgar/pkg/mox/trunk/Makefile 2009-12-28 14:09:26 UTC (rev 7781) +++ csw/mgar/pkg/mox/trunk/Makefile 2009-12-28 14:18:44 UTC (rev 7782) @@ -11,6 +11,8 @@ endef SPKG_SOURCEURL = http://code.google.com/p/pymox/ MASTER_SITES = http://pymox.googlecode.com/files/ +PACKAGES = CSWpy-mox +CATALOGNAME_CSWpy-mox = py_mox DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz TEST_SCRIPTS = 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 Dec 28 20:47:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Dec 2009 19:47:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7783] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw Message-ID: Revision: 7783 http://gar.svn.sourceforge.net/gar/?rev=7783&view=rev Author: wahwah Date: 2009-12-28 19:47:28 +0000 (Mon, 28 Dec 2009) Log Message: ----------- mysql5: Added symlinks to allow other programs to find the shared libraries. http://www.opencsw.org/bugtrack/view.php?id=4098 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-git + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2009-12-28 19:47:28 UTC (rev 7783) @@ -2,14 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = mysql5 +PROJ_NAME = mysql +GARNAME = $(PROJ_NAME)5 BASE_VERSION = 5.1 PATCHLEVEL = 40 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server # Useful when making a series of builds on the same day -GARFLAVOR = DBG +GARFLAVOR ?= DBG DISTNAME = mysql-$(GARVERSION) SPKG_SOURCEURL = http://www.mysql.com/ @@ -20,137 +21,152 @@ (Structured Query Language) database server. endef -bindir_install = $(prefix)/bin/$(GARNAME)/$(BASE_VERSION) -datadir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) -docdir=$(prefix)/share/doc/$(GARNAME)/$(BASE_VERSION) -includedir=$(prefix)/include/$(GARNAME)/$(BASE_VERSION) -infodir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/info -libdir_install =$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) -libexecdir_install =$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) -lispdir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/emacs/site-lisp -localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION) -mandir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/man -sbindir_install = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) -sharedstatedir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) -sourcedir=$(prefix)/src/$(GARNAME)/$(BASE_VERSION) -sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION) +bindir_install = $(prefix)/libexec/$(PROJ_NAME)/$(BASE_VERSION)/bin +datadir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION) +docdir = $(prefix)/share/doc/$(PROJ_NAME)/$(BASE_VERSION) +includedir = $(prefix)/include/$(PROJ_NAME)/$(BASE_VERSION) +infodir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION)/info +libdir_install = $(prefix)/lib/$(PROJ_NAME)/$(BASE_VERSION) +libexecdir_install = $(prefix)/libexec/$(PROJ_NAME)/$(BASE_VERSION) +lispdir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION)/emacs/site-lisp +localstatedir = /var$(prefix)/$(PROJ_NAME)/$(BASE_VERSION) +mandir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION)/man +sbindir_install = $(prefix)/sbin/$(PROJ_NAME)/$(BASE_VERSION) +sharedstatedir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION) +sourcedir = $(prefix)/src/$(PROJ_NAME)/$(BASE_VERSION) +sysconfdir = /etc$(prefix)/$(PROJ_NAME)/$(BASE_VERSION) # Where to put the init script -global_sysconfdir = /etc$(prefix) +global_sysconfdir = /etc/opt/csw # Where to link the binaries -global_bindir = /opt$(prefix) +global_bindir = /opt/csw/bin -INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION) +INITSMF = $(global_sysconfdir)/init\.d/csw$(GARNAME) -PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel -PACKAGES += CSWmysql5rt CSWmysql5test +PACKAGES = CSW$(GARNAME) CSW$(GARNAME)bench CSW$(GARNAME)client CSW$(GARNAME)devel +PACKAGES += CSW$(GARNAME)rt CSW$(GARNAME)test 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 -SPKG_DESC_CSWmysql5 = Multithreaded SQL database -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking -SPKG_DESC_CSWmysql5client = MySQL 5 client binaries -SPKG_DESC_CSWmysql5devel = MySQL 5 header files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files -SPKG_DESC_CSWmysql5test = MySQL 5 testing files +SPKG_DESC_CSW$(GARNAME) = Multithreaded SQL database +SPKG_DESC_CSW$(GARNAME)bench = MySQL $(BASE_VERSION) benchmarking +SPKG_DESC_CSW$(GARNAME)client = MySQL $(BASE_VERSION) client binaries +SPKG_DESC_CSW$(GARNAME)devel = MySQL $(BASE_VERSION) header files +SPKG_DESC_CSW$(GARNAME)rt = MySQL $(BASE_VERSION) runtime files +SPKG_DESC_CSW$(GARNAME)test = MySQL $(BASE_VERSION) testing files +CATALOGNAME_CSW$(GARNAME) = $(GARNAME) +CATALOGNAME_CSW$(GARNAME)bench = $(GARNAME)bench +CATALOGNAME_CSW$(GARNAME)client = $(GARNAME)client +CATALOGNAME_CSW$(GARNAME)devel = $(GARNAME)devel +CATALOGNAME_CSW$(GARNAME)rt = $(GARNAME)rt +CATALOGNAME_CSW$(GARNAME)test = $(GARNAME)test -CATALOGNAME_CSWmysql5 = $(GARNAME) -CATALOGNAME_CSWmysql5bench = $(GARNAME)bench -CATALOGNAME_CSWmysql5client = $(GARNAME)client -CATALOGNAME_CSWmysql5devel = $(GARNAME)devel -CATALOGNAME_CSWmysql5rt = $(GARNAME)rt -CATALOGNAME_CSWmysql5test = $(GARNAME)test -INCOMPATIBLE_PKGS_CSWmysql5bench = CSWmysql4bench -INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client -INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 -INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel -INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test +ARCHALL_CSWmysql5bench = 1 # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. -CSWmysql5client_programs = myisamlog -CSWmysql5client_programs += myisampack -CSWmysql5client_programs += mysql -CSWmysql5client_programs += mysqlaccess -CSWmysql5client_programs += mysqladmin -CSWmysql5client_programs += mysqlbin -CSWmysql5client_programs += mysqlbinlog -CSWmysql5client_programs += mysqlcheck -CSWmysql5client_programs += mysql_client_test -CSWmysql5client_programs += mysqldump -CSWmysql5client_programs += mysqlhotcopy -CSWmysql5client_programs += mysqlimport -CSWmysql5client_programs += mysqlshow -CSWmysql5client_programs += mysql_zap -CSWmysql5client_programs += perror -CSWmysql5client_programs += replace +CSW$(GARNAME)client_programs = myisamlog +CSW$(GARNAME)client_programs += myisampack +CSW$(GARNAME)client_programs += mysql +CSW$(GARNAME)client_programs += mysqlaccess +CSW$(GARNAME)client_programs += mysqladmin +CSW$(GARNAME)client_programs += mysqlbin +CSW$(GARNAME)client_programs += mysqlbinlog +CSW$(GARNAME)client_programs += mysqlcheck +CSW$(GARNAME)client_programs += mysql_client_test +CSW$(GARNAME)client_programs += mysqldump +CSW$(GARNAME)client_programs += mysqlhotcopy +CSW$(GARNAME)client_programs += mysqlimport +CSW$(GARNAME)client_programs += mysqlshow +CSW$(GARNAME)client_programs += mysql_zap +CSW$(GARNAME)client_programs += perror +CSW$(GARNAME)client_programs += replace # Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared # library not found. EXTRA_LIB was tried too, but did not work, as the -R path # ended up with having two $ISALIST tokens. # # Without this setting it looks for: -# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 +# /opt/csw/$(GARNAME)/lib/amd64/libmysqlclient.so.15 # The library is at: -# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +# /opt/csw/$(GARNAME)/lib/amd64/mysql/libmysqlclient.so.15 EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql -CSWmysql5devel_programs += mysql_config +CSW$(GARNAME)devel_programs += mysql_config # Enable 64 bits build BUILD64 = 1 -PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* -PKGFILES_CSWmysql5client = $(bindir) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 -PKGFILES_CSWmysql5devel += $(prefix)/include.* -PKGFILES_CSWmysql5devel += /opt/csw/include/mysql +PKGFILES_CSW$(GARNAME)bench = $(prefix)/sql-bench.* +PKGFILES_CSW$(GARNAME)client = $(bindir) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSW$(GARNAME)devel += $(prefix)/include.* +PKGFILES_CSW$(GARNAME)devel += /opt/csw/include/mysql -PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* -PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* +PKGFILES_CSW$(GARNAME)rt = $(libdir) +PKGFILES_CSW$(GARNAME)rt += $(libdir)/.* +PKGFILES_CSW$(GARNAME)test = $(prefix)/mysql-test.* -REQUIRED_PKGS_CSWmysql5bench = CSWmysql5 -REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt -REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt -REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 -REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl +REQUIRED_PKGS_CSW$(GARNAME) = CSW$(GARNAME)client +REQUIRED_PKGS_CSW$(GARNAME) += CSW$(GARNAME)rt +REQUIRED_PKGS_CSW$(GARNAME) += CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME) += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)rt = CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME)rt += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)bench = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)bench += CSWperl +REQUIRED_PKGS_CSW$(GARNAME)client = CSW$(GARNAME)rt +REQUIRED_PKGS_CSW$(GARNAME)client += CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME)client += CSWncurses +REQUIRED_PKGS_CSW$(GARNAME)client += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)devel = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)test = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)test += CSWperl MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz -DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog -DISTFILES += CSWmysql5.preinstall -DISTFILES += CSWmysql5.postinstall +DISTFILES += csw$(GARNAME) quick_start-csw README.CSW ChangeLog +DISTFILES += CSW$(GARNAME).preinstall +DISTFILES += CSW$(GARNAME).postinstall DISTFILES += cswusergroup UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWncurses CSWzlib +# TODO: Do the proper prerequsite pkgs. PREREQUISITE_PKGS = $(REQUIRED_PKGS) # MySQL-5.1.40 doesn't compile without setting EXTRA_INC. EXTRA_INC = /opt/csw/include EXTRA_LIB = /opt/csw/lib + +# The following EXTRA_CFLAGS are necessary to compile on Solaris 8. Otherwise +# the following problem occurs: +# +# "handler/i_s.cc", line 159: Error: The function "localtime_r" must have a +# prototype. EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler +# Why not have a docs package? # CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile +CONFIGURE_ARGS += --with-charset=utf8 CONFIGURE_ARGS += --with-extra-charsets=all CONFIGURE_ARGS += --with-low-memory CONFIGURE_ARGS += --with-pthread @@ -159,15 +175,19 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb CONFIGURE_ARGS += --with-comment +CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc +CONFIGURE_ARGS += --with-big-tables +CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TODO: Make the tests pass. They don't at the moment. -TEST_SCRIPTS = +SKIPTEST ?= 1 +TEST_SCRIPTS = custom TEST_TARGETS = check -USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup +USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup PROTOTYPE_MODIFIERS = dbdir PROTOTYPE_FILES_dbdir = $(localstatedir) @@ -182,6 +202,21 @@ CFLAGS := $(filter-out -I%,$(CFLAGS)) +test-custom: + alias sh=/usr/bin/bash; \ + cd $(WORKSRC)/mysql-test; \ + perl mysql-test-run.pl --mem --big-test --force \ + --skip-test=archive-big --skip-test=/gis/ + +pre-configure-modulated: + # To work around the following libtool version mismatch problem: + # libtool: Version mismatch error. This is libtool 2.2.6, but the + # libtool: definition of this LT_INIT comes from libtool 2.2.6b. + # libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6 + # http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html + cd $(WORKSRC) && autoreconf --force --install --symlink + @$(MAKECOOKIE) + post-merge: ginstall -m 755 -d $(PKGROOT)$(localstatedir) ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc @@ -191,18 +226,26 @@ # ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ # $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswmysql5 $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/csw$(GARNAME) $(PKGROOT)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql - ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 + ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) ## A symlink for mysql5 include files ## ginstall -m 755 -d $(PKGROOT)/opt/csw/include ## ln -s ../mysql5/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries ginstall -m 755 -d $(PKGROOT)$(global_bindir) for f in $(PKGROOT)$(bindir)/*; do \ - ln -s mysql/$(BASE_VERSION)/`basename $$f` $(PKGROOT)$(global_bindir)/`basename $$f`; \ + ln -s ../..$(bindir)/`basename $$f` \ + $(PKGROOT)$(global_bindir)/`basename $$f`; \ done + # /opt/csw/$(GARNAME)/lib/sparc9/mysql -- by GAR, it's logical + # /opt/csw/$(GARNAME)/lib/mysql/sparcv9 -- expected by other packages + gln -s ../$(ISA_DEFAULT64)/mysql $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT64) + # For other applications to link against gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64 + gln -s . $(PKGROOT)$(libdir)/$(ISA_DEFAULT) + gln -s . $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 28 20:53:25 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Dec 2009 19:53:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7784] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 7784 http://gar.svn.sourceforge.net/gar/?rev=7784&view=rev Author: wahwah Date: 2009-12-28 19:53:25 +0000 (Mon, 28 Dec 2009) Log Message: ----------- mysql5: Added symlinks to allow other programs to find the shared libraries. http://www.opencsw.org/bugtrack/view.php?id=4098 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/ Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-12-28 19:47:28 UTC (rev 7783) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-12-28 19:53:25 UTC (rev 7784) @@ -2,13 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = mysql5 -MYSQL_MINOR_VERSION = 0 -MYSQL_PATCHLEVEL = 87 -GARVERSION = 5.$(MYSQL_MINOR_VERSION).$(MYSQL_PATCHLEVEL) +PROJ_NAME = mysql +GARNAME = $(PROJ_NAME)5 +BASE_VERSION = 5.0 +PATCHLEVEL = 87 +GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server +# Useful when making a series of builds on the same day +# GARFLAVOR ?= DBG + DISTNAME = mysql-$(GARVERSION) +SPKG_SOURCEURL = http://www.mysql.com/ DESCRIPTION = Multithreaded SQL database server define BLURB @@ -16,108 +21,126 @@ (Structured Query Language) database server. endef -# Change prefix to /opt/csw/mysql5 -prefix = /opt/csw/mysql5 -sysconfdir = /etc/opt/csw/mysql5 -localstatedir = /var/opt/csw/mysql5 +# Change prefix to /opt/csw/$(GARNAME) +prefix = /opt/csw/$(GARNAME) +localstatedir = /var/opt/csw/$(GARNAME) +sysconfdir = /etc/opt/csw/$(GARNAME) + +# Where to put the init script global_sysconfdir = /etc/opt/csw +# Where to link the binaries global_bindir = /opt/csw/bin -INITSMF = $(global_sysconfdir)/init\.d/cswmysql5 +INITSMF = $(global_sysconfdir)/init\.d/csw$(GARNAME) +PACKAGES = CSW$(GARNAME) CSW$(GARNAME)bench CSW$(GARNAME)client CSW$(GARNAME)devel +PACKAGES += CSW$(GARNAME)rt CSW$(GARNAME)test + 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 -PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel -PACKAGES += CSWmysql5rt CSWmysql5test +SPKG_DESC_CSW$(GARNAME) = Multithreaded SQL database +SPKG_DESC_CSW$(GARNAME)bench = MySQL $(BASE_VERSION) benchmarking +SPKG_DESC_CSW$(GARNAME)client = MySQL $(BASE_VERSION) client binaries +SPKG_DESC_CSW$(GARNAME)devel = MySQL $(BASE_VERSION) header files +SPKG_DESC_CSW$(GARNAME)rt = MySQL $(BASE_VERSION) runtime files +SPKG_DESC_CSW$(GARNAME)test = MySQL $(BASE_VERSION) testing files -CATALOGNAME_CSWmysql5 = $(GARNAME) -CATALOGNAME_CSWmysql5bench = $(GARNAME)bench -CATALOGNAME_CSWmysql5client = $(GARNAME)client -CATALOGNAME_CSWmysql5devel = $(GARNAME)devel -CATALOGNAME_CSWmysql5rt = $(GARNAME)rt -CATALOGNAME_CSWmysql5test = $(GARNAME)test +CATALOGNAME_CSW$(GARNAME) = $(GARNAME) +CATALOGNAME_CSW$(GARNAME)bench = $(GARNAME)bench +CATALOGNAME_CSW$(GARNAME)client = $(GARNAME)client +CATALOGNAME_CSW$(GARNAME)devel = $(GARNAME)devel +CATALOGNAME_CSW$(GARNAME)rt = $(GARNAME)rt +CATALOGNAME_CSW$(GARNAME)test = $(GARNAME)test -SPKG_DESC_CSWmysql5 = Multithreaded SQL database -SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking -SPKG_DESC_CSWmysql5client = MySQL 5 client binaries -SPKG_DESC_CSWmysql5devel = MySQL 5 header files -SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files -SPKG_DESC_CSWmysql5test = MySQL 5 testing files ARCHALL_CSWmysql5bench = 1 # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. -CSWmysql5client_programs = myisamlog -CSWmysql5client_programs += myisampack -CSWmysql5client_programs += mysql -CSWmysql5client_programs += mysqlaccess -CSWmysql5client_programs += mysqladmin -CSWmysql5client_programs += mysqlbin -CSWmysql5client_programs += mysqlbinlog -CSWmysql5client_programs += mysqlcheck -CSWmysql5client_programs += mysql_client_test -CSWmysql5client_programs += mysqldump -CSWmysql5client_programs += mysqlhotcopy -CSWmysql5client_programs += mysqlimport -CSWmysql5client_programs += mysqlshow -CSWmysql5client_programs += mysql_zap -CSWmysql5client_programs += perror -CSWmysql5client_programs += replace +CSW$(GARNAME)client_programs = myisamlog +CSW$(GARNAME)client_programs += myisampack +CSW$(GARNAME)client_programs += mysql +CSW$(GARNAME)client_programs += mysqlaccess +CSW$(GARNAME)client_programs += mysqladmin +CSW$(GARNAME)client_programs += mysqlbin +CSW$(GARNAME)client_programs += mysqlbinlog +CSW$(GARNAME)client_programs += mysqlcheck +CSW$(GARNAME)client_programs += mysql_client_test +CSW$(GARNAME)client_programs += mysqldump +CSW$(GARNAME)client_programs += mysqlhotcopy +CSW$(GARNAME)client_programs += mysqlimport +CSW$(GARNAME)client_programs += mysqlshow +CSW$(GARNAME)client_programs += mysql_zap +CSW$(GARNAME)client_programs += perror +CSW$(GARNAME)client_programs += replace -CSWmysql5devel_programs += mysql_config +# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared +# library not found. EXTRA_LIB was tried too, but did not work, as the -R path +# ended up with having two $ISALIST tokens. +# +# Without this setting it looks for: +# /opt/csw/$(GARNAME)/lib/amd64/libmysqlclient.so.15 +# The library is at: +# /opt/csw/$(GARNAME)/lib/amd64/mysql/libmysqlclient.so.15 +EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql -PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* -PKGFILES_CSWmysql5client = $(bindir) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 -PKGFILES_CSWmysql5devel += $(prefix)/include.* -PKGFILES_CSWmysql5devel += /opt/csw/include/mysql +CSW$(GARNAME)devel_programs += mysql_config -PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* -PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* +# Enable 64 bits build +BUILD64 = 1 -REQUIRED_PKGS_CSWmysql5bench = CSWmysql5 -REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt -REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt -REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 -REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl +PKGFILES_CSW$(GARNAME)bench = $(prefix)/sql-bench.* +PKGFILES_CSW$(GARNAME)client = $(bindir) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(GARNAME)devel += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSW$(GARNAME)devel += $(prefix)/include.* +PKGFILES_CSW$(GARNAME)devel += /opt/csw/include/mysql -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.$(MYSQL_MINOR_VERSION)/ +PKGFILES_CSW$(GARNAME)rt = $(libdir) +PKGFILES_CSW$(GARNAME)rt += $(libdir)/.* +PKGFILES_CSW$(GARNAME)test = $(prefix)/mysql-test.* + +REQUIRED_PKGS_CSW$(GARNAME) = CSW$(GARNAME)client +REQUIRED_PKGS_CSW$(GARNAME) += CSW$(GARNAME)rt +# REQUIRED_PKGS_CSW$(GARNAME) += CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME) += CSWzlib +# REQUIRED_PKGS_CSW$(GARNAME)rt = CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME)rt += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)bench = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)bench += CSWperl +REQUIRED_PKGS_CSW$(GARNAME)client = CSW$(GARNAME)rt +# REQUIRED_PKGS_CSW$(GARNAME)client += CSWosslrt +REQUIRED_PKGS_CSW$(GARNAME)client += CSWncurses +REQUIRED_PKGS_CSW$(GARNAME)client += CSWzlib +REQUIRED_PKGS_CSW$(GARNAME)devel = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)test = CSW$(GARNAME) +REQUIRED_PKGS_CSW$(GARNAME)test += CSWperl + +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz -DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog -DISTFILES += CSWmysql5.preinstall -DISTFILES += CSWmysql5.postinstall +DISTFILES += csw$(GARNAME) quick_start-csw README.CSW ChangeLog +DISTFILES += CSW$(GARNAME).preinstall +DISTFILES += CSW$(GARNAME).postinstall DISTFILES += cswusergroup UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWncurses CSWzlib +# TODO: Do the proper prerequsite pkgs. PREREQUISITE_PKGS = $(REQUIRED_PKGS) EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared -# library not found. EXTRA_LIB was tried too, but did not work, as the -R path -# ended up with having two $ISALIST tokens. -# -# Without this setting it looks for: -# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15 -# The library is at: -# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 -EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql - # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler @@ -130,50 +153,66 @@ CONFIGURE_ARGS += --with-zlib-dir=/opt/csw CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb +CONFIGURE_ARGS_DBG = --with-debug +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TODO: Make the tests pass. They don't at the moment. TEST_SCRIPTS = -# Enable 64 bits build -BUILD64 = 1 -USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup +USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup -PROTOTYPE_MODIFIERS = ownmysql -PROTOTYPE_FILES_ownmysql = /var/opt/csw/mysql5 -PROTOTYPE_USER_ownmysql = mysql -PROTOTYPE_GROUP_ownmysql = mysql -PROTOTYPE_PERMS_ownmysql = 0700 -PROTOTYPE_CLASS_ownmysql = ugfiles +PROTOTYPE_MODIFIERS = dbdir +PROTOTYPE_FILES_dbdir = $(localstatedir) +PROTOTYPE_USER_dbdir = mysql +PROTOTYPE_GROUP_dbdir = mysql +PROTOTYPE_PERMS_dbdir = 0700 +PROTOTYPE_CLASS_dbdir = ugfiles SPKG_CLASSES = none ugfiles include gar/category.mk +CFLAGS := $(filter-out -I%,$(CFLAGS)) + pre-configure-modulated: - # To work around the libtool version mismatch problem. + # To work around the following libtool version mismatch problem: + # libtool: Version mismatch error. This is libtool 2.2.6, but the + # libtool: definition of this LT_INIT comes from libtool 2.2.6b. + # libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6 + # http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html cd $(WORKSRC) && autoreconf --force --install --symlink + @$(MAKECOOKIE) -post-install-modulated: - ginstall -m 755 -d $(DESTDIR)$(localstatedir) - ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc - ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc - ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ - $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW - ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql - ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 +post-merge: + ginstall -m 755 -d $(PKGROOT)$(localstatedir) + ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc + ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc + ln -sf ../../../$(GARNAME)/share/mysql/doc/README.CSW \ + $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW + ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/csw$(GARNAME) $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql + ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) # A symlink for mysql5 include files - ginstall -m 755 -d $(DESTDIR)/opt/csw/include - ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql + ginstall -m 755 -d $(PKGROOT)/opt/csw/include + ln -s ../$(GARNAME)/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries - ginstall -m 755 -d $(DESTDIR)$(global_bindir) - for f in $(DESTDIR)$(bindir)/*; do \ - ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + ginstall -m 755 -d $(PKGROOT)$(global_bindir) + for f in $(PKGROOT)$(bindir)/*; do \ + ln -s ../$(GARNAME)/bin/`basename $$f` \ + $(PKGROOT)$(global_bindir)/`basename $$f`; \ done + # /opt/csw/$(GARNAME)/lib/sparc9/mysql -- by GAR, it's logical + # /opt/csw/$(GARNAME)/lib/mysql/sparcv9 -- expected by other packages + gln -s ../$(ISA_DEFAULT64)/mysql $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT64) + # For other applications to link against + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64 + gln -s . $(PKGROOT)$(libdir)/$(ISA_DEFAULT) + gln -s . $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 29 09:05:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Dec 2009 08:05:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7785] csw/mgar/pkg/sysstat/tags/sysstat-20091024, REV=2009. 10.25/ Message-ID: Revision: 7785 http://gar.svn.sourceforge.net/gar/?rev=7785&view=rev Author: dmichelsen Date: 2009-12-29 08:05:51 +0000 (Tue, 29 Dec 2009) Log Message: ----------- sysstat: Tag sysstag-20091024,REV=2009.10.25 Added Paths: ----------- csw/mgar/pkg/sysstat/tags/sysstat-20091024,REV=2009.10.25/ 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 Dec 29 10:44:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Dec 2009 09:44:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7786] csw/mgar/pkg/sysstat/trunk Message-ID: Revision: 7786 http://gar.svn.sourceforge.net/gar/?rev=7786&view=rev Author: dmichelsen Date: 2009-12-29 09:44:04 +0000 (Tue, 29 Dec 2009) Log Message: ----------- sysstat: Update to 20091228a and force ncurses on this release Modified Paths: -------------- csw/mgar/pkg/sysstat/trunk/Makefile csw/mgar/pkg/sysstat/trunk/checksums Modified: csw/mgar/pkg/sysstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysstat/trunk/Makefile 2009-12-29 08:05:51 UTC (rev 7785) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2009-12-29 09:44:04 UTC (rev 7786) @@ -1,5 +1,5 @@ GARNAME = sysstat -GARVERSION = 20091024 +GARVERSION = 20091228a CATEGORIES = utils DESCRIPTION = Key system statistics at a glance @@ -26,6 +26,8 @@ SPKG_SOURCEURL = http://www.maier-komor.de/sysstat.html +LICENSE = LICENSE + PATCHFILES = patch-onlyisaexec-sysstatd.diff CONFIGURE_SCRIPTS = custom @@ -75,15 +77,15 @@ @( echo "OS = SunOS"; \ echo "INSTALL = /usr/sbin/install"; \ echo "CC = ${CC}"; \ - echo "C_CFLAGS = ${CFLAGS} -xc99=no_lib -I$(includedir)/ncurses -DUSECURSES -DSOLARIS=$(SOLARIS)"; \ - echo "D_CFLAGS = ${CFLAGS} -xc99=no_lib -I$(includedir)/ncurses -DUSECURSES -DSOLARIS=$(SOLARIS)"; \ + echo "C_CFLAGS = ${CFLAGS} -xc99=no_lib -I$(includedir)/ncurses -I$(includedir) -DSOLARIS=$(SOLARIS)"; \ + echo "D_CFLAGS = ${CFLAGS} -xc99=no_lib -I$(includedir)/ncurses -I$(includedir) -DSOLARIS=$(SOLARIS)"; \ echo "CDIR = app"; \ echo "DDIR = daemon"; \ echo 'C_LIBS += $(LDFLAGS) -lncurses -lsocket -lnsl'; \ echo 'LIBS = '; \ echo "PREFIX = ${DESTDIR}${prefix}"; \ echo "ISAEXEC = ${bindir}/isaexec"; \ - echo "MKDEP = ${CC} -xM1 ${CFLAGS} -I$(includedir)/ncurses"; \ + echo "MKDEP = ${CC} -xM1 ${CFLAGS} -I$(includedir)/ncurses -I$(includedir)"; \ echo "modules: $(MKRULES_MODULES)"; \ echo "install: $(MKRULES_INSTALL)"; \ ) > $@ Modified: csw/mgar/pkg/sysstat/trunk/checksums =================================================================== --- csw/mgar/pkg/sysstat/trunk/checksums 2009-12-29 08:05:51 UTC (rev 7785) +++ csw/mgar/pkg/sysstat/trunk/checksums 2009-12-29 09:44:04 UTC (rev 7786) @@ -1,2 +1,2 @@ 7a7f0f67bb68484b56375d4a922fb63f patch-onlyisaexec-sysstatd.diff -747dc25cec5c888b1dacf78730d726c0 sysstat-20091024.tgz +c723b839df3aaad9ea19b0d3a1a3aef0 sysstat-20091228a.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Dec 29 12:32:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Dec 2009 11:32:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7787] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7787 http://gar.svn.sourceforge.net/gar/?rev=7787&view=rev Author: wahwah Date: 2009-12-29 11:32:30 +0000 (Tue, 29 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Moving testdata to a subdirectory Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/__init__.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51rt.py Removed Paths: ------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWmysql51rt.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-29 09:44:04 UTC (rev 7786) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-29 11:32:30 UTC (rev 7787) @@ -4,11 +4,11 @@ import unittest import mox import checkpkg -import checkpkg_test_data_CSWmysql51rt as d1 -import checkpkg_test_data_CSWmysql51client as d2 -import checkpkg_test_data_CSWmysql51 as d3 -import checkpkg_test_data_CSWmysql51devel as d4 -import checkpkg_test_data_CSWlibpq_84 as d5 +import testdata.checkpkg_test_data_CSWmysql51rt as d1 +import testdata.checkpkg_test_data_CSWmysql51client as d2 +import testdata.checkpkg_test_data_CSWmysql51 as d3 +import testdata.checkpkg_test_data_CSWmysql51devel as d4 +import testdata.checkpkg_test_data_CSWlibpq_84 as d5 class DependenciesUnitTest_1(unittest.TestCase): Deleted: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py 2009-12-29 09:44:04 UTC (rev 7786) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test_data_CSWlibpq_84.py 2009-12-29 11:32:30 UTC (rev 7787) @@ -1,10 +0,0 @@ -# Testing data for CSWlibpq-84 -# $Id$ -DATA_PKGNAME = 'CSWlibpq-84' -DATA_DECLARED_DEPENDENCIES = {'CSWlibxml2': 'CSWlibxml2 libxml2 - XML Parser Library ', 'CSWkrb5lib': 'CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries ', 'CSWlibxslt': 'CSWlibxslt libxslt - XSLT engine runtime package ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWzlib': 'CSWzlib zlib - Zlib Data Compression Library ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} -DATA_BINARIES_BY_PKGNAME = {'CSWpostgresql-84-doc': [], 'CSWpostgresql': [], 'CSWpostgresql-84': ['vacuumdb', 'clusterdb', 'vacuumlo', 'initdb', 'reindexdb', 'createdb', 'pg_dump', 'pg_resetxlog', 'pg_config', 'pg_ctl', 'createlang', 'pg_standby', 'oid2name', 'droplang', 'dropdb', 'pgbench', 'createuser', 'pg_controldata', 'postgres', 'pg_dumpall', 'psql', 'dropuser', 'pg_restore', 'ecpg', 'oid2name', 'pg_ctl', 'droplang', 'pg_controldata', 'postgres', 'pg_dump', 'dropuser', 'dropdb', 'initdb', 'vacuumdb', 'pg_config', 'pg_resetxlog', 'createlang', 'createdb', 'vacuumlo', 'pg_standby', 'pgbench', 'reindexdb', 'pg_restore', 'clusterdb', 'ecpg', 'createuser', 'psql', 'pg_dumpall', 'pg_regress', 'pg_regress'], 'CSWpostgresql-84-dev': [], 'CSWlibpq-84': ['fuzzystrmatch.so', 'utf8_and_iso8859.so', 'seg.so', 'utf8_and_gbk.so', 'utf8_and_euc_jis_2004.so', 'cyrillic_and_mic.so', 'btree_gist.so', 'utf8_and_euc_jp.so', 'utf8_and_big5.so', 'cube.so', 'citext.so', 'insert_username.so', 'tsearch2.so', 'pg_stat_statements.so', 'utf8_and_ascii.so', 'lo.so', 'pgxml.so', 'utf8_and_euc_kr.so', 'dict_int.so', 'sslinfo.so', 'btree_gin.so', 'test_parser.so', 'euc_tw_and_big5.so', 'pgcrypto.so', 'latin2_and_win1250.so', 'auto_explain.so', 'tablefunc.so', 'dict_xsyn.so', 'latin_and_mic.so', 'dict_snowball.so', 'euc_jis_2004_and_shift_jis_2004.so', 'chkpass.so', 'utf8_and_shift_jis_2004.so', 'refint.so', 'pgstattuple.so', 'pg_trgm.so', 'utf8_and_uhc.so', 'pgrowlocks.so', 'utf8_and_cyrillic.so', 'pg_freespacemap.so', 'ltree.so', 'libpgtypes.so.3.1', 'libpq.so.5.2', '_int.so', 'utf8_and_win.so', 'pg_buffercache.so', 'euc_jp_and_sjis.so', 'utf8_and_johab.so', 'isn.so', 'timetravel.so', 'earthdistance.so', 'plpgsql.so', 'euc_kr_and_mic.so', 'dblink.so', 'hstore.so', 'pageinspect.so', 'libecpg.so.6.1', 'adminpack.so', 'utf8_and_euc_cn.so', 'utf8_and_sjis.so', 'euc_cn_and_mic.so', 'utf8_and_euc_tw.so', 'autoinc.so', 'libecpg_compat.so.3.1', 'test_parser.so', 'utf8_and_gbk.s o', 'utf8_and_euc_tw.so', 'ltree.so', 'timetravel.so', 'euc_cn_and_mic.so', 'utf8_and_euc_cn.so', 'pgrowlocks.so', 'latin_and_mic.so', 'dict_snowball.so', 'cube.so', 'utf8_and_euc_jis_2004.so', 'utf8_and_shift_jis_2004.so', 'libpgtypes.so.3.1', 'dict_xsyn.so', 'utf8_and_gb18030.so', 'tablefunc.so', 'citext.so', 'isn.so', 'fuzzystrmatch.so', 'pg_freespacemap.so', 'sslinfo.so', 'pg_buffercache.so', 'utf8_and_johab.so', 'euc_jp_and_sjis.so', 'libecpg_compat.so.3.1', 'auto_explain.so', 'btree_gin.so', 'euc_kr_and_mic.so', 'chkpass.so', 'utf8_and_big5.so', 'utf8_and_iso8859_1.so', 'tsearch2.so', 'pg_trgm.so', 'utf8_and_ascii.so', 'btree_gist.so', 'utf8_and_sjis.so', 'euc_jis_2004_and_shift_jis_2004.so', 'utf8_and_win.so', '_int.so', 'libecpg.so.6.1', 'utf8_and_uhc.so', 'pageinspect.so', 'utf8_and_euc_kr.so', 'utf8_and_iso8859.so', 'moddatetime.so', 'pg_stat_statements.so', 'utf8_and_cyrillic.so', 'euc_tw_and_big5.so', 'ascii_and_mic.so', 'libpq.so.5.2', 'cyrillic_and_mic.so', 'db link.so', 'hstore.so', 'plpgsql.so', 'pgxml.so', 'pgcrypto.so', 'lo.so', 'pgstattuple.so', 'autoinc.so', 'dict_int.so', 'earthdistance.so', 'adminpack.so', 'seg.so', 'utf8_and_euc_jp.so', 'latin2_and_win1250.so', 'refint.so', 'insert_username.so', 'ascii_and_mic.so', 'utf8_and_gb18030.so', 'utf8_and_iso8859_1.so', 'moddatetime.so']} -DATA_NEEDED_SONAMES_BY_BINARY = {'ascii_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pgxml.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libxslt.so.1', 'libxml2.so.2']}, 'pg_restore': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'dropdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/l ib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_freespacemap.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/ lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'tsearch2.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'libecpg.so.6.1': {'soname': 'libecpg.so.6', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpgtypes.so.3', 'libpq.so.5', 'libm.so.1', 'libpgtypes.so.3', 'libpq.so.5', 'libm.so.1']}, 'initdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/6 4', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_euc_tw.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/ $ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'ltree.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'postgres': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'li bpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'btree_gist.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'moddatetime.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/ postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'hstore.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'dict_xsyn.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'citext.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/ csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pgbench': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0 .9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_johab.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'cube.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libm.so.1', 'libm.so.1']}, 'pgcrypto.so': {'runpath': ['/opt/csw/lib/$ ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libcrypto.so.0.9.8', 'libz.so.1', 'libcrypto.so.0.9.8', 'libz.so.1']}, 'pg_stat_statements.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'pg_dumpall': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8 .4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'earthdistance.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/p ostgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'auto_explain.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'cyrillic_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'lo.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/post gresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'dict_int.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'adminpack.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/us r/lib'], 'needed sonames': []}, 'euc_tw_and_big5.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_ascii.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'tablefunc.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/po stgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'dict_snowball.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'libecpg_compat.so.3.1': {'soname': 'libecpg_compat.so.3', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libecpg.so.6', 'libpgtypes.so.3', 'libpq.so.5', 'libm.so.1', 'libecpg.so.6', 'libpgtypes.so.3', 'libpq.so.5', 'libm.so.1']}, 'u tf8_and_gbk.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pgrowlocks.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'createdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_buffercache.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'insert_username.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'euc_kr_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'droplang': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIS T', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'latin_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonam es': []}, 'euc_jis_2004_and_shift_jis_2004.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'utf8_and_euc_kr.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_shift_jis_2004.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISAL IST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'pg_trgm.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'autoinc.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'isn.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/ lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'euc_jp_and_sjis.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_big5.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'libpq.so.5.2': {'soname': 'libpq.so.5', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALI ST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libnsl.so.1', 'libsocket.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libnsl.so.1', 'libsocket.so.1']}, 'pg_regress': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb 5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_sjis.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'pgstattuple.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'chkpass.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'ecpg': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'dropuser': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket. so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_iso8859_1.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, '_int.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgres ql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'reindexdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'btree_gin.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'utf8_and_iso8859.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pageinspect.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/l ib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'latin2_and_win1250.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'createuser': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1' , 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'createlang': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm. so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_uhc.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'utf8_and_gb18030.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_win.so': {'runpath': ['/ opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'test_parser.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'psql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgres ql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_standby': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/l ib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_controldata': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcry pto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'refint.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'euc_cn_and_mic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib /postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'clusterdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'dblink.so': {'runpath': ['/o pt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libpq.so.5']}, 'vacuumdb': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1' , 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_resetxlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl .so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'oid2name': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt. so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'vacuumlo': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'pg_config': {'runpath': ['/opt/csw/l ib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_euc_jis_2004.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/c sw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'seg.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []}, 'pg_ctl': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['lib pq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'utf8_and_euc_jp.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'libpgtypes.so.3.1': {'soname': 'libpgtypes.so.3', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/po stgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libm.so.1', 'libm.so.1']}, 'utf8_and_cyrillic.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'timetravel.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib'], 'needed sonames': []}, 'utf8_and_euc_cn.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'plpgsql.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/usr/lib'], 'needed sonames': []}, 'pg_dump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/l ib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgssapi_krb5.so.2', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1', 'libpq.so.5', 'libxslt.so.1', 'libxml2.so.2', 'libpam.so.1', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libgss.so.1', 'libz.so.1', 'libreadline.so.6', 'libnsl.so.1', 'librt.so.1', 'libsocket.so.1', 'libdl.so.1', 'libm.so.1', 'libc.so.1']}, 'fuzzystrmatch.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': []} , 'sslinfo.so': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib/64', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib/$ISALIST', '/opt/csw/lib/postgresql/8.4/lib', '/opt/csw/lib', '/opt/csw/lib/postgresql/8.4/lib', '/usr/lib'], 'needed sonames': ['libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8']}} -DATA_PKGS_BY_FILENAME = {'libxslt.so.1': u'CSWlibxslt', 'libgss.so.1': u'SUNWgss', 'libpam.so.1': u'SUNWcsl', 'libnsl.so.1': u'SUNWcsl', 'libreadline.so.6': u'CSWreadline', 'libssl.so.0.9.8': u'CSWosslrt', 'librt.so.1': u'SUNWcsl', 'libz.so.1': u'CSWzlib', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libm.so.1': u'SUNWlibms', 'libxml2.so.2': u'CSWlibxml2', 'libc.so.1': u'SUNWcsl', 'libgssapi_krb5.so.2': u'CSWkrb5lib', 'libsocket.so.1': u'SUNWcsl', 'libdl.so.1': u'SUNWcsl'} -DATA_FILENAMES_BY_SONAME = {'libpgtypes.so.3': 'libpgtypes.so.3.1', 'libpq.so.5': 'libpq.so.5.2', 'libecpg.so.6': 'libecpg.so.6.1', 'libecpg_compat.so.3': 'libecpg_compat.so.3.1'} @@ 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 wahwah at users.sourceforge.net Tue Dec 29 23:59:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Dec 2009 22:59:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7788] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7788 http://gar.svn.sourceforge.net/gar/?rev=7788&view=rev Author: wahwah Date: 2009-12-29 22:59:44 +0000 (Tue, 29 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Implemented 64-bit symlink emulation (/opt/csw/lib/64 --> amd64), added skipping libm.so.2 Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql5client_8x.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/dump_output_1.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-29 11:32:30 UTC (rev 7787) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-29 22:59:44 UTC (rev 7788) @@ -16,10 +16,9 @@ import subprocess import logging import sys +import textwrap DUMP_BIN = "/usr/ccs/bin/dump" -RUNPATH = "runpath" -SONAME = "soname" def GetIsalist(): args = ["isalist"] @@ -68,60 +67,29 @@ # Assembling a data structure with the data about binaries. # { # : { checkpkg.NEEDED_SONAMES: [...], - # RUNPATH: [...]}, + # checkpkg.RUNPATH: [...]}, # : ..., # ... # } # for binary in binaries: binary_base_name = binary.split("/")[-1] - if binary_base_name not in needed_sonames_by_binary: - needed_sonames_by_binary[binary_base_name] = {} - binary_data = needed_sonames_by_binary[binary_base_name] - if checkpkg.NEEDED_SONAMES not in binary_data: - binary_data[checkpkg.NEEDED_SONAMES] = [] - if RUNPATH not in binary_data: - binary_data[RUNPATH] = [] args = [DUMP_BIN, "-Lv", binary] dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) stdout, stderr = dump_proc.communicate() ret = dump_proc.wait() - for line in stdout.splitlines(): - fields = re.split(ws_re, line) - # TODO: Make it a unit test - # logging.debug("%s says: %s", DUMP_BIN, fields) - if len(fields) < 3: - continue - if fields[1] == "NEEDED": - binary_data[checkpkg.NEEDED_SONAMES].append(fields[2]) - elif fields[1] == "RUNPATH": - binary_data[RUNPATH].extend(fields[2].split(":")) - # Adding the default runtime path search option. - binary_data[RUNPATH].append("/usr/lib") - elif fields[1] == "SONAME": - binary_data[SONAME] = fields[2] - if SONAME in binary_data: - filenames_by_soname[binary_data[SONAME]] = binary_base_name - # TODO: make it a unit test - # print needed_sonames_by_binary + binary_data = checkpkg.ParseDumpOutput(stdout) + needed_sonames_by_binary[binary_base_name] = binary_data + if checkpkg.SONAME in binary_data: + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name isalist = GetIsalist() - # Building indexes - runpath_by_needed_soname = {} - # {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], - # ... - # } - needed_sonames = set() - binaries_by_soname = {} - for binary_name, data in needed_sonames_by_binary.iteritems(): - for soname in data[checkpkg.NEEDED_SONAMES]: - needed_sonames.add(soname) - if soname not in runpath_by_needed_soname: - runpath_by_needed_soname[soname] = [] - runpath_by_needed_soname[soname].extend(data[RUNPATH]) - if soname not in binaries_by_soname: - binaries_by_soname[soname] = set() - binaries_by_soname[soname].add(binary_name) + # Building indexes by soname to simplify further processing + # These are indexes "by soname". + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + needed_sonames_by_binary) pkgmap = checkpkg.SystemPkgmap() logging.debug("Determining the soname-package relationships.") @@ -137,17 +105,20 @@ pkgs_by_filename[soname] = pkgname # A shared object dependency/provisioning report, plus checking. - # TODO: Rewrite this using cheetah + # TODO: Rewrite this using cheetah templates if needed_sonames: print "Analysis of sonames needed by the package set:" for soname in needed_sonames: + logging.debug("Analyzing: %s", soname) if soname in filenames_by_soname: print "%s is provided by the package itself" % soname elif soname in lines_by_soname: - print ("%s is required by %s and provided by %s" + print ("%s is provided by %s and required by:" % (soname, - binaries_by_soname[soname], repr(pkgs_by_filename[soname]))) + filename_lines = textwrap.wrap(" ".join(sorted(binaries_by_soname[soname])), 75) + for line in filename_lines: + print " ", line else: print ("%s is required by %s, but we don't know what provides it." % (soname, binaries_by_soname[soname])) @@ -159,49 +130,61 @@ for checker in checkers: orphan_sonames = set() pkgname = checker.pkgname - print "%s:" % pkgname declared_dependencies = checker.GetDependencies() - missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( - pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_filename, - filenames_by_soname, - pkg_by_any_filename) - - if options.debug or True: - data_file_name = "/var/tmp/checkpkg-dep-testing-data-%s.py" % pkgname + if options.debug: + sanitized_pkgname = pkgname.replace("-", "_") + data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname logging.warn("Saving test data to %s." % repr(data_file_name)) test_fd = open(data_file_name, "w") - sanitized_pkgname = pkgname.replace("-", "_") print >>test_fd, "# Testing data for %s" % pkgname + print >>test_fd, "# $Id$" print >>test_fd, "DATA_PKGNAME =", repr(pkgname) print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) + + print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) + print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) + print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) + print >>test_fd, "DATA_ISALIST =", repr(isalist) test_fd.close() + missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( + pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_filename, + filenames_by_soname, + pkg_by_any_filename) + # TODO: Rewrite this using cheetah templates. + print "%s:" % pkgname + msg_printed = False if missing_deps: print "SUGGESTION: you may want to add some or all of the following as depends:" print " (Feel free to ignore SUNW or SPRO packages)" for dep_pkgname in sorted(missing_deps): print ">", dep_pkgname + msg_printed = True if surplus_deps: print "The following packages might be unnecessary dependencies:" for dep_pkgname in surplus_deps: print "? ", dep_pkgname + msg_printed = True if orphan_sonames: print "The following sonames don't belong to any package:" for soname in sorted(orphan_sonames): errors.append(checkpkg.Error("The following soname does't belong to " "any package: %s" % soname)) print "! ", soname + msg_printed = True + if not msg_printed: + print "+ Dependencies of %s look good." % pkgname print if errors: Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-29 11:32:30 UTC (rev 7787) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-29 22:59:44 UTC (rev 7788) @@ -8,17 +8,24 @@ import os.path import logging import subprocess -import cPickle import re import sqlite3 +import socket SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") NEEDED_SONAMES = "needed sonames" -# Don't report these as unnecessary. -TYPICAL_DEPENDENCIES = set(["CSWcommon", "CSWcswclassutils", "CSWisaexec"]) +RUNPATH = "runpath" +SONAME = "soname" +DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) +DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", + u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms"]) +# This shared library is present on Solaris 10 on amd64, but it's missing on +# Solaris 8 on i386. It's okay if it's missing. +ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) + class Error(Exception): pass @@ -61,6 +68,10 @@ % self.pkgpath) def ListBinaries(self): + """Shells out to list all the binaries from a given package. + + Original checkpkg code: + # ######################################### # # find all executables and dynamic libs,and list their filenames. # listbinaries() { @@ -72,6 +83,7 @@ # # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' # } + """ self.CheckPkgpathExists() find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" find_proc = subprocess.Popen(find_tmpl % self.pkgpath, @@ -101,11 +113,14 @@ class SystemPkgmap(object): - """A class to hold and manipulate the /var/sadm/install/contents file.""" + """A class to hold and manipulate the /var/sadm/install/contents file. + + TODO: Implement timestamp checking and refreshing the cache. + """ STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] CHECKPKG_DIR = ".checkpkg" - SQLITE3_DBNAME = "var-sadm-install-contents-cache" + SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" def __init__(self): """There is no need to re-parse it each time. @@ -113,12 +128,15 @@ Read it slowly the first time and cache it for later.""" self.cache = {} self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) - self.db_path = os.path.join(self.checkpkg_dir, self.SQLITE3_DBNAME) + self.fqdn = socket.getfqdn() + self.db_path = os.path.join(self.checkpkg_dir, + self.SQLITE3_DBNAME_TMPL % self.fqdn) if os.path.exists(self.db_path): logging.debug("Connecting to the %s database.", self.db_path) self.conn = sqlite3.connect(self.db_path) else: - logging.info("Building a cache of /var/sadm/install/contents.") + print "Building a cache of /var/sadm/install/contents." + print "The cache will be kept in %s." % self.db_path if not os.path.exists(self.checkpkg_dir): logging.debug("Creating %s", self.checkpkg_dir) os.mkdir(self.checkpkg_dir) @@ -133,6 +151,8 @@ ); """) + # Original bit of code from checkpkg: + # # egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog @@ -142,7 +162,7 @@ # Creating a data structure: # soname - {: , : , ...} - logging.debug("Building in-memory data structure for the %s file", + logging.debug("Building sqlite3 cache db of the %s file", SYSTEM_PKGMAP) for line in system_pkgmap_fd: if stop_re.search(line): @@ -151,20 +171,22 @@ pkgmap_entry_path = fields[0].split("=")[0] pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" - c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line)) - logging.info("Creating an index.") + c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) + print "Creating a database index." sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" self.conn.execute(sql) def GetPkgmapLineByBasename(self, filename): if filename in self.cache: - return self.cache[filename] + return self.cache[filename] sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" c = self.conn.cursor() c.execute(sql, [filename]) lines = {} for row in c: lines[row[0]] = row[1] + if len(lines) == 0: + logging.debug("Cache doesn't contain filename %s", filename) self.cache[filename] = lines return lines @@ -178,20 +200,46 @@ orphan_sonames = set() self_provided = set() for binary in binaries_by_pkgname[pkgname]: - if binary in needed_sonames_by_binary: - for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: - if soname in filenames_by_soname: - filename = filenames_by_soname[soname] - pkg = pkg_by_any_filename[filename] - self_provided.add(soname) - so_dependencies.add(pkg) - elif soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) + # tmp_so_dependencies, tmp_self_provided, tmp_orphan_sonames = DependenciesOfABinary( + # binary, binaries_by_pkgname, needed_sonames_by_binary, + # pkgs_by_soname, filenames_by_soname, pkg_by_any_filename) + # so_dependencies.union(tmp_so_dependencies) + # orphan_sonames.union(tmp_orphan_sonames) + # self_provided.union(tmp_self_provided) + needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] + # DependenciesOfABinary(binary, needed_sonames, filenames_by_soname, pkgs_by_soname) + for soname in needed_sonames: + if soname in filenames_by_soname: + filename = filenames_by_soname[soname] + pkg = pkg_by_any_filename[filename] + self_provided.add(soname) + so_dependencies.add(pkg) + elif soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) + else: + orphan_sonames.add(soname) + return so_dependencies, self_provided, orphan_sonames + + +def DependenciesOfABinary(binary, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + so_dependencies = set() + orphan_sonames = set() + self_provided = set() + for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: + if soname in filenames_by_soname: + filename = filenames_by_soname[soname] + pkg = pkg_by_any_filename[filename] + self_provided.add(soname) + so_dependencies.add(pkg) + elif soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) else: - logging.warn("%s not found in needed_sonames_by_binary (%s)", - binary, needed_sonames_by_binary.keys()) + orphan_sonames.add(soname) return so_dependencies, self_provided, orphan_sonames @@ -283,20 +331,39 @@ missing_deps = auto_dependencies.difference(declared_dependencies_set) # Don't report itself as a suggested dependency. missing_deps = missing_deps.difference(set([pkgname])) + missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) surplus_deps = declared_dependencies_set.difference(auto_dependencies) - surplus_deps = surplus_deps.difference(TYPICAL_DEPENDENCIES) + surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) + orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) return missing_deps, surplus_deps, orphan_sonames def ExpandRunpath(runpath, isalist): + # Emulating $ISALIST expansion if '$ISALIST' in runpath: - runpath_expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] + expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] else: - runpath_expanded_list = [runpath] - return runpath_expanded_list + expanded_list = [runpath] + return expanded_list +def Emulate64BitSymlinks(runpath_list): + """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink + Since we don't know the architecture, we'll adding both amd64 and sparcv9. + It should be safe. + """ + symlinked_list = [] + for runpath in runpath_list: + if runpath.endswith("/64"): + symlinked_list.append("%s/amd64" % runpath[:-3]) + symlinked_list.append("%s/sparcv9" % runpath[:-3]) + else: + symlinked_list.append(runpath) + return symlinked_list + + def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): + """Works out which system pkgmap lines correspond to given sonames.""" lines_by_soname = {} for soname in needed_sonames: # This is the critical part of the algorithm: it iterates over the @@ -304,7 +371,10 @@ runpath_found = False for runpath in runpath_by_needed_soname[soname]: runpath_list = ExpandRunpath(runpath, isalist) + runpath_list = Emulate64BitSymlinks(runpath_list) soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + logging.debug("%s: will be looking for %s in %s" % + (soname, runpath_list, soname_runpath_data.keys())) for runpath_expanded in runpath_list: if runpath_expanded in soname_runpath_data: lines_by_soname[soname] = soname_runpath_data[runpath_expanded] @@ -313,5 +383,49 @@ # need another one below to finish the outer loop. break if runpath_found: - break + break return lines_by_soname + + +def BuildIndexesBySoname(needed_sonames_by_binary): + """Builds data structures indexed by soname. + + Building indexes + {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], + ... + } + """ + needed_sonames = set() + binaries_by_soname = {} + runpath_by_needed_soname = {} + for binary_name, data in needed_sonames_by_binary.iteritems(): + for soname in data[NEEDED_SONAMES]: + needed_sonames.add(soname) + if soname not in runpath_by_needed_soname: + runpath_by_needed_soname[soname] = [] + runpath_by_needed_soname[soname].extend(data[RUNPATH]) + if soname not in binaries_by_soname: + binaries_by_soname[soname] = set() + binaries_by_soname[soname].add(binary_name) + return needed_sonames, binaries_by_soname, runpath_by_needed_soname + + +def ParseDumpOutput(dump_output): + binary_data = {RUNPATH: [], + NEEDED_SONAMES: []} + for line in dump_output.splitlines(): + fields = re.split(WS_RE, line) + # TODO: Make it a unit test + # logging.debug("%s says: %s", DUMP_BIN, fields) + if len(fields) < 3: + continue + if fields[1] == "NEEDED": + binary_data[NEEDED_SONAMES].append(fields[2]) + elif fields[1] == "RUNPATH": + binary_data[RUNPATH].extend(fields[2].split(":")) + # Adding the default runtime path search option. + binary_data[RUNPATH].append("/usr/lib/$ISALIST") + binary_data[RUNPATH].append("/usr/lib") + elif fields[1] == "SONAME": + binary_data[SONAME] = fields[2] + return binary_data Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-29 11:32:30 UTC (rev 7787) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-29 22:59:44 UTC (rev 7788) @@ -9,7 +9,24 @@ import testdata.checkpkg_test_data_CSWmysql51 as d3 import testdata.checkpkg_test_data_CSWmysql51devel as d4 import testdata.checkpkg_test_data_CSWlibpq_84 as d5 +import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 +import testdata.dump_output_1 as dump_1 +"""A set of unit tests for the library checking code. + +A bunch of lines to test in the interactive Python shell. + +import sys +sys.path.append("gar/bin/checkpkg.d") +import checkpkg +import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 + +checkpkg.SharedObjectDependencies("CSWmysql5client", d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, d6.DATA_PKG_BY_ANY_FILENAME) + +sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x +SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; +""" + class DependenciesUnitTest_1(unittest.TestCase): def setUp(self): @@ -30,7 +47,7 @@ self.assertEquals(set([]), self.orphan_sonames) def testMissingDeps(self): - expected = set([u'SUNWcsl', u'SUNWlibms', u'SUNWlibC']) + expected = set([]) self.assertEquals(expected, self.missing_deps) @@ -54,7 +71,7 @@ self.assertEquals(set([]), self.orphan_sonames) def testMissingDeps(self): - expected = set([u'SUNWlibC', u'SUNWcsl', u'SUNWlibms']) + expected = set([]) self.assertEquals(expected, self.missing_deps) @@ -78,7 +95,7 @@ self.assertEquals(set([]), self.orphan_sonames) def testMissingDeps(self): - expected = set(['CSWmysql51rt', u'SUNWcsl', u'SUNWlibms', u'SUNWlibC']) + expected = set(['CSWmysql51rt']) self.assertEquals(expected, self.missing_deps) @@ -127,10 +144,36 @@ def testMissingDeps(self): # This tends to report itself... - expected = set([u'SUNWgss', u'SUNWcsl', u'SUNWlibms']) + expected = set([u'SUNWgss']) self.assertEquals(expected, self.missing_deps) +class DependenciesUnitTest_6(unittest.TestCase): + + def setUp(self): + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( + d6.DATA_PKGNAME, + d6.DATA_DECLARED_DEPENDENCIES, + d6.DATA_BINARIES_BY_PKGNAME, + d6.DATA_NEEDED_SONAMES_BY_BINARY, + d6.DATA_PKGS_BY_FILENAME, + d6.DATA_FILENAMES_BY_SONAME, + d6.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + class GuessDepsUnitTest(unittest.TestCase): def testGuessDepsByFilename1(self): @@ -195,16 +238,30 @@ class GetLinesBySonameUnitTest(unittest.TestCase): + class PkgmapStub(object): + + def __init__(self, cache): + self.cache = cache + + def GetPkgmapLineByBasename(self, soname): + return self.cache[soname] + def setUp(self): self.pkgmap_mocker = mox.Mox() - def testExpandRunpath(self): + def testExpandRunpath_1(self): isalist = ["foo", "bar"] runpath = "/opt/csw/lib/$ISALIST" expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"] self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) - def test_1(self): + def testExpandRunpath_2(self): + isalist = ["foo", "bar"] + runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql" + expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] + self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) + + def testGetLinesBySoname(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) pkgmap.GetPkgmapLineByBasename("foo") @@ -221,24 +278,135 @@ self.pkgmap_mocker.VerifyAll() self.assertEqual(expected, result) - def test_2(self): + def testGetLinesBySoname_3(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) pkgmap.GetPkgmapLineByBasename("foo") - lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} + lines1 = { + "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"} # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) self.pkgmap_mocker.ReplayAll() pkgmap.GetPkgmapLineByBasename("foo") needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} + runpath_by_needed_soname = { + "foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + result = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) self.pkgmap_mocker.VerifyAll() self.assertEqual(expected, result) + def testGetLinesBySoname_4(self): + """A more complex test, four ISAs.""" + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = { + "/opt/csw/lib/isa-value-1": + "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/mysql5/lib/isa-value-2": + "/opt/csw/mysql5/lib/isa-value-2/foo.so.1 foo", + "/opt/csw/mysql5/lib/isa-value-1": + "/opt/csw/mysql5/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": + "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": + "/usr/lib/foo.so.1 foo"} + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = { + "foo.so.1": ["/opt/csw/mysql5/lib/$ISALIST/mysql", + "/opt/csw/lib/$ISALIST", + "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + def testGetLinesBySoname_5(self): + """Based on CSWmysql5client on build8x.""" + soname = u'libm.so.1' + expected = {u'libm.so.1': u'/usr/lib/libm.so.1 f none 0755 root bin ' + u'99844 3884 1050525375 SUNWlibms\n'} + + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + def testGetLinesBySoname_6(self): + """Based on CSWmysql5client on build8x.""" + soname = u'libz.so.1' + expected = {u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' + u's none CSWzlib\n'} + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + def testGetLinesBySoname_7(self): + """A test for 64-bit symlink expansion.""" + soname = u'libncursesw.so.5' + # To test the 64-bit symlink expansion + expected = {u'libncursesw.so.5': u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 s none CSWncurses\n'} + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + +class ParseDumpOutputUnitTest(unittest.TestCase): + + def test_1(self): + expected = { + 'soname': 'libmysqlclient.so.15', + 'runpath': ['/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/mysql5/lib/$ISALIST', + '/opt/csw/mysql5/lib', + '/opt/csw/mysql5/lib/$ISALIST/mysql', + # These two are artificially appended + '/usr/lib/$ISALIST', + '/usr/lib'], + 'needed sonames': ['librt.so.1', + 'libresolv.so.2', + 'libc.so.1', + 'libgen.so.1', + 'libsocket.so.1', + 'libnsl.so.1', + 'libm.so.1', + 'libz.so.1']} + self.assertEqual(expected, + checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) + + if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql5client_8x.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql5client_8x.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql5client_8x.py 2009-12-29 22:59:44 UTC (rev 7788) @@ -0,0 +1,13 @@ +# Testing data for CSWmysql5client +# $Id$ +DATA_PKGNAME = 'CSWmysql5client' +DATA_DECLARED_DEPENDENCIES = {'CSWzlib': 'CSWzlib zlib - Zlib Data Compression Library ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWmysql5rt': 'CSWmysql5rt mysql5rt - MySQL 5.0 runtime files ', 'CSWncurses': 'CSWncurses ncurses - A free software emulation of curses ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages '} +DATA_BINARIES_BY_PKGNAME = {'CSWmysql5test': [], 'CSWmysql5rt': ['libmysqlclient.so.15.0.0', 'libmysqlclient.so.15.0.0'], 'CSWmysql5client': ['mysqlimport', 'perror', 'mysqldump', 'mysqlbinlog', 'mysql', 'mysqlcheck', 'mysql_client_test', 'mysqladmin', 'mysqlshow', 'myisampack', 'myisamlog', 'replace', 'mysql_client_test', 'mysqlcheck', 'mysqladmin', 'mysqlimport', 'myisampack', 'mysqlshow', 'myisamlog', 'mysqlbinlog', 'replace', 'perror', 'mysqldump', 'mysql'], 'CSWmysql5bench': [], 'CSWmysql5devel': [], 'CSWmysql5': ['my_print_defaults', 'comp_err', 'mysqltestmanager-pwgen', 'innochecksum', 'resolveip', 'mysql_waitpid', 'mysqltestmanagerc', 'mysql_upgrade', 'myisam_ftdump', 'myisamchk', 'resolve_stack_dump', 'mysqltest', 'mysql_tzinfo_to_sql', 'resolve_stack_dump', 'mysqltestmanagerc', 'innochecksum', 'mysqltestmanager-pwgen', 'myisam_ftdump', 'my_print_defaults', 'mysql_upgrade', 'mysql_tzinfo_to_sql', 'resolveip', 'comp_err', 'mysql_waitpid', 'mysqltest', 'myisamchk', 'm ysqlmanager', 'mysqld', 'mysqld', 'mysqlmanager']} +DATA_NEEDED_SONAMES_BY_BINARY = {'mysql_waitpid': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'comp_err': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libthread.so.1']}, 'replace': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so. 1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'libmysqlclient.so.15.0.0': {'soname': 'libmysqlclient.so.15', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1']}, 'myisamchk': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libthread.so.1']}, 'mysqldump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIS T', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/opt/csw/mysql5/lib/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libthread.so.1']}, 'mysql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/amd64', '/opt/studio/SOS11/SUNWspro/lib/amd64', '/usr/ccs/lib/64', '/lib/64', '/usr/lib/64', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libncursesw.so.5', 'libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'myisam_ftdump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'myisamlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqlimport': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libns l.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}, 'mysqlcheck': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}, 'mysqlmanager': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/amd64', '/opt/studio/SOS11/SUNWspro/lib/amd64', '/usr/ccs/lib/64', '/lib/64', '/usr/lib/64', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libpthread.so.1', 'libz.so.1', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqlad min': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/opt/csw/mysql5/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'mysqlshow': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}, 'mysqltestmanager-pwgen': {'run path': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/opt/csw/mysql5/lib/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libthread.so.1']}, 'mysql_upgrade': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}, 'innochecksum': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'n eeded sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqlbinlog': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/opt/csw/mysql5/lib/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libz.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'my_print_defaults': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'li bpthread.so.1', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libthread.so.1']}, 'mysqld': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7/amd64', '/opt/studio/SOS11/SUNWspro/lib/amd64', '/usr/ccs/lib/64', '/lib/64', '/usr/lib/64', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['librt.so.1', 'libz.so.1', 'libdl.so.1', 'libpthread.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'myisampack': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl .so.1', 'libm.so.1', 'libthread.so.1']}, 'mysql_tzinfo_to_sql': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/opt/studio/SOS11/SUNWspro/lib/rw7', '/opt/studio/SOS11/SUNWspro/lib', '/opt/SUNWspro/lib', '/usr/ccs/lib', '/lib', '/usr/lib', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libCstd.so.1', 'libCrun.so.1', 'libthread.so.1']}, 'perror': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'mysqltestmanagerc': {'runpath': ['/op t/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}, 'mysqltest': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}, 'resolve_stack_dump': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libresolv.so.2', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', 'libthread.so.1']}, 'resolveip': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libz.so.1', 'libpthread.so.1', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libthread.so.1']}, 'mysql_client_test': {'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib/64', '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib/64', '/opt/csw/mysql5/lib/64/$ISALIST/mysql', '/opt/csw/mysql5/lib/64/mysql', '/usr/lib/$ISALIST', '/usr/lib'], 'needed sonames': ['libmysqlclient.so.15', 'librt.so.1', 'libc.so.1', 'libgen.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libm.so.2', 'libz.so.1', 'libthread.so.1']}} +DATA_PKGS_BY_FILENAME = {'libresolv.so.2': u'SUNWcsl', 'libthread.so.1': u'SUNWcsl', 'libgen.so.1': u'SUNWcsl', 'libnsl.so.1': u'SUNWcsl', 'libmysqlclient.so.15': u'CSWmysql5rt', 'libCstd.so.1': u'SUNWlibC', 'libCrun.so.1': u'SUNWlibC', 'librt.so.1': u'SUNWcsl', 'libz.so.1': u'CSWzlib', 'libncursesw.so.5': u'CSWncurses', 'libsocket.so.1': u'SUNWcsl', 'libm.so.1': u'SUNWlibms', 'libpthread.so.1': u'SUNWcsl', 'libc.so.1': u'SUNWcsl', 'libdl.so.1': u'SUNWcsl'} +DATA_FILENAMES_BY_SONAME = {'libmysqlclient.so.15': 'libmysqlclient.so.15.0.0'} @@ 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 wahwah at users.sourceforge.net Wed Dec 30 00:04:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Dec 2009 23:04:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7789] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Message-ID: Revision: 7789 http://gar.svn.sourceforge.net/gar/?rev=7789&view=rev Author: wahwah Date: 2009-12-29 23:04:59 +0000 (Tue, 29 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Removed unused code Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-29 22:59:44 UTC (rev 7788) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-29 23:04:59 UTC (rev 7789) @@ -196,18 +196,16 @@ pkgs_by_soname, filenames_by_soname, pkg_by_any_filename): + """This is one of the more obscure and more important pieces of code. + + I tried to make it simpler, but given that the operations here involve + whole sets of packages, it's not easy. + """ so_dependencies = set() orphan_sonames = set() self_provided = set() for binary in binaries_by_pkgname[pkgname]: - # tmp_so_dependencies, tmp_self_provided, tmp_orphan_sonames = DependenciesOfABinary( - # binary, binaries_by_pkgname, needed_sonames_by_binary, - # pkgs_by_soname, filenames_by_soname, pkg_by_any_filename) - # so_dependencies.union(tmp_so_dependencies) - # orphan_sonames.union(tmp_orphan_sonames) - # self_provided.union(tmp_self_provided) needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] - # DependenciesOfABinary(binary, needed_sonames, filenames_by_soname, pkgs_by_soname) for soname in needed_sonames: if soname in filenames_by_soname: filename = filenames_by_soname[soname] @@ -221,28 +219,6 @@ return so_dependencies, self_provided, orphan_sonames -def DependenciesOfABinary(binary, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - so_dependencies = set() - orphan_sonames = set() - self_provided = set() - for soname in needed_sonames_by_binary[binary][NEEDED_SONAMES]: - if soname in filenames_by_soname: - filename = filenames_by_soname[soname] - pkg = pkg_by_any_filename[filename] - self_provided.add(soname) - so_dependencies.add(pkg) - elif soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) - return so_dependencies, self_provided, orphan_sonames - - def GuessDepsByFilename(pkgname, pkg_by_any_filename): """Guesses dependencies based on filename regexes.""" guessed_deps = set() 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 Dec 30 01:26:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 00:26:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7790] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 7790 http://gar.svn.sourceforge.net/gar/?rev=7790&view=rev Author: wahwah Date: 2009-12-30 00:26:26 +0000 (Wed, 30 Dec 2009) Log Message: ----------- syslog_ng: Enable TCP wrappers, removed an unnecessary dependency on CSWgcc4corert Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/syslog_ng/trunk/ Property changes on: csw/mgar/pkg/syslog_ng/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-12-29 23:04:59 UTC (rev 7789) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-12-30 00:26:26 UTC (rev 7790) @@ -29,8 +29,8 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic-linking CONFIGURE_ARGS += --enable-spoof-source=no +CONFIGURE_ARGS += --enable-tcp-wrapper -REQUIRED_PKGS = CSWgcc4corert REQUIRED_PKGS += CSWeventlog REQUIRED_PKGS += CSWosslrt REQUIRED_PKGS += CSWzlib @@ -48,6 +48,10 @@ GARCOMPILER = GNU TEST_SCRIPTS = +# The configure script finds -lwrap but doesn't actually use it. +# We need to be more pushy. +EXTRA_LDFLAGS = -L/opt/csw/lib -lwrap -lsocket + post-install-modulated: ginstall -d $(DESTDIR)/etc/opt/csw ginstall -m 444 $(WORKDIR)/$(GARNAME).conf.CSW \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 30 01:32:38 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 00:32:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7791] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7791 http://gar.svn.sourceforge.net/gar/?rev=7791&view=rev Author: wahwah Date: 2009-12-30 00:32:38 +0000 (Wed, 30 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Cosmetic changes Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-30 00:26:26 UTC (rev 7790) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-30 00:32:38 UTC (rev 7791) @@ -32,14 +32,14 @@ def main(): + result_ok = True errors = [] options, args = checkpkg.GetOptions() + pkgnames = args if options.debug: logging.basicConfig(level=logging.DEBUG) else: logging.basicConfig(level=logging.INFO) - result_ok = True - pkgnames = args checkers = [] for pkgname in pkgnames: checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) @@ -96,6 +96,8 @@ # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog lines_by_soname = checkpkg.GetLinesBySoname( pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + + # Creating a map from files to packages. pkgs_by_filename = {} for soname, line in lines_by_soname.iteritems(): # TODO: Find all the packages, not just the last field. @@ -105,6 +107,12 @@ pkgs_by_filename[soname] = pkgname # A shared object dependency/provisioning report, plus checking. + # + # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), + # it has a different purpose: it reports the relationships between shared + # libraries, binaries using them and packages providing them. Ideally, the + # same bit of code with do checking and reporting. + # # TODO: Rewrite this using cheetah templates if needed_sonames: print "Analysis of sonames needed by the package set:" @@ -116,19 +124,23 @@ print ("%s is provided by %s and required by:" % (soname, repr(pkgs_by_filename[soname]))) - filename_lines = textwrap.wrap(" ".join(sorted(binaries_by_soname[soname])), 75) - for line in filename_lines: + filename_lines = " ".join(sorted(binaries_by_soname[soname])) + for line in textwrap.wrap(filename_lines, 70): print " ", line else: print ("%s is required by %s, but we don't know what provides it." % (soname, binaries_by_soname[soname])) - errors.append(checkpkg.Error("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname]))) + if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: + print "However, it's a whitelisted soname." + else: + errors.append( + checkpkg.Error("%s is required by %s, but " + "we don't know what provides it." + % (soname, binaries_by_soname[soname]))) print dependent_pkgs = {} for checker in checkers: - orphan_sonames = set() pkgname = checker.pkgname declared_dependencies = checker.GetDependencies() if options.debug: @@ -138,19 +150,17 @@ test_fd = open(data_file_name, "w") print >>test_fd, "# Testing data for %s" % pkgname print >>test_fd, "# $Id$" - print >>test_fd, "DATA_PKGNAME =", repr(pkgname) - print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) - - - print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) + print >>test_fd, "DATA_PKGNAME =", repr(pkgname) + print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) + print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) - print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) - print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) - print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) - print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) - print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) - print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) - print >>test_fd, "DATA_ISALIST =", repr(isalist) + print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) + print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) + print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) + print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) + print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) + print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) + print >>test_fd, "DATA_ISALIST =", repr(isalist) test_fd.close() missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-30 00:26:26 UTC (rev 7790) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-30 00:32:38 UTC (rev 7791) @@ -21,7 +21,10 @@ import checkpkg import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 -checkpkg.SharedObjectDependencies("CSWmysql5client", d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, d6.DATA_PKG_BY_ANY_FILENAME) +checkpkg.SharedObjectDependencies("CSWmysql5client", +d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, +d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, +d6.DATA_PKG_BY_ANY_FILENAME) sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; @@ -369,7 +372,10 @@ """A test for 64-bit symlink expansion.""" soname = u'libncursesw.so.5' # To test the 64-bit symlink expansion - expected = {u'libncursesw.so.5': u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 s none CSWncurses\n'} + expected = { + u'libncursesw.so.5': + u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' + u's none CSWncurses\n'} pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) (needed_sonames, binaries_by_soname, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 30 10:48:25 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 09:48:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7792] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7792 http://gar.svn.sourceforge.net/gar/?rev=7792&view=rev Author: wahwah Date: 2009-12-30 09:48:25 +0000 (Wed, 30 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Better symlink emulation Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-30 00:32:38 UTC (rev 7791) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-30 09:48:25 UTC (rev 7792) @@ -330,9 +330,9 @@ """ symlinked_list = [] for runpath in runpath_list: - if runpath.endswith("/64"): - symlinked_list.append("%s/amd64" % runpath[:-3]) - symlinked_list.append("%s/sparcv9" % runpath[:-3]) + if "/64" in runpath: + symlinked_list.append(runpath.replace("/64", "/amd64")) + symlinked_list.append(runpath.replace("/64", "/sparcv9")) else: symlinked_list.append(runpath) return symlinked_list Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-30 00:32:38 UTC (rev 7791) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-30 09:48:25 UTC (rev 7792) @@ -264,6 +264,17 @@ expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) + def testEmulate64BitSymlinks_1(self): + runpath_list = ["/opt/csw/mysql5/lib/foo/mysql/64"] + expected = "/opt/csw/mysql5/lib/foo/mysql/amd64" + self.assertTrue(expected in checkpkg.Emulate64BitSymlinks(runpath_list)) + + def testEmulate64BitSymlinks_2(self): + runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] + expected = "/opt/csw/mysql5/lib/amd64/mysql/foo" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + def testGetLinesBySoname(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) 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 Dec 30 11:15:49 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 10:15:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7793] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7793 http://gar.svn.sourceforge.net/gar/?rev=7793&view=rev Author: wahwah Date: 2009-12-30 10:15:48 +0000 (Wed, 30 Dec 2009) Log Message: ----------- mysql5: Don't try to create /opt/csw/bin/{amd64,sparcv9} 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 2009-12-30 09:48:25 UTC (rev 7792) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-12-30 10:15:48 UTC (rev 7793) @@ -204,6 +204,8 @@ # Create symlinks to binaries ginstall -m 755 -d $(PKGROOT)$(global_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 ../$(GARNAME)/bin/`basename $$f` \ $(PKGROOT)$(global_bindir)/`basename $$f`; \ 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 Dec 30 17:29:56 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 16:29:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7794] csw/mgar/pkg/template/trunk Message-ID: Revision: 7794 http://gar.svn.sourceforge.net/gar/?rev=7794&view=rev Author: wahwah Date: 2009-12-30 16:29:56 +0000 (Wed, 30 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Adding SPKG_TMPDIR configuration option, making checkpkg use the CHECKPKG_TMPDIR env variable to set the tmp dir. Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/template/trunk/ Property changes on: csw/mgar/pkg/template/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-30 10:15:48 UTC (rev 7793) +++ csw/mgar/pkg/template/trunk/Makefile 2009-12-30 16:29:56 UTC (rev 7794) @@ -2,184 +2,49 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = oracle +GARVERSION = 10.2.0 +CATEGORIES = apps define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +DISTFILES = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = oracle +TEST_SCRIPTS = -#include gar/category.mk +prefix = /opt/oracle + +PACKAGES = GOOGoracle +CATALOGNAME_GOOGoracle = oracle +SPKG_DESC_GOOGoracle = The Oracle database + +REQUIRED_PKGS = CSWggettextrt CSWlibxext CSWunixodbc + +PROTOTYPE_FILTER = awk '$$$$3 ~/\/extjob$$$$/ \ + { $$$$4 = 3755; $$$$5 = "nobody"; $$$$6 = "nobody" } \ + { print }' + +ORACLE_HOME = $(prefix)/product/$(GARVERSION)/Db_1 + +include gar/category.mk + +install-oracle: + ginstall -m 755 -d $(DESTDIR)$(prefix) + @$(MAKECOOKIE) + +post-merge: + # This takes a really long time. + gtar -cf - -C $(prefix) . | gtar -xpf - -C $(PKGROOT)$(prefix) + # echo foo > $(PKGROOT)$(prefix)/bar + grm -f $(PKGROOT)$(ORACLE_HOME)/inventory/Templates/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod + grm -f $(PKGROOT)$(ORACLE_HOME)/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod + # Removing one shared library, because: + # ERROR: Couldn't find a package providing libEntrust.so + grm -f $(PKGROOT)$(ORACLE_HOME)/lib32/libnnzentr10.so + # ERROR: Couldn't find a package providing libc.so.6 + grm -f $(PKGROOT)$(ORACLE_HOME)/lib/libcxa.so.3 + grm -f $(PKGROOT)$(ORACLE_HOME)/bin/rtsora32 + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 30 17:58:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 16:58:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7795] csw/mgar/gar/v2 Message-ID: Revision: 7795 http://gar.svn.sourceforge.net/gar/?rev=7795&view=rev Author: wahwah Date: 2009-12-30 16:58:09 +0000 (Wed, 30 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Adding SPKG_TMPDIR configuration option, making checkpkg use the CHECKPKG_TMPDIR env variable to set the tmp dir. Modified Paths: -------------- csw/mgar/gar/v2/bin/mkpackage csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk csw/mgar/gar/v2-checkpkg/bin/checkpkg csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2/bin/mkpackage =================================================================== --- csw/mgar/gar/v2/bin/mkpackage 2009-12-30 16:29:56 UTC (rev 7794) +++ csw/mgar/gar/v2/bin/mkpackage 2009-12-30 16:58:09 UTC (rev 7795) @@ -908,7 +908,7 @@ my $compress = $config{usebzip} ? 'bzip2 -9 -f %s' - : 'gzip -9 -f %s'; + : 'pigz --fast -f %s'; vexec( sprintf( $compress, $tmppkg ), "Failed to compress $tmppkg" ); $tmppkg .= $config{usebzip} ? ".bz2" : ".gz"; Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-12-30 16:29:56 UTC (rev 7794) +++ csw/mgar/gar/v2/gar.mk 2009-12-30 16:58:09 UTC (rev 7795) @@ -850,7 +850,7 @@ # Update inter-package depends makedepend: - @for gspec in `gfind $(CURDIR) -type f -name '*.gspec' | ggrep files`; do \ + $(_DBG)for gspec in `gfind $(CURDIR) -type f -name '*.gspec' | ggrep files`; do \ pkgname=`basename $$gspec .gspec` ; \ pkgfiles=`dirname $$gspec` ; \ pkgdir=`dirname $$pkgfiles` ; \ Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-12-30 16:29:56 UTC (rev 7794) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-12-30 16:58:09 UTC (rev 7795) @@ -154,6 +154,7 @@ SPKG_PKGROOT ?= $(PKGROOT) SPKG_PKGBASE ?= $(PKGROOT) SPKG_WORKDIR ?= $(CURDIR)/$(WORKDIR) +SPKG_TMPDIR ?= /tmp SPKG_DEPEND_DB = $(GARDIR)/csw/depend.db @@ -709,8 +710,10 @@ # The dynamic pkginfo is only generated for dynamic gspec-files package-%: $(WORKDIR)/%.gspec $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) @echo " ==> Processing $*.gspec" - $(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ + $(_DBG)( $(call _PKG_ENV,$*) mkpackage \ + --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ + --tmpdir $(SPKG_TMPDIR) \ --destdir $(SPKG_EXPORT) \ --workdir $(SPKG_WORKDIR) \ --pkgbase $(SPKG_PKGBASE) \ @@ -726,7 +729,7 @@ # pkgcheck - check if the package is compliant # pkgcheck: $(foreach SPEC,$(_PKG_SPECS),package-$(SPEC)) - $(_DBG)( LC_ALL=C $(GARBIN)/checkpkg $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;) + $(_DBG)( LC_ALL=C $(GARBIN)/checkpkg $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage --tmpdir $(SPKG_TMPDIR) -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;) @$(MAKECOOKIE) pkgcheck-p: Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-30 16:29:56 UTC (rev 7794) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2009-12-30 16:58:09 UTC (rev 7795) @@ -25,6 +25,11 @@ PATH=$PATH:/usr/sbin LOCAL_ARCH=`uname -p` +if [[ -z "${CHECKPKG_TMPDIR}" ]]; then + readonly CHECKPKG_TMPDIR="/var/tmp" +else + readonly CHECKPKG_TMPDIR +fi # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -76,7 +81,7 @@ f=$1 file $f |sed 's/^.*://' |grep gzip >/dev/null if [ $? -eq 0 ] ; then - TMPARCHIVE=/tmp/`basename $f` + TMPARCHIVE=$CHECKPKG_TMPDIR/`basename $f` if [[ -f $TMPARCHIVE ]] ; then print ERROR: $TMPARCHIVE already exists @@ -104,13 +109,13 @@ fi # a unique filename for the list of package deps and libs we see in a 'set' -SETINF=/tmp/checkpkg.$$.`date +%Y%m%d%H%M%S` +SETINF=$CHECKPKG_TMPDIR/checkpkg.$$.`date +%Y%m%d%H%M%S` SETLIBS=$SETINF.libs SETDEPS=$SETINF.deps pkgnames="" tmparchives="" -EXTRACTDIR=/tmp/dissect.$$ +EXTRACTDIR=$CHECKPKG_TMPDIR/dissect.$$ if [ -d $EXTRACTDIR ] ; then print ERROR: $EXTRACTDIR already exists Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-30 16:29:56 UTC (rev 7794) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-30 16:58:09 UTC (rev 7795) @@ -402,6 +402,8 @@ # Adding the default runtime path search option. binary_data[RUNPATH].append("/usr/lib/$ISALIST") binary_data[RUNPATH].append("/usr/lib") + binary_data[RUNPATH].append("/lib/$ISALIST") + binary_data[RUNPATH].append("/lib") elif fields[1] == "SONAME": binary_data[SONAME] = fields[2] return binary_data 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 Dec 30 20:20:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Dec 2009 19:20:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7796] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d Message-ID: Revision: 7796 http://gar.svn.sourceforge.net/gar/?rev=7796&view=rev Author: wahwah Date: 2009-12-30 19:20:41 +0000 (Wed, 30 Dec 2009) Log Message: ----------- mGAR v2-checkpkg: Setting the default RUNPATH even when the field is not there in the binary; added a test for it. Reporting the list of binaries with missing sonames. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/dump_output_2.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-30 16:58:09 UTC (rev 7795) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2009-12-30 19:20:41 UTC (rev 7796) @@ -26,7 +26,7 @@ stdout, stderr = isalist_proc.communicate() ret = isalist_proc.wait() if ret: - logging.error("Calling isalist has failed.") + logging.error("Calling isalist has failed.") isalist = re.split(r"\s+", stdout.strip()) return isalist @@ -80,10 +80,16 @@ ret = dump_proc.wait() binary_data = checkpkg.ParseDumpOutput(stdout) needed_sonames_by_binary[binary_base_name] = binary_data - if checkpkg.SONAME in binary_data: - filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + if checkpkg.SONAME not in binary_data: + logging.info("The %s shared library doesn't provide a SONAME.", + binary_base_name) + # The shared library doesn't tell its SONAME. We're guessing it's the + # same as the base file name. + binary_data[checkpkg.SONAME] = binary_base_name + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + isalist = GetIsalist() - + # Building indexes by soname to simplify further processing # These are indexes "by soname". (needed_sonames, @@ -116,6 +122,7 @@ # TODO: Rewrite this using cheetah templates if needed_sonames: print "Analysis of sonames needed by the package set:" + binaries_with_missing_sonames = set([]) for soname in needed_sonames: logging.debug("Analyzing: %s", soname) if soname in filenames_by_soname: @@ -126,17 +133,24 @@ repr(pkgs_by_filename[soname]))) filename_lines = " ".join(sorted(binaries_by_soname[soname])) for line in textwrap.wrap(filename_lines, 70): - print " ", line + print " ", line else: print ("%s is required by %s, but we don't know what provides it." % (soname, binaries_by_soname[soname])) + for binary in binaries_by_soname[soname]: + binaries_with_missing_sonames.add(binary) if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: - print "However, it's a whitelisted soname." + print "However, it's a whitelisted soname." else: errors.append( checkpkg.Error("%s is required by %s, but " "we don't know what provides it." % (soname, binaries_by_soname[soname]))) + if binaries_with_missing_sonames: + print "The following are binaries with missing sonames:" + binary_lines = " ".join(sorted(binaries_with_missing_sonames)) + for line in textwrap.wrap(binary_lines, 70): + print " ", line print dependent_pkgs = {} @@ -194,7 +208,7 @@ print "! ", soname msg_printed = True if not msg_printed: - print "+ Dependencies of %s look good." % pkgname + print "+ Dependencies of %s look good." % pkgname print if errors: Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-30 16:58:09 UTC (rev 7795) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2009-12-30 19:20:41 UTC (rev 7796) @@ -399,11 +399,11 @@ binary_data[NEEDED_SONAMES].append(fields[2]) elif fields[1] == "RUNPATH": binary_data[RUNPATH].extend(fields[2].split(":")) - # Adding the default runtime path search option. - binary_data[RUNPATH].append("/usr/lib/$ISALIST") - binary_data[RUNPATH].append("/usr/lib") - binary_data[RUNPATH].append("/lib/$ISALIST") - binary_data[RUNPATH].append("/lib") elif fields[1] == "SONAME": binary_data[SONAME] = fields[2] + # Adding the default runtime path search option. + binary_data[RUNPATH].append("/usr/lib/$ISALIST") + binary_data[RUNPATH].append("/usr/lib") + binary_data[RUNPATH].append("/lib/$ISALIST") + binary_data[RUNPATH].append("/lib") return binary_data Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-30 16:58:09 UTC (rev 7795) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2009-12-30 19:20:41 UTC (rev 7796) @@ -11,6 +11,7 @@ import testdata.checkpkg_test_data_CSWlibpq_84 as d5 import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 import testdata.dump_output_1 as dump_1 +import testdata.dump_output_2 as dump_2 """A set of unit tests for the library checking code. @@ -410,9 +411,11 @@ '/opt/csw/mysql5/lib/$ISALIST', '/opt/csw/mysql5/lib', '/opt/csw/mysql5/lib/$ISALIST/mysql', - # These two are artificially appended + # These four are artificially appended '/usr/lib/$ISALIST', - '/usr/lib'], + '/usr/lib', + '/lib/$ISALIST', + '/lib'], 'needed sonames': ['librt.so.1', 'libresolv.so.2', 'libc.so.1', @@ -424,6 +427,12 @@ self.assertEqual(expected, checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) + def test_2(self): + expected_runpath = ['/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'] + self.assertEqual( + expected_runpath, + checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) + if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/dump_output_2.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/dump_output_2.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/dump_output_2.py 2009-12-30 19:20:41 UTC (rev 7796) @@ -0,0 +1,34 @@ +DATA_DUMP_OUTPUT = """work/pkgroot/opt/oracle/product/10.2.0/Db_1/opmn/bin/ons: + + **** DYNAMIC SECTION INFORMATION **** +.dynamic: +[INDEX] Tag Value +[1] NEEDED libpthread.so.1 +[2] NEEDED librt.so.1 +[3] NEEDED libnsl.so.1 +[4] NEEDED libxnet.so.1 +[5] NEEDED libdl.so.1 +[6] NEEDED libm.so.1 +[7] NEEDED libc.so.1 +[8] INIT 0xd6088 +[9] FINI 0xd6094 +[10] HASH 0x100e8 +[11] STRTAB 0x19274 +[12] STRSZ 0x4a24 +[13] SYMTAB 0x13174 +[14] SYMENT 0x10 +[15] CHECKSUM 0x20d5 +[16] VERNEED 0x1dc98 +[17] VERNEEDNUM 0x6 +[18] PLTSZ 0x7f8 +[19] PLTREL 0x7 +[20] JMPREL 0x1dd9c +[21] RELA 0x1dd78 +[22] RELASZ 0x81c +[23] RELAENT 0xc +[24] DEBUG 0 +[25] FEATURE_1 PARINIT +[26] FLAGS 0 +[27] FLAGS_1 0 +[28] PLTGOT 0xf6f64 +""" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Dec 30 23:00:25 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 30 Dec 2009 22:00:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7797] csw/mgar/pkg Message-ID: Revision: 7797 http://gar.svn.sourceforge.net/gar/?rev=7797&view=rev Author: rthurner Date: 2009-12-30 22:00:25 +0000 (Wed, 30 Dec 2009) Log Message: ----------- lzlib - lzma library for usage in lzip, plzip. does not compile yet Added Paths: ----------- csw/mgar/pkg/lzlib/ csw/mgar/pkg/lzlib/branches/ csw/mgar/pkg/lzlib/tags/ csw/mgar/pkg/lzlib/trunk/ csw/mgar/pkg/lzlib/trunk/Makefile csw/mgar/pkg/lzlib/trunk/checksums csw/mgar/pkg/lzlib/trunk/files/ Property changes on: csw/mgar/pkg/lzlib/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/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2009-12-30 22:00:25 UTC (rev 7797) @@ -0,0 +1,25 @@ +GARNAME = lzlib +GARVERSION = 0.8-rc1 +CATEGORIES = lib + +DESCRIPTION = lzlib is a lossless data compression library based on the LZMA algorithm. +define BLURB + The lzlib compression library provides in-memory LZMA compression and + decompression functions, including integrity checking of the uncompressed + data. The compressed data format used by the library is the lzip format. +endef + +MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/lzlib/trunk/checksums =================================================================== --- csw/mgar/pkg/lzlib/trunk/checksums (rev 0) +++ csw/mgar/pkg/lzlib/trunk/checksums 2009-12-30 22:00:25 UTC (rev 7797) @@ -0,0 +1 @@ +cdb51b3a9fb9b01a7582a5ad797377ca lzlib-0.8-rc1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 31 01:54:50 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 31 Dec 2009 00:54:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7798] csw/mgar/pkg/template/trunk/Makefile Message-ID: Revision: 7798 http://gar.svn.sourceforge.net/gar/?rev=7798&view=rev Author: wahwah Date: 2009-12-31 00:54:50 +0000 (Thu, 31 Dec 2009) Log Message: ----------- oracle: Removing shared libraries with missing deps. Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-12-30 22:00:25 UTC (rev 7797) +++ csw/mgar/pkg/template/trunk/Makefile 2009-12-31 00:54:50 UTC (rev 7798) @@ -17,11 +17,12 @@ prefix = /opt/oracle -PACKAGES = GOOGoracle -CATALOGNAME_GOOGoracle = oracle -SPKG_DESC_GOOGoracle = The Oracle database +PACKAGES = CSWoracle +CATALOGNAME_CSWoracle = oracle +SPKG_DESC_CSWoracle = The Oracle database -REQUIRED_PKGS = CSWggettextrt CSWlibxext CSWunixodbc +REQUIRED_PKGS = +# Maybe CSWunixodbc, but how would it know how to locate the shared library? PROTOTYPE_FILTER = awk '$$$$3 ~/\/extjob$$$$/ \ { $$$$4 = 3755; $$$$5 = "nobody"; $$$$6 = "nobody" } \ @@ -39,12 +40,24 @@ # This takes a really long time. gtar -cf - -C $(prefix) . | gtar -xpf - -C $(PKGROOT)$(prefix) # echo foo > $(PKGROOT)$(prefix)/bar - grm -f $(PKGROOT)$(ORACLE_HOME)/inventory/Templates/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod - grm -f $(PKGROOT)$(ORACLE_HOME)/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod - # Removing one shared library, because: - # ERROR: Couldn't find a package providing libEntrust.so - grm -f $(PKGROOT)$(ORACLE_HOME)/lib32/libnnzentr10.so - # ERROR: Couldn't find a package providing libc.so.6 - grm -f $(PKGROOT)$(ORACLE_HOME)/lib/libcxa.so.3 - grm -f $(PKGROOT)$(ORACLE_HOME)/bin/rtsora32 + grm -fv $(PKGROOT)$(ORACLE_HOME)/inventory/Templates/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod + grm -fv $(PKGROOT)$(ORACLE_HOME)/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod + # Removing shared libraries, because they depend on other shared + # libraries that aren't there. + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/libnnzentr10.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libcxa.so.3 + grm -fv $(PKGROOT)$(ORACLE_HOME)/bin/rtsora32 + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/hsdb_inf.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/hsdb_inf.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/hsdb_syb.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/hsdb_syb.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jre/1.4.2/lib/sparcv9/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jre/1.4.2/lib/sparc/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jdk/jre/lib/sparcv9/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jdk/jre/lib/sparc/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libcoresh10.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/libsqora.so.10.1 + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libsqora.so.10.1 + grm -fv $(PKGROOT)$(ORACLE_HOME)/ctx/lib/libxml4c.so.54.0 + grm -fv $(PKGROOT)$(ORACLE_HOME)/ctx/lib/xmllib.so @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 31 02:28:03 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 31 Dec 2009 01:28:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7799] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 7799 http://gar.svn.sourceforge.net/gar/?rev=7799&view=rev Author: wahwah Date: 2009-12-31 01:28:03 +0000 (Thu, 31 Dec 2009) Log Message: ----------- sqlite3: Adding readline support Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/sqlite3/trunk/ Property changes on: csw/mgar/pkg/sqlite3/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-12-31 00:54:50 UTC (rev 7798) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-12-31 01:28:03 UTC (rev 7799) @@ -33,15 +33,20 @@ PKGFILES_CSWsqlite3 = $(bindir)/.* PKGFILES_CSWsqlite3devel = $(PKGFILES_DEVEL) -REQUIRED_PKGS_CSWsqlite3 = CSWsqlite3rt +REQUIRED_PKGS_CSWsqlite3 = CSWsqlite3rt +REQUIRED_PKGS_CSWsqlite3 += CSWreadline +REQUIRED_PKGS_CSWsqlite3 += CSWncurses REQUIRED_PKGS_CSWsqlite3devel = CSWsqlite3 +PREREQUISITE_PKGS = CSWreadline CSWncurses + BUILD64 = 1 NO_ISAEXEC = 1 # Make configure options CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-threadsafe --disable-debug +CONFIGURE_ARGS += --enable-threadsafe --disable-debug +CONFIGURE_ARGS += --with-readline-inc="-I/opt/csw/include/readline" TEST_SCRIPTS = 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 Dec 31 11:48:38 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 31 Dec 2009 10:48:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7800] csw/mgar/pkg/cpan/Net-DNS/trunk Message-ID: Revision: 7800 http://gar.svn.sourceforge.net/gar/?rev=7800&view=rev Author: bonivart Date: 2009-12-31 10:48:37 +0000 (Thu, 31 Dec 2009) Log Message: ----------- netdns: update to 0.66 Modified Paths: -------------- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile csw/mgar/pkg/cpan/Net-DNS/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Net-DNS/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Net-DNS/trunk/files/CSWpmnetdns.gspec Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2009-12-31 01:28:03 UTC (rev 7799) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2009-12-31 10:48:37 UTC (rev 7800) @@ -1,5 +1,5 @@ GARNAME = Net-DNS -GARVERSION = 0.65 +GARVERSION = 0.66 CATEGORIES = cpan AUTHOR = OLAF @@ -10,8 +10,11 @@ beyond the capabilities of gethostbyname and gethostbyaddr. endef -DISTFILES += $(call admfiles,CSWpmnetdns,) +PACKAGES = CSWpmnetdns +CATALOGNAME = pm_netdns +DISTFILES += COPYING + REQUIRED_PKGS = CSWpmdigesthmac CSWpmnetip DEPENDS += cpan/Net-IP Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/checksums 2009-12-31 01:28:03 UTC (rev 7799) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/checksums 2009-12-31 10:48:37 UTC (rev 7800) @@ -1,2 +1,2 @@ -ec522b0bede886bfe23f1610d74954fe download/CSWpmnetdns.gspec -54e5a12a20de39b954a93723927ac789 download/Net-DNS-0.65.tar.gz +1d067f31702657103c7a55874014546c COPYING +1635d876324e3c2f6e277d5778bfe94c Net-DNS-0.66.tar.gz Added: csw/mgar/pkg/cpan/Net-DNS/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/files/COPYING 2009-12-31 10:48:37 UTC (rev 7800) @@ -0,0 +1,10 @@ +Copyright (c) 1997-2002 Michael Fuhr. + +Portions Copyright (c) 2002-2004 Chris Reinhardt. + +Portions Copyright (c) 2005 Olaf Kolkman (RIPE NCC) + +Portions Copyright (c) 2005 Olaf Kolkman (NLnet Labs) + +All rights reserved. This program is free software; you may redistribute +it and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Net-DNS/trunk/files/CSWpmnetdns.gspec =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/files/CSWpmnetdns.gspec 2009-12-31 01:28:03 UTC (rev 7799) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/files/CSWpmnetdns.gspec 2009-12-31 10:48:37 UTC (rev 7800) @@ -1,15 +0,0 @@ -%var bitname pm_netdns -%var pkgname CSWpmnetdns -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright - -Copyright (c) 1997-2002 Michael Fuhr. - -Portions Copyright (c) 2002-2004 Chris Reinhardt. - -Portions Copyright (c) 2005 Olaf Kolkman (RIPE NCC) - -Portions Copyright (c) 2005 Olaf Kolkman (NLnet Labs) - -All rights reserved. This program 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 Thu Dec 31 12:10:52 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Dec 2009 11:10:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7801] csw/mgar/pkg/neon/tags/neon-0.29.1, REV=2009.12.17/ Message-ID: Revision: 7801 http://gar.svn.sourceforge.net/gar/?rev=7801&view=rev Author: dmichelsen Date: 2009-12-31 11:10:52 +0000 (Thu, 31 Dec 2009) Log Message: ----------- neon: Tag neon-0.29.1,REV=2009.12.17 Added Paths: ----------- csw/mgar/pkg/neon/tags/neon-0.29.1,REV=2009.12.17/ 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 Dec 31 12:14:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Dec 2009 11:14:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7802] csw/mgar/pkg/neon/trunk Message-ID: Revision: 7802 http://gar.svn.sourceforge.net/gar/?rev=7802&view=rev Author: dmichelsen Date: 2009-12-31 11:14:14 +0000 (Thu, 31 Dec 2009) Log Message: ----------- neon: Update to 0.29.2 Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile csw/mgar/pkg/neon/trunk/checksums Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2009-12-31 11:10:52 UTC (rev 7801) +++ csw/mgar/pkg/neon/trunk/Makefile 2009-12-31 11:14:14 UTC (rev 7802) @@ -1,9 +1,9 @@ GARNAME = neon -GARVERSION = 0.29.1 +GARVERSION = 0.29.2 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 0.26.4 0.29.1 +MODULATIONS_GARVERSION = 0.26.4 0.29.2 DESCRIPTION = Neon HTTP and WebDAV client library define BLURB @@ -51,9 +51,9 @@ MERGE_SCRIPTS_isa-default64-garversion-0.26.4 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.29.1 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-0.29.1 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.29.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-0.29.2 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-0.29.2 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.29.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) PKGFILES_CSWneon-devel += $(docdir)/.* Modified: csw/mgar/pkg/neon/trunk/checksums =================================================================== --- csw/mgar/pkg/neon/trunk/checksums 2009-12-31 11:10:52 UTC (rev 7801) +++ csw/mgar/pkg/neon/trunk/checksums 2009-12-31 11:14:14 UTC (rev 7802) @@ -1,3 +1,3 @@ 4ef5552e8930ef82b1f56c2712f8ed1e COPYING 2d11fff51ffa856fc6b5d4bd801d6cc4 neon-0.26.4.tar.gz -eb4eac0499cb6fced6e3b11e4b720ebb neon-0.29.1.tar.gz +bf475710d1116cece210e8b1ae708d69 neon-0.29.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 31 14:53:54 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 31 Dec 2009 13:53:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7803] csw/mgar/gar/v2/bin/mkpackage Message-ID: Revision: 7803 http://gar.svn.sourceforge.net/gar/?rev=7803&view=rev Author: wahwah Date: 2009-12-31 13:53:54 +0000 (Thu, 31 Dec 2009) Log Message: ----------- mGAR v2: Reverting r7795, using gzip (not pigz) Modified Paths: -------------- csw/mgar/gar/v2/bin/mkpackage Modified: csw/mgar/gar/v2/bin/mkpackage =================================================================== --- csw/mgar/gar/v2/bin/mkpackage 2009-12-31 11:14:14 UTC (rev 7802) +++ csw/mgar/gar/v2/bin/mkpackage 2009-12-31 13:53:54 UTC (rev 7803) @@ -908,7 +908,7 @@ my $compress = $config{usebzip} ? 'bzip2 -9 -f %s' - : 'pigz --fast -f %s'; + : 'gzip -9 -f %s'; vexec( sprintf( $compress, $tmppkg ), "Failed to compress $tmppkg" ); $tmppkg .= $config{usebzip} ? ".bz2" : ".gz"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 31 17:49:02 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 31 Dec 2009 16:49:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7804] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 7804 http://gar.svn.sourceforge.net/gar/?rev=7804&view=rev Author: rthurner Date: 2009-12-31 16:49:02 +0000 (Thu, 31 Dec 2009) Log Message: ----------- sqlite3 - upgrade to 3.6.21 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-12-31 13:53:54 UTC (rev 7803) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-12-31 16:49:02 UTC (rev 7804) @@ -1,5 +1,5 @@ GARNAME = sqlite3 -GARVERSION = 3.6.20 +GARVERSION = 3.6.21 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2009-12-31 13:53:54 UTC (rev 7803) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2009-12-31 16:49:02 UTC (rev 7804) @@ -1,4 +1,4 @@ 22bb7b924e2ecb13997abcf15966f674 COPYING 80d638505872be7ffa238d43f0e268b2 gar-base.diff 1a2be927ceacfa534501b9f4675bce83 shell.c.diff -0faf8fc8ccff5297513c6532b2b4ce23 sqlite-3.6.20.tar.gz +03a8498828866b407c61c0aaf8ebe66c sqlite-3.6.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.