From aigoshin at users.sourceforge.net Mon Nov 1 02:01:47 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Mon, 01 Nov 2010 01:01:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[11459] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11459 http://gar.svn.sourceforge.net/gar/?rev=11459&view=rev Author: aigoshin Date: 2010-11-01 01:01:47 +0000 (Mon, 01 Nov 2010) Log Message: ----------- proftpd: 20101101 rc2 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-10-31 14:01:39 UTC (rev 11458) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-01 01:01:47 UTC (rev 11459) @@ -23,23 +23,19 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -RUNTIME_DEP_PKGS = CSWosslrt CSWggettextrt CSWiconv CSWgcc3corert CSWoldaprt CSWzlib CSWmysql5rt +RUNTIME_DEP_PKGS = CSWosslrt CSWggettextrt CSWiconv CSWgcc3corert CSWoldaprt CSWzlib CSWmysql5rt CSWsqlite3rt PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv9 -MYSQLISA_pentium_pro = i386 -MYSQLISA_$(ISA) ?= $(ISA) -MYSQLISA = $(MYSQLISA_$(ISA)) - sysconfdir=/etc/opt/csw localstatedir=/var/opt/csw CONFIGURE_ENV = install_user=$(USER) install_group=csw CONFIGURE_ENV += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" -LD_OPTIONS += -R$(prefix)/mysql5/lib/mysql/\$$ISALIST +EXTRA_LIB = $(prefix)/mysql5/lib/mysql CONFIGURE_ARGS += --prefix=$(prefix) CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) @@ -54,9 +50,8 @@ CONFIGURE_ARGS += --enable-ctrls CONFIGURE_ARGS += --enable-buffer-size=8192 CONFIGURE_ARGS += --with-includes=$(prefix)/include:$(prefix)/include/openssl:$(prefix)/include/mysql -CONFIGURE_ARGS += --with-libraries=$(prefix)/lib/mysql/$(MYSQLISA) -CONFIGURE_ARGS += --with-modules=mod_auth_pam:mod_tls:mod_tls_shmcache:mod_wrap2 -CONFIGURE_ARGS += --with-shared=mod_ban:mod_ctrls_admin:mod_ifsession:mod_ldap:mod_radius:mod_ratio:mod_readme:mod_rewrite:mod_shaper:mod_sql:mod_sql_mysql:mod_wrap2_file +CONFIGURE_ARGS += --with-modules=mod_facl +CONFIGURE_ARGS += --with-shared=mod_auth_pam:mod_ban:mod_ctrls_admin:mod_dynmasq:mod_exec:mod_ident:mod_ifsession:mod_ldap:mod_load:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql:mod_radius:mod_ratio:mod_readme:mod_rewrite:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_site_misc:mod_sql:mod_sql_mysql:mod_sql_passwd:mod_sql_sqlite:mod_tls:mod_tls_shmcache:mod_unique_id:mod_wrap2:mod_wrap2_file:mod_wrap2_sql TEST_SCRIPTS = @@ -68,6 +63,12 @@ include gar/category.mk +post-configure-modulated: + gsed -i s/\^LDFLAGS=/#LDFLAGS=/ $(WORKSRC)/contrib/mod_load/Makefile + gsed -i s/\^LDFLAGS=/#LDFLAGS=/ $(WORKSRC)/contrib/mod_sftp/Makefile + gsed -i s/\^LDFLAGS=/#LDFLAGS=/ $(WORKSRC)/contrib/mod_wrap2/Makefile + $(MAKECOOKIE) + post-install-modulated: ginstall -d $(DESTDIR)$(sysconfdir)/init.d ginstall -d $(DESTDIR)$(prefix)/share/doc/proftpd 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 Nov 1 02:06:49 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 01 Nov 2010 01:06:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[11460] csw/mgar/pkg/ruby/trunk/files/ 0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch Message-ID: Revision: 11460 http://gar.svn.sourceforge.net/gar/?rev=11460&view=rev Author: bdwalton Date: 2010-11-01 01:06:49 +0000 (Mon, 01 Nov 2010) Log Message: ----------- ruby: make the patch for ld -h passing more correct Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/files/0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch Modified: csw/mgar/pkg/ruby/trunk/files/0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch =================================================================== --- csw/mgar/pkg/ruby/trunk/files/0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch 2010-11-01 01:01:47 UTC (rev 11459) +++ csw/mgar/pkg/ruby/trunk/files/0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch 2010-11-01 01:06:49 UTC (rev 11460) @@ -1,28 +1,30 @@ -From c426b27d2b6a35acafc157182c21f15ebcb97a69 Mon Sep 17 00:00:00 2001 +From 71dcf5a7f7d60e9c0a4fe9bc4bd61e250a61c066 Mon Sep 17 00:00:00 2001 From: Ben Walton -Date: Sun, 31 Oct 2010 02:43:48 +0100 +Date: Mon, 1 Nov 2010 02:03:57 +0100 Subject: [PATCH] Force ld to embed the proper SONAME for libruby -Set LIBRUBY_DLDFLAGS in the solaris section of the configure script -in order to force ld to pass the appropriate -h when building libruby. +Ensure that LIBRUBY_DLDFLAGS is set in the solaris section of the configure +script even when not using gcc. This ensures that -h $(libname) is passed +properly when building shared objects. Signed-off-by: Ben Walton --- - configure | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + configure | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure b/configure -index 0badcbd..5753333 100755 +index 0badcbd..8dd9f62 100755 --- a/configure +++ b/configure -@@ -10696,6 +10696,7 @@ if test "$enable_shared" = 'yes'; then - SOLIBS='$(LIBS)' - LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)' +@@ -10698,6 +10698,8 @@ if test "$enable_shared" = 'yes'; then LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so' -+ LIBRUBY_DLDFLAGS="-h ${LIBRUBY_SO}" if test "$GCC" = yes; then LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)' ++ else ++ LIBRUBY_DLDFLAGS="$DLDFLAGS "'-h $(@F)' fi + XLDFLAGS="$XLDFLAGS "'-R${libdir}' + ;; -- 1.7.3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Nov 1 07:16:54 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 01 Nov 2010 06:16:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[11461] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11461 http://gar.svn.sourceforge.net/gar/?rev=11461&view=rev Author: rthurner Date: 2010-11-01 06:16:53 +0000 (Mon, 01 Nov 2010) Log Message: ----------- apache2: http:2.2.17, correct for checkpkg Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-01 01:06:49 UTC (rev 11460) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-01 06:16:53 UTC (rev 11461) @@ -88,7 +88,8 @@ RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 -CHECKPKG_OVERRIDES_CSWap2suexec += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2suexec += dependency-listed-more-than-once|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2suexec += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives 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 Nov 1 11:37:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Nov 2010 10:37:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[11462] csw/mgar/pkg/proftpd/trunk Message-ID: Revision: 11462 http://gar.svn.sourceforge.net/gar/?rev=11462&view=rev Author: dmichelsen Date: 2010-11-01 10:37:48 +0000 (Mon, 01 Nov 2010) Log Message: ----------- proftpd: Add DIRPATHS to CONFIGURE_ARGS Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/proftpd/trunk/ Property changes on: csw/mgar/pkg/proftpd/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/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-01 06:16:53 UTC (rev 11461) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-01 10:37:48 UTC (rev 11462) @@ -25,23 +25,24 @@ RUNTIME_DEP_PKGS = CSWosslrt CSWggettextrt CSWiconv CSWgcc3corert CSWoldaprt CSWzlib CSWmysql5rt CSWsqlite3rt -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 - EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv9 -sysconfdir=/etc/opt/csw -localstatedir=/var/opt/csw +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw CONFIGURE_ENV = install_user=$(USER) install_group=csw CONFIGURE_ENV += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" EXTRA_LIB = $(prefix)/mysql5/lib/mysql -CONFIGURE_ARGS += --prefix=$(prefix) -CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) -CONFIGURE_ARGS += --localstatedir=/var/run/proftpd -CONFIGURE_ARGS += --mandir=$(prefix)/share/man -CONFIGURE_ARGS += --libexecdir=$(prefix)/lib/proftpd +CONFIGURE_ARGS += $(DIRPATHS) +# These are now taken from DIRPATHS +#CONFIGURE_ARGS += --prefix=$(prefix) +#CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) +# TODO: Adjust the variables so $DIRPATHES contains the correct locations +#CONFIGURE_ARGS += --localstatedir=/var/run/proftpd +#CONFIGURE_ARGS += --mandir=$(prefix)/share/man +#CONFIGURE_ARGS += --libexecdir=$(prefix)/lib/proftpd CONFIGURE_ARGS += --enable-dso --disable-static CONFIGURE_ARGS += --enable-facl CONFIGURE_ARGS += --enable-openssl 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 Nov 1 14:40:03 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Nov 2010 13:40:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[11463] csw/mgar/pkg/taglib_gcc/trunk/Makefile Message-ID: Revision: 11463 http://gar.svn.sourceforge.net/gar/?rev=11463&view=rev Author: dmichelsen Date: 2010-11-01 13:40:03 +0000 (Mon, 01 Nov 2010) Log Message: ----------- taglib_gcc: Forcefully rip out -O2 Modified Paths: -------------- csw/mgar/pkg/taglib_gcc/trunk/Makefile Modified: csw/mgar/pkg/taglib_gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/taglib_gcc/trunk/Makefile 2010-11-01 10:37:48 UTC (rev 11462) +++ csw/mgar/pkg/taglib_gcc/trunk/Makefile 2010-11-01 13:40:03 UTC (rev 11463) @@ -29,9 +29,25 @@ EXTRA_LD_FLAGS = -lc -lm +# Do not use -O2, see below. +OPT_FLAGS_GCC = -pipe + prefix = $(BUILD_PREFIX)/kde-gcc CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +# This is a legacy lib, don't care too much about the naming for now. +CHECKPKG_OVERRIDES_CSWtaglibgcc += shared-lib-package-contains-so-symlink|file=/opt/csw/kde-gcc/lib/libtag.so +CHECKPKG_OVERRIDES_CSWtaglibgcc += shared-lib-package-contains-so-symlink|file=/opt/csw/kde-gcc/lib/libtag_c.so +CHECKPKG_OVERRIDES_CSWtaglibgcc += non-uniform-lib-versions-in-package|sonames=['libtag.so.1',|'libtag_c.so.0'] +CHECKPKG_OVERRIDES_CSWtaglibgcc += shared-lib-package-contains-so-symlink|file=/opt/csw/kde-gcc/lib/libtag.so +CHECKPKG_OVERRIDES_CSWtaglibgcc += shared-lib-package-contains-so-symlink|file=/opt/csw/kde-gcc/lib/libtag_c.so + include gar/category.mk + +# Do not use any optimization or __sync_fetch_and_add_4 will be used which +# is undefined. -O2 is hardwired at many places, so dynamically rip it out. +pre-configure-modulated: + perl -i -npe 's/-O2//' $(WORKSRC)/configure + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 1 15:42:03 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Nov 2010 14:42:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[11464] csw/mgar/pkg/taglib_gcc/trunk/Makefile Message-ID: Revision: 11464 http://gar.svn.sourceforge.net/gar/?rev=11464&view=rev Author: dmichelsen Date: 2010-11-01 14:42:03 +0000 (Mon, 01 Nov 2010) Log Message: ----------- taglib_gcc: Use gcc3 instead of gcc4 Modified Paths: -------------- csw/mgar/pkg/taglib_gcc/trunk/Makefile Modified: csw/mgar/pkg/taglib_gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/taglib_gcc/trunk/Makefile 2010-11-01 13:40:03 UTC (rev 11463) +++ csw/mgar/pkg/taglib_gcc/trunk/Makefile 2010-11-01 14:42:03 UTC (rev 11464) @@ -22,10 +22,13 @@ CATALOGNAME = taglib_gcc RUNTIME_DEP_PKGS_CSWtaglibgcc += CSWzlib -RUNTIME_DEP_PKGS_CSWtaglibgcc += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWtaglibgcc += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWtaglibgcc += CSWgcc3corert +RUNTIME_DEP_PKGS_CSWtaglibgcc += CSWgcc3g++rt -GARCOMPILER = GCC4 +# This does not work with gcc4 as the kde-gcc stuff is compiled +# with gcc3 and the runtime libs for gcc3 and gcc4 are slightly +# incompatib\xC3le. +GARCOMPILER = GCC3 EXTRA_LD_FLAGS = -lc -lm 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 Nov 1 16:22:54 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Mon, 01 Nov 2010 15:22:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[11465] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11465 http://gar.svn.sourceforge.net/gar/?rev=11465&view=rev Author: aigoshin Date: 2010-11-01 15:22:54 +0000 (Mon, 01 Nov 2010) Log Message: ----------- proftpd: 20101101 rc3 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-01 14:42:03 UTC (rev 11464) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-01 15:22:54 UTC (rev 11465) @@ -35,14 +35,10 @@ CONFIGURE_ENV += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" EXTRA_LIB = $(prefix)/mysql5/lib/mysql +NODIRPATHS = --libexecdir --localstatedir CONFIGURE_ARGS += $(DIRPATHS) -# These are now taken from DIRPATHS -#CONFIGURE_ARGS += --prefix=$(prefix) -#CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) -# TODO: Adjust the variables so $DIRPATHES contains the correct locations -#CONFIGURE_ARGS += --localstatedir=/var/run/proftpd -#CONFIGURE_ARGS += --mandir=$(prefix)/share/man -#CONFIGURE_ARGS += --libexecdir=$(prefix)/lib/proftpd +CONFIGURE_ARGS += --libexecdir=$(prefix)/libexec/proftpd +CONFIGURE_ARGS += --localstatedir=/var/run/proftpd CONFIGURE_ARGS += --enable-dso --disable-static CONFIGURE_ARGS += --enable-facl CONFIGURE_ARGS += --enable-openssl @@ -77,4 +73,5 @@ ginstall -d $(DESTDIR)$(localstatedir)/proftpd/logs cp $(WORKDIR)/cswproftpd $(DESTDIR)$(sysconfdir)/init.d/ cd $(WORKSRC); cp -r $(PROFTPDDOC) $(DESTDIR)$(prefix)/share/doc/proftpd + rm -f $(DESTDIR)$(prefix)/libexec/proftpd/*.la $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 1 16:30:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Nov 2010 15:30:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[11466] csw/mgar/pkg/gource/trunk Message-ID: Revision: 11466 http://gar.svn.sourceforge.net/gar/?rev=11466&view=rev Author: dmichelsen Date: 2010-11-01 15:30:52 +0000 (Mon, 01 Nov 2010) Log Message: ----------- gource: Add more patches Modified Paths: -------------- csw/mgar/pkg/gource/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gource/trunk/files/0002-Use-double-functions-and-proper-casts-in-lack-of-flo.patch Modified: csw/mgar/pkg/gource/trunk/Makefile =================================================================== --- csw/mgar/pkg/gource/trunk/Makefile 2010-11-01 15:22:54 UTC (rev 11465) +++ csw/mgar/pkg/gource/trunk/Makefile 2010-11-01 15:30:52 UTC (rev 11466) @@ -9,12 +9,25 @@ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Make-sure-we-have-a-prototype-for-sqrt.patch +PATCHFILES = 0001-Make-sure-we-have-a-prototype-for-sqrt.patch +PATCHFILES += 0002-Use-double-functions-and-proper-casts-in-lack-of-flo.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +RUNTIME_DEP_PKGS_CSWgource += CSWlibsdl +RUNTIME_DEP_PKGS_CSWgource += CSWpng +RUNTIME_DEP_PKGS_CSWgource += CSWmesa +RUNTIME_DEP_PKGS_CSWgource += CSWstlport +RUNTIME_DEP_PKGS_CSWgource += CSWpcrert +RUNTIME_DEP_PKGS_CSWgource += CSWftgl +RUNTIME_DEP_PKGS_CSWgource += CSWsdlimage +RUNTIME_DEP_PKGS_CSWgource += CSWglew +RUNTIME_DEP_PKGS_CSWgource += CSWjpeg + EXTRA_CXXFLAGS = -library=stlport4 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk Added: csw/mgar/pkg/gource/trunk/files/0002-Use-double-functions-and-proper-casts-in-lack-of-flo.patch =================================================================== --- csw/mgar/pkg/gource/trunk/files/0002-Use-double-functions-and-proper-casts-in-lack-of-flo.patch (rev 0) +++ csw/mgar/pkg/gource/trunk/files/0002-Use-double-functions-and-proper-casts-in-lack-of-flo.patch 2010-11-01 15:30:52 UTC (rev 11466) @@ -0,0 +1,116 @@ +From 3a19f7de7499cbd0a15be6aab3412813b08bcbaa Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 1 Nov 2010 16:17:23 +0100 +Subject: [PATCH] Use double functions and proper casts in lack of float-functions + +--- + src/commitlog.cpp | 2 +- + src/core/fxfont.cpp | 4 ++-- + src/dirnode.cpp | 4 ++-- + src/gource.cpp | 12 ++++++------ + 4 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/commitlog.cpp b/src/commitlog.cpp +index a884ba1..59d7f24 100644 +--- a/src/commitlog.cpp ++++ b/src/commitlog.cpp +@@ -248,7 +248,7 @@ RCommitFile::RCommitFile(const std::string& filename, const std::string& action, + + //prepend a root slash + if(this->filename[0] != '/') { +- this->filename.insert(0, 1, '/'); ++ this->filename.insert((unsigned)0, 1, '/'); + } + + this->action = action; +diff --git a/src/core/fxfont.cpp b/src/core/fxfont.cpp +index 956e8ce..1cb0969 100644 +--- a/src/core/fxfont.cpp ++++ b/src/core/fxfont.cpp +@@ -96,8 +96,8 @@ void FXFont::render(float x, float y, const std::string & text) const{ + + + if(round) { +- x = roundf(x); +- y = roundf(y); ++ x = floor(x); ++ y = floor(y); + } + + glPushMatrix(); +diff --git a/src/dirnode.cpp b/src/dirnode.cpp +index 9a05002..5b20209 100644 +--- a/src/dirnode.cpp ++++ b/src/dirnode.cpp +@@ -537,7 +537,7 @@ void RDirNode::calcRadius() { + //this->dir_radius_sqrt = sqrt(dir_radius); //dir_radius_sqrt is not used + + // this->parent_radius = std::max(1.0, parent_circ / PI); +- this->parent_radius = std::max(1.0, sqrt(total_file_area) * gGourceDirPadding); ++ this->parent_radius = std::max(1.0, (double) sqrt(total_file_area) * gGourceDirPadding); + } + + float RDirNode::distanceToParent() const{ +@@ -778,7 +778,7 @@ vec2f RDirNode::calcFileDest(int max_files, int file_no) { + + float frac = arc * 0.5 + arc * file_no; + +- vec2f dest = vec2f(sinf(frac*PI*2.0), cosf(frac*PI*2.0)); ++ vec2f dest = vec2f(sin(frac*PI*2.0), cos(frac*PI*2.0)); + + return dest; + } +diff --git a/src/gource.cpp b/src/gource.cpp +index 0249c93..81ef726 100644 +--- a/src/gource.cpp ++++ b/src/gource.cpp +@@ -684,7 +684,7 @@ void Gource::keyPress(SDL_KeyboardEvent *e) { + + if (e->keysym.unicode == SDLK_EQUALS || e->keysym.unicode == SDLK_PLUS) { + if(gGourceSettings.days_per_second>=1.0) { +- gGourceSettings.days_per_second = std::min(30.0f, floorf(gGourceSettings.days_per_second) + 1.0f); ++ gGourceSettings.days_per_second = std::min(30.0f, floor(gGourceSettings.days_per_second) + 1.0f); + } else { + gGourceSettings.days_per_second = std::min(1.0f, gGourceSettings.days_per_second * 2.0f); + } +@@ -692,7 +692,7 @@ void Gource::keyPress(SDL_KeyboardEvent *e) { + + if (e->keysym.unicode == SDLK_MINUS) { + if(gGourceSettings.days_per_second>1.0) { +- gGourceSettings.days_per_second = std::max(0.0f, floorf(gGourceSettings.days_per_second) - 1.0f); ++ gGourceSettings.days_per_second = std::max(0.0f, floor(gGourceSettings.days_per_second) - 1.0f); + } else { + gGourceSettings.days_per_second = std::max(0.0f, gGourceSettings.days_per_second * 0.5f); + } +@@ -717,7 +717,7 @@ void Gource::keyPress(SDL_KeyboardEvent *e) { + if(e->keysym.unicode == SDLK_PERIOD) { + + if(time_scale>=1.0) { +- time_scale = std::min(4.0f, floorf(time_scale) + 1.0f); ++ time_scale = std::min(4.0f, floor(time_scale) + 1.0f); + } else { + time_scale = std::min(1.0f, time_scale * 2.0f); + } +@@ -726,7 +726,7 @@ void Gource::keyPress(SDL_KeyboardEvent *e) { + if(e->keysym.unicode == SDLK_COMMA) { + + if(time_scale>1.0) { +- time_scale = std::max(0.0f, floorf(time_scale) - 1.0f); ++ time_scale = std::max(0.0f, floor(time_scale) - 1.0f); + } else { + time_scale = std::max(0.25f, time_scale * 0.5f); + } +@@ -1320,8 +1320,8 @@ void Gource::logic(float t, float dt) { + //apply rotation + if(rotate_angle != 0.0f) { + +- float s = sinf(rotate_angle); +- float c = cosf(rotate_angle); ++ float s = sin(rotate_angle); ++ float c = cos(rotate_angle); + + root->rotate(s, c); + +-- +1.7.2.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 1 17:42:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Nov 2010 16:42:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[11467] csw/mgar/pkg/gource/trunk/Makefile Message-ID: Revision: 11467 http://gar.svn.sourceforge.net/gar/?rev=11467&view=rev Author: dmichelsen Date: 2010-11-01 16:42:34 +0000 (Mon, 01 Nov 2010) Log Message: ----------- gource: Adjust dependencies Modified Paths: -------------- csw/mgar/pkg/gource/trunk/Makefile Modified: csw/mgar/pkg/gource/trunk/Makefile =================================================================== --- csw/mgar/pkg/gource/trunk/Makefile 2010-11-01 15:30:52 UTC (rev 11466) +++ csw/mgar/pkg/gource/trunk/Makefile 2010-11-01 16:42:34 UTC (rev 11467) @@ -15,15 +15,15 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS_CSWgource += CSWlibsdl -RUNTIME_DEP_PKGS_CSWgource += CSWpng -RUNTIME_DEP_PKGS_CSWgource += CSWmesa -RUNTIME_DEP_PKGS_CSWgource += CSWstlport -RUNTIME_DEP_PKGS_CSWgource += CSWpcrert -RUNTIME_DEP_PKGS_CSWgource += CSWftgl -RUNTIME_DEP_PKGS_CSWgource += CSWsdlimage -RUNTIME_DEP_PKGS_CSWgource += CSWglew -RUNTIME_DEP_PKGS_CSWgource += CSWjpeg +DEP_PKGS += CSWlibsdl +DEP_PKGS += CSWpng +DEP_PKGS += CSWmesa +DEP_PKGS += CSWstlport +DEP_PKGS += CSWpcrert +DEP_PKGS += CSWftgl +DEP_PKGS += CSWsdlimage +DEP_PKGS += CSWglew +DEP_PKGS += CSWjpeg EXTRA_CXXFLAGS = -library=stlport4 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Mon Nov 1 18:46:10 2010 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Mon, 01 Nov 2010 17:46:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11468] csw/mgar/pkg/cpan Message-ID: Revision: 11468 http://gar.svn.sourceforge.net/gar/?rev=11468&view=rev Author: jonbcraig Date: 2010-11-01 17:46:10 +0000 (Mon, 01 Nov 2010) Log Message: ----------- cpan/Calendar-Simple: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Calendar-Simple/ csw/mgar/pkg/cpan/Calendar-Simple/branches/ csw/mgar/pkg/cpan/Calendar-Simple/tags/ csw/mgar/pkg/cpan/Calendar-Simple/trunk/ csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile csw/mgar/pkg/cpan/Calendar-Simple/trunk/checksums csw/mgar/pkg/cpan/Calendar-Simple/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Calendar-Simple/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/Calendar-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile 2010-11-01 17:46:10 UTC (rev 11468) @@ -0,0 +1,18 @@ +GARNAME = Calendar-Simple +GARVERSION = 1.21 +CATEGORIES = cpan +AUTHOR = DAVECROSS + +DESCRIPTION = Perl extension to create simple calendars +define BLURB + This function returns a data structure representing the dates in a month. The + data structure returned is an array of array references. The first level array + represents the weeks in the month. The second level array contains the actual days. +endef + +PACKAGES = CSWpmcalendarsimple +CATALOGNAME = pm_calendarsimple + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Calendar-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Calendar-Simple/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Calendar-Simple/trunk/checksums 2010-11-01 17:46:10 UTC (rev 11468) @@ -0,0 +1 @@ +8fbfe46c0a25d036ca100460fcd00223 Calendar-Simple-1.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Mon Nov 1 18:57:43 2010 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Mon, 01 Nov 2010 17:57:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11469] csw/mgar/pkg/cpan/Calendar-Simple/trunk Message-ID: Revision: 11469 http://gar.svn.sourceforge.net/gar/?rev=11469&view=rev Author: jonbcraig Date: 2010-11-01 17:57:43 +0000 (Mon, 01 Nov 2010) Log Message: ----------- cpan/Calendar-Simple: update LICENSE Modified Paths: -------------- csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/Calendar-Simple/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile 2010-11-01 17:46:10 UTC (rev 11468) +++ csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile 2010-11-01 17:57:43 UTC (rev 11469) @@ -15,4 +15,6 @@ ARCHALL = 1 +LICENSE=files/COPYING + include gar/category.mk Added: csw/mgar/pkg/cpan/Calendar-Simple/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Calendar-Simple/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Calendar-Simple/trunk/files/COPYING 2010-11-01 17:57:43 UTC (rev 11469) @@ -0,0 +1,3 @@ +Copyright (C) 2002-2008, Magnum Solutions Ltd. All Rights Reserved. + +This script is free software; you can redistribute it and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Mon Nov 1 19:15:32 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Mon, 01 Nov 2010 18:15:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11470] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11470 http://gar.svn.sourceforge.net/gar/?rev=11470&view=rev Author: aigoshin Date: 2010-11-01 18:15:32 +0000 (Mon, 01 Nov 2010) Log Message: ----------- proftpd: 20101101 rc4 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-01 17:57:43 UTC (rev 11469) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-01 18:15:32 UTC (rev 11470) @@ -56,8 +56,8 @@ PRESERVECONF = $(sysconfdir)/proftpd.conf PROFTPDDOC = doc sample-configurations COPYING NEWS README RELEASE_NOTES +CONTRIBUTILS = ftpasswd ftpmail ftpquota - include gar/category.mk post-configure-modulated: @@ -73,5 +73,6 @@ ginstall -d $(DESTDIR)$(localstatedir)/proftpd/logs cp $(WORKDIR)/cswproftpd $(DESTDIR)$(sysconfdir)/init.d/ cd $(WORKSRC); cp -r $(PROFTPDDOC) $(DESTDIR)$(prefix)/share/doc/proftpd + cd $(WORKSRC)/contrib ; cp $(CONTRIBUTILS) $(DESTDIR)$(bindir) rm -f $(DESTDIR)$(prefix)/libexec/proftpd/*.la $(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 Mon Nov 1 22:30:20 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 01 Nov 2010 21:30:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[11471] csw/mgar/pkg/lzip/trunk Message-ID: Revision: 11471 http://gar.svn.sourceforge.net/gar/?rev=11471&view=rev Author: rthurner Date: 2010-11-01 21:30:20 +0000 (Mon, 01 Nov 2010) Log Message: ----------- lzip: upgrade to lzip-1.11 Modified Paths: -------------- csw/mgar/pkg/lzip/trunk/Makefile csw/mgar/pkg/lzip/trunk/checksums Modified: csw/mgar/pkg/lzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzip/trunk/Makefile 2010-11-01 18:15:32 UTC (rev 11470) +++ csw/mgar/pkg/lzip/trunk/Makefile 2010-11-01 21:30:20 UTC (rev 11471) @@ -1,5 +1,5 @@ GARNAME = lzip -GARVERSION = 1.10 +GARVERSION = 1.11 CATEGORIES = utils DESCRIPTION = A lossless data compressor based on the LZMA algorithm Modified: csw/mgar/pkg/lzip/trunk/checksums =================================================================== --- csw/mgar/pkg/lzip/trunk/checksums 2010-11-01 18:15:32 UTC (rev 11470) +++ csw/mgar/pkg/lzip/trunk/checksums 2010-11-01 21:30:20 UTC (rev 11471) @@ -1,4 +1 @@ -c88ba40a011ff3bb3fb1a36a1d5d1832 0001-Make-configure-use-bash.patch -b9048c2b7eb8974a7cd9d6486aaa4d4a 0002-Use-inttypes-instead-of-stdint.patch -095a3aafd43cbd99dd12c78e7cc336c0 0003-Make-testsuite-use-ucb-echo.patch -84879f20450a69a94e125a67f4724d12 lzip-1.10.tar.gz +ba9d0a705e47bcd2b73145d238aa7b58 lzip-1.11.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 Nov 1 23:01:40 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 01 Nov 2010 22:01:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11472] csw/mgar/pkg/lzip/trunk/Makefile Message-ID: Revision: 11472 http://gar.svn.sourceforge.net/gar/?rev=11472&view=rev Author: rthurner Date: 2010-11-01 22:01:40 +0000 (Mon, 01 Nov 2010) Log Message: ----------- lzip: update patches Modified Paths: -------------- csw/mgar/pkg/lzip/trunk/Makefile Modified: csw/mgar/pkg/lzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzip/trunk/Makefile 2010-11-01 21:30:20 UTC (rev 11471) +++ csw/mgar/pkg/lzip/trunk/Makefile 2010-11-01 22:01:40 UTC (rev 11472) @@ -14,10 +14,8 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Make-configure-use-bash.patch -PATCHFILES += 0002-Use-inttypes-instead-of-stdint.patch -PATCHFILES += 0003-Make-testsuite-use-ucb-echo.patch - +PATCHFILES = 0001-inttypes.h-instead-of-stdint.h.patch +PATCHFILES += 0002-inttypes.h-instead-of-stdint.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Nov 1 23:02:59 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 01 Nov 2010 22:02:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11473] csw/mgar/pkg/lzip/trunk/files Message-ID: Revision: 11473 http://gar.svn.sourceforge.net/gar/?rev=11473&view=rev Author: rthurner Date: 2010-11-01 22:02:59 +0000 (Mon, 01 Nov 2010) Log Message: ----------- lzip: update patches Added Paths: ----------- csw/mgar/pkg/lzip/trunk/files/0001-inttypes.h-instead-of-stdint.h.patch csw/mgar/pkg/lzip/trunk/files/0002-inttypes.h-instead-of-stdint.h.patch Removed Paths: ------------- csw/mgar/pkg/lzip/trunk/files/0001-Make-configure-use-bash.patch csw/mgar/pkg/lzip/trunk/files/0002-Use-inttypes-instead-of-stdint.patch csw/mgar/pkg/lzip/trunk/files/0003-Make-testsuite-use-ucb-echo.patch Deleted: csw/mgar/pkg/lzip/trunk/files/0001-Make-configure-use-bash.patch =================================================================== --- csw/mgar/pkg/lzip/trunk/files/0001-Make-configure-use-bash.patch 2010-11-01 22:01:40 UTC (rev 11472) +++ csw/mgar/pkg/lzip/trunk/files/0001-Make-configure-use-bash.patch 2010-11-01 22:02:59 UTC (rev 11473) @@ -1,31 +0,0 @@ -From f2651c910740d07b705e91c051e5838790104d96 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 19 Feb 2010 14:48:19 +0100 -Subject: [PATCH 1/3] Make configure use bash - ---- - configure | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 56462e8..6fa8696 100755 ---- a/configure -+++ b/configure -@@ -1,4 +1,4 @@ --#! /bin/sh -+#!/opt/csw/bin/bash - # configure script for Lzip - A data compressor based on the LZMA algorithm - # Copyright (C) 2008, 2009, 2010 Antonio Diaz Diaz. - # -@@ -27,7 +27,7 @@ mandir='$(datadir)/man' - sysconfdir='$(prefix)/etc' - CXX= - CPPFLAGS= --CXXFLAGS='-Wall -W -O2' -+CXXFLAGS= - LDFLAGS= - - # Loop over all args --- -1.6.5.1 - Added: csw/mgar/pkg/lzip/trunk/files/0001-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/lzip/trunk/files/0001-inttypes.h-instead-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/lzip/trunk/files/0001-inttypes.h-instead-of-stdint.h.patch 2010-11-01 22:02:59 UTC (rev 11473) @@ -0,0 +1,25 @@ +From 43958262312e06e5fde2e62815798e2c6e8f8929 Mon Sep 17 00:00:00 2001 +From: THURNER rupert +Date: Mon, 1 Nov 2010 16:57:20 -0500 +Subject: [PATCH] inttypes.h instead of stdint.h + +--- + fast_encoder.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/fast_encoder.cc b/fast_encoder.cc +index f4becde..bfefe17 100644 +--- a/fast_encoder.cc ++++ b/fast_encoder.cc +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + #include "lzip.h" + #include "encoder.h" +-- +1.7.3 + Deleted: csw/mgar/pkg/lzip/trunk/files/0002-Use-inttypes-instead-of-stdint.patch =================================================================== --- csw/mgar/pkg/lzip/trunk/files/0002-Use-inttypes-instead-of-stdint.patch 2010-11-01 22:01:40 UTC (rev 11472) +++ csw/mgar/pkg/lzip/trunk/files/0002-Use-inttypes-instead-of-stdint.patch 2010-11-01 22:02:59 UTC (rev 11473) @@ -1,68 +0,0 @@ -From c09e736df974dbe9be9ae1bcace4de5a8cfbeac6 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 19 Feb 2010 14:48:40 +0100 -Subject: [PATCH 2/3] Use inttypes instead of stdint - ---- - decoder.cc | 2 +- - encoder.cc | 2 +- - lziprecover.cc | 2 +- - main.cc | 3 ++- - 4 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/decoder.cc b/decoder.cc -index 4e3a8fc..4aadc86 100644 ---- a/decoder.cc -+++ b/decoder.cc -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - - #include "lzip.h" - #include "decoder.h" -diff --git a/encoder.cc b/encoder.cc -index 27d3db0..d38f2a8 100644 ---- a/encoder.cc -+++ b/encoder.cc -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - - #include "lzip.h" - #include "encoder.h" -diff --git a/lziprecover.cc b/lziprecover.cc -index dda4b5e..dfb1fc1 100644 ---- a/lziprecover.cc -+++ b/lziprecover.cc -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -diff --git a/main.cc b/main.cc -index 1f12805..90c3686 100644 ---- a/main.cc -+++ b/main.cc -@@ -33,7 +33,8 @@ - #include - #include - #include --#include -+#include -+#include - #include - #include - #include --- -1.6.5.1 - Added: csw/mgar/pkg/lzip/trunk/files/0002-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/lzip/trunk/files/0002-inttypes.h-instead-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/lzip/trunk/files/0002-inttypes.h-instead-of-stdint.h.patch 2010-11-01 22:02:59 UTC (rev 11473) @@ -0,0 +1,68 @@ +From e434ca6f4d7f1157d0e0e74b26739333b81d8d80 Mon Sep 17 00:00:00 2001 +From: THURNER rupert +Date: Mon, 1 Nov 2010 16:51:34 -0500 +Subject: [PATCH] replace stdint.h with inttypes.h + +--- + decoder.cc | 2 +- + encoder.cc | 2 +- + lziprecover.cc | 2 +- + main.cc | 3 ++- + 4 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/decoder.cc b/decoder.cc +index 03d2ca6..c0c4759 100644 +--- a/decoder.cc ++++ b/decoder.cc +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + + #include "lzip.h" + #include "decoder.h" +diff --git a/encoder.cc b/encoder.cc +index e10142a..f58fcb2 100644 +--- a/encoder.cc ++++ b/encoder.cc +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + #include "lzip.h" + #include "encoder.h" +diff --git a/lziprecover.cc b/lziprecover.cc +index 3f1b130..c2b218f 100644 +--- a/lziprecover.cc ++++ b/lziprecover.cc +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #if defined(__MSVCRT__) +diff --git a/main.cc b/main.cc +index 193f4ac..26b1b23 100644 +--- a/main.cc ++++ b/main.cc +@@ -33,7 +33,8 @@ + #include + #include + #include +-#include ++#include ++#include + #include + #include + #include +-- +1.7.3 + Deleted: csw/mgar/pkg/lzip/trunk/files/0003-Make-testsuite-use-ucb-echo.patch =================================================================== --- csw/mgar/pkg/lzip/trunk/files/0003-Make-testsuite-use-ucb-echo.patch 2010-11-01 22:01:40 UTC (rev 11472) +++ csw/mgar/pkg/lzip/trunk/files/0003-Make-testsuite-use-ucb-echo.patch 2010-11-01 22:02:59 UTC (rev 11473) @@ -1,27 +0,0 @@ -From f930db1d6fd81746e6d51a9caadf7104154f3117 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 19 Feb 2010 14:49:00 +0100 -Subject: [PATCH 3/3] Make testsuite use ucb echo - ---- - testsuite/check.sh | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/testsuite/check.sh b/testsuite/check.sh -index ec61c89..a1fe6da 100755 ---- a/testsuite/check.sh -+++ b/testsuite/check.sh -@@ -5,6 +5,10 @@ - # This script is free software: you have unlimited permission - # to copy, distribute and modify it. - -+# Only ucb echo has -n -+PATH=/usr/ucb:$PATH -+export PATH -+ - LC_ALL=C - export LC_ALL - objdir=`pwd` --- -1.6.5.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Tue Nov 2 00:58:21 2010 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Mon, 01 Nov 2010 23:58:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[11474] csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile Message-ID: Revision: 11474 http://gar.svn.sourceforge.net/gar/?rev=11474&view=rev Author: jonbcraig Date: 2010-11-01 23:58:21 +0000 (Mon, 01 Nov 2010) Log Message: ----------- cpan/Calendar-Simple: added old package name and appropriate dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile Modified: csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile 2010-11-01 22:02:59 UTC (rev 11473) +++ csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile 2010-11-01 23:58:21 UTC (rev 11474) @@ -10,11 +10,20 @@ represents the weeks in the month. The second level array contains the actual days. endef -PACKAGES = CSWpmcalendarsimple -CATALOGNAME = pm_calendarsimple +# CSWpmcalendarsimp is the old package. It is empty and depends on the new one +PACKAGES = CSWpmcalendarsimple CSWpmcalendarsimp +CATALOGNAME_CSWpmcalendarsimple = pm_calendarsimple +CATALOGNAME_CSWpmcalendarsimp = pm_calendarsimp -ARCHALL = 1 +SPKG_DESC_CSWpmcalendarsimple = $(DESCRIPTION) +SPKG_DESC_CSWpmcalendarsimp = Empty stub depending on new package CSWpmcalendarsimple +RUNTIME_DEP_PKGS_CSWpmcalendarsimp = CSWpmcalendarsimple + LICENSE=files/COPYING +PKGFILES_CSWpmcalendarsimp = NOFILES +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 bonivart at users.sourceforge.net Tue Nov 2 09:11:08 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 02 Nov 2010 08:11:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11475] csw/mgar/pkg/cpan/IPC-Cmd/trunk Message-ID: Revision: 11475 http://gar.svn.sourceforge.net/gar/?rev=11475&view=rev Author: bonivart Date: 2010-11-02 08:11:08 +0000 (Tue, 02 Nov 2010) Log Message: ----------- pm_ipccmd: update to 0.64 Modified Paths: -------------- csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile csw/mgar/pkg/cpan/IPC-Cmd/trunk/checksums Modified: csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile 2010-11-01 23:58:21 UTC (rev 11474) +++ csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile 2010-11-02 08:11:08 UTC (rev 11475) @@ -1,5 +1,5 @@ GARNAME = IPC-Cmd -GARVERSION = 0.60 +GARVERSION = 0.64 CATEGORIES = cpan AUTHOR = BINGOS Modified: csw/mgar/pkg/cpan/IPC-Cmd/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IPC-Cmd/trunk/checksums 2010-11-01 23:58:21 UTC (rev 11474) +++ csw/mgar/pkg/cpan/IPC-Cmd/trunk/checksums 2010-11-02 08:11:08 UTC (rev 11475) @@ -1 +1 @@ -dcb4282e413f89afa4b4fcba75ebf283 IPC-Cmd-0.60.tar.gz +c94e8acff9c02c7b1ed0533fe01db2d2 IPC-Cmd-0.64.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 Nov 2 10:35:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Nov 2010 09:35:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11476] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11476 http://gar.svn.sourceforge.net/gar/?rev=11476&view=rev Author: dmichelsen Date: 2010-11-02 09:35:32 +0000 (Tue, 02 Nov 2010) Log Message: ----------- proftpd: Explicitly set libexecdir Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-02 08:11:08 UTC (rev 11475) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-02 09:35:32 UTC (rev 11476) @@ -30,14 +30,14 @@ sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw +libexecdir_install = $(exec_prefix)/libexec/proftpd CONFIGURE_ENV = install_user=$(USER) install_group=csw CONFIGURE_ENV += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" EXTRA_LIB = $(prefix)/mysql5/lib/mysql -NODIRPATHS = --libexecdir --localstatedir +NODIRPATHS = --localstatedir CONFIGURE_ARGS += $(DIRPATHS) -CONFIGURE_ARGS += --libexecdir=$(prefix)/libexec/proftpd CONFIGURE_ARGS += --localstatedir=/var/run/proftpd CONFIGURE_ARGS += --enable-dso --disable-static CONFIGURE_ARGS += --enable-facl 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 Nov 2 12:04:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Nov 2010 11:04:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[11477] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11477 http://gar.svn.sourceforge.net/gar/?rev=11477&view=rev Author: dmichelsen Date: 2010-11-02 11:04:33 +0000 (Tue, 02 Nov 2010) Log Message: ----------- proftpd: Do not use isaexec on libexecdir Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-02 09:35:32 UTC (rev 11476) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-02 11:04:33 UTC (rev 11477) @@ -28,6 +28,8 @@ EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv9 +ISAEXEC_DIRS = $(bindir) $(sbindir) + sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw libexecdir_install = $(exec_prefix)/libexec/proftpd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Nov 2 13:31:11 2010 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Tue, 2 Nov 2010 12:31:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[11422] csw/mgar/pkg In-Reply-To: References: Message-ID: Testing if I can reply to a post on this mailing list. From maciej at opencsw.org Tue Nov 2 13:34:14 2010 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Tue, 2 Nov 2010 12:34:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[11451] csw/mgar/pkg/curl/trunk/Makefile In-Reply-To: References: Message-ID: No dia 31 de Outubro de 2010 07:05, escreveu: > +# recompile curl to link to new ldap, and temporarily include > +# the following block to make checkpkg happy. nothing in the curl > +# package changed, so it should be ok, no? It depends; there are times when checkpkg detects actual problems in already released packages, quite a few of them. You cannot reason from "The package was previously released" to "the package is therefore done correctly". There are also policy changes: what was fine in January, might not be fine in October. Let's talks about the specific errors. I'll group the overrides so it's easier to comment on them together. > +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibssh2 > +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWoldaprt > +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWsasl > +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcares > +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibnet > +CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibcares > +CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibssh2 > +CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibfbopenssl > +CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWoldaprt Here, checkpkg tells you that, for example, CSWcurlrt should depend on libcares, and that CSWcurl has no reason to do so. I think that the way dependencies are setup right now, the declared deps are: CSWcurl -> CSWcurlrt CSWcurl -> CSWlibcares If you install CSWcurl, it pulls both CSWcurlrt and CSWlibcares. The libraries in CSWcurlrt can, in effect, open the libraries from CSWlibcares and everything works. But if you installed just CSWcurlrt, you might see that the required libraries aren't actually installed, and CSWcurlrt doesn't work. Therefore I think it's a real problem caught by checkpkg. > +CHECKPKG_OVERRIDES_CSWcurldevel += surplus-dependency|CSWcurl This one is typical, I think I'll remove the surplus-dependency check on the dev packages. > +CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 > +CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0 > +CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 > +CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0 > +CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 > +CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 This is a sanity check, but there can be legitimate exceptions. I know from Dago that there are works on the way to implement AUX library linking. > +CHECKPKG_OVERRIDES_CSWcurlrt += non-uniform-lib-versions-in-package|sonames=['libcurl.so.2',|'libcurl.so.3',|'libcurl.so.4'] > +CHECKPKG_OVERRIDES_CSWcurlrtfull += shared-lib-pkgname-mismatch|sonames=['libcurl.so.4']|pkgname=CSWcurlrtfull|expected=['CSWlibcurl4']| I believe libcurl is a perfect candidate for soname splitoffs, so we'd have CSWlibcurl2, CSWlibcurl3 and CSWlibcurl4. I think checkpkg suggests the right thing and we should fix rather than override. Dagobert, can you comment? > +CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull > +CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull > +CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull > +CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull This is a real problem and will most likely be a showstopper if you try to release. > +CHECKPKG_OVERRIDES_CSWcurlrt += surplus-dependency|CSWalternatives > +CHECKPKG_OVERRIDES_CSWcurlrtfull += surplus-dependency|CSWalternatives Probably a false positive since checkpkg can't currently detect the need of CSWalternatives. Dago, can you comment how checkpkg could detect this dependency requirement? From maciej at opencsw.org Tue Nov 2 13:36:20 2010 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Tue, 2 Nov 2010 12:36:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[11453] csw/mgar/pkg/curl/trunk/Makefile In-Reply-To: References: Message-ID: No dia 31 de Outubro de 2010 08:11, escreveu: > Modified: csw/mgar/pkg/curl/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/curl/trunk/Makefile ? ?2010-10-31 07:40:43 UTC (rev 11452) > +++ csw/mgar/pkg/curl/trunk/Makefile ? ?2010-10-31 08:11:21 UTC (rev 11453) > @@ -120,10 +120,10 @@ > ?CHECKPKG_OVERRIDES_CSWcurlrt += surplus-dependency|CSWalternatives > ?CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 > ?CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 > -CHECKPKG_OVERRIDES_CSWcurlrtfull += shared-lib-pkgname-mismatch|sonames=['libcurl.so.4']|pkgname=CSWcurlrtfull|expected=['CSWlibcurl4']| > ?CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull > ?CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull > ?CHECKPKG_OVERRIDES_CSWcurlrtfull += surplus-dependency|CSWalternatives > +CHECKPKG_OVERRIDES_CSWcurlrtfull += shared-lib-pkgname-mismatch|sonames=['libcurl.so.4']|pkgname=CSWcurlrtfull|expected=['CSWlibcurl4']| I think there are syntax issues with this line resulting in the parameter not being passed the right way. If you wish to override this error, you can leave out the additional section and pass only the error tag name: CHECKPKG_OVERRIDES_CSWfoo += error-tag-name From maciej at opencsw.org Tue Nov 2 13:38:13 2010 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Tue, 2 Nov 2010 12:38:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[11461] csw/mgar/pkg/apache2/trunk/Makefile In-Reply-To: References: Message-ID: No dia 1 de Novembro de 2010 06:16, escreveu: > Revision: 11461 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=11461&view=rev > Author: ? rthurner > Date: ? ? 2010-11-01 06:16:53 +0000 (Mon, 01 Nov 2010) > > Log Message: > ----------- > apache2: http:2.2.17, correct for checkpkg > > Modified Paths: > -------------- > ? ?csw/mgar/pkg/apache2/trunk/Makefile > > Modified: csw/mgar/pkg/apache2/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-01 01:06:49 UTC (rev 11460) > +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-01 06:16:53 UTC (rev 11461) > @@ -88,7 +88,8 @@ > ?RUNTIME_DEP_PKGS_CSWap2worker ? ?+= CSWbdb48 CSWapr-util CSWiconv > ?RUNTIME_DEP_PKGS_CSWapache2rt ? ? = CSWapache2 > > -CHECKPKG_OVERRIDES_CSWap2suexec ?+= surplus-dependency|CSWapache2 > +CHECKPKG_OVERRIDES_CSWap2suexec ? += dependency-listed-more-than-once|CSWapache2 This will most probably be a showstopper during release. > +CHECKPKG_OVERRIDES_CSWap2suexec ? += surplus-dependency|CSWapache2 If we had a way for checkpkg to detect the dependency on CSWapache2, we could solve this. Any ideas? From bwalton at opencsw.org Tue Nov 2 14:05:40 2010 From: bwalton at opencsw.org (Ben Walton) Date: Tue, 02 Nov 2010 09:05:40 -0400 Subject: [csw-devel] SF.net SVN: gar:[11461] csw/mgar/pkg/apache2/trunk/Makefile In-Reply-To: References: Message-ID: <1288703117-sup-9119@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej (Matchek) Blizinski's message of Tue Nov 02 08:38:13 -0400 2010: > > +CHECKPKG_OVERRIDES_CSWap2suexec ? += surplus-dependency|CSWapache2 > > If we had a way for checkpkg to detect the dependency on CSWapache2, > we could solve this. Any ideas? Anything that ships files inside /opt/csw/apache2 ? Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From wahwah at users.sourceforge.net Tue Nov 2 16:06:31 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Nov 2010 15:06:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[11478] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11478 http://gar.svn.sourceforge.net/gar/?rev=11478&view=rev Author: wahwah Date: 2010-11-02 15:06:31 +0000 (Tue, 02 Nov 2010) Log Message: ----------- mGAR v2: checkpkg, require the dependency on CSWapache if a package ships files in /opt/csw/apache2. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/dependency_checks_test.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-11-02 11:04:33 UTC (rev 11477) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-11-02 15:06:31 UTC (rev 11478) @@ -26,6 +26,7 @@ (r".*\.py$", (u"CSWpython",)), (r".*\.rb$", (u"CSWruby",)), (r".*\.elc?$", (u"CSWemacscommon",)), + (r"/opt/csw/apache2/", (u"CSWapache2",)), ) PREFERRED_DIRECTORY_PROVIDERS = set([u"CSWcommon"]) Modified: csw/mgar/gar/v2/lib/python/dependency_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks_test.py 2010-11-02 11:04:33 UTC (rev 11477) +++ csw/mgar/gar/v2/lib/python/dependency_checks_test.py 2010-11-02 15:06:31 UTC (rev 11478) @@ -5,7 +5,7 @@ import mox import unittest import pprint -import dependency_checks as depchecks +import dependency_checks from testdata import stubs from testdata.tree_stats import pkgstats as tree_stats from testdata.sudo_stats import pkgstats as sudo_stats @@ -26,7 +26,7 @@ logger_stub = stubs.LoggerStub() self.assertEqual( expected, - depchecks.GetPkgByFullPath(self.error_mgr_mock, + dependency_checks.GetPkgByFullPath(self.error_mgr_mock, logger_stub, path_list, pkg_by_path)) @@ -54,7 +54,7 @@ '/opt/csw/lib/libfoo.so.1': ['CSWbar']} self.assertEqual( expected, - depchecks.GetPkgByFullPath(self.error_mgr_mock, + dependency_checks.GetPkgByFullPath(self.error_mgr_mock, logger_stub, paths_to_verify, pkg_by_path)) @@ -156,7 +156,7 @@ u'CSWlibxft2', u'CSWpango', u'CSWgtk2', u'CSWpkgutil'], '/opt/csw/share/man/man1': ['CSWtree'], '/opt/csw/share/man/man1/tree.1': ['CSWtree']} - result = depchecks.ByDirectory(self.pkg_data, + result = dependency_checks.ByDirectory(self.pkg_data, self.error_mgr_mock, self.logger_stub, self.messenger_stub, @@ -182,7 +182,7 @@ '/opt/csw/share/man': [u'CSWcommon', u'CSWgnuplot'], '/opt/csw/share/man/man1': ['CSWtree'], '/opt/csw/share/man/man1/tree.1': ['CSWtree']} - result = depchecks.ByDirectory(self.pkg_data, + result = dependency_checks.ByDirectory(self.pkg_data, self.error_mgr_mock, self.logger_stub, self.messenger_stub, @@ -220,7 +220,7 @@ '/opt/csw/share/man': [u'CSWcommon', u'CSWgnuplot'], '/opt/csw/share/man/man1': ['CSWtree'], '/opt/csw/share/man/man1/tree.1': ['CSWtree']} - result = depchecks.Libraries(self.pkg_data, + result = dependency_checks.Libraries(self.pkg_data, self.error_mgr_mock, self.logger_stub, self.messenger_stub, @@ -290,9 +290,9 @@ [(u'SUNWlibC', u'provides /usr/lib/libCstd.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')], [(u'SUNWlibC', u'provides /usr/lib/libCrun.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')]] - # pkg_by_path is not important for depchecks.Libraries. + # pkg_by_path is not important for dependency_checks.Libraries. pkg_by_path = {} - result = depchecks.Libraries(self.pkg_data, + result = dependency_checks.Libraries(self.pkg_data, self.error_mgr_mock, self.logger_stub, self.messenger_stub, @@ -310,7 +310,7 @@ ] declared_deps = set([u"CSWfoo2"]) expected = [[u"CSWbar"]] - result = depchecks.MissingDepsFromReasonGroups( + result = dependency_checks.MissingDepsFromReasonGroups( reason_groups, declared_deps) self.assertEqual(result, expected) @@ -330,7 +330,29 @@ # pkg_by_path pass + def testByFilename(self): + self.pkg_data = tree_stats[0] + self.pkg_data["pkgmap"] = [ + {'class': 'none', + 'line': 'not important', + 'mode': '0755', + 'path': '/opt/csw/apache2/bin/foo', + 'type': 'f', + 'group': 'bin', + 'user': 'root'}] + self.mocker.ReplayAll() + result = dependency_checks.ByFilename( + self.pkg_data, + self.error_mgr_mock, + self.logger_stub, + self.messenger_stub, + None, None) + self.mocker.VerifyAll() + expected = [[ + (u'CSWapache2', + "found file(s) matching /opt/csw/apache2/, " + "e.g. '/opt/csw/apache2/bin/foo'")]] + self.assertEqual(expected, result) - if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue Nov 2 18:49:58 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 02 Nov 2010 17:49:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[11479] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11479 http://gar.svn.sourceforge.net/gar/?rev=11479&view=rev Author: aigoshin Date: 2010-11-02 17:49:57 +0000 (Tue, 02 Nov 2010) Log Message: ----------- proftpd: 20101102 rc5 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-02 15:06:31 UTC (rev 11478) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-02 17:49:57 UTC (rev 11479) @@ -28,11 +28,12 @@ EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv9 -ISAEXEC_DIRS = $(bindir) $(sbindir) +ISAEXEC_DIRS = $(bindir) $(sbindir) +ISAEXEC_EXCLUDE_FILES = $(bindir)/ftpasswd $(bindir)/ftpmail $(bindir)/ftpquota $(bindir)/prxs -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw -libexecdir_install = $(exec_prefix)/libexec/proftpd +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw +libexecdir_install = $(exec_prefix)/lib/proftpd CONFIGURE_ENV = install_user=$(USER) install_group=csw CONFIGURE_ENV += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" @@ -76,5 +77,6 @@ cp $(WORKDIR)/cswproftpd $(DESTDIR)$(sysconfdir)/init.d/ cd $(WORKSRC); cp -r $(PROFTPDDOC) $(DESTDIR)$(prefix)/share/doc/proftpd cd $(WORKSRC)/contrib ; cp $(CONTRIBUTILS) $(DESTDIR)$(bindir) - rm -f $(DESTDIR)$(prefix)/libexec/proftpd/*.la + rm -f $(DESTDIR)$(libexecdir_install)/*.la + rm -f $(DESTDIR)$(libexecdir_install)/$(ISA)/*.la $(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 Nov 2 21:26:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Nov 2010 20:26:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11480] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11480 http://gar.svn.sourceforge.net/gar/?rev=11480&view=rev Author: dmichelsen Date: 2010-11-02 20:26:22 +0000 (Tue, 02 Nov 2010) Log Message: ----------- proftpd: Relocate libexecdir again Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-02 17:49:57 UTC (rev 11479) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-02 20:26:22 UTC (rev 11480) @@ -33,14 +33,14 @@ sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw -libexecdir_install = $(exec_prefix)/lib/proftpd CONFIGURE_ENV = install_user=$(USER) install_group=csw CONFIGURE_ENV += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" EXTRA_LIB = $(prefix)/mysql5/lib/mysql -NODIRPATHS = --localstatedir +NODIRPATHS = --localstatedir --libexecdir CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --libexecdir=$(libdir)/proftpd CONFIGURE_ARGS += --localstatedir=/var/run/proftpd CONFIGURE_ARGS += --enable-dso --disable-static CONFIGURE_ARGS += --enable-facl 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 Nov 3 01:32:53 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 03 Nov 2010 00:32:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11481] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 11481 http://gar.svn.sourceforge.net/gar/?rev=11481&view=rev Author: bdwalton Date: 2010-11-03 00:32:53 +0000 (Wed, 03 Nov 2010) Log Message: ----------- ruby19: set description for ruby19 package Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-11-02 20:26:22 UTC (rev 11480) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-11-03 00:32:53 UTC (rev 11481) @@ -56,6 +56,8 @@ RUNTIME_DEP_PKGS_CSWruby19dev = CSWruby19 RUNTIME_DEP_PKGS_CSWruby19ri = CSWruby19 +SPKG_DESC_CSWruby19 = $(DESCRIPTION) + SPKG_DESC_CSWruby19samples = Example programs for Ruby 1.9 SPKG_DESC_CSWruby19ri = Ruby 1.9 Interactive Reference 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 Nov 3 09:12:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Nov 2010 08:12:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[11482] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11482 http://gar.svn.sourceforge.net/gar/?rev=11482&view=rev Author: dmichelsen Date: 2010-11-03 08:12:31 +0000 (Wed, 03 Nov 2010) Log Message: ----------- proftpd: Add CAS migration for proftpd.conf Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-03 00:32:53 UTC (rev 11481) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-03 08:12:31 UTC (rev 11482) @@ -34,6 +34,8 @@ sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw +MIGRATE_FILES = proftpd.conf + CONFIGURE_ENV = install_user=$(USER) install_group=csw CONFIGURE_ENV += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" EXTRA_LIB = $(prefix)/mysql5/lib/mysql This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Wed Nov 3 09:26:24 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Wed, 03 Nov 2010 08:26:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[11483] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11483 http://gar.svn.sourceforge.net/gar/?rev=11483&view=rev Author: aigoshin Date: 2010-11-03 08:26:24 +0000 (Wed, 03 Nov 2010) Log Message: ----------- proftpd: 20101102 rc6 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-03 08:12:31 UTC (rev 11482) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-03 08:26:24 UTC (rev 11483) @@ -31,18 +31,23 @@ ISAEXEC_DIRS = $(bindir) $(sbindir) ISAEXEC_EXCLUDE_FILES = $(bindir)/ftpasswd $(bindir)/ftpmail $(bindir)/ftpquota $(bindir)/prxs -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw +PR_LIBEXEC_sparcv8 = $(prefix)/lib/proftpd +PR_LIBEXEC_i386 = $(prefix)/lib/proftpd +PR_LIBEXEC_$(ISA) ?= $(prefix)/lib/$(ISA)/proftpd +PR_LIBEXEC = $(PR_LIBEXEC_$(ISA)) -MIGRATE_FILES = proftpd.conf +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw +MIGRATE_FILES = proftpd.conf + CONFIGURE_ENV = install_user=$(USER) install_group=csw CONFIGURE_ENV += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" EXTRA_LIB = $(prefix)/mysql5/lib/mysql NODIRPATHS = --localstatedir --libexecdir CONFIGURE_ARGS += $(DIRPATHS) -CONFIGURE_ARGS += --libexecdir=$(libdir)/proftpd +CONFIGURE_ARGS += --libexecdir=$(PR_LIBEXEC) CONFIGURE_ARGS += --localstatedir=/var/run/proftpd CONFIGURE_ARGS += --enable-dso --disable-static CONFIGURE_ARGS += --enable-facl 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 Nov 3 09:53:10 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Nov 2010 08:53:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11485] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 11485 http://gar.svn.sourceforge.net/gar/?rev=11485&view=rev Author: wahwah Date: 2010-11-03 08:53:10 +0000 (Wed, 03 Nov 2010) Log Message: ----------- Revert "mGAR v2: checkpkg, README, the list of dependencies to run the unit tests on Ubuntu." This reverts commit 46b7b6bd95a737c1f65a8e1d60bf07e1cd3301de. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2010-11-03 08:47:23 UTC (rev 11484) +++ csw/mgar/gar/v2/lib/python/README 2010-11-03 08:53:10 UTC (rev 11485) @@ -13,16 +13,3 @@ Known problems: - libmagic fails sometimes when processing the whole catalog - -Dependencies: - -It's possible to develop checkpkg on a non-Solaris platform, using unit -tests as means to run various bits of code. Here's the dependency list -for Ubuntu. - - python-cheetah - python-hachoir-parser - python-magic - python-mox - python-progressbar - python-yaml 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 Nov 3 09:55:24 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Nov 2010 08:55:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[11486] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 11486 http://gar.svn.sourceforge.net/gar/?rev=11486&view=rev Author: wahwah Date: 2010-11-03 08:55:24 +0000 (Wed, 03 Nov 2010) Log Message: ----------- mGAR v2: checkpkg, README, re-applying the change. I thought I knew how to remove a commit in git, but I apparently don't. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2010-11-03 08:53:10 UTC (rev 11485) +++ csw/mgar/gar/v2/lib/python/README 2010-11-03 08:55:24 UTC (rev 11486) @@ -13,3 +13,16 @@ Known problems: - libmagic fails sometimes when processing the whole catalog + +Dependencies: + +It's possible to develop checkpkg on a non-Solaris platform, using unit +tests as means to run various bits of code. Here's the dependency list +for Ubuntu. + + python-cheetah + python-hachoir-parser + python-magic + python-mox + python-progressbar + python-yaml 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 Nov 3 09:47:23 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Nov 2010 08:47:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[11484] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 11484 http://gar.svn.sourceforge.net/gar/?rev=11484&view=rev Author: wahwah Date: 2010-11-03 08:47:23 +0000 (Wed, 03 Nov 2010) Log Message: ----------- mGAR v2: checkpkg, README, the list of dependencies to run the unit tests on Ubuntu. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2010-11-03 08:26:24 UTC (rev 11483) +++ csw/mgar/gar/v2/lib/python/README 2010-11-03 08:47:23 UTC (rev 11484) @@ -13,3 +13,16 @@ Known problems: - libmagic fails sometimes when processing the whole catalog + +Dependencies: + +It's possible to develop checkpkg on a non-Solaris platform, using unit +tests as means to run various bits of code. Here's the dependency list +for Ubuntu. + + python-cheetah + python-hachoir-parser + python-magic + python-mox + python-progressbar + python-yaml 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 Nov 3 12:13:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Nov 2010 11:13:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[11487] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11487 http://gar.svn.sourceforge.net/gar/?rev=11487&view=rev Author: dmichelsen Date: 2010-11-03 11:13:17 +0000 (Wed, 03 Nov 2010) Log Message: ----------- proftpd: Use custom-merging to allow installation to isa-specific libdir Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-03 08:55:24 UTC (rev 11486) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-03 11:13:17 UTC (rev 11487) @@ -36,6 +36,11 @@ PR_LIBEXEC_$(ISA) ?= $(prefix)/lib/$(ISA)/proftpd PR_LIBEXEC = $(PR_LIBEXEC_$(ISA)) +EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro = $(prefix)/lib/pentium_pro $(prefix)/lib/pentium_pro/.* $(prefix)/lib/pkgconfig.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(prefix)/lib/sparcv9 $(prefix)/lib/sparcv9/.* +EXTRA_MERGE_SCRIPTS_isa-pentium_pro = copy-proftpd-lib +EXTRA_MERGE_SCRIPTS_isa-sparcv9 = copy-proftpd-lib + sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw @@ -87,3 +92,11 @@ rm -f $(DESTDIR)$(libexecdir_install)/*.la rm -f $(DESTDIR)$(libexecdir_install)/$(ISA)/*.la $(MAKECOOKIE) + +merge-copy-proftpd-lib: + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v \ + $(foreach DIR,$(PR_LIBEXEC_$(ISA)),-s ",^\.\($(DIR)/\),\1,p") -s ",.*,," \ + . $(PKGROOT) \ + ) + @$(MAKECOOKIE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Wed Nov 3 17:18:46 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Wed, 03 Nov 2010 16:18:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[11488] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11488 http://gar.svn.sourceforge.net/gar/?rev=11488&view=rev Author: aigoshin Date: 2010-11-03 16:18:46 +0000 (Wed, 03 Nov 2010) Log Message: ----------- proftpd: release 20101102 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-03 11:13:17 UTC (rev 11487) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-03 16:18:46 UTC (rev 11488) @@ -2,8 +2,6 @@ GARVERSION = 1.3.3c CATEGORIES = server -GARCOMPILER = GCC3 - DESCRIPTION = Advanced, incredibly configurable and secure FTP daemon define BLURB ProFTPD is a proven, high-performance, scalable FTP server written from @@ -23,24 +21,17 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -RUNTIME_DEP_PKGS = CSWosslrt CSWggettextrt CSWiconv CSWgcc3corert CSWoldaprt CSWzlib CSWmysql5rt CSWsqlite3rt +RUNTIME_DEP_PKGS = CSWosslrt CSWggettextrt CSWiconv CSWoldaprt CSWzlib CSWmysql5rt CSWsqlite3rt -EXTRA_BUILD_ISAS_i386 = pentium_pro +EXTRA_BUILD_ISAS_i386 = amd64 EXTRA_BUILD_ISAS_sparc = sparcv9 ISAEXEC_DIRS = $(bindir) $(sbindir) ISAEXEC_EXCLUDE_FILES = $(bindir)/ftpasswd $(bindir)/ftpmail $(bindir)/ftpquota $(bindir)/prxs -PR_LIBEXEC_sparcv8 = $(prefix)/lib/proftpd -PR_LIBEXEC_i386 = $(prefix)/lib/proftpd -PR_LIBEXEC_$(ISA) ?= $(prefix)/lib/$(ISA)/proftpd -PR_LIBEXEC = $(PR_LIBEXEC_$(ISA)) +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = $(prefix)/bin/amd64/ftpasswd $(prefix)/bin/amd64/ftpmail $(prefix)/bin/amd64/ftpquota $(prefix)/bin/amd64/prxs +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(prefix)/bin/sparcv9/ftpasswd $(prefix)/bin/sparcv9/ftpmail $(prefix)/bin/sparcv9/ftpquota $(prefix)/bin/sparcv9/prxs -EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro = $(prefix)/lib/pentium_pro $(prefix)/lib/pentium_pro/.* $(prefix)/lib/pkgconfig.* -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(prefix)/lib/sparcv9 $(prefix)/lib/sparcv9/.* -EXTRA_MERGE_SCRIPTS_isa-pentium_pro = copy-proftpd-lib -EXTRA_MERGE_SCRIPTS_isa-sparcv9 = copy-proftpd-lib - sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw @@ -48,11 +39,12 @@ CONFIGURE_ENV = install_user=$(USER) install_group=csw CONFIGURE_ENV += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" +CONFIGURE_ENV += LD_LIBRARY_PATH="$(libdir)" EXTRA_LIB = $(prefix)/mysql5/lib/mysql NODIRPATHS = --localstatedir --libexecdir CONFIGURE_ARGS += $(DIRPATHS) -CONFIGURE_ARGS += --libexecdir=$(PR_LIBEXEC) +CONFIGURE_ARGS += --libexecdir=$(libdir)/proftpd CONFIGURE_ARGS += --localstatedir=/var/run/proftpd CONFIGURE_ARGS += --enable-dso --disable-static CONFIGURE_ARGS += --enable-facl @@ -89,14 +81,5 @@ cp $(WORKDIR)/cswproftpd $(DESTDIR)$(sysconfdir)/init.d/ cd $(WORKSRC); cp -r $(PROFTPDDOC) $(DESTDIR)$(prefix)/share/doc/proftpd cd $(WORKSRC)/contrib ; cp $(CONTRIBUTILS) $(DESTDIR)$(bindir) - rm -f $(DESTDIR)$(libexecdir_install)/*.la - rm -f $(DESTDIR)$(libexecdir_install)/$(ISA)/*.la + rm -f $(DESTDIR)$(PR_LIBEXEC)/*.la $(MAKECOOKIE) - -merge-copy-proftpd-lib: - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v \ - $(foreach DIR,$(PR_LIBEXEC_$(ISA)),-s ",^\.\($(DIR)/\),\1,p") -s ",.*,," \ - . $(PKGROOT) \ - ) - @$(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 Nov 4 10:15:15 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Nov 2010 09:15:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11489] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 11489 http://gar.svn.sourceforge.net/gar/?rev=11489&view=rev Author: wahwah Date: 2010-11-04 09:15:15 +0000 (Thu, 04 Nov 2010) Log Message: ----------- mGAR v2: checkpkg, *-devel packages should be allowed to depend on anything, a unit test. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-11-03 16:18:46 UTC (rev 11488) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-11-04 09:15:15 UTC (rev 11489) @@ -178,7 +178,8 @@ self.pkg_data[0]["depends"].append(["CSWmarsian", "A package from Mars."]) installed = ["CSWcommon", "CSWisaexec", "CSWiconv", "CSWlibpopt"] self.error_mgr_mock.GetInstalledPackages().AndReturn(installed) - self.error_mgr_mock.ReportError('CSWrsync', 'unidentified-dependency', 'CSWmarsian') + self.error_mgr_mock.ReportError( + 'CSWrsync', 'unidentified-dependency', 'CSWmarsian') class TestSetCheckDependenciesGood(CheckpkgUnitTestHelper, unittest.TestCase): @@ -214,7 +215,42 @@ self.error_mgr_mock.GetInstalledPackages().AndReturn(installed) -class TestCheckCheckDependsOnSelf(CheckpkgUnitTestHelper, unittest.TestCase): +class TestSetCheckDependenciesDoNotReportSurplusForDevel( + CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckLibraries' + def CheckpkgTest(self): + self.pkg_data_single = self.pkg_data + self.pkg_data = [self.pkg_data_single] + self.pkg_data[0]["basic_stats"]["pkgname"] = "CSWfoo-devel" + self.pkg_data[0]["depends"].append(["CSWfoo", ""]) + self.pkg_data[0]["depends"].append(["CSWbar", ""]) + self.pkg_data[0]["depends"].append(["CSWlibiconv", ""]) + # Mocking out the interaction with the database + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libiconv.so.2').AndReturn({ + "/opt/csw/lib": (u"CSWlibiconv",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libnsl.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libpopt.so.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibpopt",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsec.so.1').AndReturn({ + "/usr/lib": (u"SUNWfoo",), + "/usr/lib/sparcv9": (u"SUNWfoo"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsocket.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + common_path_pkgs = [u'CSWgdbm', u'CSWbinutils', u'CSWcommon'] + paths_to_check = [ + '/opt/csw/share/man', '/opt/csw/bin', '/opt/csw/bin/sparcv8', + '/opt/csw/bin/sparcv9', '/opt/csw/share/doc'] + for pth in paths_to_check: + self.error_mgr_mock.GetPkgByPath(pth).AndReturn(common_path_pkgs) + # There should be no error about the dependency on CSWfoo or CSWbar. + + +class TestCheckDependsOnSelf(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckDependsOnSelf' def CheckpkgTest(self): self.pkg_data["depends"].append(["CSWrsync", ""]) @@ -627,6 +663,7 @@ 'isalist': (), 'pkgmap': [], } + def CheckpkgTest(self): self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libfoo.so.1').AndReturn({ u'/opt/csw/lib': [u'CSWlibfoo'], @@ -1099,8 +1136,7 @@ }) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsocket.so.1').AndReturn({ "/usr/lib": (u"SUNWcsl",), - "/usr/lib/sparcv9": (u"SUNWcslx"), - }) + "/usr/lib/sparcv9": (u"SUNWcslx"),}) common_path_pkgs = [u'CSWgdbm', u'CSWbinutils', u'CSWcommon'] paths_to_check = [ '/opt/csw/share/man', '/opt/csw/bin', '/opt/csw/share', '/var/opt/csw', @@ -1149,9 +1185,12 @@ for path in paths_to_check: self.error_mgr_mock.GetPkgByPath(path).AndReturn(common_path_pkgs) # This is the critical test here. - self.error_mgr_mock.ReportError('CSWsudo-common', 'base-dir-not-found', '/opt/csw/share/man') - self.error_mgr_mock.ReportError('CSWsudo', 'surplus-dependency', 'CSWalternatives') - self.error_mgr_mock.ReportError('CSWsudo', 'surplus-dependency', 'CSWsudo-common') + self.error_mgr_mock.ReportError( + 'CSWsudo-common', 'base-dir-not-found', '/opt/csw/share/man') + self.error_mgr_mock.ReportError( + 'CSWsudo', 'surplus-dependency', 'CSWalternatives') + self.error_mgr_mock.ReportError( + 'CSWsudo', 'surplus-dependency', 'CSWsudo-common') class TestSetCheckDoubleDepends(CheckpkgUnitTestHelper, unittest.TestCase): 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 Nov 4 10:16:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Nov 2010 09:16:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[11490] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11490 http://gar.svn.sourceforge.net/gar/?rev=11490&view=rev Author: wahwah Date: 2010-11-04 09:16:43 +0000 (Thu, 04 Nov 2010) Log Message: ----------- mGAR v2: It's okay for *-devel packages to depend on anything. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-11-04 09:15:15 UTC (rev 11489) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-11-04 09:16:43 UTC (rev 11490) @@ -69,6 +69,12 @@ # libX11.so.4, but due to issues with 3D acceleration. DO_NOT_LINK_AGAINST_THESE_SONAMES = set([]) +# Regarding surplus libraries reports +DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) +DO_NOT_REPORT_SURPLUS_FOR = [r"CSW[a-z\-]+-dev(el)?"] +DO_NOT_REPORT_MISSING = set([]) +DO_NOT_REPORT_MISSING_RE = [r"\*?SUNW.*"] + DISCOURAGED_FILE_PATTERNS = ( (r"\.py[co]$", ("Python compiled files are supposed to be compiled using" "the cswpycompile class action script. For more " @@ -339,7 +345,7 @@ missing_dep_groups = depchecks.MissingDepsFromReasonGroups( req_pkgs_reasons, declared_deps_set) pkgs_to_remove = set() - for regex_str in checkpkg.DO_NOT_REPORT_MISSING_RE: + for regex_str in DO_NOT_REPORT_MISSING_RE: regex = re.compile(regex_str) for dep_pkgname in reduce(operator.add, missing_dep_groups, []): if re.match(regex, dep_pkgname): @@ -359,7 +365,10 @@ (x for x, y in reduce(operator.add, req_pkgs_reasons, []))) missing_dep_groups = new_missing_dep_groups surplus_deps = declared_deps_set.difference(potential_req_pkgs) - surplus_deps = surplus_deps.difference(checkpkg.DO_NOT_REPORT_SURPLUS) + surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) + for regex_str in DO_NOT_REPORT_SURPLUS_FOR: + if surplus_deps and re.match(regex_str, pkgname): + surplus_deps = set() # Using an index to avoid duplicated reasons. missing_deps_reasons_by_pkg = [] missing_deps_idx = set() Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-11-04 09:15:15 UTC (rev 11489) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-11-04 09:16:43 UTC (rev 11490) @@ -215,16 +215,9 @@ self.error_mgr_mock.GetInstalledPackages().AndReturn(installed) -class TestSetCheckDependenciesDoNotReportSurplusForDevel( - CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): - self.pkg_data_single = self.pkg_data - self.pkg_data = [self.pkg_data_single] - self.pkg_data[0]["basic_stats"]["pkgname"] = "CSWfoo-devel" - self.pkg_data[0]["depends"].append(["CSWfoo", ""]) - self.pkg_data[0]["depends"].append(["CSWbar", ""]) - self.pkg_data[0]["depends"].append(["CSWlibiconv", ""]) +class DatabaseMockingMixin(object): + + def MockDbInteraction(self): # Mocking out the interaction with the database self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ "/usr/lib": (u"SUNWcsl",)}) @@ -247,9 +240,36 @@ '/opt/csw/bin/sparcv9', '/opt/csw/share/doc'] for pth in paths_to_check: self.error_mgr_mock.GetPkgByPath(pth).AndReturn(common_path_pkgs) + + +class TestSetCheckDependenciesDoNotReportSurplusForDevel( + DatabaseMockingMixin, CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckLibraries' + def CheckpkgTest(self): + self.pkg_data_single = self.pkg_data + self.pkg_data = [self.pkg_data_single] + self.pkg_data[0]["basic_stats"]["pkgname"] = "CSWfoo-devel" + self.pkg_data[0]["depends"].append(["CSWfoo", ""]) + self.pkg_data[0]["depends"].append(["CSWbar", ""]) + self.pkg_data[0]["depends"].append(["CSWlibiconv", ""]) + self.MockDbInteraction() # There should be no error about the dependency on CSWfoo or CSWbar. +class TestSetCheckDependenciesDoNotReportSurplusForDev( + DatabaseMockingMixin, CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckLibraries' + def CheckpkgTest(self): + self.pkg_data_single = self.pkg_data + self.pkg_data = [self.pkg_data_single] + self.pkg_data[0]["basic_stats"]["pkgname"] = "CSWfoo-dev" + self.pkg_data[0]["depends"].append(["CSWfoo", ""]) + self.pkg_data[0]["depends"].append(["CSWbar", ""]) + self.pkg_data[0]["depends"].append(["CSWlibiconv", ""]) + self.MockDbInteraction() + # There should be no error about the dependency on CSWfoo or CSWbar. + + class TestCheckDependsOnSelf(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckDependsOnSelf' def CheckpkgTest(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Nov 4 10:32:40 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Nov 2010 09:32:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11491] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11491 http://gar.svn.sourceforge.net/gar/?rev=11491&view=rev Author: wahwah Date: 2010-11-04 09:32:40 +0000 (Thu, 04 Nov 2010) Log Message: ----------- mGAR v2: CSWfoodev (without a dash) is also a devel package. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-11-04 09:16:43 UTC (rev 11490) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-11-04 09:32:40 UTC (rev 11491) @@ -71,7 +71,7 @@ # Regarding surplus libraries reports DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) -DO_NOT_REPORT_SURPLUS_FOR = [r"CSW[a-z\-]+-dev(el)?"] +DO_NOT_REPORT_SURPLUS_FOR = [r"CSW[a-z\-]+dev(el)?"] DO_NOT_REPORT_MISSING = set([]) DO_NOT_REPORT_MISSING_RE = [r"\*?SUNW.*"] Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-11-04 09:16:43 UTC (rev 11490) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-11-04 09:32:40 UTC (rev 11491) @@ -270,6 +270,20 @@ # There should be no error about the dependency on CSWfoo or CSWbar. +class TestSetCheckDependenciesDoNotReportSurplusForDevNoDash( + DatabaseMockingMixin, CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckLibraries' + def CheckpkgTest(self): + self.pkg_data_single = self.pkg_data + self.pkg_data = [self.pkg_data_single] + self.pkg_data[0]["basic_stats"]["pkgname"] = "CSWfoodev" + self.pkg_data[0]["depends"].append(["CSWfoo", ""]) + self.pkg_data[0]["depends"].append(["CSWbar", ""]) + self.pkg_data[0]["depends"].append(["CSWlibiconv", ""]) + self.MockDbInteraction() + # There should be no error about the dependency on CSWfoo or CSWbar. + + class TestCheckDependsOnSelf(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckDependsOnSelf' def CheckpkgTest(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Thu Nov 4 10:47:08 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Thu, 04 Nov 2010 09:47:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11492] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 11492 http://gar.svn.sourceforge.net/gar/?rev=11492&view=rev Author: aigoshin Date: 2010-11-04 09:47:08 +0000 (Thu, 04 Nov 2010) Log Message: ----------- proftpd: release 20101104 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-04 09:32:40 UTC (rev 11491) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2010-11-04 09:47:08 UTC (rev 11492) @@ -75,11 +75,11 @@ post-install-modulated: ginstall -d $(DESTDIR)$(sysconfdir)/init.d - ginstall -d $(DESTDIR)$(prefix)/share/doc/proftpd + ginstall -d $(DESTDIR)$(docdir)/proftpd ginstall -d $(DESTDIR)$(localstatedir)/proftpd ginstall -d $(DESTDIR)$(localstatedir)/proftpd/logs cp $(WORKDIR)/cswproftpd $(DESTDIR)$(sysconfdir)/init.d/ - cd $(WORKSRC); cp -r $(PROFTPDDOC) $(DESTDIR)$(prefix)/share/doc/proftpd + cd $(WORKSRC); cp -r $(PROFTPDDOC) $(DESTDIR)$(docdir)/proftpd cd $(WORKSRC)/contrib ; cp $(CONTRIBUTILS) $(DESTDIR)$(bindir) - rm -f $(DESTDIR)$(PR_LIBEXEC)/*.la + rm -f $(DESTDIR)$(libdir)/proftpd/*.la $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Thu Nov 4 11:52:04 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Thu, 04 Nov 2010 10:52:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[11493] csw/mgar/pkg/apcupsd Message-ID: Revision: 11493 http://gar.svn.sourceforge.net/gar/?rev=11493&view=rev Author: aigoshin Date: 2010-11-04 10:52:04 +0000 (Thu, 04 Nov 2010) Log Message: ----------- apcupsd: release 20101104 Modified Paths: -------------- csw/mgar/pkg/apcupsd/trunk/Makefile csw/mgar/pkg/apcupsd/trunk/checksums csw/mgar/pkg/apcupsd/trunk/files/cswapcupsd Property Changed: ---------------- csw/mgar/pkg/apcupsd/ Property changes on: csw/mgar/pkg/apcupsd ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/apcupsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/apcupsd/trunk/Makefile 2010-11-04 09:47:08 UTC (rev 11492) +++ csw/mgar/pkg/apcupsd/trunk/Makefile 2010-11-04 10:52:04 UTC (rev 11493) @@ -1,7 +1,9 @@ GARNAME = apcupsd -GARVERSION = 3.14.4 +GARVERSION = 3.14.8 CATEGORIES = utils +GARCOMPILER = GCC3 + DESCRIPTION = A daemon for controlling APC UPS define BLURB "apcupsd" can be used for controlling all APC UPS models @@ -10,40 +12,43 @@ other hosts on a LAN endef -MASTER_SITES = http://www.apcupsd.org/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWapcupsd, postinstall) -DISTFILES += cswapcupsd +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += cswapcupsd +LICENSE = COPYING + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWcswclassutils +RUNTIME_DEP_PKGS = CSWtcpwrap -SPKG_CLASSES = none cswcpsampleconf cswinitsmf -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswapcupsd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/apcupsd\/apcupsd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' | grep -v \/etc\/rc +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/apcupsd -CONFIGURE_ARGS += --with-nologin=/var/run -CONFIGURE_ARGS += --with-pwrfail-dir=/opt/csw/etc/apcupsd/powerfail -CONFIGURE_ARGS += --with-log-dir=/opt/csw/var/apcupsd -CONFIGURE_ARGS += --with-cgi-bin=/opt/csw/etc/apcupsd/cgi +NODIRPATHS = --sysconfdir +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/apcupsd +CONFIGURE_ARGS += --with-log-dir=$(localstatedir)/apcupsd +CONFIGURE_ARGS += --with-libwrap=$(prefix) +CONFIGURE_ARGS += --with-nisip=127.0.0.1 +CONFIGURE_ARGS += --disable-install-distdir -GARCOMPILER = GNU - TEST_SCRIPTS= -# moving configuration file & installing init script -post-install-modulated: - (cd $(DESTDIR)/etc/opt/csw/apcupsd; \ - for i in apcupsd.conf; do \ - if [ -r "$$i" ]; then \ - echo "$$i -> $$i.CSW"; \ - mv "$$i" "$$i.CSW"; \ - fi \ - done) - ginstall -d $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 files/cswapcupsd $(DESTDIR)/etc/opt/csw/init.d/cswapcupsd +INITSMF = $(sysconfdir)/init.d/cswapcupsd +PRESERVECONF = $(sysconfdir)/apcupsd.conf +#DISTRETC = init.d rc0.d rc1.d rc2.d +APCUPSDDOC = COPYING ChangeLog DISCLAIMER Developers ReleaseNotes VERIFYING + include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)$(sysconfdir)/init.d + ginstall -d $(DESTDIR)$(docdir)/apcupsd + ginstall -d $(DESTDIR)$(localstatedir)/apcupsd + cd $(DESTDIR)/etc ; rm -rf $(DISTRETC) + cp $(WORKDIR)/cswapcupsd $(DESTDIR)$(sysconfdir)/init.d/ + cd $(WORKSRC); cp -r $(APCUPSDDOC) $(DESTDIR)$(docdir)/apcupsd + $(MAKECOOKIE) Modified: csw/mgar/pkg/apcupsd/trunk/checksums =================================================================== --- csw/mgar/pkg/apcupsd/trunk/checksums 2010-11-04 09:47:08 UTC (rev 11492) +++ csw/mgar/pkg/apcupsd/trunk/checksums 2010-11-04 10:52:04 UTC (rev 11493) @@ -1,4 +1 @@ -78811129db1a882b9a2b9afd540470b3 download/apcupsd-3.14.4.tar.gz -8f6ac052c4f049b79553ba43eda38d30 download/CSWapcupsd.gspec -27409e07fa0133f0ed22e0b76d5a5ada download/CSWapcupsd.postinstall -6b63d7b83cb6bc893797d41b751fef70 download/cswapcupsd +cd17f0a903dc2220e55ed54e242359d2 apcupsd-3.14.8.tar.gz Modified: csw/mgar/pkg/apcupsd/trunk/files/cswapcupsd =================================================================== --- csw/mgar/pkg/apcupsd/trunk/files/cswapcupsd 2010-11-04 09:47:08 UTC (rev 11492) +++ csw/mgar/pkg/apcupsd/trunk/files/cswapcupsd 2010-11-04 10:52:04 UTC (rev 11493) @@ -1,52 +1,32 @@ #! /bin/sh # -# apcupsd This shell script takes care of starting and stopping -# the apcupsd UPS monitoring daemon. +#RC_KNUM 21 +#RC_SNUM 89 +#RC_KLEV 0 +#RC_SLEV 1,2 +#AUTOENABLE no # -# chkconfig: 2345 20 99 -# description: apcupsd monitors power and takes action if necessary -# -# Update October 7th, 2001 - CPE -# -APCPID=/var/run/apcupsd.pid -DISTVER="Solaris" -POWERFAILDIR=/opt/csw/etc/apcupsd -LOCKDIR=/var/spool/locks -SBINDIR=/opt/csw/sbin -return=" Done." - - case "$1" in - start) - rm -f ${POWERFAILDIR}/powerfail - echo "Starting apcupsd power management ...\c" - ${SBINDIR}/apcupsd || return=" Failed." - touch ${LOCKDIR}/apcupsd - echo "$return" - ;; - stop) - echo "Stopping apcupsd power management ...\c" - if [ -f ${APCPID} ]; then - THEPID=`cat ${APCPID}` - kill ${THEPID} || return=" Failed." - rm -f ${APCPID} - else - return=" Failed." - fi + start) + rm -f /etc/powerfail + /opt/csw/sbin/apcupsd + touch /var/spool/locks/apcupsd + ;; + stop) + pkill -f "\/opt\/csw\/sbin\/apcupsd" rm -f ${LOCKDIR}/apcupsd - echo "$return" - ;; - restart) - $0 stop - $0 start - ;; - status) - ${SBINDIR}/apcaccess status - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 + ;; + restart) + $0 stop + $0 start + ;; + status) + /opt/csw/sbin/apcaccess status + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 esac exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Thu Nov 4 12:05:59 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Thu, 04 Nov 2010 11:05:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11494] csw/mgar/pkg/apcupsd/trunk/files Message-ID: Revision: 11494 http://gar.svn.sourceforge.net/gar/?rev=11494&view=rev Author: aigoshin Date: 2010-11-04 11:05:58 +0000 (Thu, 04 Nov 2010) Log Message: ----------- apcupsd: release 20101104 Removed Paths: ------------- csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.gspec csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.postinstall Deleted: csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.gspec =================================================================== --- csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.gspec 2010-11-04 10:52:04 UTC (rev 11493) +++ csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.gspec 2010-11-04 11:05:58 UTC (rev 11494) @@ -1,4 +0,0 @@ -%var bitname apcupsd -%var pkgname CSWapcupsd -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.postinstall =================================================================== --- csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.postinstall 2010-11-04 10:52:04 UTC (rev 11493) +++ csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.postinstall 2010-11-04 11:05:58 UTC (rev 11494) @@ -1,4 +0,0 @@ -if [ -f $BASEDIR/opt/csw/etc/apcupsd/apcupsd.conf ] ; then - echo "moving configuration file to /etc/opt/csw/apcupsd" - mv $BASEDIR/opt/csw/etc/apcupsd/apcupsd.conf $BASEDIR/etc/opt/csw/apcupsd/apcupsd.conf -fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 5 10:20:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Nov 2010 09:20:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11495] csw/mgar/pkg/rbgems Message-ID: Revision: 11495 http://gar.svn.sourceforge.net/gar/?rev=11495&view=rev Author: dmichelsen Date: 2010-11-05 09:20:50 +0000 (Fri, 05 Nov 2010) Log Message: ----------- rbgems/prawn-core: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/prawn-core/ csw/mgar/pkg/rbgems/prawn-core/branches/ csw/mgar/pkg/rbgems/prawn-core/tags/ csw/mgar/pkg/rbgems/prawn-core/trunk/ csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile csw/mgar/pkg/rbgems/prawn-core/trunk/checksums csw/mgar/pkg/rbgems/prawn-core/trunk/files/ Property changes on: csw/mgar/pkg/rbgems/prawn-core/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile 2010-11-05 09:20:50 UTC (rev 11495) @@ -0,0 +1,26 @@ +GARNAME = prawn-core +GARVERSION = 0.8.4 +CATEGORIES = rbgems + +DESCRIPTION = A fast and nimble PDF generator for Ruby + +define BLURB + Prawn is a fast, tiny, and nimble PDF generator for Ruby +endef + +PACKAGES = CSWgem-prawncore +CATALOGNAME = gem_prawncore + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk + +post-install-modulated: + cd $(DESTDIR); find . -name "* *" | \ + while read F; do \ + N=`echo $$F | tr ' ' '_'`; \ + mv "$$F" $$N; \ + done; + Added: csw/mgar/pkg/rbgems/prawn-core/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/prawn-core/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/prawn-core/trunk/checksums 2010-11-05 09:20:50 UTC (rev 11495) @@ -0,0 +1 @@ +6d0d9e583b24b0323b53756ce53edd7c prawn-core-0.8.4.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 5 10:28:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Nov 2010 09:28:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[11496] csw/mgar/pkg/rbgems Message-ID: Revision: 11496 http://gar.svn.sourceforge.net/gar/?rev=11496&view=rev Author: dmichelsen Date: 2010-11-05 09:28:15 +0000 (Fri, 05 Nov 2010) Log Message: ----------- rbgems/prawn-layout: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/prawn-layout/ csw/mgar/pkg/rbgems/prawn-layout/branches/ csw/mgar/pkg/rbgems/prawn-layout/tags/ csw/mgar/pkg/rbgems/prawn-layout/trunk/ csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile csw/mgar/pkg/rbgems/prawn-layout/trunk/checksums csw/mgar/pkg/rbgems/prawn-layout/trunk/files/ csw/mgar/pkg/rbgems/prawn-layout/trunk/files/COPYING Property changes on: csw/mgar/pkg/rbgems/prawn-layout/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile 2010-11-05 09:28:15 UTC (rev 11496) @@ -0,0 +1,20 @@ +GARNAME = prawn-layout +GARVERSION = 0.8.4 +CATEGORIES = rbgems + +DESCRIPTION = An extension to Prawn that provides table support and other layout functionality + +define BLURB + An extension to Prawn that provides table suport and other layout + functionality +endef + +DISTFILES = COPYING +LICENSE = COPYING + +PACKAGES = CSWgem-prawnlayout +CATALOGNAME = gem_prawnlayout + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/prawn-layout/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/prawn-layout/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/prawn-layout/trunk/checksums 2010-11-05 09:28:15 UTC (rev 11496) @@ -0,0 +1 @@ +898db7f4a42e854277d316970c39ace6 prawn-layout-0.8.4.gem Added: csw/mgar/pkg/rbgems/prawn-layout/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/rbgems/prawn-layout/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/rbgems/prawn-layout/trunk/files/COPYING 2010-11-05 09:28:15 UTC (rev 11496) @@ -0,0 +1,56 @@ +Prawn is copyrighted free software produced by Gregory Brown along with +community contributions. See git log for authorship information. + +Licensing terms follow (License of Ruby 1.8): + +You can redistribute Prawn and/or modify it under either the terms of the GPL +(see COPYING file), or the conditions below: + + 1. You may make and give away verbatim copies of the source form of the + software without restriction, provided that you duplicate all of the + original copyright notices and associated disclaimers. + + 2. You may modify your copy of the software in any way, provided that + you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise + make them Freely Available, such as by posting said + modifications to Usenet or an equivalent medium, or by allowing + the author to include your modifications in the software. + + b) use the modified software only within your corporation or + organization. + + c) rename any non-standard executables so the names do not conflict + with standard executables, which must also be provided. + + d) make other distribution arrangements with the author. + + 3. You may distribute the software in object code or executable + form, provided that you do at least ONE of the following: + + a) distribute the executables and library files of the software, + together with instructions (in the manual page or equivalent) + on where to get the original distribution. + + b) accompany the distribution with the machine-readable source of + the software. + + c) give non-standard executables non-standard names, with + instructions on where to get the original software distribution. + + d) make other distribution arrangements with the author. + + 4. You may modify and include the part of the software into any other + software (possibly commercial). + + 5. The scripts and library files supplied as input to or produced as + output from the software do not automatically fall under the + copyright of the software, but belong to whomever generated them, + and may be sold commercially, and may be aggregated with this + software. + + 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. 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 Nov 5 10:29:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Nov 2010 09:29:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[11497] csw/mgar/pkg/rbgems Message-ID: Revision: 11497 http://gar.svn.sourceforge.net/gar/?rev=11497&view=rev Author: dmichelsen Date: 2010-11-05 09:29:34 +0000 (Fri, 05 Nov 2010) Log Message: ----------- rbgems/prawn-security: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/prawn-security/ csw/mgar/pkg/rbgems/prawn-security/branches/ csw/mgar/pkg/rbgems/prawn-security/tags/ csw/mgar/pkg/rbgems/prawn-security/trunk/ csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile csw/mgar/pkg/rbgems/prawn-security/trunk/checksums csw/mgar/pkg/rbgems/prawn-security/trunk/files/ Property changes on: csw/mgar/pkg/rbgems/prawn-security/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile 2010-11-05 09:29:34 UTC (rev 11497) @@ -0,0 +1,19 @@ +GARNAME = prawn-security +GARVERSION = 0.8.4 +CATEGORIES = rbgems + +DESCRIPTION = Popular Password Protection & Permissions for Prawn PDFs + +define BLURB + Prawn/Security ads document encryption, pasword protection, and + permisions to Prawn. +endef + +PACKAGES = CSWgem-prawnsecurity +CATALOGNAME = gem_prawnsecurity + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/prawn-security/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/prawn-security/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/prawn-security/trunk/checksums 2010-11-05 09:29:34 UTC (rev 11497) @@ -0,0 +1 @@ +35213b39e4ca4a232c1cb4fa957614bd prawn-security-0.8.4.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 5 10:31:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Nov 2010 09:31:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11498] csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile Message-ID: Revision: 11498 http://gar.svn.sourceforge.net/gar/?rev=11498&view=rev Author: dmichelsen Date: 2010-11-05 09:31:15 +0000 (Fri, 05 Nov 2010) Log Message: ----------- rbgems/prawn-core: Adjust package name Modified Paths: -------------- csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile Modified: csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile 2010-11-05 09:29:34 UTC (rev 11497) +++ csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile 2010-11-05 09:31:15 UTC (rev 11498) @@ -8,8 +8,8 @@ Prawn is a fast, tiny, and nimble PDF generator for Ruby endef -PACKAGES = CSWgem-prawncore -CATALOGNAME = gem_prawncore +PACKAGES = CSWgem-prawn-core +CATALOGNAME = gem_prawn_core LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 5 10:31:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Nov 2010 09:31:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[11499] csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile Message-ID: Revision: 11499 http://gar.svn.sourceforge.net/gar/?rev=11499&view=rev Author: dmichelsen Date: 2010-11-05 09:31:44 +0000 (Fri, 05 Nov 2010) Log Message: ----------- rbgems/prawn-layout: Adjust package name Modified Paths: -------------- csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile Modified: csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile 2010-11-05 09:31:15 UTC (rev 11498) +++ csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile 2010-11-05 09:31:44 UTC (rev 11499) @@ -12,8 +12,8 @@ DISTFILES = COPYING LICENSE = COPYING -PACKAGES = CSWgem-prawnlayout -CATALOGNAME = gem_prawnlayout +PACKAGES = CSWgem-prawn-layout +CATALOGNAME = gem_prawn_layout ARCHALL = 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 Fri Nov 5 10:32:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Nov 2010 09:32:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[11500] csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile Message-ID: Revision: 11500 http://gar.svn.sourceforge.net/gar/?rev=11500&view=rev Author: dmichelsen Date: 2010-11-05 09:32:02 +0000 (Fri, 05 Nov 2010) Log Message: ----------- rbgems/prawn-security: Adjust package name Modified Paths: -------------- csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile Modified: csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile 2010-11-05 09:31:44 UTC (rev 11499) +++ csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile 2010-11-05 09:32:02 UTC (rev 11500) @@ -9,8 +9,8 @@ permisions to Prawn. endef -PACKAGES = CSWgem-prawnsecurity -CATALOGNAME = gem_prawnsecurity +PACKAGES = CSWgem-prawn-security +CATALOGNAME = gem_prawn_security LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 5 10:36:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Nov 2010 09:36:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[11503] csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile Message-ID: Revision: 11503 http://gar.svn.sourceforge.net/gar/?rev=11503&view=rev Author: dmichelsen Date: 2010-11-05 09:36:00 +0000 (Fri, 05 Nov 2010) Log Message: ----------- rbgems/prawn-security: Adjust package name Modified Paths: -------------- csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile Modified: csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile 2010-11-05 09:35:45 UTC (rev 11502) +++ csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile 2010-11-05 09:36:00 UTC (rev 11503) @@ -9,8 +9,7 @@ permisions to Prawn. endef -PACKAGES = CSWgem-prawn-security -CATALOGNAME = gem_prawn_security +GEMPKGNAME = prawnsecurity LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 5 10:35:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Nov 2010 09:35:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11501] csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile Message-ID: Revision: 11501 http://gar.svn.sourceforge.net/gar/?rev=11501&view=rev Author: dmichelsen Date: 2010-11-05 09:35:32 +0000 (Fri, 05 Nov 2010) Log Message: ----------- rbgems/prawn-core: Adjust package name Modified Paths: -------------- csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile Modified: csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile 2010-11-05 09:32:02 UTC (rev 11500) +++ csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile 2010-11-05 09:35:32 UTC (rev 11501) @@ -8,8 +8,7 @@ Prawn is a fast, tiny, and nimble PDF generator for Ruby endef -PACKAGES = CSWgem-prawn-core -CATALOGNAME = gem_prawn_core +GEMPKGNAME = prawncore LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 5 10:49:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Nov 2010 09:49:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11504] csw/mgar/pkg/rbgems Message-ID: Revision: 11504 http://gar.svn.sourceforge.net/gar/?rev=11504&view=rev Author: dmichelsen Date: 2010-11-05 09:49:22 +0000 (Fri, 05 Nov 2010) Log Message: ----------- rbgems/prawn: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/prawn/ csw/mgar/pkg/rbgems/prawn/branches/ csw/mgar/pkg/rbgems/prawn/tags/ csw/mgar/pkg/rbgems/prawn/trunk/ csw/mgar/pkg/rbgems/prawn/trunk/Makefile csw/mgar/pkg/rbgems/prawn/trunk/checksums csw/mgar/pkg/rbgems/prawn/trunk/files/ csw/mgar/pkg/rbgems/prawn/trunk/files/COPYING Property changes on: csw/mgar/pkg/rbgems/prawn/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/prawn/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/prawn/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/prawn/trunk/Makefile 2010-11-05 09:49:22 UTC (rev 11504) @@ -0,0 +1,22 @@ +GARNAME = prawn +GARVERSION = 0.8.4 +CATEGORIES = rbgems + +DESCRIPTION = A fast and nimble PDF generator for Ruby + +define BLURB + Prawn is a fast, tiny, and nimble PDF generator for Ruby +endef + +DISTFILES = COPYING +LICENSE = COPYING + +GEMPKGNAME = prawn + +RUNTIME_DEP_PKGS += CSWgem-prawncore +RUNTIME_DEP_PKGS += CSWgem-prawnlayout +RUNTIME_DEP_PKGS += CSWgem-prawnsecurity + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/prawn/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/prawn/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/prawn/trunk/checksums 2010-11-05 09:49:22 UTC (rev 11504) @@ -0,0 +1 @@ +d26e203ed1645aa124778519737a8546 prawn-0.8.4.gem Added: csw/mgar/pkg/rbgems/prawn/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/rbgems/prawn/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/rbgems/prawn/trunk/files/COPYING 2010-11-05 09:49:22 UTC (rev 11504) @@ -0,0 +1,56 @@ +Prawn is copyrighted free software produced by Gregory Brown along with +community contributions. See git log for authorship information. + +Licensing terms follow (License of Ruby 1.8): + +You can redistribute Prawn and/or modify it under either the terms of the GPL +(see COPYING file), or the conditions below: + + 1. You may make and give away verbatim copies of the source form of the + software without restriction, provided that you duplicate all of the + original copyright notices and associated disclaimers. + + 2. You may modify your copy of the software in any way, provided that + you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise + make them Freely Available, such as by posting said + modifications to Usenet or an equivalent medium, or by allowing + the author to include your modifications in the software. + + b) use the modified software only within your corporation or + organization. + + c) rename any non-standard executables so the names do not conflict + with standard executables, which must also be provided. + + d) make other distribution arrangements with the author. + + 3. You may distribute the software in object code or executable + form, provided that you do at least ONE of the following: + + a) distribute the executables and library files of the software, + together with instructions (in the manual page or equivalent) + on where to get the original distribution. + + b) accompany the distribution with the machine-readable source of + the software. + + c) give non-standard executables non-standard names, with + instructions on where to get the original software distribution. + + d) make other distribution arrangements with the author. + + 4. You may modify and include the part of the software into any other + software (possibly commercial). + + 5. The scripts and library files supplied as input to or produced as + output from the software do not automatically fall under the + copyright of the software, but belong to whomever generated them, + and may be sold commercially, and may be aggregated with this + software. + + 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. 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 Nov 5 10:35:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Nov 2010 09:35:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[11502] csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile Message-ID: Revision: 11502 http://gar.svn.sourceforge.net/gar/?rev=11502&view=rev Author: dmichelsen Date: 2010-11-05 09:35:45 +0000 (Fri, 05 Nov 2010) Log Message: ----------- rbgems/prawn-layout: Adjust package name Modified Paths: -------------- csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile Modified: csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile 2010-11-05 09:35:32 UTC (rev 11501) +++ csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile 2010-11-05 09:35:45 UTC (rev 11502) @@ -12,8 +12,7 @@ DISTFILES = COPYING LICENSE = COPYING -PACKAGES = CSWgem-prawn-layout -CATALOGNAME = gem_prawn_layout +GEMPKGNAME = prawnlayout ARCHALL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Fri Nov 5 17:16:21 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 05 Nov 2010 16:16:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[11505] csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo Message-ID: Revision: 11505 http://gar.svn.sourceforge.net/gar/?rev=11505&view=rev Author: theferret Date: 2010-11-05 16:16:20 +0000 (Fri, 05 Nov 2010) Log Message: ----------- minor tweakies to generate_pkginfo script Modified Paths: -------------- csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo Modified: csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo 2010-11-05 09:49:22 UTC (rev 11504) +++ csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo 2010-11-05 16:16:20 UTC (rev 11505) @@ -6,10 +6,10 @@ print PKG=CSW$1 print NAME=$1 - description goes here -print VERSION=1.0,REV=`date '+%Y.%m.%d'` +print VERSION=1.0,REV=YYYY.M.DD print CATEGORY=application print VENDOR=http://www.SOURCE-URL/ packaged for CSW by $FULLNAME print HOTLINE=http://www.opencsw.org/bugtrack/ print EMAIL=$USER at opencsw.org +print OPENCSW_REPOSITORY=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/$1/branch-c - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Fri Nov 5 18:07:08 2010 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Fri, 5 Nov 2010 17:07:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11505] csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo In-Reply-To: References: Message-ID: For the record, here's checkpkg output for the gtar package: # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/fr') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/gl/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/pt/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/da') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/sl/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/vi/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/tr') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/tr/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/de/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/it') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/bg') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/da/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/fi') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/sl') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/ja') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/pl/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/hr/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/sk') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/de') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/hr') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/hu') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/bg/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/ga/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/et/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/sk/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/nl') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/ca/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/uk') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/hu/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/info') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/pt') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/fr/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/ru/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/uk/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/nl/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/cs') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/et') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/ja/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/id/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/es/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/ro/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/zh_TW') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/it/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/ca') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/ro') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/el') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/sv') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/fi/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/gl') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/ru') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/ga') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/ko') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/ko/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/pl') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/zh_TW/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/vi') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/sv/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/pt_BR') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/bin') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/pt_BR/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/zh_CN') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/el/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/cs/LC_MESSAGES') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/eu') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/id') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/es') # This path is already provided by CSWcommon or is not allowed for other # reasons. # -> CheckpkgTag('CSWgtar', 'disallowed-path', 'opt/csw/share/locale/eu/LC_MESSAGES') # See http://sourceforge.net/apps/trac/gar/wiki/CopyRight # -> CheckpkgTag('CSWgtar', 'license-missing', '/opt/csw/share/doc/gtar/license') # It should be 'username at hostname-timestamp', but it's # 'current9s20101105173849'. # -> CheckpkgTag('CSWgtar', 'pkginfo-pstamp-in-wrong-format', 'current9s20101105173849') * The license file needs to be placed at /opt/csw/share/doc/gtar/license. Also see http://sourceforge.net/apps/trac/gar/wiki/CopyRight No dia 5 de Novembro de 2010 16:16, escreveu: > Revision: 11505 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=11505&view=rev > Author: ? theferret > Date: ? ? 2010-11-05 16:16:20 +0000 (Fri, 05 Nov 2010) > > Log Message: > ----------- > minor tweakies to generate_pkginfo script > > Modified Paths: > -------------- > ? ?csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo > > Modified: csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo > =================================================================== > --- csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo ? 2010-11-05 09:49:22 UTC (rev 11504) > +++ csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo ? 2010-11-05 16:16:20 UTC (rev 11505) > @@ -6,10 +6,10 @@ > > ?print PKG=CSW$1 > ?print NAME=$1 - description goes here > -print VERSION=1.0,REV=`date '+%Y.%m.%d'` > +print VERSION=1.0,REV=YYYY.M.DD > ?print CATEGORY=application > ?print VENDOR=http://www.SOURCE-URL/ packaged for CSW by $FULLNAME > ?print HOTLINE=http://www.opencsw.org/bugtrack/ > ?print EMAIL=$USER at opencsw.org > +print OPENCSW_REPOSITORY=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/$1/branch-c > > - > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel > From theferret at users.sourceforge.net Fri Nov 5 18:18:34 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 05 Nov 2010 17:18:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[11506] csw/mgar/pkg/gtar Message-ID: Revision: 11506 http://gar.svn.sourceforge.net/gar/?rev=11506&view=rev Author: theferret Date: 2010-11-05 17:18:34 +0000 (Fri, 05 Nov 2010) Log Message: ----------- gtar new branch, implementing takeover that Ben suggested I do. Added Paths: ----------- csw/mgar/pkg/gtar/branch-c/ csw/mgar/pkg/gtar/branch-c/Makefile csw/mgar/pkg/gtar/branch-c/README.CSW csw/mgar/pkg/gtar/branch-c/copyright csw/mgar/pkg/gtar/branch-c/cswreleasemgr csw/mgar/pkg/gtar/branch-c/depend csw/mgar/pkg/gtar/branch-c/pkginfo csw/mgar/pkg/gtar/branch-c/prototype Added: csw/mgar/pkg/gtar/branch-c/Makefile =================================================================== --- csw/mgar/pkg/gtar/branch-c/Makefile (rev 0) +++ csw/mgar/pkg/gtar/branch-c/Makefile 2010-11-05 17:18:34 UTC (rev 11506) @@ -0,0 +1,170 @@ +# This file is from TEMPLATES/createpkg/Makefile.lib32 +# You MUST build this with gnu make, unfortunately. +# Mainly just because of the ARCH expansion, but also for "?=" + +# Customize your prototype file(s) as needed + +# Organization: variable defintions up top, +# targets in second half. +# Note that assignments with "?=" mean "assign if not already assigned. + +# Where do we keep local downloads of software src files +ARCHIVEDIR ?= /home/src +ARCHIVENAME ?= tar-1.24.tar.gz +EXTRACTPROG ?= /usr/sfw/bin/gtar zfx + +# Only use ONE here. The name is used for compat with 'gar'. +MASTER_SITES ?= http://www.gnu.org/software/tar/ + +ARCH := $(shell /bin/uname -p) + +LDFLAGS_COMMON := + +SRCDIR= build/* + +# DO NOT specify the arch-64 stuff such as -m64 here. +# the individual targets will do that. + +CFLAGS_COMMON ?= -mt -xnorunpath -xO2 +CXXFLAGS_COMMON ?= -mt -norunpath -xO2 +CFLAGS_sparc ?= -xarch=v8 +CFLAGS_i386 ?= -xarch=386 + +# Keep this arch-neutral if possible. add arch-specific tweaks +# to arch-specific target +CONFIGURE=./configure --prefix=/opt/csw --program-prefix=g --with-rmt=/opt/csw/libexec/grmt + + + +CREATEPKG=createpkg -r `pwd`/build/*/cswstage + + +all: $(ARCH)-32 +#all: $(ARCH)-32 package + +# ARCH-XX handles configure, build, and stage for its own combo +# + +EXTRACTPROG ?= /bin/echo ERROR: need to set EXTRACTPROG ; exit 1 ; + + + +extract: build/.extract.done + +build/.extract.done: + test -d build || mkdir build + @if test -f $(ARCHIVEDIR)/$(ARCHIVENAME) ; then \ + echo Extracting $(ARCHIVENAME) under build dir... ;\ + ( cd build && $(EXTRACTPROG) $(ARCHIVEDIR)/$(ARCHIVENAME) ) ; \ + else echo Cannot extract - $(ARCHIVEDIR)/$(ARCHIVENAME) does not exist ;\ + exit 1; \ + fi + touch build/.extract.done + + +clean distclean: + @echo Calling $@ in $(SRCDIR) + $(MAKE) -C $(SRCDIR) $@ + + +reallyclean: distclean + @echo Removing any milestone files in build as well... + @rm -f build/.??* + @echo '(However, leaving src tree intact, with any patches in it)' + @echo '(If you want, you could rm -r build, then make extract once more)' + +garchive: + @echo Call the fetch target instead: it does the same thing. + + +# Downloads the source code to the common ARCHIVEDIR +fetch: $(ARCHIVEDIR)/$(ARCHIVENAME) + @echo fetch done + +$(ARCHIVEDIR)/$(ARCHIVENAME): + wget -P $(ARCHIVEDIR) $(MASTER_SITES)/$(ARCHIVENAME) + +patch: + @echo patch: patching is handled automatically as part of the configure phase. + +stage-preserved: + @if test -f preserve-$(ARCH).tar ; then \ + echo Copying preserved arch-specific files; \ + cat preserve-$(ARCH).tar |(cd $(SRCDIR)/cswstage && tar xvf -);\ + fi + @if test -f preserve.tar ; then \ + echo Copying preserved arch-neutral files; \ + cat preserve.tar |(cd $(SRCDIR)/cswstage && tar xvf -);\ + fi + +package: stage-preserved + $(CREATEPKG) + + +# split out generic $(ARCH) sections to platform-specific sections if needed. +# but it usually should not be neccessary + + +$(ARCH)-32 :: configure-$(ARCH)-32 build-$(ARCH)-32 stage-$(ARCH)-32 + @echo Completed $(ARCH)-32 configure, build and stage + touch build/.$(ARCH)-32.done + + + +build/.$(ARCH)-32.done: $(ARCH)-32 + +# Since we share the same src tree, we should only need to +# pre-configure patching one time for all. +build/.patch-preconf.done: build/.extract.done + if test -f patchfile.preconf ; then \ + gpatch -d $(SRCDIR) -p0 prototype + @echo Dont forget to add a COPYING line !! Added: csw/mgar/pkg/gtar/branch-c/README.CSW =================================================================== --- csw/mgar/pkg/gtar/branch-c/README.CSW (rev 0) +++ csw/mgar/pkg/gtar/branch-c/README.CSW 2010-11-05 17:18:34 UTC (rev 11506) @@ -0,0 +1,6 @@ +Our build of GNU tar does not include the GNU "rmt" program. That is a part +of our gcpio package. If you wish to use GNU rmt, please install +our gcpio package, and GNU tar should automatically make use of it. + +If you wish to use the Solaris rmt, you could try +ln -s /usr/sbin/rmt /opt/csw/libexec/grmt Added: csw/mgar/pkg/gtar/branch-c/copyright =================================================================== --- csw/mgar/pkg/gtar/branch-c/copyright (rev 0) +++ csw/mgar/pkg/gtar/branch-c/copyright 2010-11-05 17:18:34 UTC (rev 11506) @@ -0,0 +1 @@ +Pleas see /opt/csw/share/doc/gtar/COPYING for full copyright notice Added: csw/mgar/pkg/gtar/branch-c/cswreleasemgr =================================================================== --- csw/mgar/pkg/gtar/branch-c/cswreleasemgr (rev 0) +++ csw/mgar/pkg/gtar/branch-c/cswreleasemgr 2010-11-05 17:18:34 UTC (rev 11506) @@ -0,0 +1,2 @@ +Note for release time: Yes it has "/usr/local" references, but only in +the annoying infodir documetation. Please ignore Added: csw/mgar/pkg/gtar/branch-c/depend =================================================================== --- csw/mgar/pkg/gtar/branch-c/depend (rev 0) +++ csw/mgar/pkg/gtar/branch-c/depend 2010-11-05 17:18:34 UTC (rev 11506) @@ -0,0 +1,3 @@ +P CSWggettextrt ggettextrt - GNU locale utilities +P CSWiconv libiconv - GNU iconv library +P CSWcommon common - common files and dirs for CSW packages Added: csw/mgar/pkg/gtar/branch-c/pkginfo =================================================================== --- csw/mgar/pkg/gtar/branch-c/pkginfo (rev 0) +++ csw/mgar/pkg/gtar/branch-c/pkginfo 2010-11-05 17:18:34 UTC (rev 11506) @@ -0,0 +1,8 @@ +PKG=CSWgtar +NAME=gtar - GNU tape archiver +VERSION=1.24,REV=YYYY.MM.DD +CATEGORY=application +VENDOR=http://www.gnu.org/software/tar/ packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org +OPENCSW_REPOSITORY=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/gtar/branch-c Added: csw/mgar/pkg/gtar/branch-c/prototype =================================================================== --- csw/mgar/pkg/gtar/branch-c/prototype (rev 0) +++ csw/mgar/pkg/gtar/branch-c/prototype 2010-11-05 17:18:34 UTC (rev 11506) @@ -0,0 +1,124 @@ +i pkginfo +i copyright +i cswreleasemgr +i depend +d none /opt/csw/libexec 0755 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/info 0755 root bin +f none /opt/csw/share/info/tar.info-2 0644 root bin +f none /opt/csw/share/info/tar.info-1 0644 root bin +f none /opt/csw/share/info/tar.info 0644 root bin +d none /opt/csw/share/locale 0755 root bin +d none /opt/csw/share/locale/nl 0755 root bin +d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/nl/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/fr 0755 root bin +d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/fr/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/ky 0755 root bin +d none /opt/csw/share/locale/ky/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ky/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/cs 0755 root bin +d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/cs/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/ms 0755 root bin +d none /opt/csw/share/locale/ms/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ms/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/gl 0755 root bin +d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/gl/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/zh_TW 0755 root bin +d none /opt/csw/share/locale/zh_TW/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/zh_TW/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/pl 0755 root bin +d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pl/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/es 0755 root bin +d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/es/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/hu 0755 root bin +d none /opt/csw/share/locale/hu/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/hu/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/hr 0755 root bin +d none /opt/csw/share/locale/hr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/hr/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/bg 0755 root bin +d none /opt/csw/share/locale/bg/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/bg/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/zh_CN 0755 root bin +d none /opt/csw/share/locale/zh_CN/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/zh_CN/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/et 0755 root bin +d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/et/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/nb 0755 root bin +d none /opt/csw/share/locale/nb/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/nb/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/ga 0755 root bin +d none /opt/csw/share/locale/ga/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ga/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/da 0755 root bin +d none /opt/csw/share/locale/da/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/da/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/sk 0755 root bin +d none /opt/csw/share/locale/sk/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sk/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/tr 0755 root bin +d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/tr/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/sl 0755 root bin +d none /opt/csw/share/locale/sl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sl/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/ca 0755 root bin +d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ca/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/it 0755 root bin +d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/it/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/ro 0755 root bin +d none /opt/csw/share/locale/ro/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ro/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/ru 0755 root bin +d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ru/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/id 0755 root bin +d none /opt/csw/share/locale/id/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/id/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/fi 0755 root bin +d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/fi/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/sv 0755 root bin +d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sv/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/ko 0755 root bin +d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ko/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/pt 0755 root bin +d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pt/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/eu 0755 root bin +d none /opt/csw/share/locale/eu/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/eu/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/el 0755 root bin +d none /opt/csw/share/locale/el/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/el/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/vi 0755 root bin +d none /opt/csw/share/locale/vi/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/vi/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/pt_BR 0755 root bin +d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/de 0755 root bin +d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/de/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/ja 0755 root bin +d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ja/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/share/locale/uk 0755 root bin +d none /opt/csw/share/locale/uk/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/uk/LC_MESSAGES/tar.mo 0644 root bin +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/gtar 0755 root bin +d none /opt/csw/share/doc/gtar 0755 root bin +f none /opt/csw/share/doc/gtar/COPYING=COPYING 0644 root bin +f none /opt/csw/share/doc/gtar/README.CSW=README.CSW 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Nov 6 08:43:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 06 Nov 2010 07:43:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[11507] csw/mgar/pkg/sox/trunk Message-ID: Revision: 11507 http://gar.svn.sourceforge.net/gar/?rev=11507&view=rev Author: dmichelsen Date: 2010-11-06 07:43:35 +0000 (Sat, 06 Nov 2010) Log Message: ----------- sox: Update to 14.3.1 and split off devel and lib Modified Paths: -------------- csw/mgar/pkg/sox/trunk/Makefile csw/mgar/pkg/sox/trunk/checksums Modified: csw/mgar/pkg/sox/trunk/Makefile =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile 2010-11-05 17:18:34 UTC (rev 11506) +++ csw/mgar/pkg/sox/trunk/Makefile 2010-11-06 07:43:35 UTC (rev 11507) @@ -1,9 +1,12 @@ GARNAME = sox -GARVERSION = 14.3.0 +GARVERSION = 14.3.1 CATEGORIES = apps -DESCRIPTION = Sound Processing Tool +DESCRIPTION = Swiss Army Knife of sound processing utilities define BLURB + SoX is the Swiss Army Knife of sound processing utilities. It can convert + audio files to other popular audio file types and also apply sound effects + and filters during the conversion. endef MASTER_SITES = $(SF_MIRRORS) @@ -16,14 +19,28 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://sox.sourceforge.net/ +VENDOR_URL = http://sox.sourceforge.net/ -# XXX: Add gsm, lpc10 and wavpack -RUNTIME_DEP_PKGS = CSWvorbis CSWlibogg CSWlibmad CSWlame CSWlibid3tag -RUNTIME_DEP_PKGS += CSWflac CSWlibao CSWlibsndfile CSWpng CSWwavpack CSWzlib +PACKAGES = CSWsox CSWlibsox1 CSWlibsoxdevel -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +CATALOGNAME_CSWsox = sox +CATALOGNAME_CSWlibsox1 = libsox +CATALOGNAME_CSWlibsoxdevel = libsox_devel +SPKG_DESC_CSWsox = $(DESCRIPTION) +SPKG_DESC_CSWlibsox1 = SOX Library for Audio Processing +SPKG_DESC_CSWlibsoxdevel = SOX Library Development Files + +RUNTIME_DEP_PKGS_CSWsox = CSWlibsox1 CSWvorbis CSWlibogg CSWlibmad CSWlame CSWlibid3tag +RUNTIME_DEP_PKGS_CSWsox += CSWflac CSWlibao CSWlibsndfile CSWpng CSWwavpack CSWzlib CSWlibmagic + +RUNTIME_DEP_PKGS_CSWlibsox1 = CSWvorbis CSWlibogg CSWlibmad CSWlame CSWlibid3tag +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWflac CSWlibao CSWlibsndfile CSWpng CSWwavpack CSWzlib CSWlibmagic + +RUNTIME_DEP_PKGS_CSWlibsoxdevel = CSWlibsox1 + +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWsox) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --without-libltdl @@ -33,4 +50,7 @@ MERGE_DIRS_isa-extra = $(libdir) +PKGFILES_CSWlibsox1 = $(PKGFILES_RT) +PKGFILES_CSWlibsoxdevel = $(PKGFILES_DEVEL) + include gar/category.mk Modified: csw/mgar/pkg/sox/trunk/checksums =================================================================== --- csw/mgar/pkg/sox/trunk/checksums 2010-11-05 17:18:34 UTC (rev 11506) +++ csw/mgar/pkg/sox/trunk/checksums 2010-11-06 07:43:35 UTC (rev 11507) @@ -1,2 +1 @@ -ce1fa27946b99c023d2b37bb0d5800c4 0001-Disable-stdio-hack-to-rewind-pipes.patch -8e3509804e6227273ef84092e1a2fea7 sox-14.3.0.tar.gz +b99871c7bbae84feac9d0d1f010331ba sox-14.3.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Nov 6 14:08:15 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 06 Nov 2010 13:08:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11508] csw/mgar/gar/v2/bin/ap2mod_build_scripts Message-ID: Revision: 11508 http://gar.svn.sourceforge.net/gar/?rev=11508&view=rev Author: bdwalton Date: 2010-11-06 13:08:15 +0000 (Sat, 06 Nov 2010) Log Message: ----------- gar/v2: add a script that can build the "e build" script targets for apache modules Added Paths: ----------- csw/mgar/gar/v2/bin/ap2mod_build_scripts Added: csw/mgar/gar/v2/bin/ap2mod_build_scripts =================================================================== --- csw/mgar/gar/v2/bin/ap2mod_build_scripts (rev 0) +++ csw/mgar/gar/v2/bin/ap2mod_build_scripts 2010-11-06 13:08:15 UTC (rev 11508) @@ -0,0 +1,77 @@ +#!/bin/bash + +MERGEDIR=$1; shift +AP2MODS=opt/csw/apache2/ap2mod + +cd $MERGEDIR/ + +[ -d $AP2MODS ] || mkdir -p $AP2MODS + +for a in $*; do + for f in $(find . -name "*$a*"); do + modfile=$(basename $f) + modname=$(echo $modfile | sed 's/mod_//; s/\.so$//') + ap2modfile=$AP2MODS/$modname + cat < $ap2modfile +!install +PIR=\${PKG_INSTALL_ROOT:-'/'} + +touch \$PIR/$ap2modfile + +# Source csw.conf, if it exists +if [ -f \$PIR/opt/csw/etc/csw.conf ] ; then + . \$PIR/opt/csw/etc/csw.conf +fi +if [ -f \$PIR/etc/opt/csw/csw.conf ] ; then + . \$PIR/etc/opt/csw/csw.conf +fi + +AP2_PREFIX=/opt/csw/apache2 +AP2_BINDIR=\$AP2_PREFIX/sbin +AP2_LIBEXEC=\$AP2_PREFIX/libexec +AP2_CONFDIR=\$AP2_PREFIX/etc +AP2_CONFIG=\$AP2_CONFDIR/httpd.conf +AP2_APXS=\$AP2_BINDIR/apxs + +# Modules will be enabled by default, but a global kill switch +# is checked , followed by a module specific value. Thus, +# either ap2_enable_modules or ap2_enable_suexec (for example) +# could disable activation of the suexec module. The +# +# This value is passed to apxs (-a: add, enable; -A: add, +# disable) +enmod=-a + +if [ "\$ap2_enable_modules" = "no" ]; then + enmod=-A +fi + +if [ "\$ap2_enable_$modname" = "no" ]; then + enmod=-A +elif [ "$ap2_mod_specific" = "yes" ]; then + enmod=-a +fi + +if [ -f "\$PIR/\$AP2_CONFIG" -a -x "\$PIR/\$AP2_APXS" ]; then + # Add the module module, optionally enabling it by default + chroot \$PIR \$AP2_APXS -e \$enmod -n $modname $modfile +fi + +!remove +PIR=\${PKG_INSTALL_ROOT:-'/'} + +rm \$PIR/$ap2modfile + +AP2_PREFIX=/opt/csw/apache2 +AP2_BINDIR=\$AP2_PREFIX/sbin +AP2_LIBEXEC=\$AP2_PREFIX/libexec +AP2_CONFDIR=\$AP2_PREFIX/etc +AP2_CONFIG=\$AP2_CONFDIR/httpd.conf +AP2_APXS=\$AP2_BINDIR/apxs + +if [ -f "\$PIR/\$AP2_CONFIG" -a -x "\$PIR/\$AP2_APXS" ]; then + chroot \$PIR \$APXS -e -A -n $modname $modfile +fi +EOF + done +done Property changes on: csw/mgar/gar/v2/bin/ap2mod_build_scripts ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Nov 6 16:08:59 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 06 Nov 2010 15:08:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11509] csw/mgar/pkg Message-ID: Revision: 11509 http://gar.svn.sourceforge.net/gar/?rev=11509&view=rev Author: bonivart Date: 2010-11-06 15:08:59 +0000 (Sat, 06 Nov 2010) Log Message: ----------- mimedefang: initial commit, update to 2.71 Added Paths: ----------- csw/mgar/pkg/mimedefang/ csw/mgar/pkg/mimedefang/branches/ csw/mgar/pkg/mimedefang/tags/ csw/mgar/pkg/mimedefang/trunk/ csw/mgar/pkg/mimedefang/trunk/Makefile csw/mgar/pkg/mimedefang/trunk/checksums csw/mgar/pkg/mimedefang/trunk/files/ Property changes on: csw/mgar/pkg/mimedefang/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/mimedefang/trunk/Makefile =================================================================== --- csw/mgar/pkg/mimedefang/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mimedefang/trunk/Makefile 2010-11-06 15:08:59 UTC (rev 11509) @@ -0,0 +1,37 @@ +GARNAME = mimedefang +GARVERSION = 2.71 +CATEGORIES = net + +DESCRIPTION = Framework for filtering e-mail using Sendmail milter API, C and Perl +define BLURB + Framework for filtering e-mail using Sendmail milter API, C and Perl +endef + +MASTER_SITES = http://www.mimedefang.com/static/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +UPSTREAM_MASTER_SITES = http://www.mimedefang.com/static/ +UFILES_REGEX = (\d+(?:\.\d+)*) + +RUNTIME_DEP_PKGS += CSWperl CSWsendmail CSWlibmilter +RUNTIME_DEP_PKGS += CSWpmmimetools CSWpmiostringy +RUNTIME_DEP_PKGS += CSWpmmimebase64 CSWpmmailtools +RUNTIME_DEP_PKGS += CSWpmdigestsha1 CSWpmhtmlparser + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-sendmail=/opt/csw/lib/sendmail +CONFIGURE_ARGS += --with-milterinc=/opt/csw/include +CONFIGURE_ARGS += --with-milterlib=/opt/csw/lib + +SKIPTEST = 1 + +CHECKPKG_OVERRIDES_CSWmimedefang += surplus-dependency|CSWpmdigestsha1 +CHECKPKG_OVERRIDES_CSWmimedefang += surplus-dependency|CSWpmiostringy +CHECKPKG_OVERRIDES_CSWmimedefang += surplus-dependency|CSWsendmail +CHECKPKG_OVERRIDES_CSWmimedefang += surplus-dependency|CSWlibmilter +CHECKPKG_OVERRIDES_CSWmimedefang += surplus-dependency|CSWpmmimebase64 +CHECKPKG_OVERRIDES_CSWmimedefang += surplus-dependency|CSWpmmailtools +CHECKPKG_OVERRIDES_CSWmimedefang += surplus-dependency|CSWpmmimetools +CHECKPKG_OVERRIDES_CSWmimedefang += surplus-dependency|CSWpmhtmlparser + +include gar/category.mk Added: csw/mgar/pkg/mimedefang/trunk/checksums =================================================================== --- csw/mgar/pkg/mimedefang/trunk/checksums (rev 0) +++ csw/mgar/pkg/mimedefang/trunk/checksums 2010-11-06 15:08:59 UTC (rev 11509) @@ -0,0 +1 @@ +a5ff39051b0fb9021352e1a5f0b01f72 mimedefang-2.71.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 Sun Nov 7 00:56:51 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 06 Nov 2010 23:56:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[11510] csw/mgar/pkg/mimedefang/trunk/Makefile Message-ID: Revision: 11510 http://gar.svn.sourceforge.net/gar/?rev=11510&view=rev Author: bonivart Date: 2010-11-06 23:56:51 +0000 (Sat, 06 Nov 2010) Log Message: ----------- mimedefang: some tweaks, still need to fix init script Modified Paths: -------------- csw/mgar/pkg/mimedefang/trunk/Makefile Modified: csw/mgar/pkg/mimedefang/trunk/Makefile =================================================================== --- csw/mgar/pkg/mimedefang/trunk/Makefile 2010-11-06 15:08:59 UTC (rev 11509) +++ csw/mgar/pkg/mimedefang/trunk/Makefile 2010-11-06 23:56:51 UTC (rev 11510) @@ -10,6 +10,8 @@ MASTER_SITES = http://www.mimedefang.com/static/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +SPKG_SOURCEURL = http://www.mimedefang.com + UPSTREAM_MASTER_SITES = http://www.mimedefang.com/static/ UFILES_REGEX = (\d+(?:\.\d+)*) @@ -22,9 +24,25 @@ CONFIGURE_ARGS += --with-sendmail=/opt/csw/lib/sendmail CONFIGURE_ARGS += --with-milterinc=/opt/csw/include CONFIGURE_ARGS += --with-milterlib=/opt/csw/lib +CONFIGURE_ARGS += --with-spooldir=/var/opt/csw/mimedefang/MIMEDefang +CONFIGURE_ARGS += --with-quarantinedir=/var/opt/csw/mimedefang/MD-Quarantine +# No tests included SKIPTEST = 1 +PROTOTYPE_MODIFIERS = 1 +PROTOTYPE_FILES_1 = /var/opt/csw/mimedefang/.* +PROTOTYPE_CLASS_1 = ugfiles +PROTOTYPE_USER_1 = defang +PROTOTYPE_GROUP_1 = defang +PROTOTYPE_PERMS_1 = 0700 + +INITSMF = /etc/opt/csw/init.d/cswmimedefang +USERGROUP = /etc/opt/csw/pkg/CSWmimedefang/cswusergroup +SAMPLECONF = /etc/mail/mimedefang-filter /etc/mail/sa-mimedefang.cf +SAMPLECONF += /etc/opt/csw/pkg/CSWmimedefang/mimedefang +POSTMSG = /opt/csw/share/doc/mimedefang/README.CSW + CHECKPKG_OVERRIDES_CSWmimedefang += surplus-dependency|CSWpmdigestsha1 CHECKPKG_OVERRIDES_CSWmimedefang += surplus-dependency|CSWpmiostringy CHECKPKG_OVERRIDES_CSWmimedefang += surplus-dependency|CSWsendmail @@ -35,3 +53,17 @@ CHECKPKG_OVERRIDES_CSWmimedefang += surplus-dependency|CSWpmhtmlparser include gar/category.mk + +DOCLIST = Changelog README README.NONROOT README.SECURITY README.SOPHIE README.SPAMASSASSIN README.VEXIRA examples contrib SpamAssassin tests gen-ip-validator.pl + +post-install-modulated: + @echo " ==> Post-install $(GARNAME) (custom)" + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/cswmimedefang $(DESTDIR)/etc/opt/csw/init.d/ + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWmimedefang + @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWmimedefang/ + @ginstall -m 644 $(FILEDIR)/mimedefang $(DESTDIR)/etc/opt/csw/pkg/CSWmimedefang/ + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @$(foreach DOC,$(DOCLIST),cp -r $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) + @ginstall -m 444 $(FILEDIR)/README.CSW $(DESTDIR)/opt/csw/share/doc/mimedefang/ + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Nov 7 00:58:25 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 06 Nov 2010 23:58:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[11511] csw/mgar/pkg/mimedefang/trunk/files Message-ID: Revision: 11511 http://gar.svn.sourceforge.net/gar/?rev=11511&view=rev Author: bonivart Date: 2010-11-06 23:58:24 +0000 (Sat, 06 Nov 2010) Log Message: ----------- mimedefang: add files Added Paths: ----------- csw/mgar/pkg/mimedefang/trunk/files/README.CSW csw/mgar/pkg/mimedefang/trunk/files/cswusergroup csw/mgar/pkg/mimedefang/trunk/files/mimedefang Added: csw/mgar/pkg/mimedefang/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/mimedefang/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/mimedefang/trunk/files/README.CSW 2010-11-06 23:58:24 UTC (rev 11511) @@ -0,0 +1,21 @@ +CONFIGURATION (from the README file) +------------- +Add the following line to your Sendmail "m4" configuration file. + +INPUT_MAIL_FILTER(`mimedefang', `S=unix:/var/spool/MIMEDefang/mimedefang.sock, F +=T, T=S:360s;R:360s;E:15m') + +(If you keep your spool directory elsewhere, use its location instead of +/var/spool/MIMEDefang/mimedefang.sock) + +The "T=..." equate increases the default timeouts for milter, which are +way too small. + +To configure your filter, you have to edit the file +`/etc/mail/mimedefang-filter'. This is a Perl source file, so you have +to know Perl. Go ahead and read the man pages mimedefang(8), +mimedefang.pl(8) and mimedefang-filter(5). There are some sample +filters in the examples directory. + +-- +Peter Bonivart, OpenCSW, 2010-11-06 Added: csw/mgar/pkg/mimedefang/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/mimedefang/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/mimedefang/trunk/files/cswusergroup 2010-11-06 23:58:24 UTC (rev 11511) @@ -0,0 +1 @@ +defang:defang:CSW MimeDefang:/false:/bin/false:::NP Added: csw/mgar/pkg/mimedefang/trunk/files/mimedefang =================================================================== --- csw/mgar/pkg/mimedefang/trunk/files/mimedefang (rev 0) +++ csw/mgar/pkg/mimedefang/trunk/files/mimedefang 2010-11-06 23:58:24 UTC (rev 11511) @@ -0,0 +1,161 @@ +# This is where you customize some settings of your MimeDefang installation so +# you don't have to edit the scripts themselves as they will be replaced during +# upgrades. +# +# Peter Bonivart, OpenCSW + +# The spool directory +# SPOOLDIR=/var/spool/MIMEDefang + +# The socket used by mimedefang to communicate with sendmail +# SOCKET=$SPOOLDIR/mimedefang.sock + +# If you want to log messages like "Filter time is 156ms" to syslog, +# uncomment the next line +# LOG_FILTER_TIME=yes + +# Run the multiplexor and filters as this user, not root. RECOMMENDED +MX_USER=defang + +# If you want to keep spool directories around if the filter fails, +# set the next one to yes +# KEEP_FAILED_DIRECTORIES=no + +# If "yes", turn on the multiplexor relay checking function +# MX_RELAY_CHECK=no + +# If "yes", turn on the multiplexor HELO checking function +# MX_HELO_CHECK=no + +# If "yes", turn on the multiplexor sender checking function +# MX_SENDER_CHECK=no + +# If "yes", turn on the multiplexor recipient checking function +# MX_RECIPIENT_CHECK=no + +# Ask for filter_tick to be called every 60 seconds +# MX_TICK_REQUEST=60 + +# Run three tick bands +# MX_TICK_PARALLEL=3 + +# Set to yes if you want the multiplexor to log events to syslog +MX_LOG=yes + +# Number of slaves reserved for connections from loopback. Use -1 +# for default behaviour, 0 to allow loopback connections to queue, +# or >0 to reserve slaves for loopback connections +LOOPBACK_RESERVED_CONNECTIONS=-1 + +# Set to path name of UNIX-domain socket if you want to use MIMEDefang +# with Sendmail's SOCKETMAP map type +# MX_MAP_SOCKET=$SPOOLDIR/map.sock + +# Set to yes if you want to use an embedded Perl interpreter +# MX_EMBED_PERL=yes + +# Set to the syslog facility. Also set $SyslogFacility in your filter +# SYSLOG_FACILITY=mail + +# The multiplexor does not start all slaves at the same time. Instead, +# it starts one slave every MX_SLAVE_DELAY seconds when the system is idle. +# (If the system is busy, the multiplexor starts slaves as incoming mail +# requires attention.) +# MX_SLAVE_DELAY=3 + +# The next setting is an absolute limit on slave activation. The multiplexor +# will NEVER activate a slave within MX_MIN_SLAVE_DELAY seconds of another. +# The default of zero means that the multiplexor will activate slaves as +# quickly as necessary to keep up with incoming mail. +# MX_MIN_SLAVE_DELAY=0 + +# Set to yes if you want the multiplexor to log stats in +# /var/log/mimdefang/md-stats The /var/log/mimedefang directory +# must exist and be writable by the user you're running MIMEDefang as. +# MX_STATS=no + +# Set to yes if you want the stats file flushed after each entry +# MX_FLUSH_STATS=no + +# Set to yes if you want the multiplexor to log stats to syslog +# MX_STATS_SYSLOG=no + +# The socket used by the multiplexor +# MX_SOCKET=$SPOOLDIR/mimedefang-multiplexor.sock + +# Maximum # of requests a process handles +# MX_REQUESTS=200 + +# Minimum number of processes to keep. The default of 0 is probably +# too low; we suggest 2 instead. +MX_MINIMUM=2 + +# If you want to allow the multiplexor to queue new connections when +# all slaves are busy, set this to yes +ALLOW_NEW_CONNECTIONS_TO_QUEUE=yes + +# Maximum number of processes to run (mail received while this many +# processes are running is rejected with a temporary failure, so be +# wary of how many emails you receive at a time). This applies only +# if you DO use the multiplexor. The default value of 2 is probably +# too low; we suggest 10 instead +MX_MAXIMUM=10 + +# Uncomment to log slave status; it will be logged every +# MX_LOG_SLAVE_STATUS_INTERVAL seconds +# MX_LOG_SLAVE_STATUS_INTERVAL=30 + +# Uncomment next line to have busy slaves send status updates to the +# multiplexor. NOTE: Consumes one extra file descriptor per slave, plus +# a bit of CPU time. +# MX_STATUS_UPDATES=yes + +# Limit slave processes' resident-set size to this many kilobytes. Default +# is unlimited. +# MX_MAX_RSS=10000 + +# Limit total size of slave processes' memory space to this many kilobytes. +# Default is unlimited. +# MX_MAX_AS=30000 + +# If you want to use the "notification" facility, set the appropriate port. +# See the mimedefang-notify man page for details. +# MX_NOTIFIER=inet:4567 + +# Number of seconds a process should be idle before checking for +# minimum number and killed +# MX_IDLE=300 + +# Limit number of concurrent recipok requests on a per-domain basis. +# 0 means no limit +MX_RECIPOK_PERDOMAIN_LIMIT=0 + +# Number of seconds a process is allowed to scan an email before it is +# considered dead. The default is 30 seconds; we suggest 600. +MX_BUSY=600 + +# Multiplexor queue size -- default is 0 (no queueing) +# MX_QUEUE_SIZE=10 + +# Multiplexor queue timeout -- default is 30 seconds +# MX_QUEUE_TIMEOUT=30 + +# Any extra arguments to mimedefang +# MD_EXTRA="-a auth_author" + +# SUBFILTER specifies which filter rules file to use +# SUBFILTER=/etc/mail/mimedefang-filter + +# I question why I'm including this as I see no real need for it +# but in the interests of a flexible implementation, here goes! +# +# DO NOT CHANGE THIS VARIABLE LIGHTLY!! +# +# The filtering program used by mimedefang or the multiplexor. This is +# *NOT* a replacement for /etc/mail/mimedefang-filter!!! It replaces +# the entire mimedefang perl program, /usr/bin/mimedefang.pl and allows +# a unique filtering agent to be used. Read mimedefang-protocol man +# page VERY carefully before you attempt to change this! +# +# FILTER=/usr/bin/mimedefang.pl + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Nov 7 01:13:59 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 07 Nov 2010 00:13:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11512] csw/mgar/pkg/mimedefang/trunk/files Message-ID: Revision: 11512 http://gar.svn.sourceforge.net/gar/?rev=11512&view=rev Author: bonivart Date: 2010-11-07 00:13:58 +0000 (Sun, 07 Nov 2010) Log Message: ----------- mimedefang: some mods, init script not done Modified Paths: -------------- csw/mgar/pkg/mimedefang/trunk/files/cswusergroup csw/mgar/pkg/mimedefang/trunk/files/mimedefang Added Paths: ----------- csw/mgar/pkg/mimedefang/trunk/files/cswmimedefang Added: csw/mgar/pkg/mimedefang/trunk/files/cswmimedefang =================================================================== --- csw/mgar/pkg/mimedefang/trunk/files/cswmimedefang (rev 0) +++ csw/mgar/pkg/mimedefang/trunk/files/cswmimedefang 2010-11-07 00:13:58 UTC (rev 11512) @@ -0,0 +1,455 @@ +#!/sbin/sh + +#RC_KLEV 0,1,S +#RC_SLEV 2 + +# rc-script for CSW MimeDefang +# Peter Bonivart, 2010-11-06 + +# Source config file +#[ -r /etc/opt/csw/pkg/CSWbind/bind ] && . /etc/opt/csw/pkg/CSWbind/bind + +ZONE= # used for initialization, do not change + +case "$1" in + start) + if [ -f /opt/csw/sbin/named -a -f /etc/opt/csw/named.conf ]; then + echo "Starting bind." + if [ -n "$ROOTDIR" ]; then + echo ROOTDIR set to $ROOTDIR + ROOTDIR="-t $ROOTDIR" + fi + # ulimit -n 1024 + /opt/csw/sbin/named -u named $OPTIONS $ROOTDIR & + fi + ;; + stop) + echo "Shutting down bind." + if [ -x /usr/bin/zonename ]; then + if [ "`/usr/bin/zonename`" = "global" ]; then + ZONE="-z global" + fi + fi + pkill $ZONE -x named + ;; + reload|refresh) + echo "Reloading bind." + if [ -x /usr/bin/zonename ]; then + if [ "`/usr/bin/zonename`" = "global" ]; then + ZONE="-z global" + fi + fi + pkill -HUP $ZONE -x named + ;; + *) + echo "Usage: $0 { start | stop | reload | refresh }" + ;; +esac +#!/bin/sh +# +# FreeBSD/NetBSD start/stop script for MIMEDefang. +# +# PROVIDE: mimedefang +# REQUIRE: LOGIN +# BEFORE: mail +# KEYWORD: shutdown + +RETVAL=0 +prog='mimedefang' +SPOOLDIR='/var/opt/csw/mimedefang/MIMEDefang' +PID="$SPOOLDIR/$prog.pid" +MXPID="$SPOOLDIR/$prog-multiplexor.pid" + +# These lines keep SpamAssassin happy. Not needed if you +# aren't using SpamAssassin. +HOME="$SPOOLDIR" +export HOME +# Is the program executable? We search in /usr/bin and /usr/local/bin. + +if [ -x /opt/csw/bin/$prog ] ; then + PROGDIR=/opt/csw/bin +elif [ -x /usr/bin/$prog ] ; then + PROGDIR=/usr/bin +elif [ -x /usr/local/bin/$prog ] ; then + PROGDIR=/usr/local/bin +else + exit 0 +fi + +# Locale should be set to "C" for generating valid date headers +LC_ALL=C +export LC_ALL + +# The settings which follow are defaults. You can override them by +# placing assignments in /etc/mail/mimedefang.conf + +# The socket used by mimedefang to communicate with sendmail +# SOCKET=$SPOOLDIR/mimedefang.sock + +# Run the multiplexor and filters as this user, not root. RECOMMENDED +MX_USER=defang + +# Syslog facility +# SYSLOG_FACILITY=mail + +# If you want to keep spool directories around if the filter fails, +# set the next one to yes +# KEEP_FAILED_DIRECTORIES=no + +# "yes" turns on the multiplexor relay checking function +# MX_RELAY_CHECK=no + +# "yes" turns on the multiplexor HELO checking function +# MX_HELO_CHECK=no + +# "yes" turns on the multiplexor sender checking function +# MX_SENDER_CHECK=no + +# "yes" turns on the multiplexor recipient checking function +# MX_RECIPIENT_CHECK=no + +# Set to yes if you want the multiplexor to log events to syslog +MX_LOG=yes + +# Set to yes if you want to use an embedded Perl interpreter +# MX_EMBED_PERL=yes + +# Set to full path of socket for Sendmail's SOCKETMAP map, if you +# want to use it with MIMEDefang +# MX_MAP_SOCKET=$SPOOLDIR/map.sock + +# The multiplexor does not start all slaves at the same time. Instead, +# it starts one slave every MX_SLAVE_DELAY seconds when the system is idle. +# (If the system is busy, the multiplexor starts slaves as incoming mail +# requires attention.) +# MX_SLAVE_DELAY=3 + +# The next setting is an absolute limit on slave activation. The multiplexor +# will NEVER activate a slave within MX_MIN_SLAVE_DELAY seconds of another. +# The default of zero means that the multiplexor will activate slaves as +# quickly as necessary to keep up with incoming mail. +# MX_MIN_SLAVE_DELAY=0 + +# Set to yes if you want the multiplexor to log stats in +# /var/log/mimedefang/stats The /var/log/mimedefang directory must +# exist and be writable by the user you're running MIMEDefang as. +# MX_STATS=no + +# Number of slaves reserved for connections from loopback. Use -1 +# for default behaviour, 0 to allow loopback connections to queue, +# or >0 to reserve slaves for loopback connections +LOOPBACK_RESERVED_CONNECTIONS=-1 + +# If you want new connections to be allowed to queue, set the +# next variable to yes. Normally, only existing connections are +# allowed to queue requests for work. +ALLOW_NEW_CONNECTIONS_TO_QUEUE=no + +# Set to yes if you want the stats file flushed after each entry +# MX_FLUSH_STATS=no + +# Set to yes if you want the multiplexor to log stats to syslog +# MX_STATS_SYSLOG=no + +# The socket used by the multiplexor +# MX_SOCKET=$SPOOLDIR/mimedefang-multiplexor.sock + +# Maximum # of requests a process handles +# MX_REQUESTS=200 + +# Minimum number of processes to keep. The default of 0 is probably +# too low; we suggest 2 instead. +MX_MINIMUM=2 + +# Maximum number of processes to run (mail received while this many +# processes are running is rejected with a temporary failure, so be +# wary of how many emails you receive at a time). This applies only +# if you DO use the multiplexor. The default value of 2 is probably +# too low; we suggest 10 instead +MX_MAXIMUM=10 + +# Uncomment to log slave status; it will be logged every +# MX_LOG_SLAVE_STATUS_INTERVAL seconds +# MX_LOG_SLAVE_STATUS_INTERVAL=30 + +# Uncomment next line to have busy slaves send status updates to the +# multiplexor. NOTE: Consumes one extra file descriptor per slave, plus +# a bit of CPU time. +# MX_STATUS_UPDATES=yes + +# Limit slave processes' resident-set size to this many kilobytes. Default +# is unlimited. +# MX_MAX_RSS=10000 + +# Limit total size of slave processes' memory space to this many kilobytes. +# Default is unlimited. +# MX_MAX_AS=30000 + +# If you want to use the "notification" facility, set the appropriate port. +# See the mimedefang-notify man page for details. +# MX_NOTIFIER=inet:4567 + +# Number of seconds a process should be idle before checking for +# minimum number and killed +# MX_IDLE=300 + +# Number of seconds a process is allowed to scan an email before it is +# considered dead. The default is 30 seconds; we suggest 600. +MX_BUSY=600 + +# Maximum number of concurrent recipok requests on a per-domain basis. +# 0 means no limit +MX_RECIPOK_PERDOMAIN_LIMIT=0 + +# Extra sendmail macros to pass. Actually, you can add any extra +# mimedefang options here... +# MD_EXTRA="-a auth_author" + +# Multiplexor queue size -- default is 0 (no queueing) +# MX_QUEUE_SIZE=10 + +# Multiplexor queue timeout -- default is 30 seconds +# MX_QUEUE_TIMEOUT=30 + +# Set to yes if you don't want MIMEDefang to see invalid recipients. +# Only works with Sendmail 8.14.0 and later. +# MD_SKIP_BAD_RCPTS=no + +# SUBFILTER specifies which filter rules file to use +# SUBFILTER=/etc/mail/mimedefang-filter + + +# Source configuration +if [ -f /etc/mail/$prog.conf ] ; then + . /etc/mail/$prog.conf +fi + +# BSD specific setup +if [ -f /etc/rc.subr ] +then + . /etc/rc.subr + + name=$prog + rcvar=`set_rcvar` + # default to not enabled, enable in rc.conf + eval $rcvar=\${$rcvar:-NO} + + load_rc_config $name + + pidfile=$MXPID + procname=$PROGDIR/$prog-multiplexor + start_cmd="start_it" + stop_cmd="stop_it" + sig_reload="INT" + reread_cmd="reread_it" + # provide both "reload", the FreeBSD default, with a direct signal to + # the multiplexor, and "reread", the MIMEDefang default, using md-mx-ctrl + extra_commands="reload reread" +fi + +# Make sure required vars are set +SOCKET=${SOCKET:=$SPOOLDIR/$prog.sock} +MX_SOCKET=${MX_SOCKET:=$SPOOLDIR/$prog-multiplexor.sock} + +start_it() { + if test -r $PID ; then + if kill -0 `cat $PID` > /dev/null 2>&1 ; then + echo "mimedefang (`cat $PID`) seems to be running." + return 1 + fi + fi + if test -r $MXPID ; then + if kill -0 `cat $MXPID` > /dev/null 2>&1 ; then + echo "mimedefang-multiplexor (`cat $MXPID`) seems to be running." + return 1 + fi + fi + + printf "%-60s" "Starting $prog-multiplexor: " + rm -f $MX_SOCKET > /dev/null 2>&1 + if [ "$MX_EMBED_PERL" = "yes" ] ; then + EMBEDFLAG=-E + else + EMBEDFLAG="" + fi + $PROGDIR/$prog-multiplexor -p $MXPID \ + $EMBEDFLAG \ + `[ -n "$SPOOLDIR" ] && echo "-z $SPOOLDIR"` \ + `[ -n "$FILTER" ] && echo "-f $FILTER"` \ + `[ -n "$SYSLOG_FACILITY" ] && echo "-S $SYSLOG_FACILITY"` \ + `[ -n "$SUBFILTER" ] && echo "-F $SUBFILTER"` \ + `[ -n "$MX_MINIMUM" ] && echo "-m $MX_MINIMUM"` \ + `[ -n "$MX_MAXIMUM" ] && echo "-x $MX_MAXIMUM"` \ + `[ -n "$MX_MAP_SOCKET" ] && echo "-N $MX_MAP_SOCKET"` \ + `[ -n "$MX_LOG_SLAVE_STATUS_INTERVAL" ] && echo "-L $MX_LOG_SLAVE_STATUS_INTERVAL"` \ + `[ -n "$MX_USER" ] && echo "-U $MX_USER"` \ + `[ -n "$MX_IDLE" ] && echo "-i $MX_IDLE"` \ + `[ -n "$MX_BUSY" ] && echo "-b $MX_BUSY"` \ + `[ -n "$MX_REQUESTS" ] && echo "-r $MX_REQUESTS"` \ + `[ -n "$MX_SLAVE_DELAY" ] && echo "-w $MX_SLAVE_DELAY"` \ + `[ -n "$MX_MIN_SLAVE_DELAY" ] && echo "-W $MX_MIN_SLAVE_DELAY"` \ + `[ -n "$MX_MAX_RSS" ] && echo "-R $MX_MAX_RSS"` \ + `[ -n "$MX_MAX_AS" ] && echo "-M $MX_MAX_AS"` \ + `[ "$MX_LOG" = "yes" ] && echo "-l"` \ + `[ "$MX_STATS" = "yes" ] && echo "-t /var/log/mimedefang/stats"` \ + `[ "$MX_STATS" = "yes" -a "$MX_FLUSH_STATS" = "yes" ] && echo "-u"` \ + `[ "$MX_STATS_SYSLOG" = "yes" ] && echo "-T"` \ + `[ "$MX_STATUS_UPDATES" = "yes" ] && echo "-Z"` \ + `[ -n "$MX_QUEUE_SIZE" ] && echo "-q $MX_QUEUE_SIZE"` \ + `[ -n "$MX_QUEUE_TIMEOUT" ] && echo "-Q $MX_QUEUE_TIMEOUT"` \ + `[ -n "$MX_NOTIFIER" ] && echo "-O $MX_NOTIFIER"` \ + `[ -n "$MX_RECIPOK_PERDOMAIN_LIMIT" ] && echo "-y $MX_RECIPOK_PERDOMAIN_LIMIT"` \ + -s $MX_SOCKET + RETVAL=$? + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + return 1 + fi + + # Start mimedefang + printf "%-60s" "Starting $prog: " + rm -f $SOCKET > /dev/null 2>&1 + $PROGDIR/$prog -P $PID -R $LOOPBACK_RESERVED_CONNECTIONS \ + -m $MX_SOCKET \ + `[ -n "$SPOOLDIR" ] && echo "-z $SPOOLDIR"` \ + `[ -n "$MX_USER" ] && echo "-U $MX_USER"` \ + `[ -n "$SYSLOG_FACILITY" ] && echo "-S $SYSLOG_FACILITY"` \ + `[ "$MX_RELAY_CHECK" = "yes" ] && echo "-r"` \ + `[ "$MX_HELO_CHECK" = "yes" ] && echo "-H"` \ + `[ "$MX_SENDER_CHECK" = "yes" ] && echo "-s"` \ + `[ "$MX_RECIPIENT_CHECK" = "yes" ] && echo "-t"` \ + `[ "$KEEP_FAILED_DIRECTORIES" = "yes" ] && echo "-k"` \ + `[ "$MD_EXTRA" != "" ] && echo $MD_EXTRA` \ + `[ "$MD_SKIP_BAD_RCPTS" = "yes" ] && echo "-N"` \ + `[ "$ALLOW_NEW_CONNECTIONS_TO_QUEUE" = "yes" ] && echo "-q"` \ + -p $SOCKET + RETVAL=$? + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + kill `cat $MXPID` + return 1 + fi + return 0 +} + +stop_it() { + # Stop daemon + printf "%-60s" "Shutting down $prog: " + if test -f "$PID" ; then + kill `cat $PID` + RETVAL=$? + else + RETVAL=1 + fi + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + fi + + # Stop daemon + printf "%-60s" "Shutting down $prog-multiplexor: " + if test -f "$MXPID" ; then + kill `cat $MXPID` + RETVAL=$? + else + RETVAL=1 + fi + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + fi + + rm -f $MX_SOCKET > /dev/null 2>&1 + rm -f $SOCKET > /dev/null 2>&1 + + if [ "$1" = "wait" ] ; then + printf "Waiting for daemons to exit." + WAITPID="" + test -f $PID && WAITPID=`cat $PID` + test -f $MXPID && WAITPID="$WAITPID `cat $MXPID`" + n=0 + while [ -n "$WAITPID" ] ; do + W2="" + for pid in $WAITPID ; do + if kill -0 $pid > /dev/null 2>&1 ; then + W2="$W2 $pid" + fi + done + printf "." + n=`expr $n + 1` + test $n -eq 30 && kill -KILL $WAITPID > /dev/null 2>&1 + test $n -eq 60 && break + WAITPID=$W2 + sleep 1 + done + echo "" + fi + + rm -f $MXPID > /dev/null 2>&1 + rm -f $PID > /dev/null 2>&1 +} + +reread_it() { + if [ -x $PROGDIR/md-mx-ctrl ] ; then + $PROGDIR/md-mx-ctrl -s $MX_SOCKET reread > /dev/null 2>&1 + RETVAL=$? + if [ $RETVAL = 0 ] ; then + echo "Told $prog-multiplexor to force reread of filter rules." + else + echo "Could not communicate with $prog-multiplexor" + fi + else + if [ -r $MXPID ] ; then + kill -INT `cat $MXPID` + RETVAL=$? + if [ $RETVAL = 0 ] ; then + echo "Told $prog-multiplexor to force reread of filter rules." + else + echo "Could not signal $prog-multiplexor" + fi + else + RETVAL=1 + echo "Could not find process-ID of $prog-multiplexor" + fi + fi +} + +if type run_rc_command > /dev/null 2>&1 +then + # NetBSD/FreeBSD compatible startup script + run_rc_command "$1" + exit $RETVAL +fi + +# See how we were called. +case "$1" in + start) + start_it + ;; + + stop) + stop_it $2 + ;; + + restart) + stop_it wait + start_it + RETVAL=$? + ;; + + reread|reload) + reread_it + ;; + + *) + echo "Usage: $0 {start|stop|restart|reread|reload}" + exit 1 +esac + +exit $RETVAL Property changes on: csw/mgar/pkg/mimedefang/trunk/files/cswmimedefang ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/pkg/mimedefang/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/mimedefang/trunk/files/cswusergroup 2010-11-06 23:58:24 UTC (rev 11511) +++ csw/mgar/pkg/mimedefang/trunk/files/cswusergroup 2010-11-07 00:13:58 UTC (rev 11512) @@ -1 +1 @@ -defang:defang:CSW MimeDefang:/false:/bin/false:::NP +defang:defang:CSW MIMEDefang:/false:/bin/false:::NP Modified: csw/mgar/pkg/mimedefang/trunk/files/mimedefang =================================================================== --- csw/mgar/pkg/mimedefang/trunk/files/mimedefang 2010-11-06 23:58:24 UTC (rev 11511) +++ csw/mgar/pkg/mimedefang/trunk/files/mimedefang 2010-11-07 00:13:58 UTC (rev 11512) @@ -1,11 +1,11 @@ -# This is where you customize some settings of your MimeDefang installation so +# This is where you customize some settings of your MIMEDefang installation so # you don't have to edit the scripts themselves as they will be replaced during # upgrades. # # Peter Bonivart, OpenCSW # The spool directory -# SPOOLDIR=/var/spool/MIMEDefang +# SPOOLDIR=/var/opt/csw/mimedefang/MIMEDefang # The socket used by mimedefang to communicate with sendmail # SOCKET=$SPOOLDIR/mimedefang.sock This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Nov 7 11:03:27 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 07 Nov 2010 10:03:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[11513] csw/mgar/pkg/mimedefang/trunk/files/cswmimedefang Message-ID: Revision: 11513 http://gar.svn.sourceforge.net/gar/?rev=11513&view=rev Author: bonivart Date: 2010-11-07 10:03:27 +0000 (Sun, 07 Nov 2010) Log Message: ----------- mimedefang: fix init script Modified Paths: -------------- csw/mgar/pkg/mimedefang/trunk/files/cswmimedefang Modified: csw/mgar/pkg/mimedefang/trunk/files/cswmimedefang =================================================================== --- csw/mgar/pkg/mimedefang/trunk/files/cswmimedefang 2010-11-07 00:13:58 UTC (rev 11512) +++ csw/mgar/pkg/mimedefang/trunk/files/cswmimedefang 2010-11-07 10:03:27 UTC (rev 11513) @@ -1,69 +1,21 @@ #!/sbin/sh #RC_KLEV 0,1,S -#RC_SLEV 2 +#RC_SLEV 3 -# rc-script for CSW MimeDefang -# Peter Bonivart, 2010-11-06 +# rc-script for CSW MIMEDefang +# Peter Bonivart, 2010-11-07 # Source config file -#[ -r /etc/opt/csw/pkg/CSWbind/bind ] && . /etc/opt/csw/pkg/CSWbind/bind +[ -r /etc/opt/csw/pkg/CSWmimedefang/mimedefang ] && . /etc/opt/csw/pkg/CSWmimedefang/mimedefang -ZONE= # used for initialization, do not change - -case "$1" in - start) - if [ -f /opt/csw/sbin/named -a -f /etc/opt/csw/named.conf ]; then - echo "Starting bind." - if [ -n "$ROOTDIR" ]; then - echo ROOTDIR set to $ROOTDIR - ROOTDIR="-t $ROOTDIR" - fi - # ulimit -n 1024 - /opt/csw/sbin/named -u named $OPTIONS $ROOTDIR & - fi - ;; - stop) - echo "Shutting down bind." - if [ -x /usr/bin/zonename ]; then - if [ "`/usr/bin/zonename`" = "global" ]; then - ZONE="-z global" - fi - fi - pkill $ZONE -x named - ;; - reload|refresh) - echo "Reloading bind." - if [ -x /usr/bin/zonename ]; then - if [ "`/usr/bin/zonename`" = "global" ]; then - ZONE="-z global" - fi - fi - pkill -HUP $ZONE -x named - ;; - *) - echo "Usage: $0 { start | stop | reload | refresh }" - ;; -esac -#!/bin/sh -# -# FreeBSD/NetBSD start/stop script for MIMEDefang. -# -# PROVIDE: mimedefang -# REQUIRE: LOGIN -# BEFORE: mail -# KEYWORD: shutdown - +ulimit -n 1024 RETVAL=0 prog='mimedefang' -SPOOLDIR='/var/opt/csw/mimedefang/MIMEDefang' +SPOOLDIR='/var/opt/csw/mimedefang' PID="$SPOOLDIR/$prog.pid" MXPID="$SPOOLDIR/$prog-multiplexor.pid" -# These lines keep SpamAssassin happy. Not needed if you -# aren't using SpamAssassin. -HOME="$SPOOLDIR" -export HOME # Is the program executable? We search in /usr/bin and /usr/local/bin. if [ -x /opt/csw/bin/$prog ] ; then @@ -80,8 +32,16 @@ LC_ALL=C export LC_ALL +# Create spool directory if needed + +if [ ! -d $SPOOLDIR ] ; then + mkdir -m 755 $SPOOLDIR + chown defang:defang $SPOOLDIR + chmod 750 $SPOOLDIR +fi + # The settings which follow are defaults. You can override them by -# placing assignments in /etc/mail/mimedefang.conf +# placing assignments in /opt/csw/etc/mimedefang.conf # The socket used by mimedefang to communicate with sendmail # SOCKET=$SPOOLDIR/mimedefang.sock @@ -140,11 +100,6 @@ # or >0 to reserve slaves for loopback connections LOOPBACK_RESERVED_CONNECTIONS=-1 -# If you want new connections to be allowed to queue, set the -# next variable to yes. Normally, only existing connections are -# allowed to queue requests for work. -ALLOW_NEW_CONNECTIONS_TO_QUEUE=no - # Set to yes if you want the stats file flushed after each entry # MX_FLUSH_STATS=no @@ -197,10 +152,6 @@ # considered dead. The default is 30 seconds; we suggest 600. MX_BUSY=600 -# Maximum number of concurrent recipok requests on a per-domain basis. -# 0 means no limit -MX_RECIPOK_PERDOMAIN_LIMIT=0 - # Extra sendmail macros to pass. Actually, you can add any extra # mimedefang options here... # MD_EXTRA="-a auth_author" @@ -211,42 +162,9 @@ # Multiplexor queue timeout -- default is 30 seconds # MX_QUEUE_TIMEOUT=30 -# Set to yes if you don't want MIMEDefang to see invalid recipients. -# Only works with Sendmail 8.14.0 and later. -# MD_SKIP_BAD_RCPTS=no - # SUBFILTER specifies which filter rules file to use -# SUBFILTER=/etc/mail/mimedefang-filter +# SUBFILTER=/opt/csw/etc/mimedefang-filter - -# Source configuration -if [ -f /etc/mail/$prog.conf ] ; then - . /etc/mail/$prog.conf -fi - -# BSD specific setup -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr - - name=$prog - rcvar=`set_rcvar` - # default to not enabled, enable in rc.conf - eval $rcvar=\${$rcvar:-NO} - - load_rc_config $name - - pidfile=$MXPID - procname=$PROGDIR/$prog-multiplexor - start_cmd="start_it" - stop_cmd="stop_it" - sig_reload="INT" - reread_cmd="reread_it" - # provide both "reload", the FreeBSD default, with a direct signal to - # the multiplexor, and "reread", the MIMEDefang default, using md-mx-ctrl - extra_commands="reload reread" -fi - # Make sure required vars are set SOCKET=${SOCKET:=$SPOOLDIR/$prog.sock} MX_SOCKET=${MX_SOCKET:=$SPOOLDIR/$prog-multiplexor.sock} @@ -298,7 +216,6 @@ `[ -n "$MX_QUEUE_SIZE" ] && echo "-q $MX_QUEUE_SIZE"` \ `[ -n "$MX_QUEUE_TIMEOUT" ] && echo "-Q $MX_QUEUE_TIMEOUT"` \ `[ -n "$MX_NOTIFIER" ] && echo "-O $MX_NOTIFIER"` \ - `[ -n "$MX_RECIPOK_PERDOMAIN_LIMIT" ] && echo "-y $MX_RECIPOK_PERDOMAIN_LIMIT"` \ -s $MX_SOCKET RETVAL=$? if [ $RETVAL = 0 ] ; then @@ -322,7 +239,6 @@ `[ "$MX_RECIPIENT_CHECK" = "yes" ] && echo "-t"` \ `[ "$KEEP_FAILED_DIRECTORIES" = "yes" ] && echo "-k"` \ `[ "$MD_EXTRA" != "" ] && echo $MD_EXTRA` \ - `[ "$MD_SKIP_BAD_RCPTS" = "yes" ] && echo "-N"` \ `[ "$ALLOW_NEW_CONNECTIONS_TO_QUEUE" = "yes" ] && echo "-q"` \ -p $SOCKET RETVAL=$? @@ -351,6 +267,9 @@ echo "[FAILED]" fi + rm -f $SOCKET > /dev/null 2>&1 + rm -f $PID > /dev/null 2>&1 + # Stop daemon printf "%-60s" "Shutting down $prog-multiplexor: " if test -f "$MXPID" ; then @@ -395,7 +314,23 @@ rm -f $PID > /dev/null 2>&1 } -reread_it() { +# See how we were called. +case "$1" in + start) + start_it + ;; + + stop) + stop_it $2 + ;; + + restart) + stop_it wait + start_it + RETVAL=$? + ;; + + reread|reload|refresh) if [ -x $PROGDIR/md-mx-ctrl ] ; then $PROGDIR/md-mx-ctrl -s $MX_SOCKET reread > /dev/null 2>&1 RETVAL=$? @@ -418,37 +353,10 @@ echo "Could not find process-ID of $prog-multiplexor" fi fi -} - -if type run_rc_command > /dev/null 2>&1 -then - # NetBSD/FreeBSD compatible startup script - run_rc_command "$1" - exit $RETVAL -fi - -# See how we were called. -case "$1" in - start) - start_it ;; - stop) - stop_it $2 - ;; - - restart) - stop_it wait - start_it - RETVAL=$? - ;; - - reread|reload) - reread_it - ;; - *) - echo "Usage: $0 {start|stop|restart|reread|reload}" + echo "Usage: $0 {start|stop|restart|reread|reload|refresh}" exit 1 esac 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 Nov 7 13:23:08 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Nov 2010 12:23:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11514] csw/mgar/pkg/cmake/trunk/Makefile Message-ID: Revision: 11514 http://gar.svn.sourceforge.net/gar/?rev=11514&view=rev Author: rthurner Date: 2010-11-07 12:23:07 +0000 (Sun, 07 Nov 2010) Log Message: ----------- cmake: two test targets fail, so switch them off atm Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2010-11-07 10:03:27 UTC (rev 11513) +++ csw/mgar/pkg/cmake/trunk/Makefile 2010-11-07 12:23:07 UTC (rev 11514) @@ -36,6 +36,9 @@ NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) --docdir=$(docdir) +# switch off tests as two of them fail +TEST_TARGET = + include gar/category.mk FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/$(GARNAME)-$(GARVERSION)/Modules 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 Nov 7 16:30:27 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Nov 2010 15:30:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[11515] csw/mgar/pkg/cmake/trunk/Makefile Message-ID: Revision: 11515 http://gar.svn.sourceforge.net/gar/?rev=11515&view=rev Author: rthurner Date: 2010-11-07 15:30:27 +0000 (Sun, 07 Nov 2010) Log Message: ----------- cmake: add ssl runtime dependency Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2010-11-07 12:23:07 UTC (rev 11514) +++ csw/mgar/pkg/cmake/trunk/Makefile 2010-11-07 15:30:27 UTC (rev 11515) @@ -24,7 +24,9 @@ RUNTIME_DEP_PKGS_CSWcmake = CSWcurlrt CSWexpat RUNTIME_DEP_PKGS_CSWcmake += CSWzlib +RUNTIME_DEP_PKGS_CSWcmake += CSWosslrt + # We define upstream file regex so we can be notifed of # new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) 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 Nov 7 16:47:14 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Nov 2010 15:47:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[11516] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 11516 http://gar.svn.sourceforge.net/gar/?rev=11516&view=rev Author: rthurner Date: 2010-11-07 15:47:14 +0000 (Sun, 07 Nov 2010) Log Message: ----------- mercurial: upgrade to hg-1.7 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-11-07 15:30:27 UTC (rev 11515) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-11-07 15:47:14 UTC (rev 11516) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.6.4 +GARVERSION = 1.7 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-11-07 15:30:27 UTC (rev 11515) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-11-07 15:47:14 UTC (rev 11516) @@ -1 +1 @@ -657dd6aff80aa9a3b187652a635544d0 mercurial-1.6.4.tar.gz +698948ff128d265db55bee8149445556 mercurial-1.7.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 Nov 7 16:59:30 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Nov 2010 15:59:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[11517] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 11517 http://gar.svn.sourceforge.net/gar/?rev=11517&view=rev Author: rthurner Date: 2010-11-07 15:59:30 +0000 (Sun, 07 Nov 2010) Log Message: ----------- mercurial: depend on python runtime lib ... should be in gar? Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-11-07 15:47:14 UTC (rev 11516) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-11-07 15:59:30 UTC (rev 11517) @@ -20,6 +20,7 @@ TEST_SCRIPTS = #TEST_TARGET = #tests +RUNTIME_DEP_PKGS_CSWmercurial += CSWlibpython2-6-1-0 CHECKPKG_OVERRIDES_CSWmercurial += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWmercurial += catalogname-does-not-start-with-py_ 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 Nov 7 19:32:51 2010 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 07 Nov 2010 18:32:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[11518] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 11518 http://gar.svn.sourceforge.net/gar/?rev=11518&view=rev Author: j_arndt Date: 2010-11-07 18:32:50 +0000 (Sun, 07 Nov 2010) Log Message: ----------- nagios: update to version 3.2.3 Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile csw/mgar/pkg/nagios/trunk/checksums Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2010-11-07 15:59:30 UTC (rev 11517) +++ csw/mgar/pkg/nagios/trunk/Makefile 2010-11-07 18:32:50 UTC (rev 11518) @@ -1,5 +1,5 @@ GARNAME = nagios -GARVERSION = 3.2.1 +GARVERSION = 3.2.3 CATEGORIES = apps DESCRIPTION = Nagios network monitoring base package (no plugins) @@ -63,7 +63,7 @@ INSTALL_ARGS += install-commandmode LD_OPTIONS += -R/opt/csw/lib -LD_OPTIONS -= -R/opt/csw/nagios/lib +LD_OPTIONS += -R/opt/csw/nagios/lib include gar/category.mk Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2010-11-07 15:59:30 UTC (rev 11517) +++ csw/mgar/pkg/nagios/trunk/checksums 2010-11-07 18:32:50 UTC (rev 11518) @@ -1,9 +1 @@ -e407a4b179bd7de72b3e8c21f309f9b7 CSWnagios.checkinstall -e131ac989a8b7f10de8eb40fdd0b4120 CSWnagios.postinstall -7926d365165ee1ad76a7ddb5308bdbff CSWnagios.preinstall -92437323de0cceaa58c6238ec9e6c954 CSWnagios.preremove -26c7d23a186dbb0aea6d0e4ba6a7be63 CSWnagios.prototype -0c26e222285ad2666ca0ecf6c85cebf8 cswnagios -f3161bcb7c65f89707ee37b0a8d861d5 install-opts.diff -d4655ee8c95c9679fd4fd53dac34bbe3 nagios-3.2.1.tar.gz -91407bdea2047b6ff5a1542550933144 patch.diff +fe1be46e6976a52acdb021a782b5d04b nagios-3.2.3.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 Nov 7 20:08:57 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Nov 2010 19:08:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[11519] csw/mgar/pkg/cmake/trunk/Makefile Message-ID: Revision: 11519 http://gar.svn.sourceforge.net/gar/?rev=11519&view=rev Author: rthurner Date: 2010-11-07 19:08:56 +0000 (Sun, 07 Nov 2010) Log Message: ----------- cmake: checkpkg error ignore Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2010-11-07 18:32:50 UTC (rev 11518) +++ csw/mgar/pkg/cmake/trunk/Makefile 2010-11-07 19:08:56 UTC (rev 11519) @@ -41,6 +41,24 @@ # switch off tests as two of them fail TEST_TARGET = +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/lib|opt/csw/bin/ccmake +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/ccmake +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/ccmake +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/ccmake +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/lib|opt/csw/bin/cmake +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/cmake +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/cmake +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/cmake +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/lib|opt/csw/bin/cpack +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/cpack +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/cpack +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/cpack +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/lib|opt/csw/bin/ctest +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/ctest +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/ctest +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/ctest + + include gar/category.mk FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/$(GARNAME)-$(GARVERSION)/Modules This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Nov 7 21:51:29 2010 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Sun, 7 Nov 2010 20:51:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[11519] csw/mgar/pkg/cmake/trunk/Makefile In-Reply-To: References: Message-ID: No dia 7 de Novembro de 2010 19:08, escreveu: > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/lib|opt/csw/bin/ccmake > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/ccmake > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/ccmake > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/ccmake > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/lib|opt/csw/bin/cmake > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/cmake > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/cmake > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/cmake > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/lib|opt/csw/bin/cpack > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/cpack > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/cpack > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/cpack > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/lib|opt/csw/bin/ctest > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/ctest > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/ctest > +CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/ctest Instead of all these, you can say: CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry But, I think you can actually fix this problem, by adding -norunpath to CXXFLAGS and -xnorunpath to CFLAGS. From bdwalton at users.sourceforge.net Sun Nov 7 23:32:12 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 07 Nov 2010 22:32:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[11521] csw/mgar/gar/v2/lib/python/opencsw_test.py Message-ID: Revision: 11521 http://gar.svn.sourceforge.net/gar/?rev=11521&view=rev Author: bdwalton Date: 2010-11-07 22:32:12 +0000 (Sun, 07 Nov 2010) Log Message: ----------- checkpkg: initial test for new e filetype in pkgmap files Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-11-07 22:24:46 UTC (rev 11520) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-11-07 22:32:12 UTC (rev 11521) @@ -63,6 +63,12 @@ 1 i preinstall 1488 45678 125630250 """ +PKGMAP_3 = """1 d none /opt/csw/apache2/ap2mod 0755 root bin +1 e build /opt/csw/apache2/ap2mod/suexec ? ? ? 1472 50478 1289099700 +1 d none /opt/csw/apache2/libexec 0755 root bin +1 f none /opt/csw/apache2/libexec/mod_suexec.so 0755 root bin 6852 52597 1289092061 +""" + SUBMITPKG_DATA_1 = { 'NEW_PACKAGE': 'new package', 'to': u'Release Manager ', @@ -403,6 +409,9 @@ pkgmap = opencsw.Pkgmap(PKGMAP_2.splitlines()) self.assertTrue("cswcpsampleconf" in pkgmap.entries_by_class) + def test_4(self): + pkgmap = opencsw.Pkgmap(PKGMAP_3.splitlines()) + self.assertTrue("build" in pkgmap.entries_by_class) class IndexByUnitTest(unittest.TestCase): 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 Nov 7 23:24:46 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 07 Nov 2010 22:24:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[11520] csw/mgar/gar/v2/lib/python/opencsw.py Message-ID: Revision: 11520 http://gar.svn.sourceforge.net/gar/?rev=11520&view=rev Author: bdwalton Date: 2010-11-07 22:24:46 +0000 (Sun, 07 Nov 2010) Log Message: ----------- checkpkg: allow type e files (apache2 modules using build leverage this) Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-11-07 19:08:56 UTC (rev 11519) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-11-07 22:24:46 UTC (rev 11520) @@ -522,6 +522,7 @@ "s": "symlink", "l": "link", "i": "script", + "e": "editable file" } def __init__(self, input, permissions=False, @@ -552,6 +553,11 @@ if self.analyze_permissions: line_to_add += " %s" % fields[4] mode, user, group = fields[4:7] + elif line_type in ('e'): + # Editable files + line_to_add = fields[3] + installed_path = fields[3] + prototype_class = fields[2] elif line_type in ('s', 'l'): # soft- and hardlinks link_from, link_to = fields[3].split("=") 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 Nov 8 02:34:48 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 08 Nov 2010 01:34:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[11522] csw/mgar/gar/v2 Message-ID: Revision: 11522 http://gar.svn.sourceforge.net/gar/?rev=11522&view=rev Author: bdwalton Date: 2010-11-08 01:34:48 +0000 (Mon, 08 Nov 2010) Log Message: ----------- gar/v2: convert AP2_MODS to use build instead of custom cswap2mod CAS Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-11-07 22:32:12 UTC (rev 11521) +++ csw/mgar/gar/v2/gar.mk 2010-11-08 01:34:48 UTC (rev 11522) @@ -805,7 +805,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) $(if $(AP2_MODS),post-merge-ap2mod) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) @@ -833,6 +833,9 @@ echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ ) +post-merge-ap2mod: + $(GARBIN)/ap2mod_build_scripts $(PKGROOT) $(AP2_MODFILES) + @$(MAKECOOKIE) # This merges the merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated @@ -881,7 +884,7 @@ .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-src +reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-ap2mod reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-11-07 22:32:12 UTC (rev 11521) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-11-08 01:34:48 UTC (rev 11522) @@ -188,9 +188,9 @@ # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) -# if AP2_MODS is set, files matching this pattern will have cswap2mod -# set as their class -AP2_MODFILES ?= /opt/csw/apache2/libexec/.*\.so $(EXTRA_AP2_MODFILES) +# if AP2_MODS is set, files matching this shell glob (passed to find) +# will have 'build' set as their class +AP2_MODFILES ?= opt/csw/apache2/libexec/*so $(EXTRA_AP2_MODFILES) # - set class for all config files _CSWCLASS_FILTER = | perl -ane '\ @@ -204,7 +204,7 @@ $(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)$$) );)\ - $(if $(AP2_MODS),$(foreach FILE,$(AP2_MODFILES),$$F[1] = "cswap2mod" if( $$F[2] =~ m(^$(FILE)$$) );))\ + $(if $(AP2_MODS), at F = ("e", "build", $$F[2], "?", "?", "?") if ($$F[2] =~ m(^/opt/csw/apache2/ap2mod/.*));) \ print join(" ", at F),"\n";' # If you add another filter above, also add the class to this list. It is used @@ -224,7 +224,6 @@ _CSWCLASSES += cswinetd _CSWCLASSES += cswinitsmf _CSWCLASSES += cswtexinfo -_CSWCLASSES += cswap2mod _CSWCLASSES += cswpostmsg # Make sure the configuration files always have a .CSW suffix and rename the @@ -458,7 +457,6 @@ # actually matching the _TEXINFO_FILTER. This is done at the prototype-level. $(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),CSWalternatives) -$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswap2mod")')),CSWapache2) $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) # The final "true" is for packages without dependencies to make the shell happy as "( )" is not allowed. @@ -569,7 +567,7 @@ # The texinfo filter has been taken out of the normal filters as TEXINFO has a default. $(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype $(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),cswalternatives) -$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswap2mod")')),cswap2mod) +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "build")')),build) $(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) @@ -638,6 +636,9 @@ reset-merge-classutils: reset-merge-migrateconf reset-merge-usergroup reset-merge-inetdconf reset-merge-etcservices +reset-merge-ap2mod: + @rm -f $(COOKIEDIR)/post-merge-ap2mod + merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) @$(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 Mon Nov 8 02:35:26 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 08 Nov 2010 01:35:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[11523] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11523 http://gar.svn.sourceforge.net/gar/?rev=11523&view=rev Author: bdwalton Date: 2010-11-08 01:35:26 +0000 (Mon, 08 Nov 2010) Log Message: ----------- apache2: update to use new semantics for AP2_MODS Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-08 01:34:48 UTC (rev 11522) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-08 01:35:26 UTC (rev 11523) @@ -88,14 +88,9 @@ RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 -CHECKPKG_OVERRIDES_CSWap2suexec += dependency-listed-more-than-once|CSWapache2 -CHECKPKG_OVERRIDES_CSWap2suexec += surplus-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 @@ -111,7 +106,7 @@ POSTMSG = /opt/csw/share/doc/apache2/README.CSW AP2_MODS = 1 -AP2_MODFILES = /opt/csw/apache2/libexec/.*suexec.*\.so +AP2_MODFILES = *suexec*\.so ALTERNATIVES_CSWapache2 = prefork ALTERNATIVES_CSWap2worker = worker @@ -198,6 +193,7 @@ STRIP_DIRS = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* +PKGFILES_CSWap2suexec += .*ap2mod.*suexec PKGFILES_CSWapache2-devel = .*include/.* .*\.(a|la) PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.* 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 Nov 8 03:20:36 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 08 Nov 2010 02:20:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[11524] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11524 http://gar.svn.sourceforge.net/gar/?rev=11524&view=rev Author: bdwalton Date: 2010-11-08 02:20:36 +0000 (Mon, 08 Nov 2010) Log Message: ----------- apache2: scrap the cswap2mod stuff completely Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/i.cswap2mod csw/mgar/pkg/apache2/trunk/files/r.cswap2mod Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-08 01:35:26 UTC (rev 11523) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-08 02:20:36 UTC (rev 11524) @@ -44,8 +44,6 @@ DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork DISTFILES += README.CSW.apache2rt -DISTFILES += i.cswap2mod r.cswap2mod - UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # The PACKAGES variable tell GAR which packages to build @@ -200,8 +198,6 @@ PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }' - include gar/category.mk CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS) @@ -216,16 +212,8 @@ @$(MAKECOOKIE) -post-install-modulated: rename-httpd copy-local-files create-templates copy-readmes install-cas +post-install-modulated: rename-httpd copy-local-files create-templates copy-readmes -install-cas: CASD = $(DESTDIR)/usr/sadm/install/scripts -install-cas: - @(cd $(WORKDIR); \ - ginstall -d -m0755 $(CASD); \ - for f in *cswap2mod; do \ - ginstall -m 0755 $$f $(CASD); \ - done) - copy-readmes: @(cd $(WORKDIR); for f in README.CSW*; do \ p=`echo $$f | sed 's/README.CSW.//'`; \ Deleted: csw/mgar/pkg/apache2/trunk/files/i.cswap2mod =================================================================== --- csw/mgar/pkg/apache2/trunk/files/i.cswap2mod 2010-11-08 01:35:26 UTC (rev 11523) +++ csw/mgar/pkg/apache2/trunk/files/i.cswap2mod 2010-11-08 02:20:36 UTC (rev 11524) @@ -1,79 +0,0 @@ -#!/bin/sh -# -# i.cswap2mod - Class action script for installing apache2 modules -# -# Written by Ben Walton -# -# 2010-09-29 First Release -# - -# Source csw.conf, if it exists -if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then - . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf -fi -if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then - . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -fi - -AP2_PREFIX=/opt/csw/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_LIBEXEC=$AP2_PREFIX/libexec -AP2_CONFDIR=$AP2_PREFIX/etc -AP2_CONFIG=$AP2_CONFDIR/httpd.conf -AP2_APXS=$AP2_BINDIR/apxs - -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} - -while read src dest; do - # Place the file first - /usr/bin/cp -p $src $dest || exit 2 - echo $dest - - CONF=$PKG_INSTALL_ROOT/$AP2_CONFIG - APXS=$PKG_INSTALL_ROOT/$AP2_APXS - MODFILE=`basename $dest` - MODNAME=`echo $MODFILE | sed 's/mod_//; s/\.so$//'` - - # Modules will be enabled by default, but a global kill switch - # is checked , followed by a module specific value. Thus, - # either ap2_enable_modules or ap2_enable_suexec (for example) - # could disable activation of the suexec module. The - # - # This value is passed to apxs (-a: add, enable; -A: add, - # disable) - enmod=-a - - if [ "$ap2_enable_modules" = "no" ]; then - enmod=-A - fi - - eval ap2_mod_specific="\$ap2_enable_$MODNAME" - if [ "$ap2_mod_specific" = "no" ]; then - enmod=-A - elif [ "$ap2_mod_specific" = "yes" ]; then - enmod=-a - fi - - if [ -f "$CONF" -a -x "$APXS" ]; then - # Add the module module, optionally enabling it by default - chroot $PKG_INSTALL_ROOT \ - $APXS -e $enmod -n $MODNAME $MODFILE - conftouched=1 - fi -done - -if [ "$conftouched" = "1" ]; then - cat < References: Message-ID: No dia 7 de Novembro de 2010 15:59, escreveu: > Revision: 11517 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=11517&view=rev > Author: ? rthurner > Date: ? ? 2010-11-07 15:59:30 +0000 (Sun, 07 Nov 2010) > > Log Message: > ----------- > mercurial: depend on python runtime lib ... should be in gar? There are two separate dependencies: Python interpreter (CSWpython) and the shared library (CSWlibpython*). All Python programs require the interpreter, but only some require the shared library. The CSWlibpython dependency works the same way as all the other shared library dependencies; you need to add it by hand. From wahwah at users.sourceforge.net Mon Nov 8 14:35:25 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Nov 2010 13:35:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[11525] csw/mgar/pkg/cmake/trunk/Makefile Message-ID: Revision: 11525 http://gar.svn.sourceforge.net/gar/?rev=11525&view=rev Author: wahwah Date: 2010-11-08 13:35:25 +0000 (Mon, 08 Nov 2010) Log Message: ----------- cmake: Using -norunpath and removing bad-rpath-entry overrides. Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/cmake/trunk/Makefile Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2010-11-08 02:20:36 UTC (rev 11524) +++ csw/mgar/pkg/cmake/trunk/Makefile 2010-11-08 13:35:25 UTC (rev 11525) @@ -1,3 +1,5 @@ +# $Id$ + GARNAME = cmake GARVERSION = 2.8.2 CATEGORIES = devel @@ -41,24 +43,6 @@ # switch off tests as two of them fail TEST_TARGET = -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/lib|opt/csw/bin/ccmake -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/ccmake -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/ccmake -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/ccmake -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/lib|opt/csw/bin/cmake -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/cmake -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/cmake -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/cmake -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/lib|opt/csw/bin/cpack -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/cpack -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/cpack -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/cpack -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/lib|opt/csw/bin/ctest -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/ctest -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/ctest -CHECKPKG_OVERRIDES_CSWcmake += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/ctest - - include gar/category.mk FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/$(GARNAME)-$(GARVERSION)/Modules @@ -66,6 +50,9 @@ FIXCONFIG_DIRS += $(DESTDIR)$(prefix)$(docdir) FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/man/man1 +EXTRA_CFLAGS = -xnorunpath +EXTRA_CXXFLAGS = -norunpath + pre-configure: @echo $(DIRPATHS) @echo "Docdir: $(docdir)" Property changes on: csw/mgar/pkg/cmake/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 maciej at opencsw.org Mon Nov 8 14:35:53 2010 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Mon, 8 Nov 2010 13:35:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11519] csw/mgar/pkg/cmake/trunk/Makefile In-Reply-To: References: Message-ID: No dia 7 de Novembro de 2010 20:51, Maciej (Matchek) Blizinski escreveu: > But, I think you can actually fix this problem, by adding -norunpath > to CXXFLAGS and -xnorunpath to CFLAGS. I've fixed this in r11525. From skayser at users.sourceforge.net Mon Nov 8 19:26:24 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 08 Nov 2010 18:26:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[11526] csw/mgar/pkg/mairix/trunk Message-ID: Revision: 11526 http://gar.svn.sourceforge.net/gar/?rev=11526&view=rev Author: skayser Date: 2010-11-08 18:26:23 +0000 (Mon, 08 Nov 2010) Log Message: ----------- mairix: work towards 0.22 Modified Paths: -------------- csw/mgar/pkg/mairix/trunk/Makefile csw/mgar/pkg/mairix/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mairix/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff Modified: csw/mgar/pkg/mairix/trunk/Makefile =================================================================== --- csw/mgar/pkg/mairix/trunk/Makefile 2010-11-08 13:35:25 UTC (rev 11525) +++ csw/mgar/pkg/mairix/trunk/Makefile 2010-11-08 18:26:23 UTC (rev 11526) @@ -1,5 +1,5 @@ GARNAME = mairix -GARVERSION = 0.21 +GARVERSION = 0.22 CATEGORIES = utils DESCRIPTION = An index and search tool for Maildir, MH, or mbox @@ -17,17 +17,14 @@ of the matched messages.) endef +VENDOR_URL = http://www.rpcurnow.force9.co.uk/mairix/ MASTER_SITES = $(SF_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -SPKG_SOURCEURL = http://www.rpcurnow.force9.co.uk/mairix/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz RUNTIME_DEP_PKGS = CSWbzip2 CSWzlib TEST_SCRIPTS = -# Mention option -x in the help message (-h) -PATCHFILES = patch-excerpt.diff - # configure doesn't understand most of the $(DIRPATHS) arguments CONFIGURE_ARGS = --prefix=/opt/csw CONFIGURE_ARGS += --bindir=/opt/csw/bin @@ -53,3 +50,10 @@ @ginstall -d $(DOCDEST) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) $(MAKECOOKIE) + +# Install changelog.CSW +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Modified: csw/mgar/pkg/mairix/trunk/checksums =================================================================== --- csw/mgar/pkg/mairix/trunk/checksums 2010-11-08 13:35:25 UTC (rev 11525) +++ csw/mgar/pkg/mairix/trunk/checksums 2010-11-08 18:26:23 UTC (rev 11526) @@ -1,2 +1 @@ -821619895931711c370f51f3442a0ded download/mairix-0.21.tar.gz -a8f4dce18bc0562a85c0cc2ae2dd6f41 download/patch-excerpt.diff +6c6aaca19c2b2de3bf567b856705ce1a mairix-0.22.tar.gz Added: csw/mgar/pkg/mairix/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mairix/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/mairix/trunk/files/changelog.CSW 2010-11-08 18:26:23 UTC (rev 11526) @@ -0,0 +1,5 @@ +mairix (0.22,REV=2010.11.08) + + * Updated to 0.22. (Fixes #4598). + + -- Sebastian Kayser Mon, 8 Nov 2010 18:42:33 +0100 Deleted: csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff =================================================================== --- csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff 2010-11-08 13:35:25 UTC (rev 11525) +++ csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff 2010-11-08 18:26:23 UTC (rev 11526) @@ -1,11 +0,0 @@ -diff -ur mairix-0.21.org/mairix.c mairix-0.21/mairix.c ---- mairix-0.21.org/mairix.c 2007-06-22 21:18:00.000000000 +0100 -+++ mairix-0.21/mairix.c 2009-03-03 14:17:23.119599595 +0000 -@@ -410,6 +410,7 @@ - "-t : include all messages in same threads as matching messages\n" - "-o : override setting of mfolder from mairixrc file\n" - "-r : force raw output regardless of mformat setting in mairixrc file\n" -+ "-x : show an excerpt of the headers of the matching messages\n" - "expr_i : search expression (all expr's AND'ed together):\n" - " word : match word in message body and major headers\n" - " t:word : match word in To: header\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Nov 8 20:11:36 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 08 Nov 2010 19:11:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[11527] csw/mgar/pkg/mairix/trunk Message-ID: Revision: 11527 http://gar.svn.sourceforge.net/gar/?rev=11527&view=rev Author: skayser Date: 2010-11-08 19:11:36 +0000 (Mon, 08 Nov 2010) Log Message: ----------- mairix: add patch for make invocations Modified Paths: -------------- csw/mgar/pkg/mairix/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mairix/trunk/files/0001-Use-MAKE-instead-of-a-hardcoded-make.patch Modified: csw/mgar/pkg/mairix/trunk/Makefile =================================================================== --- csw/mgar/pkg/mairix/trunk/Makefile 2010-11-08 18:26:23 UTC (rev 11526) +++ csw/mgar/pkg/mairix/trunk/Makefile 2010-11-08 19:11:36 UTC (rev 11527) @@ -23,6 +23,11 @@ RUNTIME_DEP_PKGS = CSWbzip2 CSWzlib +# Let make invocations refer to $(MAKE) not "make". Otherwise gmake flags +# might be passed to invocations of make (via $MAKEFLAGS) which make +# doesn't understand. This particulary pertains to ~skayser/bin/mgar. +PATCHFILES += 0001-Use-MAKE-instead-of-a-hardcoded-make.patch + TEST_SCRIPTS = # configure doesn't understand most of the $(DIRPATHS) arguments Added: csw/mgar/pkg/mairix/trunk/files/0001-Use-MAKE-instead-of-a-hardcoded-make.patch =================================================================== --- csw/mgar/pkg/mairix/trunk/files/0001-Use-MAKE-instead-of-a-hardcoded-make.patch (rev 0) +++ csw/mgar/pkg/mairix/trunk/files/0001-Use-MAKE-instead-of-a-hardcoded-make.patch 2010-11-08 19:11:36 UTC (rev 11527) @@ -0,0 +1,38 @@ +From 5f7573b82d9334486709f5fc3b5548d77b2c901e Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Mon, 8 Nov 2010 19:56:21 +0100 +Subject: [PATCH] Use $(MAKE) instead of a hardcoded make. + +This is to make sure that the make used for sub-invocations of the build +process is the same as the one with which it was triggered in the first place +(and which doesn't need to go by the name of make). On Solaris e.g. there's +"gmake" which is the GNU make, whereas "make" is a non-GNU make which only +implements a subset of options. +--- + Makefile.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e20182e..b8f098e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -77,14 +77,14 @@ version.h: + ./mkversion + + ./dfasyn/dfasyn: +- if [ -d dfasyn ]; then cd dfasyn ; make CC="$(CC)" CFLAGS="$(CFLAGS)" ; else echo "No dfasyn subdirectory?" ; exit 1 ; fi ++ if [ -d dfasyn ]; then cd dfasyn ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" ; else echo "No dfasyn subdirectory?" ; exit 1 ; fi + + clean: + -rm -f *~ *.o mairix *.s core + -rm -f mairix.cp mairix.fn mairix.aux mairix.log mairix.ky mairix.pg mairix.toc mairix.tp mairix.vr + -rm -f fromcheck.[ch] datescan.[ch] + -rm -f nvpscan.[ch] +- if [ -d dfasyn ]; then cd dfasyn ; make clean ; fi ++ if [ -d dfasyn ]; then cd dfasyn ; $(MAKE) clean ; fi + + distclean: clean + -rm -f Makefile config.log +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 9 12:39:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Nov 2010 11:39:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[11528] csw/mgar/pkg/sox/trunk/Makefile Message-ID: Revision: 11528 http://gar.svn.sourceforge.net/gar/?rev=11528&view=rev Author: dmichelsen Date: 2010-11-09 11:39:48 +0000 (Tue, 09 Nov 2010) Log Message: ----------- sox: Fix type in catalogname Modified Paths: -------------- csw/mgar/pkg/sox/trunk/Makefile Modified: csw/mgar/pkg/sox/trunk/Makefile =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile 2010-11-08 19:11:36 UTC (rev 11527) +++ csw/mgar/pkg/sox/trunk/Makefile 2010-11-09 11:39:48 UTC (rev 11528) @@ -24,7 +24,7 @@ PACKAGES = CSWsox CSWlibsox1 CSWlibsoxdevel CATALOGNAME_CSWsox = sox -CATALOGNAME_CSWlibsox1 = libsox +CATALOGNAME_CSWlibsox1 = libsox1 CATALOGNAME_CSWlibsoxdevel = libsox_devel SPKG_DESC_CSWsox = $(DESCRIPTION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Nov 9 13:55:46 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 09 Nov 2010 12:55:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[11529] csw/mgar/pkg/ldns/trunk Message-ID: Revision: 11529 http://gar.svn.sourceforge.net/gar/?rev=11529&view=rev Author: idogan23 Date: 2010-11-09 12:55:46 +0000 (Tue, 09 Nov 2010) Log Message: ----------- ldns: bump revision to 1.6.7, rename packages Modified Paths: -------------- csw/mgar/pkg/ldns/trunk/Makefile csw/mgar/pkg/ldns/trunk/checksums Modified: csw/mgar/pkg/ldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile 2010-11-09 11:39:48 UTC (rev 11528) +++ csw/mgar/pkg/ldns/trunk/Makefile 2010-11-09 12:55:46 UTC (rev 11529) @@ -1,5 +1,5 @@ GARNAME = ldns -GARVERSION = 1.6.6 +GARVERSION = 1.6.7 CATEGORIES = lib DESCRIPTION = A library for programs conforming to DNS RFCs and drafts @@ -17,13 +17,13 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -PACKAGES = CSWldns CSWldnsdevel -CATALOGNAME_CSWldns = ldns -CATALOGNAME_CSWldnsdevel = ldns_devel +PACKAGES = CSWlibldns1 CSWlibldnsdevel +CATALOGNAME_CSWlibldns1 = libldns1 +CATALOGNAME_CSWldnsdevel = libldns_devel -SPKG_DESC_CSWldns = $(DESCRIPTION) -SPKG_DESC_CSWldnsdevel = $(DESCRIPTION) development package -CHECKPKG_OVERRIDES_CSWldnsdevel += surplus-dependency|CSWldns +SPKG_DESC_CSWlibldns1 = $(DESCRIPTION) +SPKG_DESC_CSWlibldnsdevel = $(DESCRIPTION) development package +CHECKPKG_OVERRIDES_CSWlibldnsdevel += surplus-dependency|CSWlibldns1 SPKG_SOURCEURL = http://www.nlnetlabs.nl/projects/ldns/ @@ -40,15 +40,21 @@ EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv8plus -RUNTIME_DEP_PKGS_CSWldns += CSWosslrt -RUNTIME_DEP_PKGS_CSWldnsdevel += CSWldns +RUNTIME_DEP_PKGS_CSWlibldns1 += CSWosslrt +RUNTIME_DEP_PKGS_CSWldnsdevel += CSWlibldns1 +INCOMPATIBLE_PKGS_CSWlibldns1 = CSWldns +INCOMPATIBLE_PKGS_CSWldnsdevel = CSWldnsdevel + PATCHFILES = CSWldns.doxyparse.diff CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --enable-sha2 +# Gost requiers OpenSSL 1.0 +CONFIGURE_ARGS += --disable-gost + MERGE_DIRS_isa-sparcv9 = $(libdir) MERGE_DIRS_isa-sparcv8plus = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) @@ -56,7 +62,7 @@ TEST_TARGET = -PKGFILES_CSWldnsdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWldnsrt = $(PKGFILES_RT) +PKGFILES_CSWlibldnsdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibldnsrt = $(PKGFILES_RT) include gar/category.mk Modified: csw/mgar/pkg/ldns/trunk/checksums =================================================================== --- csw/mgar/pkg/ldns/trunk/checksums 2010-11-09 11:39:48 UTC (rev 11528) +++ csw/mgar/pkg/ldns/trunk/checksums 2010-11-09 12:55:46 UTC (rev 11529) @@ -1,2 +1 @@ -b5516aacfa819947cbfb6d0c34f0c546 CSWldns.doxyparse.diff -f2bff31764c98aa69749070a21199164 ldns-1.6.6.tar.gz +7c0c50ee6b91ae6b713616b70005ad03 ldns-1.6.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Nov 9 14:01:10 2010 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Tue, 9 Nov 2010 13:01:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11529] csw/mgar/pkg/ldns/trunk In-Reply-To: References: Message-ID: No dia 9 de Novembro de 2010 12:55, escreveu: > +INCOMPATIBLE_PKGS_CSWlibldns1 = CSWldns > +INCOMPATIBLE_PKGS_CSWldnsdevel = CSWldnsdevel This looks like the same pkgname two times. From idogan23 at users.sourceforge.net Tue Nov 9 14:44:04 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 09 Nov 2010 13:44:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[11530] csw/mgar/pkg Message-ID: Revision: 11530 http://gar.svn.sourceforge.net/gar/?rev=11530&view=rev Author: idogan23 Date: 2010-11-09 13:44:04 +0000 (Tue, 09 Nov 2010) Log Message: ----------- rename ldns to libldns Added Paths: ----------- csw/mgar/pkg/libldns/ csw/mgar/pkg/libldns/trunk/Makefile csw/mgar/pkg/libldns/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ldns/ csw/mgar/pkg/libldns/trunk/Makefile csw/mgar/pkg/libldns/trunk/checksums Deleted: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile 2010-11-08 19:11:36 UTC (rev 11527) +++ csw/mgar/pkg/libldns/trunk/Makefile 2010-11-09 13:44:04 UTC (rev 11530) @@ -1,62 +0,0 @@ -GARNAME = ldns -GARVERSION = 1.6.6 -CATEGORIES = lib - -DESCRIPTION = A library for programs conforming to DNS RFCs and drafts -define BLURB - Ldns is a library to simplify implementation of recent DNS RFCs. The goal - is to allow depelopers to easily create software conforming to current RFCs - and experimental software for current Internet drafts. - Because ldns is written in C it should be a lot faster than Perl or other - scripting languages. -endef - -MASTER_SITES = http://www.nlnetlabs.nl/downloads/ldns/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWldns.doxyparse.diff - -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 - -PACKAGES = CSWldns CSWldnsdevel -CATALOGNAME_CSWldns = ldns -CATALOGNAME_CSWldnsdevel = ldns_devel - -SPKG_DESC_CSWldns = $(DESCRIPTION) -SPKG_DESC_CSWldnsdevel = $(DESCRIPTION) development package -CHECKPKG_OVERRIDES_CSWldnsdevel += surplus-dependency|CSWldns - -SPKG_SOURCEURL = http://www.nlnetlabs.nl/projects/ldns/ - -# 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 = http://www.nlnetlabs.nl/downloads/ldns - -LICENSE = LICENSE - -BUILD64 = 1 -EXTRA_BUILD_ISAS_i386 = pentium_pro -EXTRA_BUILD_ISAS_sparc = sparcv8plus - -RUNTIME_DEP_PKGS_CSWldns += CSWosslrt -RUNTIME_DEP_PKGS_CSWldnsdevel += CSWldns - -PATCHFILES = CSWldns.doxyparse.diff - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-ssl=/opt/csw -CONFIGURE_ARGS += --enable-sha2 - -MERGE_DIRS_isa-sparcv9 = $(libdir) -MERGE_DIRS_isa-sparcv8plus = $(libdir) -MERGE_DIRS_isa-amd64 = $(libdir) -MERGE_DIRS_isa-pentium_pro = $(libdir) - -TEST_TARGET = - -PKGFILES_CSWldnsdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWldnsrt = $(PKGFILES_RT) - -include gar/category.mk Copied: csw/mgar/pkg/libldns/trunk/Makefile (from rev 11529, csw/mgar/pkg/ldns/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libldns/trunk/Makefile 2010-11-09 13:44:04 UTC (rev 11530) @@ -0,0 +1,68 @@ +GARNAME = ldns +GARVERSION = 1.6.7 +CATEGORIES = lib + +DESCRIPTION = A library for programs conforming to DNS RFCs and drafts +define BLURB + Ldns is a library to simplify implementation of recent DNS RFCs. The goal + is to allow depelopers to easily create software conforming to current RFCs + and experimental software for current Internet drafts. + Because ldns is written in C it should be a lot faster than Perl or other + scripting languages. +endef + +MASTER_SITES = http://www.nlnetlabs.nl/downloads/ldns/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWldns.doxyparse.diff + +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 + +PACKAGES = CSWlibldns1 CSWlibldnsdevel +CATALOGNAME_CSWlibldns1 = libldns1 +CATALOGNAME_CSWldnsdevel = libldns_devel + +SPKG_DESC_CSWlibldns1 = $(DESCRIPTION) +SPKG_DESC_CSWlibldnsdevel = $(DESCRIPTION) development package +CHECKPKG_OVERRIDES_CSWlibldnsdevel += surplus-dependency|CSWlibldns1 + +SPKG_SOURCEURL = http://www.nlnetlabs.nl/projects/ldns/ + +# 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 = http://www.nlnetlabs.nl/downloads/ldns + +LICENSE = LICENSE + +BUILD64 = 1 +EXTRA_BUILD_ISAS_i386 = pentium_pro +EXTRA_BUILD_ISAS_sparc = sparcv8plus + +RUNTIME_DEP_PKGS_CSWlibldns1 += CSWosslrt +RUNTIME_DEP_PKGS_CSWldnsdevel += CSWlibldns1 + +INCOMPATIBLE_PKGS_CSWlibldns1 = CSWldns +INCOMPATIBLE_PKGS_CSWldnsdevel = CSWldnsdevel + +PATCHFILES = CSWldns.doxyparse.diff + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-ssl=/opt/csw +CONFIGURE_ARGS += --enable-sha2 + +# Gost requiers OpenSSL 1.0 +CONFIGURE_ARGS += --disable-gost + +MERGE_DIRS_isa-sparcv9 = $(libdir) +MERGE_DIRS_isa-sparcv8plus = $(libdir) +MERGE_DIRS_isa-amd64 = $(libdir) +MERGE_DIRS_isa-pentium_pro = $(libdir) + +TEST_TARGET = + +PKGFILES_CSWlibldnsdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibldnsrt = $(PKGFILES_RT) + +include gar/category.mk Deleted: csw/mgar/pkg/libldns/trunk/checksums =================================================================== --- csw/mgar/pkg/ldns/trunk/checksums 2010-11-08 19:11:36 UTC (rev 11527) +++ csw/mgar/pkg/libldns/trunk/checksums 2010-11-09 13:44:04 UTC (rev 11530) @@ -1,2 +0,0 @@ -b5516aacfa819947cbfb6d0c34f0c546 CSWldns.doxyparse.diff -f2bff31764c98aa69749070a21199164 ldns-1.6.6.tar.gz Copied: csw/mgar/pkg/libldns/trunk/checksums (from rev 11529, csw/mgar/pkg/ldns/trunk/checksums) =================================================================== --- csw/mgar/pkg/libldns/trunk/checksums (rev 0) +++ csw/mgar/pkg/libldns/trunk/checksums 2010-11-09 13:44:04 UTC (rev 11530) @@ -0,0 +1 @@ +7c0c50ee6b91ae6b713616b70005ad03 ldns-1.6.7.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 Nov 9 14:47:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Nov 2010 13:47:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[11531] csw/mgar/pkg/libnet/branches/1.1.x Message-ID: Revision: 11531 http://gar.svn.sourceforge.net/gar/?rev=11531&view=rev Author: dmichelsen Date: 2010-11-09 13:47:37 +0000 (Tue, 09 Nov 2010) Log Message: ----------- libnet/1.1.x: Update to 1.1.5 among several fixes Modified Paths: -------------- csw/mgar/pkg/libnet/branches/1.1.x/Makefile csw/mgar/pkg/libnet/branches/1.1.x/checksums Added Paths: ----------- csw/mgar/pkg/libnet/branches/1.1.x/files/0001-Fix-missing-uint-instead-of-u_int.patch Removed Paths: ------------- csw/mgar/pkg/libnet/branches/1.1.x/files/CSWlibnet.gspec csw/mgar/pkg/libnet/branches/1.1.x/files/buildpatch csw/mgar/pkg/libnet/branches/1.1.x/files/libnet-cq-end-loop.patch csw/mgar/pkg/libnet/branches/1.1.x/files/libnet.pc.in csw/mgar/pkg/libnet/branches/1.1.x/files/libnet_build_ntp.patch csw/mgar/pkg/libnet/branches/1.1.x/files/libnet_checksum.c.patch csw/mgar/pkg/libnet/branches/1.1.x/files/libnet_pblock_coalesce_leak.patch csw/mgar/pkg/libnet/branches/1.1.x/files/ltmain.sh Modified: csw/mgar/pkg/libnet/branches/1.1.x/Makefile =================================================================== --- csw/mgar/pkg/libnet/branches/1.1.x/Makefile 2010-11-09 13:44:04 UTC (rev 11530) +++ csw/mgar/pkg/libnet/branches/1.1.x/Makefile 2010-11-09 13:47:37 UTC (rev 11531) @@ -1,5 +1,5 @@ GARNAME = libnet -GARVERSION = 1.1.4 +GARVERSION = 1.1.5 CATEGORIES = lib DESCRIPTION = The libnet packet construction library @@ -18,61 +18,62 @@ SF_PROJ = libnet-dev MASTER_SITES = $(SF_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += libnet.so.1.0.2.i +DISTFILES += libnet.so.1.0.2.s +PATCHFILES = 0001-Fix-missing-uint-instead-of-u_int.patch LICENSE = doc/COPYING UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://github.com/sam-github/libnet +VENDOR_URL = http://github.com/sam-github/libnet -BUILD64 = 1 +PACKAGES = CSWlibnet CSWlibnet1 CSWlibnetdevel -#PATCHFILES = buildpatch -#PATCHFILES += libnet_pblock_coalesce_leak.patch -#PATCHFILES += libnet-cq-end-loop.patch -#PATCHFILES += libnet_build_ntp.patch -#PATCHFILES += libnet_checksum.c.patch +CATALOGNAME_CSWlibnet = libnet +CATALOGNAME_CSWlibnet1 = libnet1 +CATALOGNAME_CSWlibnetdevel = libnet_devel +SPKG_DESC_CSWlibnet = Libnet Package Construction Library (Legacy) +SPKG_DESC_CSWlibnet1 = Libnet Package Construction Library +SPKG_DESC_CSWlibnetdevel = Libnet Development Files + +RUNTIME_DEP_PKGS_CSWlibnetdevel = CSWlibnet1 + +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -TEST_SCRIPTS = +TEST_TARGET = check +PKGFILES_CSWlibnet = $(libdir)/libnet.so +PKGFILES_CSWlibnet += $(libdir)/libnet.so.1.0.2 +PKGFILES_CSWlibnet1 = $(call baseisadirs,$(libdir),[^/]*\.so\.1) +PKGFILES_CSWlibnet1 += $(call baseisadirs,$(libdir),[^/]*\.so\.1\.6(\.\d+)*) + +# These overrides are for the legacy library which should just +# stay the way it is. +CHECKPKG_OVERRIDES_CSWlibnet += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libnet.so +CHECKPKG_OVERRIDES_CSWlibnet += bad-rpath-entry +# CHECKPKG_OVERRIDES_CSWlibnet += bad-rpath-entry|$ORIGIN/../lib|opt/csw/lib/libnet.so.1.0.2 +CHECKPKG_OVERRIDES_CSWlibnet += shared-lib-pkgname-mismatch|file=opt/csw/lib/libnet.so.1.0.2|soname=libnet.so.1.0.2|pkgname=CSWlibnet|expected=['CSWlibnet1-0-2'] +CHECKPKG_OVERRIDES_CSWlibnet += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libnet.so + include gar/category.mk -#post-extract-$(MODULATION): -# ( cp $(FILEDIR)/ltmain.sh $(WORKROOTDIR)/build-$(MODULATION)/$(DISTNAME) ) -# ( cp $(FILEDIR)/libnet.pc.in $(WORKROOTDIR)/build-$(MODULATION)/$(DISTNAME)/src ) -# @$(MAKECOOKIE) -# -#post-install-modulated: -# @ginstall -d $(DESTDIR)$(bindir) -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/libnet-config $(DESTDIR)$(bindir) -# @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/BUGS $(DESTDIR)$(docdir)/$(GARNAME) -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/CHANGELOG $(DESTDIR)$(docdir)/$(GARNAME) -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/CONTRIB $(DESTDIR)$(docdir)/$(GARNAME) -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/COPYING $(DESTDIR)$(docdir)/$(GARNAME) -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/DESIGN_NOTES $(DESTDIR)$(docdir)/$(GARNAME) -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/MIGRATION $(DESTDIR)$(docdir)/$(GARNAME) -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/PACKET_BUILDING $(DESTDIR)$(docdir)/$(GARNAME) -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/PORTED $(DESTDIR)$(docdir)/$(GARNAME) -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/RAWSOCKET_NON_SEQUITUR $(DESTDIR)$(docdir)/$(GARNAME) -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/TODO $(DESTDIR)$(docdir)/$(GARNAME) -# @ginstall -d $(DESTDIR)$(mandir)/man3 -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-functions.h.3 $(DESTDIR)$(mandir)/man3 -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-headers.h.3 $(DESTDIR)$(mandir)/man3 -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-macros.h.3 $(DESTDIR)$(mandir)/man3 -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet.h.3 $(DESTDIR)$(mandir)/man3 -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet_802_1q_hdr.3 $(DESTDIR)$(mandir)/man3 -# @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet_802_1x_hdr.3 $(DESTDIR)$(mandir)/man3 -# @$(MAKECOOKIE) +post-install-isa-sparcv8: + ginstall -d $(DESTDIR)$(libdir) + cp $(WORKDIR)/libnet.so.1.0.2.s $(DESTDIR)$(libdir)/libnet.so.1.0.2 + rm $(DESTDIR)$(libdir)/libnet.so + ln -s libnet.so.1.0.2 $(DESTDIR)$(libdir)/libnet.so + mkdir $(DESTDIR)$(libdir)/libnet-new + ln -s ../libnet.so.1 $(DESTDIR)$(libdir)/libnet-new/libnet.so + @$(MAKECOOKIE) -#post-install-isa-sparcv8: -# @ginstall -d $(DESTDIR)$(libdir) -# @cp $(FILEDIR)/libnet.so.1.0.2.s $(INSTALLISADIR)/opt/csw/lib/libnet.so.1.0.2 -# @$(MAKECOOKIE) -# -#post-install-isa-i386: -# @ginstall -d $(DESTDIR)$(libdir) -# @cp $(FILEDIR)/libnet.so.1.0.2.i $(INSTALLISADIR)/opt/csw/lib/libnet.so.1.0.2 -# @$(MAKECOOKIE) +post-install-isa-i386: + ginstall -d $(DESTDIR)$(libdir) + cp $(WORKDIR)/libnet.so.1.0.2.i $(DESTDIR)$(libdir)/libnet.so.1.0.2 + rm $(DESTDIR)$(libdir)/libnet.so + ln -s libnet.so.1.0.2 $(DESTDIR)$(libdir)/libnet.so + mkdir $(DESTDIR)$(libdir)/libnet-new + ln -s ../libnet.so.1 $(DESTDIR)$(libdir)/libnet-new/libnet.so + @$(MAKECOOKIE) Modified: csw/mgar/pkg/libnet/branches/1.1.x/checksums =================================================================== --- csw/mgar/pkg/libnet/branches/1.1.x/checksums 2010-11-09 13:44:04 UTC (rev 11530) +++ csw/mgar/pkg/libnet/branches/1.1.x/checksums 2010-11-09 13:47:37 UTC (rev 11531) @@ -1 +1 @@ -c5e06418a89cc4209f677a776a798fd9 libnet-1.1.4.tar.gz +a9bc1d75a610efcfee200d3e28d8eb8f libnet-1.1.5.tar.gz Added: csw/mgar/pkg/libnet/branches/1.1.x/files/0001-Fix-missing-uint-instead-of-u_int.patch =================================================================== --- csw/mgar/pkg/libnet/branches/1.1.x/files/0001-Fix-missing-uint-instead-of-u_int.patch (rev 0) +++ csw/mgar/pkg/libnet/branches/1.1.x/files/0001-Fix-missing-uint-instead-of-u_int.patch 2010-11-09 13:47:37 UTC (rev 11531) @@ -0,0 +1,64 @@ +From 08bbc551da84a5cf9507dc3801a32d3092ea5e03 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 9 Nov 2010 13:15:42 +0100 +Subject: [PATCH] Fix missing uint instead of u_int + +--- + include/libnet/libnet-functions.h | 4 ++-- + src/libnet_build_icmp.c | 6 +++--- + src/libnet_checksum.c | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/include/libnet/libnet-functions.h b/include/libnet/libnet-functions.h +index ad70d12..eff534e 100644 +--- a/include/libnet/libnet-functions.h ++++ b/include/libnet/libnet-functions.h +@@ -791,8 +791,8 @@ const uint8_t* payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag); + * @return protocol tag value on success, -1 on error + */ + libnet_ptag_t +-libnet_build_icmpv6_unreach(u_int8_t type, u_int8_t code, u_int16_t sum, +-u_int8_t *payload, u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag); ++libnet_build_icmpv6_unreach(uint8_t type, uint8_t code, uint16_t sum, ++uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag); + + /** + * Builds an RFC 1112 Internet Group Memebership Protocol (IGMP) header. +diff --git a/src/libnet_build_icmp.c b/src/libnet_build_icmp.c +index 90a64bd..ee31d1a 100644 +--- a/src/libnet_build_icmp.c ++++ b/src/libnet_build_icmp.c +@@ -397,10 +397,10 @@ bad: + + + libnet_ptag_t +-libnet_build_icmpv6_unreach(u_int8_t type, u_int8_t code, u_int16_t sum, +-u_int8_t *payload, u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) ++libnet_build_icmpv6_unreach(uint8_t type, uint8_t code, uint16_t sum, ++uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag) + { +- u_int32_t n, h; ++ uint32_t n, h; + libnet_pblock_t *p; + struct libnet_icmpv6_hdr icmp_hdr; + +diff --git a/src/libnet_checksum.c b/src/libnet_checksum.c +index d2c25a5..07799ad 100644 +--- a/src/libnet_checksum.c ++++ b/src/libnet_checksum.c +@@ -345,10 +345,10 @@ libnet_inet_checksum(libnet_t *l, uint8_t *iphdr, int protocol, int h_len, const + icmph_p->icmp_sum = 0; + if (is_ipv6) + { +- sum = libnet_in_cksum((u_int16_t *)&ip6h_p->ip_src, 32); ++ sum = libnet_in_cksum((uint16_t *)&ip6h_p->ip_src, 32); + sum += ntohs(IPPROTO_ICMP6 + h_len); + } +- sum += libnet_in_cksum((u_int16_t *)icmph_p, h_len); ++ sum += libnet_in_cksum((uint16_t *)icmph_p, h_len); + icmph_p->icmp_sum = LIBNET_CKSUM_CARRY(sum); + break; + } +-- +1.7.3 + Deleted: csw/mgar/pkg/libnet/branches/1.1.x/files/CSWlibnet.gspec =================================================================== --- csw/mgar/pkg/libnet/branches/1.1.x/files/CSWlibnet.gspec 2010-11-09 13:44:04 UTC (rev 11530) +++ csw/mgar/pkg/libnet/branches/1.1.x/files/CSWlibnet.gspec 2010-11-09 13:47:37 UTC (rev 11531) @@ -1,4 +0,0 @@ -%var bitname libnet -%var pkgname CSWlibnet -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/libnet/branches/1.1.x/files/buildpatch =================================================================== --- csw/mgar/pkg/libnet/branches/1.1.x/files/buildpatch 2010-11-09 13:44:04 UTC (rev 11530) +++ csw/mgar/pkg/libnet/branches/1.1.x/files/buildpatch 2010-11-09 13:47:37 UTC (rev 11531) @@ -1,42360 +0,0 @@ -diff -ru libnet.orig/Makefile.in libnet/Makefile.in ---- libnet.orig/Makefile.in 2004-03-11 19:50:20.000000000 +0100 -+++ libnet/Makefile.in 2009-03-09 16:58:48.160768448 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.10.2 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -14,7 +14,7 @@ - - @SET_MAKE@ - --# $Id: Makefile.in,v 1.16 2004/03/11 18:50:20 mike Exp $ -+# $Id: Makefile.am,v 1.7 2004/03/01 20:26:11 mike Exp $ - # - # Libnet automake information file - # Copyright (c) 1998 - 2004 Mike D. Schiffman -@@ -22,139 +22,251 @@ - # - # Process this file with automake to produce a Makefile.in script. - --# $Id: Makefile.in,v 1.16 2004/03/11 18:50:20 mike Exp $ -+# $Id: Makefile.am.common,v 1.3 2004/01/03 20:31:00 mike Exp $ - # - # Libnet automake information file - # Copyright (c) 1998 - 2004 Mike D. Schiffman - # All rights reserved. - # --SHELL = @SHELL@ -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = . -- --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_alias = @build_alias@ - build_triplet = @build@ --host_alias = @host_alias@ - host_triplet = @host@ --target_alias = @target_alias@ - target_triplet = @target@ -- --EXEEXT = @EXEEXT@ --OBJEXT = @OBJEXT@ --PATH_SEPARATOR = @PATH_SEPARATOR@ -+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(srcdir)/libnet-config.in \ -+ $(srcdir)/version.h.in $(top_srcdir)/Makefile.am.common \ -+ $(top_srcdir)/configure acconfig.h config.guess config.sub \ -+ install-sh ltmain.sh missing mkinstalldirs -+subdir = . -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -+ configure.lineno config.status.lineno -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/include/config.h -+CONFIG_CLEAN_FILES = version.h libnet-config -+depcomp = -+am__depfiles_maybe = -+SOURCES = -+DIST_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 -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+distdir = $(PACKAGE)-$(VERSION) -+top_distdir = $(distdir) -+am__remove_distdir = \ -+ { test ! -d $(distdir) \ -+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -fr $(distdir); }; } -+DIST_ARCHIVES = $(distdir).tar.gz -+GZIP_ENV = --best -+distuninstallcheck_listfiles = find . -type f -print -+distcleancheck_listfiles = find . -type f -print -+ACLOCAL = @ACLOCAL@ - ADDITIONAL_LIBS = @ADDITIONAL_LIBS@ - AMTAR = @AMTAR@ -+AR = @AR@ -+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 = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ - ENDIANESS = @ENDIANESS@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+GREP = @GREP@ - HAVE_PACKET_SOCKET = @HAVE_PACKET_SOCKET@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBNET_AGE = @LIBNET_AGE@ - LIBNET_CONFIG_CFLAGS = @LIBNET_CONFIG_CFLAGS@ - LIBNET_CONFIG_DEFINES = @LIBNET_CONFIG_DEFINES@ - LIBNET_CONFIG_LIBS = @LIBNET_CONFIG_LIBS@ -+LIBNET_CURRENT = @LIBNET_CURRENT@ -+LIBNET_REVISION = @LIBNET_REVISION@ - LIBNET_VERSION = @LIBNET_VERSION@ -+LIBNET_VERSION_INFO = @LIBNET_VERSION_INFO@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ -+LIBTOOL = @LIBTOOL@ -+LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - RANLIB = @RANLIB@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ - VERSION = @VERSION@ -+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@ -+ac_ct_F77 = @ac_ct_F77@ - 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@ -+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@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+sysconfdir = @sysconfdir@ -+target = @target@ -+target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ -+top_build_prefix = @top_build_prefix@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign no-dependencies -- - DISTCLEANFILES = *~ -- - SUBDIRS = include src sample -- - EXTRA_DIST = Makefile.am.common -- - bin_scripts = libnet-config --subdir = . --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/include/config.h --CONFIG_CLEAN_FILES = version.h libnet-config --depcomp = --am__depfiles_maybe = --DIST_SOURCES = -- --RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ -- uninstall-info-recursive all-recursive install-data-recursive \ -- install-exec-recursive installdirs-recursive install-recursive \ -- uninstall-recursive check-recursive installcheck-recursive --DIST_COMMON = README Makefile.am Makefile.in acconfig.h acinclude.m4 \ -- aclocal.m4 config.guess config.sub configure configure.in \ -- install-sh libnet-config.in missing mkinstalldirs version.h.in --DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: -- --am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -- configure.lineno --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4) -+am--refresh: -+ @: -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ -+ cd $(srcdir) && $(AUTOMAKE) --foreign \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ echo ' $(SHELL) ./config.status'; \ -+ $(SHELL) ./config.status;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ -+ esac; - --$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck --$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) -- cd $(srcdir) && $(AUTOCONF) - --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(srcdir) && $(AUTOCONF) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) --version.h: $(top_builddir)/config.status version.h.in -+version.h: $(top_builddir)/config.status $(srcdir)/version.h.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --libnet-config: $(top_builddir)/config.status libnet-config.in -+libnet-config: $(top_builddir)/config.status $(srcdir)/libnet-config.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --uninstall-info-am: -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool config.lt - - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. -@@ -163,7 +275,13 @@ - # (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): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @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 \ -@@ -175,15 +293,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(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)' ;; \ -@@ -204,44 +327,67 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -- --ETAGS = etags --ETAGSFLAGS = -- --tags: TAGS -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (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; } \ -- END { for (i in files) print i; }'`; \ -+ $(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) - tags=; \ - 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 && tags="$$tags -i $$here/$$subdir/TAGS"; \ -+ test ! -f $$subdir/TAGS || \ -+ tags="$$tags $$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; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ 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)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - - GTAGS: -@@ -250,34 +396,26 @@ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = . --distdir = $(PACKAGE)-$(VERSION) -- --am__remove_distdir = \ -- { test ! -d $(distdir) \ -- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -- && rm -fr $(distdir); }; } -- --GZIP_ENV = --best --distcleancheck_listfiles = find . -type f -print -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) - $(am__remove_distdir) -- mkdir $(distdir) -- $(mkinstalldirs) $(distdir)/. $(distdir)/include -- @list='$(DISTFILES)'; for file in $$list; do \ -+ test -d $(distdir) || mkdir $(distdir) -+ @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; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -288,15 +426,19 @@ - || exit 1; \ - fi; \ - done -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d $(distdir)/$$subdir \ -- || mkdir $(distdir)/$$subdir \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -304,29 +446,63 @@ - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ -- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ -+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) - dist-gzip: distdir -- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(am__remove_distdir) -+ -+dist-bzip2: distdir -+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 -+ $(am__remove_distdir) -+ -+dist-lzma: distdir -+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma -+ $(am__remove_distdir) -+ -+dist-tarZ: distdir -+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z -+ $(am__remove_distdir) -+ -+dist-shar: distdir -+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz -+ $(am__remove_distdir) -+ -+dist-zip: distdir -+ -rm -f $(distdir).zip -+ zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - - dist dist-all: distdir -- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - - # This target untars the dist file and tries a VPATH configuration. Then - # it guarantees that the distribution is self-contained by making another - # tarfile. - distcheck: dist -- $(am__remove_distdir) -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - -+ case '$(DIST_ARCHIVES)' in \ -+ *.tar.gz*) \ -+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ -+ *.tar.bz2*) \ -+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ *.tar.lzma*) \ -+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ -+ *.tar.Z*) \ -+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ -+ *.shar.gz*) \ -+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ -+ *.zip*) \ -+ unzip $(distdir).zip ;;\ -+ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) -- mkdir $(distdir)/=build -- mkdir $(distdir)/=inst -+ mkdir $(distdir)/_build -+ mkdir $(distdir)/_inst - chmod a-w $(distdir) -- dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ -- && cd $(distdir)/=build \ -- && ../configure --srcdir=.. --prefix=$$dc_install_base \ -+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ -+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ -+ && cd $(distdir)/_build \ -+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ -@@ -334,23 +510,40 @@ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ -- && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ -- || { echo "ERROR: files left after uninstall:" ; \ -- find $$dc_install_base -type f -print ; \ -- exit 1; } >&2 ) \ -- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ -- && rm -f $(distdir).tar.gz \ -+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ -+ distuninstallcheck \ -+ && chmod -R a-w "$$dc_install_base" \ -+ && ({ \ -+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ -+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ -+ } || { rm -rf "$$dc_destdir"; exit 1; }) \ -+ && rm -rf "$$dc_destdir" \ -+ && $(MAKE) $(AM_MAKEFLAGS) dist \ -+ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) -- @echo "$(distdir).tar.gz is ready for distribution" | \ -- sed 'h;s/./=/g;p;x;p;x' -+ @(echo "$(distdir) archives ready for distribution: "; \ -+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ -+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -+distuninstallcheck: -+ @cd $(distuninstallcheck_dir) \ -+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -+ || { echo "ERROR: files left after uninstall:" ; \ -+ if test -n "$(DESTDIR)"; then \ -+ echo " (check DESTDIR support)"; \ -+ fi ; \ -+ $(distuninstallcheck_listfiles) ; \ -+ exit 1; } >&2 - distcleancheck: distclean -- if test '$(srcdir)' = . ; then \ -+ @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi -- test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ -- || { echo "ERROR: files left after distclean:" ; \ -+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ -+ || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 - check-am: all-am -@@ -358,7 +551,6 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -- - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -370,7 +562,7 @@ - installcheck: installcheck-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- INSTALL_STRIP_FLAG=-s \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -378,7 +570,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -386,57 +578,80 @@ - @echo "it deletes files that may require special tools to rebuild." - clean: clean-recursive - --clean-am: clean-generic mostlyclean-am -+clean-am: clean-generic clean-libtool mostlyclean-am - - distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) --distclean-am: clean-am distclean-generic distclean-tags -+ -rm -f Makefile -+distclean-am: clean-am distclean-generic distclean-libtool \ -+ distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: - - install-data-am: - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) -- -rm -rf autom4te.cache -+ -rm -rf $(top_srcdir)/autom4te.cache -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-recursive - --mostlyclean-am: mostlyclean-generic -+mostlyclean-am: mostlyclean-generic mostlyclean-libtool -+ -+pdf: pdf-recursive - --uninstall-am: uninstall-info-am -+pdf-am: - --uninstall-info: uninstall-info-recursive -+ps: ps-recursive - --.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ -- clean-generic clean-recursive dist dist-all dist-gzip distcheck \ -- distclean distclean-generic distclean-recursive distclean-tags \ -- distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ -- info-recursive install install-am install-data install-data-am \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-man install-recursive \ -- install-strip installcheck installcheck-am installdirs \ -- installdirs-am installdirs-recursive maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -- mostlyclean-generic mostlyclean-recursive tags tags-recursive \ -- uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-recursive -+ps-am: -+ -+uninstall-am: -+ -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip -+ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am am--refresh check check-am clean clean-generic \ -+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ -+ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ -+ distclean distclean-generic distclean-libtool distclean-tags \ -+ distcleancheck distdir distuninstallcheck 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-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am - - # 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. -diff -ru libnet.orig/acinclude.m4 libnet/acinclude.m4 ---- libnet.orig/acinclude.m4 2004-01-16 00:53:06.000000000 +0100 -+++ libnet/acinclude.m4 2009-03-10 00:34:01.428768705 +0100 -@@ -11,7 +11,7 @@ - dnl usage: AC_LIBNET_LINUX_PROCFS - dnl results: HAVE_LINUX_PROCFS - dnl --AC_DEFUN(AC_LIBNET_LINUX_PROCFS, -+AC_DEFUN([AC_LIBNET_LINUX_PROCFS], - [AC_MSG_CHECKING(for Linux proc filesystem) - AC_CACHE_VAL(ac_cv_libnet_linux_procfs, - if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" ; then -@@ -37,15 +37,15 @@ - dnl HAVE_PACKET_SOCKET (DEFINED) - dnl - --AC_DEFUN(AC_LIBNET_CHECK_PF_PACKET, -+AC_DEFUN([AC_LIBNET_CHECK_PF_PACKET], - [ - AC_MSG_CHECKING(for packet socket (PF_SOCKET)) -- AC_CACHE_VAL(ac_libnet_have_packet_socket, -+ AC_CACHE_VAL(ac_cv_libnet_have_packet_socket, - - [case "$target_os" in - - linux) -- ac_libnet_have_packet_socket = no -+ ac_cv_libnet_have_packet_socket = no - ;; - *) - -@@ -94,17 +94,17 @@ - - # Oopz 4.3 BSD doesn't have this. Sorry. - if test ! -x ./pf_packet-test ; then -- ac_libnet_have_packet_socket=choked -+ ac_cv_libnet_have_packet_socket=choked - else -- ac_libnet_have_packet_socket=`./pf_packet-test`; -+ ac_cv_libnet_have_packet_socket=`./pf_packet-test`; - fi -- if test $ac_libnet_have_packet_socket = choked; then -+ if test $ac_cv_libnet_have_packet_socket = choked; then - AC_MSG_RESULT(test program compile choked... assuming no) -- elif test $ac_libnet_have_packet_socket = yes; then -+ elif test $ac_cv_libnet_have_packet_socket = yes; then - AC_MSG_RESULT(yes) -- elif test $ac_libnet_have_packet_socket = probably; then -+ elif test $ac_cv_libnet_have_packet_socket = probably; then - AC_MSG_RESULT(test program got EPERM... assuming yes) -- elif test $ac_libnet_have_packet_socket = no; then -+ elif test $ac_cv_libnet_have_packet_socket = no; then - AC_MSG_RESULT(no) - fi - -@@ -112,7 +112,7 @@ - ;; - esac]) - -- if test $ac_libnet_have_packet_socket = yes -o $ac_libnet_have_packet_socket = probably; then -+ if test $ac_cv_libnet_have_packet_socket = yes -o $ac_cv_libnet_have_packet_socket = probably; then - AC_DEFINE(HAVE_PACKET_SOCKET) - fi - ]) -@@ -131,17 +131,17 @@ - dnl - dnl - --AC_DEFUN(AC_LIBNET_CHECK_LIBNET_VER, -+AC_DEFUN([AC_LIBNET_CHECK_LIBNET_VER], - [ - AC_CHECK_LIB(net, libnet_build_ip, AC_MSG_CHECKING(version) \ - - changequote(<<, >>)dnl -- if [[ ! -f $LIB_PREFIX/libnet.a ]] ; then -+ if [[ ! -f $LIB_PREFIX/libnet.la ]] ; then - changequote([, ])dnl -- AC_MSG_RESULT($LIB_PREFIX/libnet.a doesn't exist) -+ AC_MSG_RESULT($LIB_PREFIX/libnet.la doesn't exist) - AC_MSG_RESULT(previous libnet install lives elsewhere, you should probably find it) - else -- __LIBNET_VERSION=`strings $LIB_PREFIX/libnet.a | grep "libnet version"\ -+ __LIBNET_VERSION=`strings $LIB_PREFIX/libnet.la | grep "libnet version"\ - | cut -f3 -d" "`;\ - if test -z "$__LIBNET_VERSION"; then - AC_MSG_RESULT(<0.8) -@@ -166,7 +166,7 @@ - dnl HAVE_STRUCT_IP_CSUM (DEFINED) - dnl - --AC_DEFUN(AC_LIBNET_CHECK_IP_CSUM, -+AC_DEFUN([AC_LIBNET_CHECK_IP_CSUM], - [ - AC_MSG_CHECKING([struct ip contains ip_csum]) - AC_TRY_COMPILE([ -@@ -199,7 +199,7 @@ - dnl LBL_ALIGN (DEFINED) - dnl - --AC_DEFUN(AC_LBL_UNALIGNED_ACCESS, -+AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], - [AC_MSG_CHECKING(if unaligned accesses fail) - AC_CACHE_VAL(ac_cv_lbl_unaligned_fail, - [case "$target_cpu" in -@@ -278,7 +278,7 @@ - dnl LIBNET_LIL_ENDIAN = 1 - dnl - --AC_DEFUN(AC_LIBNET_ENDIAN_CHECK, -+AC_DEFUN([AC_LIBNET_ENDIAN_CHECK], - [AC_MSG_CHECKING(machine endianess) - - cat > conftest.c << EOF -@@ -439,7 +439,7 @@ - dnl statically and happen to have a libresolv.a lying around (and no - dnl libnsl.a). - dnl --AC_DEFUN(AC_LBL_LIBRARY_NET, [ -+AC_DEFUN([AC_LBL_LIBRARY_NET], [ - # Most operating systems have gethostbyname() in the default searched - # libraries (i.e. libc): - AC_CHECK_FUNC(gethostbyname, , -diff -ru libnet.orig/aclocal.m4 libnet/aclocal.m4 ---- libnet.orig/aclocal.m4 2004-03-01 21:26:11.000000000 +0100 -+++ libnet/aclocal.m4 2009-03-09 16:58:13.599561854 +0100 -@@ -1,7 +1,7 @@ --# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- -+# generated automatically by aclocal 1.10.2 -*- Autoconf -*- - --# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 --# Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -11,771 +11,6622 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --dnl $Id: aclocal.m4,v 1.9 2004/03/01 20:26:11 mike Exp $ --dnl --dnl Libnet specific autoconf macros --dnl Copyright (c) 1998 - 2004 Mike D. Schiffman --dnl All rights reserved. --dnl -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -+[m4_warning([this file was generated for autoconf 2.63. -+You have another version of autoconf. It may work, but is not guaranteed to. -+If you have problems, you may need to regenerate the build system entirely. -+To do so, use the procedure documented by the package, typically `autoreconf'.])]) -+ -+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -+ -+# serial 51 AC_PROG_LIBTOOL -+ -+ -+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -+# ----------------------------------------------------------- -+# If this macro is not defined by Autoconf, define it here. -+m4_ifdef([AC_PROVIDE_IFELSE], -+ [], -+ [m4_define([AC_PROVIDE_IFELSE], -+ [m4_ifdef([AC_PROVIDE_$1], -+ [$2], [$3])])]) - --dnl --dnl Check for the Linux /proc filesystem --dnl --dnl usage: AC_LIBNET_LINUX_PROCFS --dnl results: HAVE_LINUX_PROCFS --dnl --AC_DEFUN(AC_LIBNET_LINUX_PROCFS, -- [AC_MSG_CHECKING(for Linux proc filesystem) -- AC_CACHE_VAL(ac_cv_libnet_linux_procfs, -- if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" ; then -- ac_cv_libnet_linux_procfs=yes -- else -- ac_cv_libnet_linux_procfs=no -- fi) -- AC_MSG_RESULT($ac_cv_libnet_linux_procfs) -- if test $ac_cv_libnet_linux_procfs = yes ; then -- AC_DEFINE(HAVE_LINUX_PROCFS, 1, -- [Define if you have the Linux /proc filesystem.]) -- fi]) - --dnl --dnl Checks to see if this linux kernel has a working PF_PACKET --dnl --dnl usage: --dnl --dnl AC_LIBNET_CHECK_PF_PACKET --dnl --dnl results: --dnl --dnl HAVE_PACKET_SOCKET (DEFINED) --dnl -+# AC_PROG_LIBTOOL -+# --------------- -+AC_DEFUN([AC_PROG_LIBTOOL], -+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. -+ AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [AC_LIBTOOL_CXX], -+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -+ ])]) -+dnl And a similar setup for Fortran 77 support -+ AC_PROVIDE_IFELSE([AC_PROG_F77], -+ [AC_LIBTOOL_F77], -+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -+])]) -+ -+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. -+ AC_PROVIDE_IFELSE([AC_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [ifdef([AC_PROG_GCJ], -+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -+ ifdef([A][M_PROG_GCJ], -+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -+ ifdef([LT_AC_PROG_GCJ], -+ [define([LT_AC_PROG_GCJ], -+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -+])])# AC_PROG_LIBTOOL -+ -+ -+# _AC_PROG_LIBTOOL -+# ---------------- -+AC_DEFUN([_AC_PROG_LIBTOOL], -+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -+ -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+ -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+AC_SUBST(LIBTOOL)dnl -+ -+# Prevent multiple expansion -+define([AC_PROG_LIBTOOL], []) -+])# _AC_PROG_LIBTOOL -+ -+ -+# AC_LIBTOOL_SETUP -+# ---------------- -+AC_DEFUN([AC_LIBTOOL_SETUP], -+[AC_PREREQ(2.50)dnl -+AC_REQUIRE([AC_ENABLE_SHARED])dnl -+AC_REQUIRE([AC_ENABLE_STATIC])dnl -+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_PROG_LD])dnl -+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -+AC_REQUIRE([AC_PROG_NM])dnl -+ -+AC_REQUIRE([AC_PROG_LN_S])dnl -+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -+AC_REQUIRE([AC_OBJEXT])dnl -+AC_REQUIRE([AC_EXEEXT])dnl -+dnl -+ -+AC_LIBTOOL_SYS_MAX_CMD_LEN -+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+AC_LIBTOOL_OBJDIR -+ -+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+_LT_AC_PROG_ECHO_BACKSLASH -+ -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+ fi -+ ;; -+esac - --AC_DEFUN(AC_LIBNET_CHECK_PF_PACKET, --[ -- AC_MSG_CHECKING(for packet socket (PF_SOCKET)) -- AC_CACHE_VAL(ac_libnet_have_packet_socket, -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed='sed -e 1s/^X//' -+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] -+ -+# Same as above, but do not quote variable references. -+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] -+ -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+ -+# Constants: -+rm="rm -f" -+ -+# Global variables: -+default_ofile=libtool -+can_build_shared=yes -+ -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+ltmain="$ac_aux_dir/ltmain.sh" -+ofile="$default_ofile" -+with_gnu_ld="$lt_cv_prog_gnu_ld" -+ -+AC_CHECK_TOOL(AR, ar, false) -+AC_CHECK_TOOL(RANLIB, ranlib, :) -+AC_CHECK_TOOL(STRIP, strip, :) -+ -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" -+ -+# Set sane defaults for various variables -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+test -z "$AS" && AS=as -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+test -z "$LD" && LD=ld -+test -z "$LN_S" && LN_S="ln -s" -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+test -z "$NM" && NM=nm -+test -z "$SED" && SED=sed -+test -z "$OBJDUMP" && OBJDUMP=objdump -+test -z "$RANLIB" && RANLIB=: -+test -z "$STRIP" && STRIP=: -+test -z "$ac_objext" && ac_objext=o -+ -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= -+ -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi - -- [case "$target_os" in -+_LT_CC_BASENAME([$compiler]) - -- linux) -- ac_libnet_have_packet_socket = no -- ;; -- *) -+# Only perform the check for file, if the check method requires it -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ AC_PATH_MAGIC -+ fi -+ ;; -+esac - -- cat > pf_packet-test.c << EOF --#include --#include --#include --#include --#include --#include /* for the glibc version number */ --#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 --#include --#include /* the L2 protocols */ --#else --#include --#include --#include /* The L2 protocols */ --#endif -- --#ifndef SOL_PACKET --#define SOL_PACKET 263 --#endif /* SOL_PACKET */ -- --int --main(int argc, char **argv) --{ -- int fd; -- -- fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); -- if (fd == -1) -- { -- if (errno == EPERM) -- { -- /* user's UID != 0 */ -- printf("probably"); -- exit (EXIT_FAILURE); -- } -- printf("no"); -- exit (EXIT_FAILURE); -- } -- printf("yes"); -- exit (EXIT_SUCCESS); --} --EOF -- ${CC-cc} -o pf_packet-test $CFLAGS pf_packet-test.c >/dev/null 2>&1 -+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -+enable_win32_dll=yes, enable_win32_dll=no) -+ -+AC_ARG_ENABLE([libtool-lock], -+ [AC_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+AC_ARG_WITH([pic], -+ [AC_HELP_STRING([--with-pic], -+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -+ [pic_mode="$withval"], -+ [pic_mode=default]) -+test -z "$pic_mode" && pic_mode=default -+ -+# Use C for the default configuration in the libtool script -+tagname= -+AC_LIBTOOL_LANG_C_CONFIG -+_LT_AC_TAGCONFIG -+])# AC_LIBTOOL_SETUP -+ -+ -+# _LT_AC_SYS_COMPILER -+# ------------------- -+AC_DEFUN([_LT_AC_SYS_COMPILER], -+[AC_REQUIRE([AC_PROG_CC])dnl -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+])# _LT_AC_SYS_COMPILER -+ -+ -+# _LT_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+AC_DEFUN([_LT_CC_BASENAME], -+[for cc_temp in $1""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+]) - -- # Oopz 4.3 BSD doesn't have this. Sorry. -- if test ! -x ./pf_packet-test ; then -- ac_libnet_have_packet_socket=choked -- else -- ac_libnet_have_packet_socket=`./pf_packet-test`; -- fi -- if test $ac_libnet_have_packet_socket = choked; then -- AC_MSG_RESULT(test program compile choked... assuming no) -- elif test $ac_libnet_have_packet_socket = yes; then -- AC_MSG_RESULT(yes) -- elif test $ac_libnet_have_packet_socket = probably; then -- AC_MSG_RESULT(test program got EPERM... assuming yes) -- elif test $ac_libnet_have_packet_socket = no; then -- AC_MSG_RESULT(no) -- fi - -- rm -f pf_packet-test* core core.pf_packet-test -- ;; -- esac]) -+# _LT_COMPILER_BOILERPLATE -+# ------------------------ -+# Check for compiler boilerplate output or warnings with -+# the simple compiler test code. -+AC_DEFUN([_LT_COMPILER_BOILERPLATE], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_COMPILER_BOILERPLATE - -- if test $ac_libnet_have_packet_socket = yes -o $ac_libnet_have_packet_socket = probably; then -- AC_DEFINE(HAVE_PACKET_SOCKET) -- fi --]) - --dnl --dnl Looks for a previous libnet version and attempts to determine which verion --dnl it is. Version 0.8 was the first version that actually knew internally --dnl what version it was. --dnl --dnl usage: --dnl --dnl AC_LIBNET_CHECK_LIBNET_VERSION --dnl --dnl results: --dnl --dnl --dnl -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+AC_DEFUN([_LT_LINKER_BOILERPLATE], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_LINKER_BOILERPLATE - --AC_DEFUN(AC_LIBNET_CHECK_LIBNET_VER, --[ -- AC_CHECK_LIB(net, libnet_build_ip, AC_MSG_CHECKING(version) \ - --changequote(<<, >>)dnl -- if [[ ! -f $LIB_PREFIX/libnet.a ]] ; then --changequote([, ])dnl -- AC_MSG_RESULT($LIB_PREFIX/libnet.a doesn't exist) -- AC_MSG_RESULT(previous libnet install lives elsewhere, you should probably find it) -- else -- __LIBNET_VERSION=`strings $LIB_PREFIX/libnet.a | grep "libnet version"\ -- | cut -f3 -d" "`;\ -- if test -z "$__LIBNET_VERSION"; then -- AC_MSG_RESULT(<0.8) -- else -- AC_MSG_RESULT($__LIBNET_VERSION) -- fi -- fi\ -- ) --]) -+# _LT_AC_SYS_LIBPATH_AIX -+# ---------------------- -+# Links a minimal program and checks the executable -+# for the system default hardcoded library path. In most cases, -+# this is /usr/lib:/lib, but when the MPI compilers are used -+# the location of the communication and MPI libs are included too. -+# If we don't find anything, use the default library path according -+# to the aix ld manual. -+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi],[]) -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+])# _LT_AC_SYS_LIBPATH_AIX - - --dnl --dnl Checks to see if this linux kernel uses ip_sum or ip_csum --dnl (Pulled from queso) --dnl --dnl usage: --dnl --dnl AC_LIBNET_CHECK_IP_CSUM --dnl --dnl results: --dnl --dnl HAVE_STRUCT_IP_CSUM (DEFINED) --dnl -+# _LT_AC_SHELL_INIT(ARG) -+# ---------------------- -+AC_DEFUN([_LT_AC_SHELL_INIT], -+[ifdef([AC_DIVERSION_NOTICE], -+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -+ [AC_DIVERT_PUSH(NOTICE)]) -+$1 -+AC_DIVERT_POP -+])# _LT_AC_SHELL_INIT -+ -+ -+# _LT_AC_PROG_ECHO_BACKSLASH -+# -------------------------- -+# Add some code to the start of the generated configure script which -+# will find an echo command which doesn't interpret backslashes. -+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -+[_LT_AC_SHELL_INIT([ -+# Check that we are running under the correct shell. -+SHELL=${CONFIG_SHELL-/bin/sh} -+ -+case X$ECHO in -+X*--fallback-echo) -+ # Remove one level of quotation (which was required for Make). -+ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -+ ;; -+esac -+ -+echo=${ECHO-echo} -+if test "X[$]1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+elif test "X[$]1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then -+ # Yippee, $echo works! -+ : -+else -+ # Restart under the correct shell. -+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -+fi - --AC_DEFUN(AC_LIBNET_CHECK_IP_CSUM, --[ -- AC_MSG_CHECKING([struct ip contains ip_csum]) -- AC_TRY_COMPILE([ -- #define __BSD_SOURCE -- #define _BSD_SOURCE -- #include -- #include -- #include -- #include ], -- [ -- struct ip ip; -- ip.ip_csum = 0; -- ], -- [AC_MSG_RESULT(yes); -- AC_DEFINE(HAVE_STRUCT_IP_CSUM)], -- [AC_MSG_RESULT(no); -- ]) --]) -+if test "X[$]1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat </dev/null 2>&1 && unset CDPATH -+ -+if test -z "$ECHO"; then -+if test "X${echo_test_string+set}" != Xset; then -+# find a string as large as possible, as long as the shell can cope with it -+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -+ if (echo_test_string=`eval $cmd`) 2>/dev/null && -+ echo_test_string=`eval $cmd` && -+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -+ then -+ break -+ fi -+ done -+fi - --AC_DEFUN(AC_LBL_UNALIGNED_ACCESS, -- [AC_MSG_CHECKING(if unaligned accesses fail) -- AC_CACHE_VAL(ac_cv_lbl_unaligned_fail, -- [case "$target_cpu" in -- -- alpha|hp*|mips|sparc) -- ac_cv_lbl_unaligned_fail=yes -- ;; -- -- *) -- cat >conftest.c < --# include --# include -- unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; -- main() -- { -- unsigned int i; -- pid_t pid; -- int status; -- /* avoid "core dumped" message */ -- pid = fork(); -- if (pid < 0) -- { -- exit(2); -- } -- if (pid > 0) -- { -- /* parent */ -- pid = waitpid(pid, &status, 0); -- if (pid < 0) -- { -- exit(3); -- } -- exit(!WIFEXITED(status)); -- } -- /* child */ -- i = *(unsigned int *)&a[[1]]; -- printf("%d\n", i); -- exit(0); -- } --EOF -- ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \ -- conftest.c $LIBS > /dev/null 2>&1 -- # Oopz 4.3 BSD doesn't have this. Sorry. -- if test ! -x conftest ; then -- dnl failed to compile for some reason -- ac_cv_lbl_unaligned_fail=yes -- else -- ./conftest > conftest.out -- if test ! -s conftest.out ; then -- ac_cv_lbl_unaligned_fail=yes -- else -- ac_cv_lbl_unaligned_fail=no -- fi -- fi -- rm -f conftest* core core.conftest -- ;; -- esac]) -- AC_MSG_RESULT($ac_cv_lbl_unaligned_fail) -- if test $ac_cv_lbl_unaligned_fail = yes ; then -- AC_DEFINE(LBL_ALIGN) -+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ : -+else -+ # The Solaris, AIX, and Digital Unix default echo programs unquote -+ # backslashes. This makes it impossible to quote backslashes using -+ # echo "$something" | sed 's/\\/\\\\/g' -+ # -+ # So, first we look for a working echo in the user's PATH. -+ -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" -+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$dir/echo" -+ break - fi --]) -+ done -+ IFS="$lt_save_ifs" - -+ if test "X$echo" = Xecho; then -+ # We didn't find a better echo, so look for alternatives. -+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # This shell has a builtin print -r that does the trick. -+ echo='print -r' -+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -+ test "X$CONFIG_SHELL" != X/bin/ksh; then -+ # If we have ksh, try running configure again with it. -+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -+ export ORIGINAL_CONFIG_SHELL -+ CONFIG_SHELL=/bin/ksh -+ export CONFIG_SHELL -+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -+ else -+ # Try using printf. -+ echo='printf %s\n' -+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # Cool, printf works -+ : -+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -+ export CONFIG_SHELL -+ SHELL="$CONFIG_SHELL" -+ export SHELL -+ echo="$CONFIG_SHELL [$]0 --fallback-echo" -+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$CONFIG_SHELL [$]0 --fallback-echo" -+ else -+ # maybe with a smaller string... -+ prev=: - --dnl --dnl Checks endianess --dnl --dnl usage: --dnl --dnl AC_LIBNET_ENDIAN_CHECK --dnl --dnl results: --dnl --dnl LIBNET_BIG_ENDIAN = 1 or --dnl LIBNET_LIL_ENDIAN = 1 --dnl -+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -+ then -+ break -+ fi -+ prev="$cmd" -+ done -+ -+ if test "$prev" != 'sed 50q "[$]0"'; then -+ echo_test_string=`eval $prev` -+ export echo_test_string -+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -+ else -+ # Oops. We lost completely, so just stick with echo. -+ echo=echo -+ fi -+ fi -+ fi -+ fi -+fi -+fi - --AC_DEFUN(AC_LIBNET_ENDIAN_CHECK, -- [AC_MSG_CHECKING(machine endianess) -+# Copy echo and quote the copy suitably for passing to libtool from -+# the Makefile, instead of quoting the original, which is used later. -+ECHO=$echo -+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -+ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -+fi - -- cat > conftest.c << EOF --# include --# include -- -- int main() -- { -- union -- { -- short s; -- char c[[sizeof(short)]]; -- } un; -- -- un.s = 0x0102; -- if (sizeof (short) == 2) -- { -- if (un.c [[0]] == 1 && un.c [[1]] == 2) -- { -- printf("B\n"); -- } -- else -- { -- if (un.c [[0]] == 2 && un.c [[1]] == 1) -- { -- printf("L\n"); -- } -- } -- } -- else -- { -- printf("?\n"); -- } -- return (EXIT_SUCCESS); -- } --EOF -- ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS > /dev/null 2>&1 -- # Oopz 4.3 BSD doesn't have this. Sorry. -- if test ! -x conftest ; then --dnl failed to compile for some reason -- ac_cv_libnet_endianess=unknown -- else -- ./conftest > conftest.out -- result=`cat conftest.out` -- if test $result = "B"; then -- ac_cv_libnet_endianess=big -- elif test $result = "L"; then -- ac_cv_libnet_endianess=lil -- else -- ac_cv_libnet_endianess=unknown -- fi -- fi -- rm -f conftest* core core.conftest -+AC_SUBST(ECHO) -+])])# _LT_AC_PROG_ECHO_BACKSLASH - -- AC_MSG_RESULT($ac_cv_libnet_endianess) - -- if test $ac_cv_libnet_endianess = big ; then -- AC_DEFINE(LIBNET_BIG_ENDIAN) -- ENDIANESS="LIBNET_BIG_ENDIAN" -- LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_BIG_ENDIAN" -- elif test $ac_cv_libnet_endianess = lil ; then -- AC_DEFINE(LIBNET_LIL_ENDIAN) -- ENDIANESS="LIBNET_LIL_ENDIAN" -- LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN" -- fi -- ]) -+# _LT_AC_LOCK -+# ----------- -+AC_DEFUN([_LT_AC_LOCK], -+[AC_ARG_ENABLE([libtool-lock], -+ [AC_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+ia64-*-hpux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ fi -+ rm -rf conftest* -+ ;; - --dnl --dnl Improved version of AC_CHECK_LIB --dnl --dnl Thanks to John Hawkinson (jhawk at mit.edu) --dnl --dnl usage: --dnl --dnl AC_LBL_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [, --dnl ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]]) --dnl --dnl results: --dnl --dnl LIBS --dnl -- --define(AC_LBL_CHECK_LIB, --[AC_MSG_CHECKING([for $2 in -l$1]) --dnl Use a cache variable name containing both the library and function name, --dnl because the test really is for library $1 defining function $2, not --dnl just for library $1. Separate tests with the same $1 and different $2's --dnl may have different results. --ac_lib_var=`echo $1['_']$2['_']$5 | sed 'y%./+- %__p__%'` --AC_CACHE_VAL(ac_cv_lbl_lib_$ac_lib_var, --[ac_save_LIBS="$LIBS" --LIBS="-l$1 $5 $LIBS" --AC_TRY_LINK(dnl --ifelse([$2], [main], , dnl Avoid conflicting decl of main. --[/* Override any gcc2 internal prototype to avoid an error. */ --]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus --extern "C" --#endif --])dnl --[/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $2(); --]), -- [$2()], -- eval "ac_cv_lbl_lib_$ac_lib_var=yes", -- eval "ac_cv_lbl_lib_$ac_lib_var=no") --LIBS="$ac_save_LIBS" --])dnl --if eval "test \"`echo '$ac_cv_lbl_lib_'$ac_lib_var`\" = yes"; then -- AC_MSG_RESULT(yes) -- ifelse([$3], , --[changequote(, )dnl -- ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` --changequote([, ])dnl -- AC_DEFINE_UNQUOTED($ac_tr_lib) -- LIBS="-l$1 $LIBS" --], [$3]) --else -- AC_MSG_RESULT(no) --ifelse([$4], , , [$4 --])dnl --fi --]) -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|sparc*-*linux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *32-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *64-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_x86_64" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; - --dnl --dnl AC_LBL_LIBRARY_NET --dnl --dnl This test is for network applications that need socket() and --dnl gethostbyname() -ish functions. Under Solaris, those applications --dnl need to link with "-lsocket -lnsl". Under IRIX, they need to link --dnl with "-lnsl" but should *not* link with "-lsocket" because --dnl libsocket.a breaks a number of things (for instance: --dnl gethostbyname() under IRIX 5.2, and snoop sockets under most --dnl versions of IRIX). --dnl --dnl Unfortunately, many application developers are not aware of this, --dnl and mistakenly write tests that cause -lsocket to be used under --dnl IRIX. It is also easy to write tests that cause -lnsl to be used --dnl under operating systems where neither are necessary (or useful), --dnl such as SunOS 4.1.4, which uses -lnsl for TLI. --dnl --dnl This test exists so that every application developer does not test --dnl this in a different, and subtly broken fashion. -- --dnl It has been argued that this test should be broken up into two --dnl seperate tests, one for the resolver libraries, and one for the --dnl libraries necessary for using Sockets API. Unfortunately, the two --dnl are carefully intertwined and allowing the autoconf user to use --dnl them independantly potentially results in unfortunate ordering --dnl dependancies -- as such, such component macros would have to --dnl carefully use indirection and be aware if the other components were --dnl executed. Since other autoconf macros do not go to this trouble, --dnl and almost no applications use sockets without the resolver, this --dnl complexity has not been implemented. --dnl --dnl The check for libresolv is in case you are attempting to link --dnl statically and happen to have a libresolv.a lying around (and no --dnl libnsl.a). --dnl --AC_DEFUN(AC_LBL_LIBRARY_NET, [ -- # Most operating systems have gethostbyname() in the default searched -- # libraries (i.e. libc): -- AC_CHECK_FUNC(gethostbyname, , -- # Some OSes (eg. Solaris) place it in libnsl: -- AC_LBL_CHECK_LIB(nsl, gethostbyname, , -- # Some strange OSes (SINIX) have it in libsocket: -- AC_LBL_CHECK_LIB(socket, gethostbyname, , -- # Unfortunately libsocket sometimes depends on libnsl. -- # AC_CHECK_LIB's API is essentially broken so the -- # following ugliness is necessary: -- AC_LBL_CHECK_LIB(socket, gethostbyname, -- LIBS="-lsocket -lnsl $LIBS", -- AC_CHECK_LIB(resolv, gethostbyname), -- -lnsl)))) -- AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket, , -- AC_LBL_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", , -- -lnsl))) -- # DLPI needs putmsg under HPUX so test for -lstr while we're at it -- AC_CHECK_LIB(str, putmsg) -- ]) -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -+ [AC_LANG_PUSH(C) -+ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -+ AC_LANG_POP]) -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+sparc*-*solaris*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) LD="${LD-ld} -64" ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; - -+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -+[*-*-cygwin* | *-*-mingw* | *-*-pw32*) -+ AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+ AC_CHECK_TOOL(AS, as, false) -+ AC_CHECK_TOOL(OBJDUMP, objdump, false) -+ ;; -+ ]) -+esac -+ -+need_locks="$enable_libtool_lock" -+ -+])# _LT_AC_LOCK -+ -+ -+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------------------- -+# Check whether the given compiler option works -+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -+[AC_REQUIRE([LT_AC_PROG_SED]) -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$3" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ fi -+ $rm conftest* -+]) - --# Do all the work for Automake. -*- Autoconf -*- -+if test x"[$]$2" = xyes; then -+ ifelse([$5], , :, [$5]) -+else -+ ifelse([$6], , :, [$6]) -+fi -+])# AC_LIBTOOL_COMPILER_OPTION - --# This macro actually does too much some checks are only needed if --# your package does certain things. But this isn't really a big deal. - --# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 --# Free Software Foundation, Inc. -+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ------------------------------------------------------------ -+# Check whether the given compiler option works -+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $3" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&AS_MESSAGE_LOG_FD -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ else -+ $2=yes -+ fi -+ fi -+ $rm conftest* -+ LDFLAGS="$save_LDFLAGS" -+]) - --# 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. -+if test x"[$]$2" = xyes; then -+ ifelse([$4], , :, [$4]) -+else -+ ifelse([$5], , :, [$5]) -+fi -+])# AC_LIBTOOL_LINKER_OPTION - --# 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, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+# AC_LIBTOOL_SYS_MAX_CMD_LEN -+# -------------------------- -+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -+[# find the maximum length of command line arguments -+AC_MSG_CHECKING([the maximum length of command line arguments]) -+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl -+ i=0 -+ teststring="ABCD" -+ -+ case $build_os in -+ msdosdjgpp*) -+ # On DJGPP, this test can blow up pretty badly due to problems in libc -+ # (any single argument exceeding 2000 bytes causes a buffer overrun -+ # during glob expansion). Even if it were fixed, the result of this -+ # check would be larger than it should be. -+ lt_cv_sys_max_cmd_len=12288; # 12K is about right -+ ;; - --# serial 8 -+ gnu*) -+ # Under GNU Hurd, this test is not required because there is -+ # no limit to the length of command line arguments. -+ # Libtool will interpret -1 as no limit whatsoever -+ lt_cv_sys_max_cmd_len=-1; -+ ;; - --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -+ cygwin* | mingw*) -+ # On Win9x/ME, this test blows up -- it succeeds, but takes -+ # about 5 minutes as the teststring grows exponentially. -+ # Worse, since 9x/ME are not pre-emptively multitasking, -+ # you end up with a "frozen" computer, even though with patience -+ # the test eventually succeeds (with a max line length of 256k). -+ # Instead, let's just punt: use the minimum linelength reported by -+ # all of the supported platforms: 8192 (on NT/2K/XP). -+ lt_cv_sys_max_cmd_len=8192; -+ ;; - -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; - --AC_PREREQ([2.52]) -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; - --# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow --# the ones we care about. --m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -+ interix*) -+ # We know the value 262144 and hardcode it with a safety zone (like BSD) -+ lt_cv_sys_max_cmd_len=196608 -+ ;; - --# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) --# AM_INIT_AUTOMAKE([OPTIONS]) --# ----------------------------------------------- --# The call with PACKAGE and VERSION arguments is the old style --# call (pre autoconf-2.50), which is being phased out. PACKAGE --# and VERSION should now be passed to AC_INIT and removed from --# the call to AM_INIT_AUTOMAKE. --# We support both call styles for the transition. After --# the next Automake release, Autoconf can make the AC_INIT --# arguments mandatory, and then we can depend on a new Autoconf --# release and drop the old call support. --AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -- AC_REQUIRE([AC_PROG_INSTALL])dnl --# test to see if srcdir already configured --if test "`cd $srcdir && pwd`" != "`pwd`" && -- test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ sco3.2v5*) -+ lt_cv_sys_max_cmd_len=102400 -+ ;; -+ sysv5* | sco5v6* | sysv4.2uw2*) -+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -+ if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` -+ else -+ lt_cv_sys_max_cmd_len=32768 -+ fi -+ ;; -+ *) -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ else -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on massive -+ # amounts of additional arguments before passing them to the linker. -+ # It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ fi -+ ;; -+ esac -+]) -+if test -n $lt_cv_sys_max_cmd_len ; then -+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -+else -+ AC_MSG_RESULT(none) - fi -+])# AC_LIBTOOL_SYS_MAX_CMD_LEN - --# Define the identity of the package. --dnl Distinguish between old-style and new-style calls. --m4_ifval([$2], --[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -- AC_SUBST([PACKAGE], [$1])dnl -- AC_SUBST([VERSION], [$2])], --[_AM_SET_OPTIONS([$1])dnl -- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl -- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl - --_AM_IF_OPTION([no-define],, --[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -+# _LT_AC_CHECK_DLFCN -+# ------------------ -+AC_DEFUN([_LT_AC_CHECK_DLFCN], -+[AC_CHECK_HEADERS(dlfcn.h)dnl -+])# _LT_AC_CHECK_DLFCN - --# Some tools Automake needs. --AC_REQUIRE([AM_SANITY_CHECK])dnl --AC_REQUIRE([AC_ARG_PROGRAM])dnl --AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) --AM_MISSING_PROG(AUTOCONF, autoconf) --AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) --AM_MISSING_PROG(AUTOHEADER, autoheader) --AM_MISSING_PROG(MAKEINFO, makeinfo) --AM_MISSING_PROG(AMTAR, tar) --AM_PROG_INSTALL_SH --AM_PROG_INSTALL_STRIP --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. --AC_REQUIRE([AC_PROG_AWK])dnl --AC_REQUIRE([AC_PROG_MAKE_SET])dnl - --_AM_IF_OPTION([no-dependencies],, --[AC_PROVIDE_IFELSE([AC_PROG_][CC], -- [_AM_DEPENDENCIES(CC)], -- [define([AC_PROG_][CC], -- defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_][CXX], -- [_AM_DEPENDENCIES(CXX)], -- [define([AC_PROG_][CXX], -- defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl --]) --]) -+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -+# --------------------------------------------------------------------- -+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+if test "$cross_compiling" = yes; then : -+ [$4] -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext < -+#endif - --# 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. -+#include - --# 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. -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif - --# AM_AUTOMAKE_VERSION(VERSION) --# ---------------------------- --# Automake X.Y traces this macro to ensure aclocal.m4 has been --# generated from the m4 files accompanying Automake X.Y. --AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif - --# AM_SET_CURRENT_AUTOMAKE_VERSION --# ------------------------------- --# Call AM_AUTOMAKE_VERSION so it can be traced. --# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. --AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.6.3])]) -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; - --# Helper functions for option handling. -*- Autoconf -*- -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); - --# Copyright 2001, 2002 Free Software Foundation, Inc. -+ exit (status); -+}] -+EOF -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) $1 ;; -+ x$lt_dlneed_uscore) $2 ;; -+ x$lt_dlunknown|x*) $3 ;; -+ esac -+ else : -+ # compilation failed -+ $3 -+ fi -+fi -+rm -fr conftest* -+])# _LT_AC_TRY_DLOPEN_SELF - --# 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. -+# AC_LIBTOOL_DLOPEN_SELF -+# ---------------------- -+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= -+ -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; -+ -+ mingw* | pw32*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ darwin*) -+ # if libdl is installed we need to link against it -+ AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ]) -+ ;; -+ -+ *) -+ AC_CHECK_FUNC([shl_load], -+ [lt_cv_dlopen="shl_load"], -+ [AC_CHECK_LIB([dld], [shl_load], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], -+ [AC_CHECK_FUNC([dlopen], -+ [lt_cv_dlopen="dlopen"], -+ [AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -+ [AC_CHECK_LIB([svld], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -+ [AC_CHECK_LIB([dld], [dld_link], -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ;; -+ esac -+ -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi -+ -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ -+ save_LDFLAGS="$LDFLAGS" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" -+ -+ AC_CACHE_CHECK([whether a program can dlopen itself], -+ lt_cv_dlopen_self, [dnl -+ _LT_AC_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, -+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) -+ ]) -+ -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], -+ lt_cv_dlopen_self_static, [dnl -+ _LT_AC_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, -+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) -+ ]) -+ fi -+ -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac -+ -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac -+ -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+])# AC_LIBTOOL_DLOPEN_SELF -+ -+ -+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -+# --------------------------------- -+# Check to see if options -c and -o are simultaneously supported by compiler -+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], -+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ fi -+ fi -+ chmod u+w . 2>&AS_MESSAGE_LOG_FD -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* -+]) -+])# AC_LIBTOOL_PROG_CC_C_O -+ -+ -+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -+# ----------------------------------------- -+# Check to see if we can do hard links to lock some files if needed -+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -+[AC_REQUIRE([_LT_AC_LOCK])dnl -+ -+hard_links="nottested" -+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ AC_MSG_CHECKING([if we can lock with hard links]) -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ AC_MSG_RESULT([$hard_links]) -+ if test "$hard_links" = no; then -+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS -+ -+ -+# AC_LIBTOOL_OBJDIR -+# ----------------- -+AC_DEFUN([AC_LIBTOOL_OBJDIR], -+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -+[rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null]) -+objdir=$lt_cv_objdir -+])# AC_LIBTOOL_OBJDIR -+ -+ -+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -+# ---------------------------------------------- -+# Check hardcoding attributes. -+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -+[AC_MSG_CHECKING([how to hardcode library paths into programs]) -+_LT_AC_TAGVAR(hardcode_action, $1)= -+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ -+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ -+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then -+ -+ # We can hardcode non-existant directories. -+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && -+ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then -+ # Linking always hardcodes the temporary library directory. -+ _LT_AC_TAGVAR(hardcode_action, $1)=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ _LT_AC_TAGVAR(hardcode_action, $1)=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -+fi -+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) -+ -+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH -+ -+ -+# AC_LIBTOOL_SYS_LIB_STRIP -+# ------------------------ -+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -+[striplib= -+old_striplib= -+AC_MSG_CHECKING([whether stripping libraries is possible]) -+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ AC_MSG_RESULT([yes]) -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ old_striplib="$STRIP -S" -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+fi -+ ;; -+ *) -+ AC_MSG_RESULT([no]) -+ ;; -+ esac -+fi -+])# AC_LIBTOOL_SYS_LIB_STRIP -+ -+ -+# AC_LIBTOOL_SYS_DYNAMIC_LINKER -+# ----------------------------- -+# PORTME Fill in your ld.so characteristics -+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_MSG_CHECKING([dynamic linker characteristics]) -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+m4_if($1,[],[ -+if test "$GCC" = yes; then -+ case $host_os in -+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -+ *) lt_awk_arg="/^libraries:/" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` @@ 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 Tue Nov 9 14:50:37 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 09 Nov 2010 13:50:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[11532] csw/mgar/pkg/libldns/trunk/Makefile Message-ID: Revision: 11532 http://gar.svn.sourceforge.net/gar/?rev=11532&view=rev Author: idogan23 Date: 2010-11-09 13:50:37 +0000 (Tue, 09 Nov 2010) Log Message: ----------- libldns: fixing a typo Modified Paths: -------------- csw/mgar/pkg/libldns/trunk/Makefile Modified: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile 2010-11-09 13:47:37 UTC (rev 11531) +++ csw/mgar/pkg/libldns/trunk/Makefile 2010-11-09 13:50:37 UTC (rev 11532) @@ -44,7 +44,7 @@ RUNTIME_DEP_PKGS_CSWldnsdevel += CSWlibldns1 INCOMPATIBLE_PKGS_CSWlibldns1 = CSWldns -INCOMPATIBLE_PKGS_CSWldnsdevel = CSWldnsdevel +INCOMPATIBLE_PKGS_CSWlibldnsdevel = CSWldnsdevel PATCHFILES = CSWldns.doxyparse.diff 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 Nov 9 15:22:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Nov 2010 14:22:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[11533] csw/mgar/pkg/libnet/branches/1.1.x/Makefile Message-ID: Revision: 11533 http://gar.svn.sourceforge.net/gar/?rev=11533&view=rev Author: dmichelsen Date: 2010-11-09 14:22:07 +0000 (Tue, 09 Nov 2010) Log Message: ----------- libnet/1.1.x: Set version of legacy library Modified Paths: -------------- csw/mgar/pkg/libnet/branches/1.1.x/Makefile Modified: csw/mgar/pkg/libnet/branches/1.1.x/Makefile =================================================================== --- csw/mgar/pkg/libnet/branches/1.1.x/Makefile 2010-11-09 13:50:37 UTC (rev 11532) +++ csw/mgar/pkg/libnet/branches/1.1.x/Makefile 2010-11-09 14:22:07 UTC (rev 11533) @@ -38,6 +38,8 @@ SPKG_DESC_CSWlibnet1 = Libnet Package Construction Library SPKG_DESC_CSWlibnetdevel = Libnet Development Files +SPKG_VERSION_CSWlibnet = 1.0.2a + RUNTIME_DEP_PKGS_CSWlibnetdevel = CSWlibnet1 BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Nov 9 15:52:20 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 09 Nov 2010 14:52:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[11534] csw/mgar/pkg/drill/trunk Message-ID: Revision: 11534 http://gar.svn.sourceforge.net/gar/?rev=11534&view=rev Author: idogan23 Date: 2010-11-09 14:52:20 +0000 (Tue, 09 Nov 2010) Log Message: ----------- drill: bump version to 1.6.7 Modified Paths: -------------- csw/mgar/pkg/drill/trunk/Makefile csw/mgar/pkg/drill/trunk/checksums Modified: csw/mgar/pkg/drill/trunk/Makefile =================================================================== --- csw/mgar/pkg/drill/trunk/Makefile 2010-11-09 14:22:07 UTC (rev 11533) +++ csw/mgar/pkg/drill/trunk/Makefile 2010-11-09 14:52:20 UTC (rev 11534) @@ -1,5 +1,5 @@ GARNAME = drill -GARVERSION = 1.6.5 +GARVERSION = 1.6.7 CATEGORIES = utils DESCRIPTION = A dig style dnssec aware dns debugging tool @@ -25,7 +25,7 @@ LICENSE = LICENSE -RUNTIME_DEP_PKGS = CSWldns +RUNTIME_DEP_PKGS = CSWlibldns1 RUNTIME_DEP_PKGS += CSWosslrt CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/drill/trunk/checksums =================================================================== --- csw/mgar/pkg/drill/trunk/checksums 2010-11-09 14:22:07 UTC (rev 11533) +++ csw/mgar/pkg/drill/trunk/checksums 2010-11-09 14:52:20 UTC (rev 11534) @@ -1 +1 @@ -ab41a641a0416908e03e63631f527c4a ldns-1.6.5.tar.gz +7c0c50ee6b91ae6b713616b70005ad03 ldns-1.6.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 Tue Nov 9 16:01:30 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Nov 2010 15:01:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[11535] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 11535 http://gar.svn.sourceforge.net/gar/?rev=11535&view=rev Author: wahwah Date: 2010-11-09 15:01:30 +0000 (Tue, 09 Nov 2010) Log Message: ----------- Revert "mGAR v2: checkpkg, README, the list of dependencies to run the unit tests on Ubuntu." This reverts commit 46b7b6bd95a737c1f65a8e1d60bf07e1cd3301de. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2010-11-09 14:52:20 UTC (rev 11534) +++ csw/mgar/gar/v2/lib/python/README 2010-11-09 15:01:30 UTC (rev 11535) @@ -13,16 +13,3 @@ Known problems: - libmagic fails sometimes when processing the whole catalog - -Dependencies: - -It's possible to develop checkpkg on a non-Solaris platform, using unit -tests as means to run various bits of code. Here's the dependency list -for Ubuntu. - - python-cheetah - python-hachoir-parser - python-magic - python-mox - python-progressbar - python-yaml 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 Nov 9 16:45:51 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Nov 2010 15:45:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[11536] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 11536 http://gar.svn.sourceforge.net/gar/?rev=11536&view=rev Author: wahwah Date: 2010-11-09 15:45:51 +0000 (Tue, 09 Nov 2010) Log Message: ----------- mGAR v2: checkpkg, README, the list of dependencies to run the unit tests on Ubuntu. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2010-11-09 15:01:30 UTC (rev 11535) +++ csw/mgar/gar/v2/lib/python/README 2010-11-09 15:45:51 UTC (rev 11536) @@ -13,3 +13,16 @@ Known problems: - libmagic fails sometimes when processing the whole catalog + +Dependencies: + +It's possible to develop checkpkg on a non-Solaris platform, using unit +tests as means to run various bits of code. Here's the dependency list +for Ubuntu. + + python-cheetah + python-hachoir-parser + python-magic + python-mox + python-progressbar + python-yaml 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 Nov 9 16:46:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Nov 2010 15:46:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[11537] csw/mgar/gar/v2 Message-ID: Revision: 11537 http://gar.svn.sourceforge.net/gar/?rev=11537&view=rev Author: wahwah Date: 2010-11-09 15:46:21 +0000 (Tue, 09 Nov 2010) Log Message: ----------- mGAR v2: checkpkg, when suggesting a new package with a library, enclose gar suggestion lines in two additional lines. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-11-09 15:45:51 UTC (rev 11536) +++ csw/mgar/gar/v2/bin/checkpkg 2010-11-09 15:46:21 UTC (rev 11537) @@ -220,7 +220,7 @@ # "checkpkg-". test_suite_ok=1 -checkpkg_module_dir=${command_basedir}/../lib/checkpkg.d +checkpkg_module_dir="${command_basedir}/../lib/checkpkg.d" checkpkg_module_tag="checkpkg-" checkpkg_stats_basedir="${HOME}/.checkpkg/stats" @@ -301,15 +301,14 @@ if [[ "${ANALYZE}" -eq 1 ]]; then # Collecting errors and applying the overrides. # This has to use the original files. - echo "Applying the overrides and analyzing the results." ${command_basedir}/analyze_module_results.py \ ${catalog_options} \ ${quiet_options} \ "$@" if [[ "$?" -ne 0 ]]; then - errmsg "${RED}Modular checks are reporting errors.${COLOR_RESET}" + errmsg "${RED}Checkpkg has reported errors.${COLOR_RESET}" else - print "${GREEN}All modular tests were successful.${COLOR_RESET}" + print "${GREEN}Checkpkg reports no errors.${COLOR_RESET}" fi else echo "Skipping result analysis." Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-11-09 15:45:51 UTC (rev 11536) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-11-09 15:46:21 UTC (rev 11537) @@ -1041,6 +1041,8 @@ lib_path, lib_basename = os.path.split(binary_info["path"]) tmp = su.MakePackageNameBySoname(soname) policy_pkgname_list, policy_catalogname_list = tmp + messenger.SuggestGarLine("# The following lines define a new package: " + "%s" % policy_pkgname_list[0]) messenger.SuggestGarLine("PACKAGES += %s" % policy_pkgname_list[0]) messenger.SuggestGarLine( "CATALOGNAME_%s = %s" @@ -1059,6 +1061,8 @@ messenger.SuggestGarLine( "RUNTIME_DEP_PKGS_%s += %s" % (pkgname, policy_pkgname_list[0])) + messenger.SuggestGarLine( + "# The end of %s definition" % policy_pkgname_list[0]) check_names = False else: 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 Nov 9 16:46:47 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Nov 2010 15:46:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[11538] csw/mgar/gar/v2/lib/python/dependency_checks.py Message-ID: Revision: 11538 http://gar.svn.sourceforge.net/gar/?rev=11538&view=rev Author: wahwah Date: 2010-11-09 15:46:47 +0000 (Tue, 09 Nov 2010) Log Message: ----------- mGAR v2: Deprecating /opt/csw/lib/libnet.so for linking. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-11-09 15:46:21 UTC (rev 11537) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-11-09 15:46:47 UTC (rev 11538) @@ -14,6 +14,9 @@ "Please use /opt/csw/mysql5/..."), ("/opt/csw/lib/mysql", "libmysqlclient.so.15", "Please use /opt/csw/mysql5/..."), + ("/opt/csw/lib", "libnet.so", + "Please use -L/opt/csw/lib/libnet-new for linking. " + "See more at http://wiki.opencsw.org/project-libnet"), ) DLOPEN_LIB_LOCATIONS = ( 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 Nov 10 02:16:00 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 10 Nov 2010 01:16:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[11539] csw/mgar/gar/v2/bin/ap2mod_build_scripts Message-ID: Revision: 11539 http://gar.svn.sourceforge.net/gar/?rev=11539&view=rev Author: bdwalton Date: 2010-11-10 01:16:00 +0000 (Wed, 10 Nov 2010) Log Message: ----------- gar/v2: streamline ap2mod_build_scripts generated script outputs Modified Paths: -------------- csw/mgar/gar/v2/bin/ap2mod_build_scripts Modified: csw/mgar/gar/v2/bin/ap2mod_build_scripts =================================================================== --- csw/mgar/gar/v2/bin/ap2mod_build_scripts 2010-11-09 15:46:47 UTC (rev 11538) +++ csw/mgar/gar/v2/bin/ap2mod_build_scripts 2010-11-10 01:16:00 UTC (rev 11539) @@ -13,9 +13,17 @@ modname=$(echo $modfile | sed 's/mod_//; s/\.so$//') ap2modfile=$AP2MODS/$modname cat < $ap2modfile -!install + PIR=\${PKG_INSTALL_ROOT:-'/'} +AP2_PREFIX=/opt/csw/apache2 +AP2_BINDIR=\$AP2_PREFIX/sbin +AP2_LIBEXEC=\$AP2_PREFIX/libexec +AP2_CONFDIR=\$AP2_PREFIX/etc +AP2_CONFIG=\$AP2_CONFDIR/httpd.conf +AP2_APXS=\$AP2_BINDIR/apxs +if [ "\$1" = install ]; then + touch \$PIR/$ap2modfile # Source csw.conf, if it exists @@ -26,13 +34,6 @@ . \$PIR/etc/opt/csw/csw.conf fi -AP2_PREFIX=/opt/csw/apache2 -AP2_BINDIR=\$AP2_PREFIX/sbin -AP2_LIBEXEC=\$AP2_PREFIX/libexec -AP2_CONFDIR=\$AP2_PREFIX/etc -AP2_CONFIG=\$AP2_CONFDIR/httpd.conf -AP2_APXS=\$AP2_BINDIR/apxs - # Modules will be enabled by default, but a global kill switch # is checked , followed by a module specific value. Thus, # either ap2_enable_modules or ap2_enable_suexec (for example) @@ -57,21 +58,14 @@ chroot \$PIR \$AP2_APXS -e \$enmod -n $modname $modfile fi -!remove -PIR=\${PKG_INSTALL_ROOT:-'/'} +else rm \$PIR/$ap2modfile -AP2_PREFIX=/opt/csw/apache2 -AP2_BINDIR=\$AP2_PREFIX/sbin -AP2_LIBEXEC=\$AP2_PREFIX/libexec -AP2_CONFDIR=\$AP2_PREFIX/etc -AP2_CONFIG=\$AP2_CONFDIR/httpd.conf -AP2_APXS=\$AP2_BINDIR/apxs - if [ -f "\$PIR/\$AP2_CONFIG" -a -x "\$PIR/\$AP2_APXS" ]; then - chroot \$PIR \$APXS -e -A -n $modname $modfile + chroot \$PIR \$AP2_APXS -e -A -n $modname $modfile fi +fi EOF done done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 10 09:40:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 08:40:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[11540] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 11540 http://gar.svn.sourceforge.net/gar/?rev=11540&view=rev Author: dmichelsen Date: 2010-11-10 08:40:58 +0000 (Wed, 10 Nov 2010) Log Message: ----------- mGAR v2: Added PyPI mirror Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-11-10 01:16:00 UTC (rev 11539) +++ csw/mgar/gar/v2/gar.conf.mk 2010-11-10 08:40:58 UTC (rev 11540) @@ -629,6 +629,11 @@ CPAN_MIRRORS = $(foreach S,$(CPAN_SITES),$(S)/authors/id/$(AUTHOR_ID)/) CPAN_FIRST_MIRROR = $(firstword $(CPAN_SITES))/authors/id +# Python Package Index +PYPI_PROJECT ?= $(GARNAME) +PYPI_SUBDIR = $(shell echo $(PYPI_PROJECT) | cut -c 1) +PYPI_MIRROR = http://pypi.python.org/packages/source/$(PYPI_SUBDIR)/$(PYPI_PROJECT)/ + # Package dir GARPACKAGE = $(shell basename $(CURDIR)) 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 Nov 10 12:34:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 11:34:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[11541] csw/mgar/pkg/cpan Message-ID: Revision: 11541 http://gar.svn.sourceforge.net/gar/?rev=11541&view=rev Author: dmichelsen Date: 2010-11-10 11:34:16 +0000 (Wed, 10 Nov 2010) Log Message: ----------- DBD-Sybase: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/DBD-Sybase/ csw/mgar/pkg/cpan/DBD-Sybase/branches/ csw/mgar/pkg/cpan/DBD-Sybase/tags/ csw/mgar/pkg/cpan/DBD-Sybase/trunk/ csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile csw/mgar/pkg/cpan/DBD-Sybase/trunk/checksums csw/mgar/pkg/cpan/DBD-Sybase/trunk/files/ csw/mgar/pkg/cpan/DBD-Sybase/trunk/files/0001-Use-CS_UNITEXT_TYPE-only-when-available.patch csw/mgar/pkg/cpan/DBD-Sybase/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/DBD-Sybase/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/DBD-Sybase/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile 2010-11-10 11:34:16 UTC (rev 11541) @@ -0,0 +1,39 @@ +GARNAME = DBD-Sybase +GARVERSION = 1.11 +CATEGORIES = cpan +AUTHOR = MEWP + +DESCRIPTION = Sybase database driver for the DBI module +define BLURB +endef + +DISTFILES = COPYING +PATCHFILES = 0001-Use-CS_UNITEXT_TYPE-only-when-available.patch + +PACKAGES = CSWpmdbdsybase +CATALOGNAME = pm_dbdsybase + +SYBASE = /opt/csw/sybase/OCS-12_5 +LD_LIBRARY_PATH = $(SYBASE)/lib + +NOISALIST = 1 +EXTRA_LIB = $(SYBASE)/lib + +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + +EXTRA_CONFIGURE_EXPORTS = SYBASE LD_LIBRARY_PATH +PERL_CONFIGURE_ARGS = --accept_test_defaults --chained Y --threaded_libs N + +EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH + +# We need a running database for this +TEST_SCRIPTS ?= + +# These are provided by the Sybase OCS libraries +CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase.so +CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase.so +CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase.so +CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase.so + +include gar/category.mk Added: csw/mgar/pkg/cpan/DBD-Sybase/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBD-Sybase/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/DBD-Sybase/trunk/checksums 2010-11-10 11:34:16 UTC (rev 11541) @@ -0,0 +1 @@ +7bbad79fcfc34195e6a3a8418277e64d DBD-Sybase-1.11.tar.gz Added: csw/mgar/pkg/cpan/DBD-Sybase/trunk/files/0001-Use-CS_UNITEXT_TYPE-only-when-available.patch =================================================================== --- csw/mgar/pkg/cpan/DBD-Sybase/trunk/files/0001-Use-CS_UNITEXT_TYPE-only-when-available.patch (rev 0) +++ csw/mgar/pkg/cpan/DBD-Sybase/trunk/files/0001-Use-CS_UNITEXT_TYPE-only-when-available.patch 2010-11-10 11:34:16 UTC (rev 11541) @@ -0,0 +1,30 @@ +From 32772f45d772b1721b47f7487b9c46b5d392e3c3 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 10 Nov 2010 11:39:56 +0100 +Subject: [PATCH] Use CS_UNITEXT_TYPE only when available + +--- + dbdimp.c | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/dbdimp.c b/dbdimp.c +index 1bbe697..0abfbf7 100644 +--- a/dbdimp.c ++++ b/dbdimp.c +@@ -4013,8 +4013,11 @@ AV * syb_st_fetch(SV *sth, imp_sth_t *imp_sth) { + } + #if defined(DBD_CAN_HANDLE_UTF8) + if (imp_dbh->enable_utf8 +- && (imp_sth->coldata[i].realType == CS_UNICHAR_TYPE || +- imp_sth->coldata[i].realType == CS_UNITEXT_TYPE)) { ++ && (imp_sth->coldata[i].realType == CS_UNICHAR_TYPE ++#if defined(CS_UNITEXT_TYPE) ++ || imp_sth->coldata[i].realType == CS_UNITEXT_TYPE ++#endif ++ )) { + U8 *value = SvPV_nolen(sv); + STRLEN len = SvLEN(sv); + +-- +1.7.3 + Added: csw/mgar/pkg/cpan/DBD-Sybase/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/DBD-Sybase/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/DBD-Sybase/trunk/files/COPYING 2010-11-10 11:34:16 UTC (rev 11541) @@ -0,0 +1,5 @@ + Copyright (c) 1996-2007 Michael Peppler + + You may distribute under the terms of either the GNU General Public + License or the Artistic License, as specified in the Perl README file. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 10 13:14:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 12:14:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11542] csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile Message-ID: Revision: 11542 http://gar.svn.sourceforge.net/gar/?rev=11542&view=rev Author: dmichelsen Date: 2010-11-10 12:14:39 +0000 (Wed, 10 Nov 2010) Log Message: ----------- cpan/DBD-Sybase: Add alternative for FreeTDS Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile 2010-11-10 11:34:16 UTC (rev 11541) +++ csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile 2010-11-10 12:14:39 UTC (rev 11542) @@ -10,10 +10,28 @@ DISTFILES = COPYING PATCHFILES = 0001-Use-CS_UNITEXT_TYPE-only-when-available.patch -PACKAGES = CSWpmdbdsybase -CATALOGNAME = pm_dbdsybase +EXTRA_MODULATORS = DBDRIVER +MODULATIONS_DBDRIVER = ocs freetds -SYBASE = /opt/csw/sybase/OCS-12_5 +PACKAGES = CSWpmdbdsybase CSWpmdbdsybaseftds + +CATALOGNAME_CSWpmdbdsybase = pm_dbdsybase +CATALOGNAME_CSWpmdbdsybaseftds = pm_dbdsybaseftds + +SPKG_DESC_CSWpmdbdsybase = $(DESCRIPTION) (Linked against Sybase OCS) +SPKG_DESC_CSWpmdbdsybaseftds = $(DESCRIPTION) (Linked against FreeTDS) + +# The "standard" is to link against Sybase OCS as it does not have additional +# dependencies. If you don't have that you can *additionally* install +# the version linked against FreeTDS pulling in all additional dependencies. +RUNTIME_DEP_PKGS_CSWpmdbdsybaseftds += CSWpmdbdsybase +RUNTIME_DEP_PKGS_CSWpmdbdsybaseftds += CSWfreetds +RUNTIME_DEP_PKGS_CSWpmdbdsybaseftds += CSWggettextrt + +SYBASE_ocs = /opt/csw/sybase/OCS-12_5 +SYBASE_freetds = /opt/csw +SYBASE = $(SYBASE_$(DBDRIVER)) + LD_LIBRARY_PATH = $(SYBASE)/lib NOISALIST = 1 @@ -30,10 +48,28 @@ # We need a running database for this TEST_SCRIPTS ?= +DBDSYBASEDIR = $(libdir)/perl/site_perl/auto/DBD/Sybase + +MERGE_SCRIPTS_isa-default-dbdriver-ocs = copy-all +MERGE_SCRIPTS_isa-default-dbdriver-freetds = copy-only +MERGE_DIRS_isa-default-dbdriver-freetds = $(DBDSYBASEDIR) + +EXTRA_PAX_ARGS = -s ",/Sybase\.bs$$,/Sybase-$(DBDRIVER).bs,p" +EXTRA_PAX_ARGS += -s ",/Sybase\.so$$,/Sybase-$(DBDRIVER).so,p" + +PKGFILES_CSWpmdbdsybaseftds = $(DBDSYBASEDIR)/.*-freetds\..* + +ALTERNATIVES_CSWpmdbdsybase = ocs +ALTERNATIVES_CSWpmdbdsybaseftds = freetds +ALTERNATIVE_ocs = $(DBDSYBASEDIR)/Sybase.so so $(DBDSYBASEDIR)/Sybase-ocs.so 200 +ALTERNATIVE_ocs += $(DBDSYBASEDIR)/Sybase.bs bs $(DBDSYBASEDIR)/Sybase-ocs.bs +ALTERNATIVE_freetds = $(DBDSYBASEDIR)/Sybase.so so $(DBDSYBASEDIR)/Sybase-freetds.so 100 +ALTERNATIVE_freetds += $(DBDSYBASEDIR)/Sybase.bs bs $(DBDSYBASEDIR)/Sybase-freetds.bs + # These are provided by the Sybase OCS libraries -CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase.so -CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase.so -CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase.so -CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase.so +CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 10 13:34:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 12:34:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11543] csw/mgar/gar/v2/categories/cpan/category.mk Message-ID: Revision: 11543 http://gar.svn.sourceforge.net/gar/?rev=11543&view=rev Author: dmichelsen Date: 2010-11-10 12:34:21 +0000 (Wed, 10 Nov 2010) Log Message: ----------- mGAR v2: Make sure the description in Perl packages can be adjust even when producing multiple packages Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2010-11-10 12:14:39 UTC (rev 11542) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2010-11-10 12:34:21 UTC (rev 11543) @@ -31,7 +31,7 @@ UFILES_REGEX ?= $(GARNAME)-(\d+(?:\.\d+)*).tar.gz USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL) -_CATEGORY_SPKG_DESC = $(GARNAME): $(SPKG_DESC) +$(foreach P,$(PACKAGES),$(eval _CATEGORY_SPKG_DESC_$P = $$(GARNAME): $$(or $$(SPKG_DESC_$P),$$(SPKG_DESC)))) _CATEGORY_PKGINFO = echo "PERL_MODULE_NAME=$(GARNAME)"; SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Nov 10 13:34:34 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 10 Nov 2010 12:34:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[11544] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 11544 http://gar.svn.sourceforge.net/gar/?rev=11544&view=rev Author: idogan23 Date: 2010-11-10 12:34:33 +0000 (Wed, 10 Nov 2010) Log Message: ----------- unbound: bump version to 1.4.7, split into multiple packages Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unbound/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/unbound/trunk/files/0001-disable-default-cflags-on-sparc.patch Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2010-11-10 12:34:21 UTC (rev 11543) +++ csw/mgar/pkg/unbound/trunk/Makefile 2010-11-10 12:34:33 UTC (rev 11544) @@ -1,5 +1,5 @@ GARNAME = unbound -GARVERSION = 1.4.6 +GARVERSION = 1.4.7 CATEGORIES = server DESCRIPTION = A validating, recursive, and caching DNS resolver @@ -9,8 +9,10 @@ a server, but are linked into an application) are easily possible. endef -PACKAGES = CSWunbound -CATALOGNAME = unbound +PACKAGES = CSWunbound CSWlibunbound2 CSWunbound-devel +CATALOGNAME_CSWunbound = unbound +CATALOGNAME_CSWlibunbound2 = libunbound2 +CATALOGNAME_CSWunbound-devel = unbound_devel LICENSE = LICENSE MASTER_SITES = http://unbound.net/downloads/ @@ -18,9 +20,7 @@ DISTFILES += cswunbound DISTFILES += cswusergroup -PATCHFILES += 0001-disable-default-cflags-on-sparc.patch - -SPKG_CLASSES = none cswusergroup cswcpsampleconf cswinitsmf +SPKG_CLASSES_CSWunbound = none cswusergroup cswcpsampleconf cswinitsmf PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswunbound$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/CSWunbound\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/unbound\/unbound.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' # We define upstream file regex so we can be notifed of new upstream software release @@ -41,12 +41,29 @@ CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw +# Gost requiers OpenSSL 1.0 +CONFIGURE_ARGS += --disable-gost + STRIP_LIBTOOL = 0 -RUNTIME_DEP_PKGS += CSWosslrt -RUNTIME_DEP_PKGS += CSWldns -RUNTIME_DEP_PKGS += CSWlibevent +SPKG_DESC_CSWunbound = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWunbound += CSWlibunbound2 +RUNTIME_DEP_PKGS_CSWunbound += CSWexpat +RUNTIME_DEP_PKGS_CSWunbound += CSWlibevent +RUNTIME_DEP_PKGS_CSWunbound += CSWlibldns1 +RUNTIME_DEP_PKGS_CSWunbound += CSWosslrt +SPKG_DESC_CSWlibunbound2 = Library implementing DNS resolution and validation +#PKGFILES_CSWlibunbound2 += /opt/csw/lib/libunbound.so.2.* +PKGFILES_CSWlibunbound2 += $(PKGFILES_RT) +RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibldns1 +RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibevent + +SPKG_DESC_CSWunbound-devel = $(DESCRIPTION) development package +#PKGFILES_CSWunbound-devel += /opt/csw/lib/libunbound.so +PKGFILES_CSWunbound-devel += $(PKGFILES_DEVEL) + # make test doesn't work for the moment on Solaris SKIPTEST = 1 Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2010-11-10 12:34:21 UTC (rev 11543) +++ csw/mgar/pkg/unbound/trunk/checksums 2010-11-10 12:34:33 UTC (rev 11544) @@ -1 +1 @@ -2cdcfe0ca45373c6b22e274560ae9943 unbound-1.4.6.tar.gz +97ee3c4a9877ff725fad23e31ecadfe0 unbound-1.4.7.tar.gz Deleted: csw/mgar/pkg/unbound/trunk/files/0001-disable-default-cflags-on-sparc.patch =================================================================== --- csw/mgar/pkg/unbound/trunk/files/0001-disable-default-cflags-on-sparc.patch 2010-11-10 12:34:21 UTC (rev 11543) +++ csw/mgar/pkg/unbound/trunk/files/0001-disable-default-cflags-on-sparc.patch 2010-11-10 12:34:33 UTC (rev 11544) @@ -1,751 +0,0 @@ -From b37f71e0473b23b92dc55238362c259bfbbe4e6c Mon Sep 17 00:00:00 2001 -From: Ihsan Dogan -Date: Sat, 23 Oct 2010 13:57:53 +0200 -Subject: [PATCH] disable default cflags on sparc - ---- - configure | 298 +++++++++++++++++++++++++++++++++++++++++----------------- - configure.ac | 111 ++++++++++++++++++++-- - doc/README | 15 +++- - 3 files changed, 326 insertions(+), 98 deletions(-) - -diff --git a/configure b/configure -index fa2b6df..6dc8502 100755 ---- a/configure -+++ b/configure -@@ -1,6 +1,6 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.65 for unbound 1.4.6. -+# Generated by GNU Autoconf 2.65 for unbound 1.4.7. - # - # Report bugs to . - # -@@ -701,8 +701,8 @@ MAKEFLAGS= - # Identity of this package. - PACKAGE_NAME='unbound' - PACKAGE_TARNAME='unbound' --PACKAGE_VERSION='1.4.6' --PACKAGE_STRING='unbound 1.4.6' -+PACKAGE_VERSION='1.4.7' -+PACKAGE_STRING='unbound 1.4.7' - PACKAGE_BUGREPORT='unbound-bugs at nlnetlabs.nl' - PACKAGE_URL='' - -@@ -797,6 +797,8 @@ LEX - debug_enabled - DEPFLAG - UNBOUND_USERNAME -+UNBOUND_ROOTCERT_FILE -+UNBOUND_ROOTKEY_FILE - UNBOUND_PIDFILE - UNBOUND_SHARE_DIR - UNBOUND_CHROOT_DIR -@@ -873,6 +875,8 @@ with_run_dir - with_chroot_dir - with_share_dir - with_pidfile -+with_rootkey_file -+with_rootcert_file - with_username - enable_checking - enable_debug -@@ -892,6 +896,7 @@ with_ssl - enable_sha2 - enable_gost - with_libevent -+with_libexpat - enable_staticexe - enable_lock_checks - enable_alloc_checks -@@ -1453,7 +1458,7 @@ if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF --\`configure' configures unbound 1.4.6 to adapt to many kinds of systems. -+\`configure' configures unbound 1.4.7 to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... - -@@ -1519,7 +1524,7 @@ fi - - if test -n "$ac_init_help"; then - case $ac_init_help in -- short | recursive ) echo "Configuration of unbound 1.4.6:";; -+ short | recursive ) echo "Configuration of unbound 1.4.7:";; - esac - cat <<\_ACEOF - -@@ -1563,6 +1568,13 @@ Optional Packages: - same as share/unbound) - --with-pidfile=filename set default pathname to unbound pidfile (default - run-dir/unbound.pid) -+ --with-rootkey-file=filename -+ set default pathname to root key file (default -+ run-dir/root.key). This file is read and written. -+ --with-rootcert-file=filename -+ set default pathname to root update certificate file -+ (default run-dir/icannbundle.pem). This file need -+ not exist if you are content with the builtin. - --with-username=user set default user that unbound changes to (default - user is unbound) - --with-pic try to use only PIC/non-PIC objects [default=use -@@ -1583,6 +1595,7 @@ Optional Packages: - /usr/lib /usr/pkg /usr/sfw /usr or you can specify - an explicit path). Slower, but allows use of large - outgoing port ranges. -+ --with-libexpat=path specify explicit path for libexpat. - --with-ldns=PATH specify prefix of path of ldns library to use - --with-ldns-builtin forces use of package included with this one - -@@ -1671,7 +1684,7 @@ fi - test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF --unbound configure 1.4.6 -+unbound configure 1.4.7 - generated by GNU Autoconf 2.65 - - Copyright (C) 2009 Free Software Foundation, Inc. -@@ -2135,7 +2148,7 @@ cat >config.log <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - --It was created by unbound $as_me 1.4.6, which was -+It was created by unbound $as_me 1.4.7, which was - generated by GNU Autoconf 2.65. Invocation command line was - - $ $0 $@ -@@ -2484,7 +2497,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - LIBUNBOUND_CURRENT=2 --LIBUNBOUND_REVISION=6 -+LIBUNBOUND_REVISION=7 - LIBUNBOUND_AGE=0 - # 1.0.0 had 0:12:0 - # 1.0.1 had 0:13:0 -@@ -2506,6 +2519,7 @@ LIBUNBOUND_AGE=0 - # 1.4.4 had 2:4:0 - # 1.4.5 had 2:5:0 - # 1.4.6 had 2:6:0 -+# 1.4.7 had 2:7:0 - - # Current -- the number of the binary API that we're implementing - # Revision -- which iteration of the implementation of the binary -@@ -4059,6 +4073,50 @@ _ACEOF - - - -+# Check whether --with-rootkey-file was given. -+if test "${with_rootkey_file+set}" = set; then : -+ withval=$with_rootkey_file; UNBOUND_ROOTKEY_FILE="$withval" -+else -+ if test $on_mingw = no; then -+ UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key" -+else -+ UNBOUND_ROOTKEY_FILE="C:\\Program Files\\Unbound\\root.key" -+fi -+ -+fi -+ -+ -+hdr_rkey="`echo $UNBOUND_ROOTKEY_FILE | sed -e 's/\\\\/\\\\\\\\/g'`" -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define ROOT_ANCHOR_FILE "$hdr_rkey" -+_ACEOF -+ -+ -+ -+# Check whether --with-rootcert-file was given. -+if test "${with_rootcert_file+set}" = set; then : -+ withval=$with_rootcert_file; UNBOUND_ROOTCERT_FILE="$withval" -+else -+ if test $on_mingw = no; then -+ UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem" -+else -+ UNBOUND_ROOTCERT_FILE="C:\\Program Files\\Unbound\\icannbundle.pem" -+fi -+ -+fi -+ -+ -+hdr_rpem="`echo $UNBOUND_ROOTCERT_FILE | sed -e 's/\\\\/\\\\\\\\/g'`" -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define ROOT_CERT_FILE "$hdr_rpem" -+_ACEOF -+ -+ -+ - # Check whether --with-username was given. - if test "${with_username+set}" = set; then : - withval=$with_username; UNBOUND_USERNAME="$withval" -@@ -5531,70 +5589,6 @@ fi - - - --# for Sun studio 11. -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -xO4" >&5 --$as_echo_n "checking whether $CC supports -xO4... " >&6; } --cache=`echo xO4 | sed 'y%.=/+-%___p_%'` --if { as_var=cv_prog_cc_flag_$cache; eval "test \"\${$as_var+set}\" = set"; }; then : -- $as_echo_n "(cached) " >&6 --else -- --echo 'void f(){}' >conftest.c --if test -z "`$CC $CPPFLAGS $CFLAGS -xO4 -c conftest.c 2>&1`"; then --eval "cv_prog_cc_flag_$cache=yes" --else --eval "cv_prog_cc_flag_$cache=no" --fi --rm -f conftest conftest.o conftest.c -- --fi -- --if eval "test \"`echo '$cv_prog_cc_flag_'$cache`\" = yes"; then --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } --: --CFLAGS="$CFLAGS -xO4" --else --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --: -- --fi -- -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -xtarget=generic" >&5 --$as_echo_n "checking whether $CC supports -xtarget=generic... " >&6; } --cache=`echo xtarget=generic | sed 'y%.=/+-%___p_%'` --if { as_var=cv_prog_cc_flag_$cache; eval "test \"\${$as_var+set}\" = set"; }; then : -- $as_echo_n "(cached) " >&6 --else -- --echo 'void f(){}' >conftest.c --if test -z "`$CC $CPPFLAGS $CFLAGS -xtarget=generic -c conftest.c 2>&1`"; then --eval "cv_prog_cc_flag_$cache=yes" --else --eval "cv_prog_cc_flag_$cache=no" --fi --rm -f conftest conftest.o conftest.c -- --fi -- --if eval "test \"`echo '$cv_prog_cc_flag_'$cache`\" = yes"; then --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } --: --CFLAGS="$CFLAGS -xtarget=generic" --else --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --: -- --fi -- -- - # debug mode flags warnings - # Check whether --enable-checking was given. - if test "${enable_checking+set}" = set; then : -@@ -6818,13 +6812,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:6821: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:6815: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:6824: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:6818: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:6827: output\"" >&5) -+ (eval echo "\"\$as_me:6821: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -8029,7 +8023,7 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 8032 "configure"' > conftest.$ac_ext -+ echo '#line 8026 "configure"' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -9289,11 +9283,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9292: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9286: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9296: \$? = $ac_status" >&5 -+ echo "$as_me:9290: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -9628,11 +9622,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9631: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9625: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9635: \$? = $ac_status" >&5 -+ echo "$as_me:9629: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -9733,11 +9727,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9736: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9730: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9740: \$? = $ac_status" >&5 -+ echo "$as_me:9734: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -9788,11 +9782,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9791: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9785: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9795: \$? = $ac_status" >&5 -+ echo "$as_me:9789: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -12158,7 +12152,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12161 "configure" -+#line 12155 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12254,7 +12248,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12257 "configure" -+#line 12251 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -15664,6 +15658,47 @@ $as_echo "#define USE_MINI_EVENT 1" >>confdefs.h - - fi - -+# check for libexpat -+ -+# Check whether --with-libexpat was given. -+if test "${with_libexpat+set}" = set; then : -+ withval=$with_libexpat; -+else -+ withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr" -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexpat" >&5 -+$as_echo_n "checking for libexpat... " >&6; } -+found_libexpat="no" -+for dir in $withval ; do -+ if test -f "$dir/include/expat.h"; then -+ found_libexpat="yes" -+ if test "$dir" != "/usr"; then -+ CPPFLAGS="$CPPFLAGS -I$dir/include" -+ LDFLAGS="$LDFLAGS -L$dir/lib" -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $dir" >&5 -+$as_echo "found in $dir" >&6; } -+ break; -+ fi -+done -+if test x_$found_libexpat != x_yes; then -+ as_fn_error "Could not find libexpat, expat.h" "$LINENO" 5 -+fi -+for ac_header in expat.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default -+" -+if test "x$ac_cv_header_expat_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_EXPAT_H 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ - # set static linking if requested - - staticexe="" -@@ -16096,6 +16131,73 @@ fi - - fi - -+# check wether strptime also works -+for ac_func in strptime -+do : -+ ac_fn_c_check_func "$LINENO" "strptime" "ac_cv_func_strptime" -+if test "x$ac_cv_func_strptime" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_STRPTIME 1 -+_ACEOF -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime works" >&5 -+$as_echo_n "checking whether strptime works... " >&6; } -+if test c${cross_compiling} = cno; then -+if test "$cross_compiling" = yes; then : -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "cannot run test program while cross compiling -+See \`config.log' for more details." "$LINENO" 5; } -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#define _XOPEN_SOURCE -+#include -+int main(void) { struct tm tm; char *res; -+res = strptime("20070207111842", "%Y%m%d%H%M%S", &tm); -+if (!res) return 1; return 0; } -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ eval "ac_cv_c_strptime_works=yes" -+else -+ eval "ac_cv_c_strptime_works=no" -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+ -+else -+eval "ac_cv_c_strptime_works=maybe" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_strptime_works" >&5 -+$as_echo "$ac_cv_c_strptime_works" >&6; } -+if test $ac_cv_c_strptime_works = no; then -+case " $LIBOBJS " in -+ *" strptime.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS strptime.$ac_objext" -+ ;; -+esac -+ -+else -+ -+cat >>confdefs.h <<_ACEOF -+#define STRPTIME_WORKS 1 -+_ACEOF -+ -+fi -+ -+else -+ case " $LIBOBJS " in -+ *" strptime.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS strptime.$ac_objext" -+ ;; -+esac -+ -+fi -+done -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setusercontext" >&5 - $as_echo_n "checking for library containing setusercontext... " >&6; } - if test "${ac_cv_search_setusercontext+set}" = set; then : -@@ -16484,6 +16586,26 @@ done - for ac_header in ldns/ldns.h - do : - ac_fn_c_check_header_compile "$LINENO" "ldns/ldns.h" "ac_cv_header_ldns_ldns_h" "$ac_includes_default -+#ifdef HAVE_SYS_SOCKET_H -+#include -+#endif -+ -+#ifdef HAVE_NETINET_IN_H -+#include -+#endif -+ -+#ifdef HAVE_ARPA_INET_H -+#include -+#endif -+ -+#ifdef HAVE_WINSOCK2_H -+#include -+#endif -+ -+#ifdef HAVE_WS2TCPIP_H -+#include -+#endif -+ - " - if test "x$ac_cv_header_ldns_ldns_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -@@ -17114,7 +17236,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - # report actual input values of CONFIG_FILES etc. instead of their - # values after options handling. - ac_log=" --This file was extended by unbound $as_me 1.4.6, which was -+This file was extended by unbound $as_me 1.4.7, which was - generated by GNU Autoconf 2.65. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES -@@ -17180,7 +17302,7 @@ _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ --unbound config.status 1.4.6 -+unbound config.status 1.4.7 - configured by $0, generated by GNU Autoconf 2.65, - with options \\"\$ac_cs_config\\" - -diff --git a/configure.ac b/configure.ac -index 304e876..6aadeb4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6,10 +6,10 @@ sinclude(acx_pthread.m4) - sinclude(acx_python.m4) - sinclude(ac_pkg_swig.m4) - --AC_INIT(unbound, 1.4.6, unbound-bugs at nlnetlabs.nl, unbound) -+AC_INIT(unbound, 1.4.7, unbound-bugs at nlnetlabs.nl, unbound) - - LIBUNBOUND_CURRENT=2 --LIBUNBOUND_REVISION=6 -+LIBUNBOUND_REVISION=7 - LIBUNBOUND_AGE=0 - # 1.0.0 had 0:12:0 - # 1.0.1 had 0:13:0 -@@ -31,6 +31,7 @@ LIBUNBOUND_AGE=0 - # 1.4.4 had 2:4:0 - # 1.4.5 had 2:5:0 - # 1.4.6 had 2:6:0 -+# 1.4.7 had 2:7:0 - - # Current -- the number of the binary API that we're implementing - # Revision -- which iteration of the implementation of the binary -@@ -153,6 +154,34 @@ AC_SUBST(UNBOUND_PIDFILE) - ACX_ESCAPE_BACKSLASH($UNBOUND_PIDFILE, hdr_pid) - AC_DEFINE_UNQUOTED(PIDFILE, ["$hdr_pid"], [default pidfile location]) - -+AC_ARG_WITH(rootkey-file, -+ AC_HELP_STRING([--with-rootkey-file=filename], -+ [set default pathname to root key file (default run-dir/root.key). This file is read and written.]), -+ UNBOUND_ROOTKEY_FILE="$withval", -+if test $on_mingw = no; then -+ UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key" -+else -+ UNBOUND_ROOTKEY_FILE="C:\\Program Files\\Unbound\\root.key" -+fi -+) -+AC_SUBST(UNBOUND_ROOTKEY_FILE) -+ACX_ESCAPE_BACKSLASH($UNBOUND_ROOTKEY_FILE, hdr_rkey) -+AC_DEFINE_UNQUOTED(ROOT_ANCHOR_FILE, ["$hdr_rkey"], [default rootkey location]) -+ -+AC_ARG_WITH(rootcert-file, -+ AC_HELP_STRING([--with-rootcert-file=filename], -+ [set default pathname to root update certificate file (default run-dir/icannbundle.pem). This file need not exist if you are content with the builtin.]), -+ UNBOUND_ROOTCERT_FILE="$withval", -+if test $on_mingw = no; then -+ UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem" -+else -+ UNBOUND_ROOTCERT_FILE="C:\\Program Files\\Unbound\\icannbundle.pem" -+fi -+) -+AC_SUBST(UNBOUND_ROOTCERT_FILE) -+ACX_ESCAPE_BACKSLASH($UNBOUND_ROOTCERT_FILE, hdr_rpem) -+AC_DEFINE_UNQUOTED(ROOT_CERT_FILE, ["$hdr_rpem"], [default rootcert location]) -+ - AC_ARG_WITH(username, - AC_HELP_STRING([--with-username=user], - [set default user that unbound changes to (default user is unbound)]), -@@ -174,10 +203,6 @@ AC_PROG_CC - ACX_DEPFLAG - ACX_DETERMINE_EXT_FLAGS_UNBOUND - --# for Sun studio 11. --ACX_CHECK_COMPILER_FLAG(xO4, [CFLAGS="$CFLAGS -xO4"]) --ACX_CHECK_COMPILER_FLAG(xtarget=generic, [CFLAGS="$CFLAGS -xtarget=generic"]) -- - # debug mode flags warnings - AC_ARG_ENABLE(checking, AC_HELP_STRING([--enable-checking], [Enable warnings, asserts, makefile-dependencies])) - AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [same as enable-checking])) -@@ -531,6 +556,29 @@ else - AC_DEFINE(USE_MINI_EVENT, 1, [Define if you want to use internal select based events]) - fi - -+# check for libexpat -+AC_ARG_WITH(libexpat, AC_HELP_STRING([--with-libexpat=path], -+ [specify explicit path for libexpat.]), -+ [ ],[ withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr" ]) -+AC_MSG_CHECKING(for libexpat) -+found_libexpat="no" -+for dir in $withval ; do -+ if test -f "$dir/include/expat.h"; then -+ found_libexpat="yes" -+ dnl assume /usr is in default path. -+ if test "$dir" != "/usr"; then -+ CPPFLAGS="$CPPFLAGS -I$dir/include" -+ LDFLAGS="$LDFLAGS -L$dir/lib" -+ fi -+ AC_MSG_RESULT(found in $dir) -+ break; -+ fi -+done -+if test x_$found_libexpat != x_yes; then -+ AC_ERROR([Could not find libexpat, expat.h]) -+fi -+AC_CHECK_HEADERS([expat.h],,, [AC_INCLUDES_DEFAULT]) -+ - # set static linking if requested - AC_SUBST(staticexe) - staticexe="" -@@ -606,6 +654,29 @@ if test $ac_cv_func_daemon = yes; then - ]) - fi - -+# check wether strptime also works -+AC_DEFUN([AC_CHECK_STRPTIME_WORKS], -+[AC_REQUIRE([AC_PROG_CC]) -+AC_MSG_CHECKING(whether strptime works) -+if test c${cross_compiling} = cno; then -+AC_TRY_RUN([ -+#define _XOPEN_SOURCE -+#include -+int main(void) { struct tm tm; char *res; -+res = strptime("20070207111842", "%Y%m%d%H%M%S", &tm); -+if (!res) return 1; return 0; } -+] , [eval "ac_cv_c_strptime_works=yes"], [eval "ac_cv_c_strptime_works=no"]) -+else -+eval "ac_cv_c_strptime_works=maybe" -+fi -+AC_MSG_RESULT($ac_cv_c_strptime_works) -+if test $ac_cv_c_strptime_works = no; then -+AC_LIBOBJ(strptime) -+else -+AC_DEFINE_UNQUOTED([STRPTIME_WORKS], 1, [use default strptime.]) -+fi -+])dnl -+AC_CHECK_FUNCS([strptime],[AC_CHECK_STRPTIME_WORKS],[AC_LIBOBJ([strptime])]) - AC_SEARCH_LIBS([setusercontext], [util]) - AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam getrlimit setrlimit setsid sbrk chroot kill sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex]) - AC_CHECK_FUNCS([setresuid],,[AC_CHECK_FUNCS([setreuid])]) -@@ -655,7 +726,27 @@ if test "$use_ldns_builtin" = "no"; then - else - ac_cv_func_ldns_key_EVP_load_gost_id="yes" - fi -- AC_CHECK_HEADERS([ldns/ldns.h],,, [AC_INCLUDES_DEFAULT]) -+ AC_CHECK_HEADERS([ldns/ldns.h],,, [AC_INCLUDES_DEFAULT -+#ifdef HAVE_SYS_SOCKET_H -+#include -+#endif -+ -+#ifdef HAVE_NETINET_IN_H -+#include -+#endif -+ -+#ifdef HAVE_ARPA_INET_H -+#include -+#endif -+ -+#ifdef HAVE_WINSOCK2_H -+#include -+#endif -+ -+#ifdef HAVE_WS2TCPIP_H -+#include -+#endif -+]) - if test $ac_cv_lib_ldns_ldns_buffer_copy = yes \ - -a $ac_cv_func_ldns_key_buf2rsa_raw = yes \ - -a $ac_cv_header_ldns_ldns_h = yes \ -@@ -773,6 +864,12 @@ AHX_MEMCMP_BROKEN(unbound) - char *ctime_r(const time_t *timep, char *buf); - #endif - -+#if !defined(HAVE_STRPTIME) || !defined(STRPTIME_WORKS) -+#define strptime unbound_strptime -+struct tm; -+char *strptime(const char *s, const char *format, struct tm *tm); -+#endif -+ - #if defined(HAVE_EVENT_H) && !defined(HAVE_EVENT_BASE_ONCE) && (defined(HAVE_PTHREAD) || defined(HAVE_SOLARIS_THREADS)) - /* using version of libevent that is not threadsafe. */ - # define LIBEVENT_SIGNAL_PROBLEM 1 -diff --git a/doc/README b/doc/README -index a572250..5f13384 100644 ---- a/doc/README -+++ b/doc/README -@@ -1,4 +1,4 @@ --README for Unbound 1.4.6 -+README for Unbound @version@ - Copyright 2007 NLnet Labs - http://unbound.net - -@@ -28,6 +28,8 @@ This software is under BSD license, see LICENSE for details. - of outgoing ports. This improves randomization and spoof - resistance. For the default of 16 ports the builtin alternative - works well and is a little faster. -+ * --with-libexpat=/path/to/libexpat -+ Can be set to the install directory of libexpat. - * --without-pthreads - This disables pthreads. Without this option the pthreads library - is detected automatically. Use this option to disable threading -@@ -59,6 +61,13 @@ This software is under BSD license, see LICENSE for details. - * --with-chroot-dir=path - Set default chroot directory, - the default is /usr/local/etc/unbound. -+ * --with-rootkey-file=path -+ Set the default root.key path. This file is read and written. -+ the default is /usr/local/etc/unbound/root.key -+ * --with-rootcert-file=path -+ Set the default root update certificate path. A builtin certificate -+ is used if this file is empty or does not exist. -+ the default is /usr/local/etc/unbound/icannbundle.pem - * --with-username=user - Set default user name to change to, - the default is the "unbound" user. -@@ -72,8 +81,7 @@ This software is under BSD license, see LICENSE for details. - * --disable-gost - Disable support for GOST crypto, RFC 5933. - --* 'make test' attempts to run a series of tests, depending on the support -- programs that are installed. -+* 'make test' runs a series of self checks. - - Known issues - ------------ -@@ -97,6 +105,7 @@ o The warning 'openssl has no entropy, seeding with time', with chroot - o On Solaris 5.10 some libtool packages from repositories do not work with - gcc, showing errors gcc: unrecognized option `-KPIC' - To solve this do ./configure libtool=./libtool [your options...]. -+ On Solaris you may pass CFLAGS="-xO4 -xtarget=generic" if you use sun-cc. - o If unbound-control (or munin graphs) do not work, this can often be because - the unbound-control-setup script creates the keys with restricted - permissions, and the files need to be made readable or ownered by both the --- -1.7.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Nov 10 15:29:50 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 10 Nov 2010 14:29:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11545] csw/mgar/pkg/libldns/trunk/Makefile Message-ID: Revision: 11545 http://gar.svn.sourceforge.net/gar/?rev=11545&view=rev Author: idogan23 Date: 2010-11-10 14:29:50 +0000 (Wed, 10 Nov 2010) Log Message: ----------- libldns: fixing typo Modified Paths: -------------- csw/mgar/pkg/libldns/trunk/Makefile Modified: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile 2010-11-10 12:34:33 UTC (rev 11544) +++ csw/mgar/pkg/libldns/trunk/Makefile 2010-11-10 14:29:50 UTC (rev 11545) @@ -41,7 +41,7 @@ EXTRA_BUILD_ISAS_sparc = sparcv8plus RUNTIME_DEP_PKGS_CSWlibldns1 += CSWosslrt -RUNTIME_DEP_PKGS_CSWldnsdevel += CSWlibldns1 +RUNTIME_DEP_PKGS_CSWlibldnsdevel += CSWlibldns1 INCOMPATIBLE_PKGS_CSWlibldns1 = CSWldns INCOMPATIBLE_PKGS_CSWlibldnsdevel = CSWldnsdevel 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 Nov 10 15:46:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 14:46:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[11546] csw/mgar/pkg/cpan Message-ID: Revision: 11546 http://gar.svn.sourceforge.net/gar/?rev=11546&view=rev Author: dmichelsen Date: 2010-11-10 14:46:12 +0000 (Wed, 10 Nov 2010) Log Message: ----------- cpan/Crypt-RC4: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Crypt-RC4/ csw/mgar/pkg/cpan/Crypt-RC4/branches/ csw/mgar/pkg/cpan/Crypt-RC4/tags/ csw/mgar/pkg/cpan/Crypt-RC4/trunk/ csw/mgar/pkg/cpan/Crypt-RC4/trunk/Makefile csw/mgar/pkg/cpan/Crypt-RC4/trunk/checksums csw/mgar/pkg/cpan/Crypt-RC4/trunk/files/ csw/mgar/pkg/cpan/Crypt-RC4/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Crypt-RC4/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/Crypt-RC4/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-RC4/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Crypt-RC4/trunk/Makefile 2010-11-10 14:46:12 UTC (rev 11546) @@ -0,0 +1,17 @@ +GARNAME = Crypt-RC4 +GARVERSION = 2.02 +CATEGORIES = cpan +AUTHOR = SIFUKURT + +DESCRIPTION = Perl implementation of the RC4 encryption algorithm +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmcryptrc4 +CATALOGNAME = pm_cryptrc4 + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Crypt-RC4/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-RC4/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Crypt-RC4/trunk/checksums 2010-11-10 14:46:12 UTC (rev 11546) @@ -0,0 +1 @@ +4ca59a7e58ac9597c3b4f3f46ea22629 Crypt-RC4-2.02.tar.gz Added: csw/mgar/pkg/cpan/Crypt-RC4/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Crypt-RC4/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Crypt-RC4/trunk/files/COPYING 2010-11-10 14:46:12 UTC (rev 11546) @@ -0,0 +1,10 @@ +=head1 AUTHOR + +Kurt Kincaid (sifukurt at yahoo.com) +Ronald Rivest for RSA Security, Inc. + +=head1 LICENSE + +This is free software and may be modified and/or +redistributed under the same terms as Perl itself. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 10 16:04:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 15:04:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[11547] csw/mgar/gar/v2 Message-ID: Revision: 11547 http://gar.svn.sourceforge.net/gar/?rev=11547&view=rev Author: dmichelsen Date: 2010-11-10 15:04:13 +0000 (Wed, 10 Nov 2010) Log Message: ----------- Add new variable RUNTIME_DEP_PKGS_ONLY_* to finer control dependencies Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk csw/mgar/gar/v2/gar.pkg.mk csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2010-11-10 14:46:12 UTC (rev 11546) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2010-11-10 15:04:13 UTC (rev 11547) @@ -39,6 +39,8 @@ _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist _CATEGORY_GSPEC_INCLUDE ?= csw_cpan_dyngspec.gspec +_CATEGORY_RUNTIME_DEP_PKGS ?= CSWperl + # Perl module dependencies can not be properly tracked right now _CATEGORY_CHECKPKG_OVERRIDES = surplus-dependency Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-11-10 14:46:12 UTC (rev 11546) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-11-10 15:04:13 UTC (rev 11547) @@ -456,16 +456,19 @@ # 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 += $(_CATEGORY_RUNTIME_DEP_PKGS) $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),CSWalternatives) $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) +$(WORKDIR)/%.depend: _DEP_PKGS=$(or $(RUNTIME_DEP_PKGS_ONLY_$*),$(RUNTIME_DEP_PKGS_ONLY),$(sort $(_EXTRA_GAR_PKGS)) $(or $(RUNTIME_DEP_PKGS_$*),$(RUNTIME_DEP_PKGS),$(DEP_PKGS_$*),$(DEP_PKGS))) +$(WORKDIR)/%.depend: $(WORKDIR) # The final "true" is for packages without dependencies to make the shell happy as "( )" is not allowed. -$(WORKDIR)/%.depend: $(WORKDIR) - $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(DEP_PKGS)$(DEP_PKGS_$*)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ +$(WORKDIR)/%.depend: + $(_DBG)$(if $(_DEP_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ echo "I $(PKG)";\ )\ - $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(or $(RUNTIME_DEP_PKGS_$*),$(RUNTIME_DEP_PKGS),$(DEP_PKGS_$*),$(DEP_PKGS)),\ + $(foreach PKG,$(_DEP_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \ Modified: csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec =================================================================== --- csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec 2010-11-10 14:46:12 UTC (rev 11546) +++ csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec 2010-11-10 15:04:13 UTC (rev 11547) @@ -1,5 +1,4 @@ %include url file://%{PKGLIB}/csw_vars.gspec %pkginfo url file://%{PKGLIB}/csw/pkginfo %prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} -%depend:merge url file://%{PKGLIB}/csw/depend.perl %depend exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 10 16:08:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 15:08:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11548] csw/mgar/pkg/cpan Message-ID: Revision: 11548 http://gar.svn.sourceforge.net/gar/?rev=11548&view=rev Author: dmichelsen Date: 2010-11-10 15:08:50 +0000 (Wed, 10 Nov 2010) Log Message: ----------- cpan/Convert-EBCDIC: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Convert-EBCDIC/ csw/mgar/pkg/cpan/Convert-EBCDIC/branches/ csw/mgar/pkg/cpan/Convert-EBCDIC/tags/ csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/ csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/Makefile csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/checksums csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/files/ csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Convert-EBCDIC/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/Convert-EBCDIC/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/Makefile 2010-11-10 15:08:50 UTC (rev 11548) @@ -0,0 +1,17 @@ +GARNAME = Convert-EBCDIC +GARVERSION = 0.06 +CATEGORIES = cpan +AUTHOR = CXL + +DESCRIPTION = Perl module for string conversion between EBCDIC and ASCII +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmconvertebcdic +CATALOGNAME = pm_convertebcdic + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/checksums 2010-11-10 15:08:50 UTC (rev 11548) @@ -0,0 +1 @@ +931cffde61b7040b2cd42002387d320d Convert-EBCDIC-0.06.tar.gz Added: csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/files/COPYING 2010-11-10 15:08:50 UTC (rev 11548) @@ -0,0 +1,7 @@ +Convert::ASCII-EBCDIC + +This program is Copyright (c) 1996 - 1998 Chris Leach. + +This program is free software; you can use, distribute and/or +modify it under the same terms as Perl itself. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 10 16:13:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 15:13:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[11549] csw/mgar/pkg/cpan/Time-modules/trunk Message-ID: Revision: 11549 http://gar.svn.sourceforge.net/gar/?rev=11549&view=rev Author: dmichelsen Date: 2010-11-10 15:13:35 +0000 (Wed, 10 Nov 2010) Log Message: ----------- cpan/Time-modules: Update to mGAR v2, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Time-modules/trunk/Makefile csw/mgar/pkg/cpan/Time-modules/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Time-modules/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Time-modules/trunk/files/CSWpmtimemods.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Time-modules/trunk/ Property changes on: csw/mgar/pkg/cpan/Time-modules/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Time-modules/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Time-modules/trunk/Makefile 2010-11-10 15:08:50 UTC (rev 11548) +++ csw/mgar/pkg/cpan/Time-modules/trunk/Makefile 2010-11-10 15:13:35 UTC (rev 11549) @@ -3,13 +3,26 @@ CATEGORIES = cpan AUTHOR = MUIR -DESCRIPTION = various time manipulation modules +DESCRIPTION = Various time manipulation modules define BLURB endef -DISTFILES += CSWpmtimemods.gspec +MASTER_SITES = $(addsuffix modules/,$(CPAN_MIRRORS)) +DISTFILES = COPYING +PACKAGES = CSWpmtimemodules CSWpmtimemods + +CATALOGNAME_CSWpmtimemodules = pm_timemodules +CATALOGNAME_CSWpmtimemods = pm_timemods + +SPKG_DESC_CSWpmtimemodules = $(DESCRIPTION) +SPKG_DESC_CSWpmtimemods = Empty stub as contents has been moved to CSWpmtimemodules + +ARCHALL = 1 + +RUNTIME_DEP_PKGS_ONLY_CSWpmtimemods = CSWpmtimemodules + +PKGFILES_CSWpmtimemods = NOFILES + include gar/category.mk -# Modify AUTHOR_ID -AUTHOR_ID := $(AUTHOR_ID)/modules Modified: csw/mgar/pkg/cpan/Time-modules/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Time-modules/trunk/checksums 2010-11-10 15:08:50 UTC (rev 11548) +++ csw/mgar/pkg/cpan/Time-modules/trunk/checksums 2010-11-10 15:13:35 UTC (rev 11549) @@ -1,2 +1 @@ -b62893dee5f0bd36709e638c7d739d99 download/CSWpmtimemods.gspec -790c6739f601b85654fac9ee516b18d8 download/Time-modules-2006.0814.tar.gz +790c6739f601b85654fac9ee516b18d8 Time-modules-2006.0814.tar.gz Added: csw/mgar/pkg/cpan/Time-modules/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Time-modules/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Time-modules/trunk/files/COPYING 2010-11-10 15:13:35 UTC (rev 11549) @@ -0,0 +1,4 @@ +Copyright (C) 1996-1999 David Muir Sharnoff. License hereby +granted for anyone to use, modify or redistribute this module at +their own risk. Please feed useful changes back to muir at idiom.com. + Deleted: csw/mgar/pkg/cpan/Time-modules/trunk/files/CSWpmtimemods.gspec =================================================================== --- csw/mgar/pkg/cpan/Time-modules/trunk/files/CSWpmtimemods.gspec 2010-11-10 15:08:50 UTC (rev 11548) +++ csw/mgar/pkg/cpan/Time-modules/trunk/files/CSWpmtimemods.gspec 2010-11-10 15:13:35 UTC (rev 11549) @@ -1,8 +0,0 @@ -%var bitname pm_timemodules -%var pkgname CSWpmtimemodules -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (C) 1996-1999 David Muir Sharnoff. License hereby -granted for anyone to use, modify or redistribute this module at -their own risk. Please feed useful changes back to muir at idiom.com. 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 Nov 10 16:30:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 15:30:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[11550] csw/mgar/pkg/cpan Message-ID: Revision: 11550 http://gar.svn.sourceforge.net/gar/?rev=11550&view=rev Author: dmichelsen Date: 2010-11-10 15:30:26 +0000 (Wed, 10 Nov 2010) Log Message: ----------- cpan/Time-Period: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Time-Period/ csw/mgar/pkg/cpan/Time-Period/branches/ csw/mgar/pkg/cpan/Time-Period/tags/ csw/mgar/pkg/cpan/Time-Period/trunk/ csw/mgar/pkg/cpan/Time-Period/trunk/Makefile csw/mgar/pkg/cpan/Time-Period/trunk/checksums csw/mgar/pkg/cpan/Time-Period/trunk/files/ csw/mgar/pkg/cpan/Time-Period/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Time-Period/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/Time-Period/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Time-Period/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Time-Period/trunk/Makefile 2010-11-10 15:30:26 UTC (rev 11550) @@ -0,0 +1,17 @@ +GARNAME = Period +GARVERSION = 1.20 +CATEGORIES = cpan +AUTHOR = PRYAN + +DESCRIPTION = A Perl module to deal with time periods +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmtimeperiod +CATALOGNAME = pm_timeperiod + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Time-Period/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Time-Period/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Time-Period/trunk/checksums 2010-11-10 15:30:26 UTC (rev 11550) @@ -0,0 +1 @@ +63b073af8ec96e7fa48801cd6fcccdd1 Period-1.20.tar.gz Added: csw/mgar/pkg/cpan/Time-Period/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Time-Period/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Time-Period/trunk/files/COPYING 2010-11-10 15:30:26 UTC (rev 11550) @@ -0,0 +1,5 @@ +Copyright (c) 1997 Patrick Ryan. All rights reserved. + +This Perl module uses the conditions given by Perl. This module may only +be distributed and or modified under the conditions given by Perl. + 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 Nov 10 16:41:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 15:41:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[11551] csw/mgar/pkg/cpan Message-ID: Revision: 11551 http://gar.svn.sourceforge.net/gar/?rev=11551&view=rev Author: dmichelsen Date: 2010-11-10 15:41:35 +0000 (Wed, 10 Nov 2010) Log Message: ----------- cpan/Module-Refresh: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Module-Refresh/ csw/mgar/pkg/cpan/Module-Refresh/branches/ csw/mgar/pkg/cpan/Module-Refresh/tags/ csw/mgar/pkg/cpan/Module-Refresh/trunk/ csw/mgar/pkg/cpan/Module-Refresh/trunk/Makefile csw/mgar/pkg/cpan/Module-Refresh/trunk/checksums csw/mgar/pkg/cpan/Module-Refresh/trunk/files/ csw/mgar/pkg/cpan/Module-Refresh/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Module-Refresh/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/Module-Refresh/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Refresh/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Module-Refresh/trunk/Makefile 2010-11-10 15:41:35 UTC (rev 11551) @@ -0,0 +1,26 @@ +GARNAME = Module-Refresh +GARVERSION = 0.13 +CATEGORIES = cpan +AUTHOR = JESSE + +DESCRIPTION = Refresh %INC files when updated on disk +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmmodulerefresh CSWpmmodrefresh + +CATALOGNAME_CSWpmmodulerefresh = pm_modulerefresh +CATALOGNAME_CSWpmmodrefresh = pm_modrefresh + +SPKG_DESC_CSWpmmodulerefresh = $(DESCRIPTION) +SPKG_DESC_CSWpmmodrefresh = Empty stub as contents has been moved to CSWpmmodulerefresh + +RUNTIME_DEP_PKGS_ONLY_CSWpmmodrefresh = CSWpmmodulerefresh + +ARCHALL = 1 + +PKGFILES_CSWpmmodrefresh = NOFILES + +include gar/category.mk Added: csw/mgar/pkg/cpan/Module-Refresh/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Refresh/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Module-Refresh/trunk/checksums 2010-11-10 15:41:35 UTC (rev 11551) @@ -0,0 +1 @@ +d968e32fc272b5a258f527504c99dc7d Module-Refresh-0.13.tar.gz Added: csw/mgar/pkg/cpan/Module-Refresh/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Module-Refresh/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Module-Refresh/trunk/files/COPYING 2010-11-10 15:41:35 UTC (rev 11551) @@ -0,0 +1,8 @@ +Copyright 2004 by Jesse Vincent Ejesse at bestpractical.comE, +Autrijus Tang Eautrijus at autrijus.orgE + +This program is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. + +See L + 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 Nov 10 16:51:34 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 10 Nov 2010 15:51:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[11552] csw/mgar/pkg/cpan Message-ID: Revision: 11552 http://gar.svn.sourceforge.net/gar/?rev=11552&view=rev Author: bonivart Date: 2010-11-10 15:51:33 +0000 (Wed, 10 Nov 2010) Log Message: ----------- pm_netssh2: initial commit, built on request Added Paths: ----------- csw/mgar/pkg/cpan/Net-SSH2/ csw/mgar/pkg/cpan/Net-SSH2/branches/ csw/mgar/pkg/cpan/Net-SSH2/tags/ csw/mgar/pkg/cpan/Net-SSH2/trunk/ csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile csw/mgar/pkg/cpan/Net-SSH2/trunk/checksums csw/mgar/pkg/cpan/Net-SSH2/trunk/files/ csw/mgar/pkg/cpan/Net-SSH2/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Net-SSH2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile 2010-11-10 15:51:33 UTC (rev 11552) @@ -0,0 +1,18 @@ +GARNAME = Net-SSH2 +GARVERSION = 0.33 +CATEGORIES = cpan +AUTHOR = RKITOVER + +DESCRIPTION = Support for the SSH 2 protocol via libssh2 +define BLURB + Support for the SSH 2 protocol via libssh2 +endef + +DISTFILES += COPYING + +PACKAGES = CSWpmnetssh2 +CATALOGNAME = pm_netssh2 + +RUNTIME_DEP_PKGS_CSWpmnetssh2 += CSWosslrt CSWlibssh2 CSWzlib + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-SSH2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-SSH2/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-SSH2/trunk/checksums 2010-11-10 15:51:33 UTC (rev 11552) @@ -0,0 +1 @@ +96782c938539794c0c2c396a84ea2f09 Net-SSH2-0.33.tar.gz Added: csw/mgar/pkg/cpan/Net-SSH2/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Net-SSH2/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Net-SSH2/trunk/files/COPYING 2010-11-10 15:51:33 UTC (rev 11552) @@ -0,0 +1,5 @@ +Copyright (C) 2005-2008 by David B. Robins; all rights reserved. + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself, either Perl version 5.8.0 or, +at your option, any later version of Perl 5 you may have available. 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 Nov 10 16:59:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 15:59:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11553] csw/mgar/pkg/cpan/Text-Wrapper/trunk Message-ID: Revision: 11553 http://gar.svn.sourceforge.net/gar/?rev=11553&view=rev Author: dmichelsen Date: 2010-11-10 15:59:53 +0000 (Wed, 10 Nov 2010) Log Message: ----------- cpan/Text-Wrapper: Update to mGAR v2 and syanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Text-Wrapper/trunk/Makefile csw/mgar/pkg/cpan/Text-Wrapper/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Text-Wrapper/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Text-Wrapper/trunk/files/CSWtextwrap.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Text-Wrapper/trunk/ Property changes on: csw/mgar/pkg/cpan/Text-Wrapper/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Text-Wrapper/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-Wrapper/trunk/Makefile 2010-11-10 15:51:33 UTC (rev 11552) +++ csw/mgar/pkg/cpan/Text-Wrapper/trunk/Makefile 2010-11-10 15:59:53 UTC (rev 11553) @@ -1,16 +1,29 @@ GARNAME = Text-Wrapper -GARVERSION = 1.000 +GARVERSION = 1.02 CATEGORIES = cpan AUTHOR = CJM -DESCRIPTION = simple word wrapping routine +DESCRIPTION = Simple word wrapping routine define BLURB Text::Wrapper provides simple word wrapping. It breaks long lines, but does not alter spacing or remove existing line breaks. If you're looking for more sophisticated text formatting, try the Text::Format module. endef -# This may some day collide with the real Text::Wrap -DISTFILES += CSWtextwrap.gspec +DISTFILES = COPYING +PACKAGES = CSWpmtextwrapper CSWpmtextwrap + +CATALOGNAME_CSWpmtextwrapper = pm_textwrapper +CATALOGNAME_CSWpmtextwrap = pm_textwrap + +SPKG_DESC_CSWpmtextwrapper = $(DESCRIPTION) +SPKG_DESC_CSWpmtextwrap = Empty stub as contents has been moved to CSWpmtextwrapper + +RUNTIME_DEP_PKGS_ONLY_CSWpmtextwrap = CSWpmtextwrapper + +ARCHALL = 1 + +PKGFILES_CSWpmtextwrap = NOFILES + include gar/category.mk Modified: csw/mgar/pkg/cpan/Text-Wrapper/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-Wrapper/trunk/checksums 2010-11-10 15:51:33 UTC (rev 11552) +++ csw/mgar/pkg/cpan/Text-Wrapper/trunk/checksums 2010-11-10 15:59:53 UTC (rev 11553) @@ -1,2 +1 @@ -fcafb4307238a2712b861177b155c3e5 download/CSWtextwrap.gspec -9f78b13b4c32c61e6aac5cefd75989dd download/Text-Wrapper-1.000.tar.gz +a0cdfe6e9e9627db147b3970d3fcad4d Text-Wrapper-1.02.tar.gz Copied: csw/mgar/pkg/cpan/Text-Wrapper/trunk/files/COPYING (from rev 11153, csw/mgar/pkg/cpan/Text-Wrapper/trunk/files/CSWtextwrap.gspec) =================================================================== --- csw/mgar/pkg/cpan/Text-Wrapper/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Text-Wrapper/trunk/files/COPYING 2010-11-10 15:59:53 UTC (rev 11553) @@ -0,0 +1,13 @@ +Copyright 1998 Christopher J. Madsen + +Author: Christopher J. Madsen +Created: 06 Mar 1998 +Version: 1.000 (27-Oct-1998) + +This program is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. + +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 either the +GNU General Public License or the Artistic License for more details. Deleted: csw/mgar/pkg/cpan/Text-Wrapper/trunk/files/CSWtextwrap.gspec =================================================================== --- csw/mgar/pkg/cpan/Text-Wrapper/trunk/files/CSWtextwrap.gspec 2010-11-10 15:51:33 UTC (rev 11552) +++ csw/mgar/pkg/cpan/Text-Wrapper/trunk/files/CSWtextwrap.gspec 2010-11-10 15:59:53 UTC (rev 11553) @@ -1,18 +0,0 @@ -%var bitname pm_textwrap -%var pkgname CSWpmtextwrap -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 1998 Christopher J. Madsen - -Author: Christopher J. Madsen -Created: 06 Mar 1998 -Version: 1.000 (27-Oct-1998) - -This program is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. - -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 either the -GNU General Public License or the Artistic License for more details. 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 Nov 10 17:37:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 16:37:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[11554] csw/mgar/pkg/rbgems Message-ID: Revision: 11554 http://gar.svn.sourceforge.net/gar/?rev=11554&view=rev Author: dmichelsen Date: 2010-11-10 16:37:10 +0000 (Wed, 10 Nov 2010) Log Message: ----------- rbgems/redcloth: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/redcloth/ csw/mgar/pkg/rbgems/redcloth/branches/ csw/mgar/pkg/rbgems/redcloth/tags/ csw/mgar/pkg/rbgems/redcloth/trunk/ csw/mgar/pkg/rbgems/redcloth/trunk/Makefile csw/mgar/pkg/rbgems/redcloth/trunk/checksums csw/mgar/pkg/rbgems/redcloth/trunk/files/ Property changes on: csw/mgar/pkg/rbgems/redcloth/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/redcloth/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/redcloth/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/redcloth/trunk/Makefile 2010-11-10 16:37:10 UTC (rev 11554) @@ -0,0 +1,16 @@ +GARNAME = redcloth +GARVERSION = 4.2.3 +CATEGORIES = rbgems + +DESCRIPTION = Textile parser for Ruby + +define BLURB +endef + +GEMNAME = RedCloth +DISTNAME = $(GEMNAME)-$(GARVERSION) +GEMPKGNAME = redcloth + +LICENSE = COPYING + +include gar/category.mk Added: csw/mgar/pkg/rbgems/redcloth/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/redcloth/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/redcloth/trunk/checksums 2010-11-10 16:37:10 UTC (rev 11554) @@ -0,0 +1 @@ +cc95e8af45e7a81c30c7480991d1c7ea RedCloth-4.2.3.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 10 17:48:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 16:48:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[11555] csw/mgar/pkg/cpan Message-ID: Revision: 11555 http://gar.svn.sourceforge.net/gar/?rev=11555&view=rev Author: dmichelsen Date: 2010-11-10 16:48:47 +0000 (Wed, 10 Nov 2010) Log Message: ----------- cpan/Text-Glob: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Text-Glob/ csw/mgar/pkg/cpan/Text-Glob/branches/ csw/mgar/pkg/cpan/Text-Glob/tags/ csw/mgar/pkg/cpan/Text-Glob/trunk/ csw/mgar/pkg/cpan/Text-Glob/trunk/Makefile csw/mgar/pkg/cpan/Text-Glob/trunk/checksums csw/mgar/pkg/cpan/Text-Glob/trunk/files/ csw/mgar/pkg/cpan/Text-Glob/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Text-Glob/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/Text-Glob/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-Glob/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Text-Glob/trunk/Makefile 2010-11-10 16:48:47 UTC (rev 11555) @@ -0,0 +1,17 @@ +GARNAME = Text-Glob +GARVERSION = 0.08 +CATEGORIES = cpan +AUTHOR = RCLAMP + +DESCRIPTION = Match globbing patterns against text +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmtextglob +CATALOGNAME = pm_textglob + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Text-Glob/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-Glob/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Text-Glob/trunk/checksums 2010-11-10 16:48:47 UTC (rev 11555) @@ -0,0 +1 @@ +39a1a3e890cd5d3f51a707579098bc1c Text-Glob-0.08.tar.gz Added: csw/mgar/pkg/cpan/Text-Glob/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Text-Glob/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Text-Glob/trunk/files/COPYING 2010-11-10 16:48:47 UTC (rev 11555) @@ -0,0 +1,5 @@ +Copyright (C) 2002, 2003, 2006, 2007 Richard Clamp. All Rights Reserved. + +This module is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 10 17:54:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Nov 2010 16:54:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[11556] csw/mgar/pkg/cpan Message-ID: Revision: 11556 http://gar.svn.sourceforge.net/gar/?rev=11556&view=rev Author: dmichelsen Date: 2010-11-10 16:54:26 +0000 (Wed, 10 Nov 2010) Log Message: ----------- cpan/Text-WikiFormat: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Text-WikiFormat/ csw/mgar/pkg/cpan/Text-WikiFormat/branches/ csw/mgar/pkg/cpan/Text-WikiFormat/tags/ csw/mgar/pkg/cpan/Text-WikiFormat/trunk/ csw/mgar/pkg/cpan/Text-WikiFormat/trunk/Makefile csw/mgar/pkg/cpan/Text-WikiFormat/trunk/checksums csw/mgar/pkg/cpan/Text-WikiFormat/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Text-WikiFormat/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/Text-WikiFormat/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-WikiFormat/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Text-WikiFormat/trunk/Makefile 2010-11-10 16:54:26 UTC (rev 11556) @@ -0,0 +1,26 @@ +GARNAME = Text-WikiFormat +GARVERSION = 0.79 +CATEGORIES = cpan +AUTHOR = CHROMATIC + +DESCRIPTION = Module for translating Wiki formatted text into other formats +define BLURB +endef + +PACKAGES = CSWpmtextwikiformat CSWpmtextwikifmt + +CATALOGNAME_CSWpmtextwikiformat = pm_textwikiformat +CATALOGNAME_CSWpmtextwikifmt = pm_textwikifmt + +SPKG_DESC_CSWpmtextwikiformat = $(DESCRIPTION) +SPKG_DESC_CSWpmtextwikifmt = Empty stub as contents has been moved to CSWpmtextwikiformat + +RUNTIME_DEP_PKGS_ONLY_CSWpmtextwikifmt = CSWpmtextwikiformat + +LICENSE = ARTISTIC + +ARCHALL = 1 + +PKGFILES_CSWpmtextwikifmt = NOFILES + +include gar/category.mk Added: csw/mgar/pkg/cpan/Text-WikiFormat/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-WikiFormat/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Text-WikiFormat/trunk/checksums 2010-11-10 16:54:26 UTC (rev 11556) @@ -0,0 +1 @@ +7f3e888ff898f67332216c4a25523f30 Text-WikiFormat-0.79.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 Nov 11 00:45:36 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 10 Nov 2010 23:45:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[11557] csw/mgar/gar/v2/bin/ap2mod_build_scripts Message-ID: Revision: 11557 http://gar.svn.sourceforge.net/gar/?rev=11557&view=rev Author: bdwalton Date: 2010-11-10 23:45:36 +0000 (Wed, 10 Nov 2010) Log Message: ----------- gar/v2: make ap2mod generate a file identifying package that placed it Modified Paths: -------------- csw/mgar/gar/v2/bin/ap2mod_build_scripts Modified: csw/mgar/gar/v2/bin/ap2mod_build_scripts =================================================================== --- csw/mgar/gar/v2/bin/ap2mod_build_scripts 2010-11-10 16:54:26 UTC (rev 11556) +++ csw/mgar/gar/v2/bin/ap2mod_build_scripts 2010-11-10 23:45:36 UTC (rev 11557) @@ -24,7 +24,7 @@ if [ "\$1" = install ]; then -touch \$PIR/$ap2modfile +echo "File created by \$PKGINST during install. Please do not remove." > \$PIR/$ap2modfile # Source csw.conf, if it exists if [ -f \$PIR/opt/csw/etc/csw.conf ] ; then 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 Nov 11 03:33:41 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Nov 2010 02:33:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[11558] csw/mgar/pkg/apache2/trunk/files/conf_build_scripts Message-ID: Revision: 11558 http://gar.svn.sourceforge.net/gar/?rev=11558&view=rev Author: bdwalton Date: 2010-11-11 02:33:41 +0000 (Thu, 11 Nov 2010) Log Message: ----------- apache2: add a script that will be used to generate the etc/ template files and deliver the conf files if they do not exist via the build CAS Added Paths: ----------- csw/mgar/pkg/apache2/trunk/files/conf_build_scripts Added: csw/mgar/pkg/apache2/trunk/files/conf_build_scripts =================================================================== --- csw/mgar/pkg/apache2/trunk/files/conf_build_scripts (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/conf_build_scripts 2010-11-11 02:33:41 UTC (rev 11558) @@ -0,0 +1,39 @@ +#!/bin/bash + +ROOT=$1 + +AP2_ROOT=/opt/csw/apache2 +AP2_CONF=$AP2_ROOT/etc + +cd $ROOT/$AP2_CONF; + +for f in $(find . -name '*conf'); do + if [ ! -f "$f.bak" ]; then + perl -pi.bak -e 's/\$/\\\$/g' $f + fi + + cat < $f.new +PIR=\${PKG_INSTALL_ROOT:-/} +AP2_ROOT=\$PIR/$AP2_ROOT +AP2_CONF=\$AP2_ROOT/etc + +if [ "\$1" = install ]; then + cat < \$AP2_CONF/$f.CSW +EOF +cat $f >> $f.new + +cat <> $f.new +EOS + +if [ ! -f \$AP2_CONF/$f ]; then + cp -p \$AP2_CONF/$f.CSW \$AP2_CONF/$f +fi + +else + rm \$AP2_CONF/$f +fi + +EOF + +mv $f.new $f +done Property changes on: csw/mgar/pkg/apache2/trunk/files/conf_build_scripts ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Nov 11 03:39:33 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Nov 2010 02:39:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11559] csw/mgar/pkg/apache2/trunk/files/conf_build_scripts Message-ID: Revision: 11559 http://gar.svn.sourceforge.net/gar/?rev=11559&view=rev Author: bdwalton Date: 2010-11-11 02:39:32 +0000 (Thu, 11 Nov 2010) Log Message: ----------- apache2: tweak the conf building script Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/conf_build_scripts Modified: csw/mgar/pkg/apache2/trunk/files/conf_build_scripts =================================================================== --- csw/mgar/pkg/apache2/trunk/files/conf_build_scripts 2010-11-11 02:33:41 UTC (rev 11558) +++ csw/mgar/pkg/apache2/trunk/files/conf_build_scripts 2010-11-11 02:39:32 UTC (rev 11559) @@ -8,9 +8,7 @@ cd $ROOT/$AP2_CONF; for f in $(find . -name '*conf'); do - if [ ! -f "$f.bak" ]; then - perl -pi.bak -e 's/\$/\\\$/g' $f - fi + echo "...processing $f" cat < $f.new PIR=\${PKG_INSTALL_ROOT:-/} 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 Nov 11 04:05:06 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Nov 2010 03:05:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[11560] csw/mgar/pkg/apache2/trunk/files/conf_build_scripts Message-ID: Revision: 11560 http://gar.svn.sourceforge.net/gar/?rev=11560&view=rev Author: bdwalton Date: 2010-11-11 03:05:05 +0000 (Thu, 11 Nov 2010) Log Message: ----------- apache2: more tweaking of the conf builder script Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/conf_build_scripts Modified: csw/mgar/pkg/apache2/trunk/files/conf_build_scripts =================================================================== --- csw/mgar/pkg/apache2/trunk/files/conf_build_scripts 2010-11-11 02:39:32 UTC (rev 11559) +++ csw/mgar/pkg/apache2/trunk/files/conf_build_scripts 2010-11-11 03:05:05 UTC (rev 11560) @@ -7,7 +7,7 @@ cd $ROOT/$AP2_CONF; -for f in $(find . -name '*conf'); do +for f in $(find . -type f | grep -v original/ ); do echo "...processing $f" cat < $f.new @@ -18,6 +18,8 @@ if [ "\$1" = install ]; then cat < \$AP2_CONF/$f.CSW EOF + +perl -pi -e 's/\$/\\\$/g' $f cat $f >> $f.new cat <> $f.new 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 Nov 11 10:04:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 09:04:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[11562] csw/mgar/pkg/cpan/Class-Autouse/trunk Message-ID: Revision: 11562 http://gar.svn.sourceforge.net/gar/?rev=11562&view=rev Author: dmichelsen Date: 2010-11-11 09:04:40 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Class-Autouse: Update to 1.29 and mGAR v2, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Class-Autouse/trunk/Makefile csw/mgar/pkg/cpan/Class-Autouse/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Class-Autouse/trunk/files/CSWpmclsautouse.depend csw/mgar/pkg/cpan/Class-Autouse/trunk/files/CSWpmclsautouse.gspec csw/mgar/pkg/cpan/Class-Autouse/trunk/files/CSWpmclsautouse.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Class-Autouse/trunk/ Property changes on: csw/mgar/pkg/cpan/Class-Autouse/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Class-Autouse/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Autouse/trunk/Makefile 2010-11-11 08:20:56 UTC (rev 11561) +++ csw/mgar/pkg/cpan/Class-Autouse/trunk/Makefile 2010-11-11 09:04:40 UTC (rev 11562) @@ -1,5 +1,5 @@ GARNAME = Class-Autouse -GARVERSION = 1.27 +GARVERSION = 1.29 CATEGORIES = cpan AUTHOR = ADAMK @@ -11,6 +11,20 @@ large amounts of memory, and decrease the script load time a great deal. endef -DISTFILES = $(call admfiles,CSWpmclsautouse,depend prototype) +PACKAGES = CSWpmclassautouse CSWpmclsautouse +CATALOGNAME_CSWpmclassautouse = pm_classautouse +CATALOGNAME_CSWpmclsautouse = pm_clsautouse + +SPKG_DESC_CSWpmclassautouse = $(DESCRIPTION) +SPKG_DESC_CSWpmclsautouse = Empty stub as contents has been moved to CSWpmclassautouse + +RUNTIME_DEP_PKGS_ONLY_CSWpmclsautouse = CSWpmclassautouse + +LICENSE = LICENSE + +ARCHALL = 1 + +PKGFILES_CSWpmclsautouse = NOFILES + include gar/category.mk Modified: csw/mgar/pkg/cpan/Class-Autouse/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-Autouse/trunk/checksums 2010-11-11 08:20:56 UTC (rev 11561) +++ csw/mgar/pkg/cpan/Class-Autouse/trunk/checksums 2010-11-11 09:04:40 UTC (rev 11562) @@ -1,4 +1 @@ -c208bf3a9a82300eaa4fadeeccda7fb5 download/CSWpmclsautouse.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmclsautouse.depend -25b0818245bd8e45be2aeb5b87cfe5c0 download/CSWpmclsautouse.prototype -f6b69cae6db84d6c1728384e6e7bd281 download/Class-Autouse-1.27.tar.gz +da37cc729e01a504b93bc8bdc548d9a9 Class-Autouse-1.29.tar.gz Deleted: csw/mgar/pkg/cpan/Class-Autouse/trunk/files/CSWpmclsautouse.depend =================================================================== Deleted: csw/mgar/pkg/cpan/Class-Autouse/trunk/files/CSWpmclsautouse.gspec =================================================================== --- csw/mgar/pkg/cpan/Class-Autouse/trunk/files/CSWpmclsautouse.gspec 2010-11-11 08:20:56 UTC (rev 11561) +++ csw/mgar/pkg/cpan/Class-Autouse/trunk/files/CSWpmclsautouse.gspec 2010-11-11 09:04:40 UTC (rev 11562) @@ -1,5 +0,0 @@ -%var bitname pm_clsautouse -%var pkgname CSWpmclsautouse -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/cpan/Class-Autouse/trunk/files/CSWpmclsautouse.prototype =================================================================== --- csw/mgar/pkg/cpan/Class-Autouse/trunk/files/CSWpmclsautouse.prototype 2010-11-11 08:20:56 UTC (rev 11561) +++ csw/mgar/pkg/cpan/Class-Autouse/trunk/files/CSWpmclsautouse.prototype 2010-11-11 09:04:40 UTC (rev 11562) @@ -1,17 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Class 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Class/Autouse 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Class/Autouse/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Class::Autouse.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Class 0755 root bin -d none /opt/csw/share/perl/csw/Class/Autouse 0755 root bin -f none /opt/csw/share/perl/csw/Class/Autouse.pm 0444 root bin -f none /opt/csw/share/perl/csw/Class/Autouse/Parent.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 09:20:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 08:20:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[11561] csw/mgar/pkg/ntop/tags/ntop-3.3.10/ Message-ID: Revision: 11561 http://gar.svn.sourceforge.net/gar/?rev=11561&view=rev Author: dmichelsen Date: 2010-11-11 08:20:56 +0000 (Thu, 11 Nov 2010) Log Message: ----------- ntop: Tag 3.3.10 Added Paths: ----------- csw/mgar/pkg/ntop/tags/ntop-3.3.10/ 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 Nov 11 11:40:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 10:40:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[11563] csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk Message-ID: Revision: 11563 http://gar.svn.sourceforge.net/gar/?rev=11563&view=rev Author: dmichelsen Date: 2010-11-11 10:40:19 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Class-Data-Inheritable: Update to 0.08 and mGAR v2, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/Makefile csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/files/CSWpmclsdtainherit.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/ Property changes on: csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/Makefile 2010-11-11 09:04:40 UTC (rev 11562) +++ csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/Makefile 2010-11-11 10:40:19 UTC (rev 11563) @@ -1,9 +1,9 @@ GARNAME = Class-Data-Inheritable -GARVERSION = 0.06 +GARVERSION = 0.08 CATEGORIES = cpan AUTHOR = TMTM -DESCRIPTION = inheritable, overridable class data +DESCRIPTION = Inheritable, overridable class data define BLURB Class::Data::Inheritable is for creating accessor/mutators to class data. That is, if you want to store something about your class as a whole (instead @@ -11,6 +11,20 @@ and can be overriden. endef -DISTFILES += $(call admfiles,CSWpmclsdtainherit,) +DISTFILES = COPYING +PACKAGES = CSWpmclassdatainheritable CSWpmclsdtainherit + +CATALOGNAME_CSWpmclassdatainheritable = pm_classdatainheritable +CATALOGNAME_CSWpmclsdtainherit = pm_clsdtainherit + +SPKG_DESC_CSWpmclassdatainheritable = $(DESCRIPTION) +SPKG_DESC_CSWpmclsdtainherit = Empty stub as contents has been moved to CSWpmclassdatainheritable + +RUNTIME_DEP_PKGS_ONLY_CSWpmclsdtainherit = CSWpmclassdatainheritable + +ARCHALL = 1 + +PKGFILES_CSWpmclsdtainherit = NOFILES + include gar/category.mk Modified: csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/checksums 2010-11-11 09:04:40 UTC (rev 11562) +++ csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/checksums 2010-11-11 10:40:19 UTC (rev 11563) @@ -1,2 +1 @@ -b04980e6d18f733bd5dc8e57e9300f59 download/CSWpmclsdtainherit.gspec -86d95ee16854a5503dc9f86a2f2ffa83 download/Class-Data-Inheritable-0.06.tar.gz +fc0fe65926eb8fb932743559feb54eb9 Class-Data-Inheritable-0.08.tar.gz Copied: csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/files/COPYING (from rev 11153, csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/files/CSWpmclsdtainherit.gspec) =================================================================== --- csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/files/COPYING 2010-11-11 10:40:19 UTC (rev 11563) @@ -0,0 +1,4 @@ +Copyright (c) 2000, Damian Conway and Michael G Schwern. All +Rights Reserved. This module is free software. It may be used, +redistributed and/or modified under the terms of the Perl Artistic +License (see http://www.perl.com/perl/misc/Artistic.html) Deleted: csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/files/CSWpmclsdtainherit.gspec =================================================================== --- csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/files/CSWpmclsdtainherit.gspec 2010-11-11 09:04:40 UTC (rev 11562) +++ csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/files/CSWpmclsdtainherit.gspec 2010-11-11 10:40:19 UTC (rev 11563) @@ -1,9 +0,0 @@ -%var bitname pm_clsdtainherit -%var pkgname CSWpmclsdtainherit -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2000, Damian Conway and Michael G Schwern. All -Rights Reserved. This module is free software. It may be used, -redistributed and/or modified under the terms of the Perl Artistic -License (see http://www.perl.com/perl/misc/Artistic.html) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 11:48:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 10:48:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[11564] csw/mgar/pkg/cpan/Test-LongString/trunk Message-ID: Revision: 11564 http://gar.svn.sourceforge.net/gar/?rev=11564&view=rev Author: dmichelsen Date: 2010-11-11 10:48:07 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Test-LongString: Update to 0.14 and mGAR v2, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Test-LongString/trunk/Makefile csw/mgar/pkg/cpan/Test-LongString/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Test-LongString/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Test-LongString/trunk/files/CSWpmtestlongstr.gspec csw/mgar/pkg/cpan/Test-LongString/trunk/files/CSWpmtestlongstr.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Test-LongString/trunk/ Property changes on: csw/mgar/pkg/cpan/Test-LongString/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Test-LongString/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-LongString/trunk/Makefile 2010-11-11 10:40:19 UTC (rev 11563) +++ csw/mgar/pkg/cpan/Test-LongString/trunk/Makefile 2010-11-11 10:48:07 UTC (rev 11564) @@ -1,5 +1,5 @@ GARNAME = Test-LongString -GARVERSION = 0.11 +GARVERSION = 0.14 CATEGORIES = cpan AUTHOR = RGARCIA @@ -12,8 +12,20 @@ module for you. endef -DISTFILES += $(call admfiles,CSWpmtestlongstr,) +DISTFILES = COPYING -BUILDDEPS += cpan/Test-Builder-Tester +PACKAGES = CSWpmtestlongstring CSWpmtestlongstr +CATALOGNAME_CSWpmtestlongstring = pm_testlongstring +CATALOGNAME_CSWpmtestlongstr = pm_testlongstr + +SPKG_DESC_CSWpmtestlongstring = $(DESCRIPTION) +SPKG_DESC_CSWpmtestlongstr = Empty stub as contents has been moved to CSWpmtestlongstring + +RUNTIME_DEP_PKGS_ONLY_CSWpmtestlongstr = CSWpmtestlongstring + +ARCHALL = 1 + +PKGFILES_CSWpmtestlongstr = NOFILES + include gar/category.mk Modified: csw/mgar/pkg/cpan/Test-LongString/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-LongString/trunk/checksums 2010-11-11 10:40:19 UTC (rev 11563) +++ csw/mgar/pkg/cpan/Test-LongString/trunk/checksums 2010-11-11 10:48:07 UTC (rev 11564) @@ -1,2 +1 @@ -ca1b3e54719c569b3c34aa765ac47a0d download/CSWpmtestlongstr.gspec -860635425e63c5f15261418f25cf106f download/Test-LongString-0.11.tar.gz +d10a25c6c3f22d041d6910fae0b8f826 Test-LongString-0.14.tar.gz Copied: csw/mgar/pkg/cpan/Test-LongString/trunk/files/COPYING (from rev 11153, csw/mgar/pkg/cpan/Test-LongString/trunk/files/CSWpmtestlongstr.gspec) =================================================================== --- csw/mgar/pkg/cpan/Test-LongString/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Test-LongString/trunk/files/COPYING 2010-11-11 10:48:07 UTC (rev 11564) @@ -0,0 +1,4 @@ +This program is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. + +Copyright (c) 2002, 2003, 2004, 2005 Rafael Garcia-Suarez Deleted: csw/mgar/pkg/cpan/Test-LongString/trunk/files/CSWpmtestlongstr.gspec =================================================================== --- csw/mgar/pkg/cpan/Test-LongString/trunk/files/CSWpmtestlongstr.gspec 2010-11-11 10:40:19 UTC (rev 11563) +++ csw/mgar/pkg/cpan/Test-LongString/trunk/files/CSWpmtestlongstr.gspec 2010-11-11 10:48:07 UTC (rev 11564) @@ -1,9 +0,0 @@ -%var bitname pm_testlongstr -%var pkgname CSWpmtestlongstr -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This program is free software; you can redistribute it and/or modify it -under the same terms as Perl itself. - -Copyright (c) 2002, 2003, 2004, 2005 Rafael Garcia-Suarez Deleted: csw/mgar/pkg/cpan/Test-LongString/trunk/files/CSWpmtestlongstr.prototype =================================================================== --- csw/mgar/pkg/cpan/Test-LongString/trunk/files/CSWpmtestlongstr.prototype 2010-11-11 10:40:19 UTC (rev 11563) +++ csw/mgar/pkg/cpan/Test-LongString/trunk/files/CSWpmtestlongstr.prototype 2010-11-11 10:48:07 UTC (rev 11564) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Test 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Test/LongString 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Test/LongString/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Test::LongString.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Test 0755 root bin -f none /opt/csw/share/perl/csw/Test/LongString.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 12:52:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 11:52:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11565] csw/mgar/pkg/ntop/trunk Message-ID: Revision: 11565 http://gar.svn.sourceforge.net/gar/?rev=11565&view=rev Author: dmichelsen Date: 2010-11-11 11:52:33 +0000 (Thu, 11 Nov 2010) Log Message: ----------- ntop: Builds cleanly now, start/stop/smf still missing Modified Paths: -------------- csw/mgar/pkg/ntop/trunk/Makefile csw/mgar/pkg/ntop/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ntop/trunk/files/0001-Fix-misplaced-endif.patch csw/mgar/pkg/ntop/trunk/files/0002-Do-not-redeclare-__builtin_alloca.patch csw/mgar/pkg/ntop/trunk/files/0003-Check-for-uint_-in-addition-to-u_int_.patch csw/mgar/pkg/ntop/trunk/files/0004-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch csw/mgar/pkg/ntop/trunk/files/cswntop csw/mgar/pkg/ntop/trunk/files/postinstall csw/mgar/pkg/ntop/trunk/files/postremove csw/mgar/pkg/ntop/trunk/files/request Removed Paths: ------------- csw/mgar/pkg/ntop/trunk/files/configure.in.diff csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff csw/mgar/pkg/ntop/trunk/files/intdef.diff Modified: csw/mgar/pkg/ntop/trunk/Makefile =================================================================== --- csw/mgar/pkg/ntop/trunk/Makefile 2010-11-11 10:48:07 UTC (rev 11564) +++ csw/mgar/pkg/ntop/trunk/Makefile 2010-11-11 11:52:33 UTC (rev 11565) @@ -1,8 +1,8 @@ GARNAME = ntop -GARVERSION = 3.3.10 +GARVERSION = 4.0.3 CATEGORIES = net -DESCRIPTION = A network traffic usage monitor. +DESCRIPTION = A network traffic usage monitor define BLURB ntop is a network probe that shows network usage in a way similar to what top does for processes. In interactive mode, it displays the network status on the @@ -13,29 +13,75 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tgz -PATCHFILES = configure.in.diff -PATCHFILES += configureextra_opencsw.diff +PATCHFILES = 0001-Fix-misplaced-endif.patch +PATCHFILES += 0002-Do-not-redeclare-__builtin_alloca.patch +PATCHFILES += 0003-Check-for-uint_-in-addition-to-u_int_.patch +PATCHFILES += 0004-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch +# 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 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +RUNTIME_DEP_PKGS_CSWntop += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWntop += CSWlibpcap +RUNTIME_DEP_PKGS_CSWntop += CSWosslrt +RUNTIME_DEP_PKGS_CSWntop += CSWrrd +RUNTIME_DEP_PKGS_CSWntop += CSWgeoip +RUNTIME_DEP_PKGS_CSWntop += CSWpython +RUNTIME_DEP_PKGS_CSWntop += CSWgdbm +RUNTIME_DEP_PKGS_CSWntop += CSWzlib +RUNTIME_DEP_PKGS_CSWntop += CSWiconv + +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWntop) +BUILD_DEP_PKGS += CSWlibtool CSWautoconf CSWautomake +BUILD_DEP_PKGS += CSWlibpcapdevel CSWossldevel + +CONFIGURE_SCRIPTS = $(WORKSRC)/autogen.sh + +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + 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 +CONFIGURE_ARGS += --enable-jumbo-frames +# CONFIGURE_ARGS += --enable-fc +# CONFIGURE_ARGS += --enable-mysql +TEST_TARGET = check + +# We don't have a separate devel-package, so this is ok +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libcpacketPlugin.so +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libicmpPlugin.so +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libnetflowPlugin.so +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libntop.so +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libntopreport.so +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/librrdPlugin.so +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libsflowPlugin.so + +# Upstream has chosen it that way... +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libcpacketPlugin-4.0.3.so|filename=cpacketPlugin.so +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libicmpPlugin-4.0.3.so|filename=icmpPlugin.so +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libnetflowPlugin-4.0.3.so|filename=netflowPlugin.so +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=librrdPlugin-4.0.3.so|filename=rrdPlugin.so +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libsflowPlugin-4.0.3.so|filename=sflowPlugin.so +#CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch|sonames=['libcpacketPlugin-4.0.3.so',|'libicmpPlugin-4.0.3.so',|'libnetflowPlugin-4.0.3.so',|'libntop-4.0.3.so',|'libntopreport-4.0.3.so',|'librrdPlugin-4.0.3.so',|'libsflowPlugin-4.0.3.so']|pkgname=CSWntop|expected=['CSWlib4-0-3']| +CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch + include gar/category.mk pre-configure-modulated: - ( cd $(WORKSRC) ; ./autogen.sh --noconfig) + @# This brainded autogen.sh script search in /usr and /usr/local *only* + cp /opt/csw/share/aclocal/libtool.m4 $(WORKSRC)/libtool.m4.in @$(MAKECOOKIE) Modified: csw/mgar/pkg/ntop/trunk/checksums =================================================================== --- csw/mgar/pkg/ntop/trunk/checksums 2010-11-11 10:48:07 UTC (rev 11564) +++ csw/mgar/pkg/ntop/trunk/checksums 2010-11-11 11:52:33 UTC (rev 11565) @@ -1,3 +1 @@ -1615818e06d4a503b6a52426e88aaed4 configure.in.diff -257b92864fc22a475e23191c60dd100c configureextra_opencsw.diff -6e2ffa90d5f935c8f03d88a5dd19a866 ntop-3.3.10.tar.gz +f064393a2090e5bda102cd49c2707789 ntop-4.0.3.tgz Added: csw/mgar/pkg/ntop/trunk/files/0001-Fix-misplaced-endif.patch =================================================================== --- csw/mgar/pkg/ntop/trunk/files/0001-Fix-misplaced-endif.patch (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/0001-Fix-misplaced-endif.patch 2010-11-11 11:52:33 UTC (rev 11565) @@ -0,0 +1,27 @@ +From 7ba230598efb6fc4636c0bb18b0d340d723e3d75 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 11 Nov 2010 10:46:42 +0100 +Subject: [PATCH 1/4] Fix misplaced #endif + +--- + address.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/address.c b/address.c +index 73d8046..59436e1 100644 +--- a/address.c ++++ b/address.c +@@ -239,9 +239,9 @@ void* dequeueAddress(void *_i) { + he = &_hp; + else + he = NULL; +-#endif + } else + he = NULL; ++#endif + #else + he = gethostbyaddr(theAddr, size, family); + #endif +-- +1.7.3 + Added: csw/mgar/pkg/ntop/trunk/files/0002-Do-not-redeclare-__builtin_alloca.patch =================================================================== --- csw/mgar/pkg/ntop/trunk/files/0002-Do-not-redeclare-__builtin_alloca.patch (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/0002-Do-not-redeclare-__builtin_alloca.patch 2010-11-11 11:52:33 UTC (rev 11565) @@ -0,0 +1,24 @@ +From b41a4c15c708ee01cf91a9d20dca3b6ae095370a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 11 Nov 2010 10:50:20 +0100 +Subject: [PATCH 2/4] Do not redeclare __builtin_alloca + +--- + argv.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/argv.c b/argv.c +index 9212e85..84b02c6 100644 +--- a/argv.c ++++ b/argv.c +@@ -28,6 +28,7 @@ Cambridge, MA 02139, USA. */ + #else /* not __GNUC__ */ + #ifdef sparc + #include ++/* This is declared at least on Solaris 9, maybe this should better be detected during configure-time? + extern char *__builtin_alloca(); /* Stupid include file doesn't declare it */ + #else + #ifdef _AIX +-- +1.7.3 + Added: csw/mgar/pkg/ntop/trunk/files/0003-Check-for-uint_-in-addition-to-u_int_.patch =================================================================== --- csw/mgar/pkg/ntop/trunk/files/0003-Check-for-uint_-in-addition-to-u_int_.patch (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/0003-Check-for-uint_-in-addition-to-u_int_.patch 2010-11-11 11:52:33 UTC (rev 11565) @@ -0,0 +1,95 @@ +From a4b0c017045180b7fb5ddcd9a1b7433f2a7b55ea Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 11 Nov 2010 12:34:45 +0100 +Subject: [PATCH 3/4] Check for uint_* in addition to u_int_* + +--- + configure.in | 6 ++++++ + globals-structtypes.h | 20 ++++++++++++++++++++ + 2 files changed, 26 insertions(+), 0 deletions(-) + +diff --git a/configure.in b/configure.in +index 652e409..5c6fa98 100644 +--- a/configure.in ++++ b/configure.in +@@ -207,7 +207,10 @@ AH_TEMPLATE([HAVE_INT16_T], [Define for int16 typedef]) + AH_TEMPLATE([HAVE_INT32_T], [Define for int32 typedef]) + AH_TEMPLATE([HAVE_INT64_T], [Define for int64 typedef]) + AH_TEMPLATE([HAVE_INT8_T], [Define for int8 typedef]) ++AH_TEMPLATE([HAVE_UINT16_T], [Define for unsigned int 16 typedef]) ++AH_TEMPLATE([HAVE_UINT32_T], [Define for unsigned int 32 typedef]) + AH_TEMPLATE([HAVE_UINT64_T], [Define for unsigned int 64 typedef]) ++AH_TEMPLATE([HAVE_UINT8_T], [Define for unsigned int 8 typedef]) + AH_TEMPLATE([HAVE_U_INT16_T], [Define for unsigned int 16 typedef]) + AH_TEMPLATE([HAVE_U_INT32_T], [Define for unsigned int 32 typedef]) + AH_TEMPLATE([HAVE_U_INT64_T], [Define for unsigned int 64 typedef]) +@@ -1122,8 +1125,11 @@ AC_STRUCT_TIMEZONE + AC_CHECK_TYPEDEF(u_int64_t, sys/types.h) + AC_CHECK_TYPEDEF(uint64_t, sys/types.h) + AC_CHECK_TYPEDEF(u_int32_t, sys/types.h) ++AC_CHECK_TYPEDEF(uint32_t, sys/types.h) + AC_CHECK_TYPEDEF(u_int16_t, sys/types.h) ++AC_CHECK_TYPEDEF(uint16_t, sys/types.h) + AC_CHECK_TYPEDEF(u_int8_t, sys/types.h) ++AC_CHECK_TYPEDEF(uint8_t, sys/types.h) + AC_CHECK_TYPEDEF(int64_t, sys/types.h) + AC_CHECK_TYPEDEF(int32_t, sys/types.h) + AC_CHECK_TYPEDEF(int16_t, sys/types.h) +diff --git a/globals-structtypes.h b/globals-structtypes.h +index 2de7c6f..61a1632 100644 +--- a/globals-structtypes.h ++++ b/globals-structtypes.h +@@ -71,22 +71,38 @@ typedef u_int u_int32_t; + #if defined(HAVE_u_int64_T) + #define u_int64_t u_int64_t + #else ++#if defined(HAVE_UINT64_T) ++#define u_int64_t uint64_t ++#else + #error "Sorry, I'm unable to define u_int64_t on your platform" + #endif + #endif + #endif ++#endif + + #if !defined(HAVE_U_INT32_T) ++#if defined(HAVE_UINT32_T) ++#define u_int32_t uint32_t ++#else + typedef unsigned int u_int32_t; + #endif ++#endif + + #if !defined(HAVE_U_INT16_T) ++#if defined(HAVE_UINT16_T) ++#define u_int16_t uint16_t ++#else + typedef unsigned short u_int16_t; + #endif ++#endif + + #if !defined(HAVE_U_INT8_T) ++#if defined(HAVE_UINT8_T) ++#define u_int8_t uint8_t ++#else + typedef unsigned char u_int8_t; + #endif ++#endif + + #if !defined(HAVE_INT32_T) + typedef int int32_t; +@@ -312,7 +328,11 @@ typedef struct protocolsList { + #define pthread_rwlock_wrlock pthread_mutex_lock + #define pthread_rwlock_unlock pthread_mutex_unlock + #define pthread_rwlock_destroy pthread_mutex_destroy ++#ifdef SOLARIS ++#define pthread_rwlock_trywrlock pthread_mutex_trylock ++#else /* SOLARIS */ + #define pthread_rwlock_trywrlock pthread_mutex_trywrlock ++#endif /* SOLARIS */ + #endif + #endif + +-- +1.7.3 + Added: csw/mgar/pkg/ntop/trunk/files/0004-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch =================================================================== --- csw/mgar/pkg/ntop/trunk/files/0004-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/0004-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch 2010-11-11 11:52:33 UTC (rev 11565) @@ -0,0 +1,52 @@ +From ef3ce9708fb1625f97fd8eff7665052602bb6429 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 11 Nov 2010 12:35:04 +0100 +Subject: [PATCH 4/4] Strip default Solaris library pathes as we set our own + +--- + configureextra/SOLARIS10 | 6 +++--- + configureextra/SOLARIS9 | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configureextra/SOLARIS10 b/configureextra/SOLARIS10 +index 5e12960..6f1a6ea 100644 +--- a/configureextra/SOLARIS10 ++++ b/configureextra/SOLARIS10 +@@ -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/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}" + LIBS="-lnsl -lsocket ${LIBS}" +-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include" ++#CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include" + + . configureextra/functions + +@@ -28,4 +28,4 @@ echo "- cd /usr/local/lib" + echo "- ln -s libpcap.so.0.X.Y libpcap.so" + echo "- rm libpcap.a" + echo "" +-echo "*************************************************" +\ No newline at end of file ++echo "*************************************************" +diff --git a/configureextra/SOLARIS9 b/configureextra/SOLARIS9 +index f968ea1..4323773 100755 +--- a/configureextra/SOLARIS9 ++++ b/configureextra/SOLARIS9 +@@ -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/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}" + LIBS="-lnsl -lsocket ${LIBS}" +-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include" ++# CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include" + + . configureextra/functions + +-- +1.7.3 + Deleted: csw/mgar/pkg/ntop/trunk/files/configure.in.diff =================================================================== --- csw/mgar/pkg/ntop/trunk/files/configure.in.diff 2010-11-11 10:48:07 UTC (rev 11564) +++ csw/mgar/pkg/ntop/trunk/files/configure.in.diff 2010-11-11 11:52:33 UTC (rev 11565) @@ -1,44 +0,0 @@ ---- 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 Deleted: csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff =================================================================== --- csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff 2010-11-11 10:48:07 UTC (rev 11564) +++ csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff 2010-11-11 11:52:33 UTC (rev 11565) @@ -1,51 +0,0 @@ -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 - Added: csw/mgar/pkg/ntop/trunk/files/cswntop =================================================================== --- csw/mgar/pkg/ntop/trunk/files/cswntop (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/cswntop 2010-11-11 11:52:33 UTC (rev 11565) @@ -0,0 +1,110 @@ +#!/sbin/sh +# +# ntop startup script for ntop v3.0 +# v1.0 +# +BINDIR=/opt/csw/bin +CONF=/opt/csw/etc/ntop/ntop.conf + + if [ ! -f "$CONF" ]; then + echo "Configuration file not found." + exit 1 + else + DATADIR=`/usr/bin/egrep "^\--db-file-path|^-P" "$CONF" | /usr/bin/cut -f2 -d" "` + if [ -z "$DATADIR" ]; then + DATADIR=/var/opt/csw/ntop + EXTRA="-P ${DATADIR}" + fi + fi + PIDFILE=${DATADIR}/ntop.pid + +case $1 in +'start') + DAEMON_MODE=`/usr/bin/egrep "^\--daemon|^-d" "$CONF"` + if [ -z "$DAEMON_MODE" ];then + echo "No configured as a daemon." + exit 1 + fi + NTOPUSER=`/usr/bin/egrep "^\--user|^-u" "$CONF" | /usr/bin/cut -f2 -d" "` + NTOPGROUP=`/usr/bin/egrep "^${NTOPUSER}:" /etc/passwd | /usr/bin/cut -f4 -d":" ` + if [ -z "$NTOPGROUP" ]; then + echo "Invalid ntop user ${NTOPUSER}" + exit 1 + fi + if [ -z "$NTOPUSER" ]; then + NTOPUSER=nobody + EXTRA="${EXTRA} -u ${NTOPUSER}" + fi + if [ ! -d "$DATADIR" ];then + /usr/bin/mkdir -p ${DATADIR} + /usr/bin/chown ${NTOPUSER}:${NTOPGROUP} ${DATADIR} + /usr/bin/chmod 0711 ${DATADIR} + fi + if [ ! -f "$DATADIR/ntop_pw.db" ];then + echo "No password database !" + exit 1; + fi + HTTP=`/usr/bin/egrep "^\--http-server|^-w" "$CONF" | /usr/bin/cut -f2 -d" "` + if [ -z "$HTTP" ];then + EXTRA=" ${EXTRA} -w 3000" + fi + HTTPS=`/usr/bin/egrep "^\--http-servers|^-W" "$CONF" | /usr/bin/cut -f2 -d" "` + if [ -z "$HTTPS" ];then + EXTRA=" ${EXTRA} -W 0" + fi + INTERFACES=`/usr/bin/egrep "^\--interfaces|^-i" "$CONF" | /usr/bin/cut -f2 -d" "` + if [ -z "$INTERFACES" ];then + for i in `/sbin/ifconfig -a |/usr/bin/grep "^[a-z0-9]*:"` + do + /usr/bin/echo $i | /usr/bin/grep "^[a-z0-9]*:" >/dev/null 2>&1 + if [ $? -eq 1 ]; then + continue + fi + m=`/usr/bin/echo ${i} | /usr/bin/sed 's/:[0-9]*:*//'` + if [ "$m" = "lo0" ]; then + continue + fi + net_device_list="${net_device_list} ${m}" + done + net_device_list=`/usr/bin/echo $net_device_list | /usr/bin/sort -u` + interfaces=0; + set -- $net_device_list + for i + do + if [ ${interfaces} -gt 0 ]; then + INTERFACES="${i},${INTERFACES}" + else + INTERFACES="${i}" + fi + interfaces=`/usr/bin/expr ${interfaces} + 1` + done + fi + if [ ${interfaces} -gt 1 ]; then + EXTRA=" ${EXTRA} -i ${INTERFACES}" + fi + LOG=`/usr/bin/egrep "^\--use-syslog|^-L" "$CONF" | /usr/bin/cut -f2 -d" "` + if [ -z "$LOG" ];then + EXTRA=" ${EXTRA} --use-syslog=local3" + fi + + /usr/bin/echo "Start ntop network traffic usage monitor..." + if [ -z "$EXTRA" ];then + $BINDIR/ntop @${CONF} + else + $BINDIR/ntop ${EXTRA} @${CONF} + fi + + ;; +'stop') + + echo "Stop ntop network traffic usage monitor..." + if [ -f "$PIDFILE" ]; then + /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE` + fi + ;; + +*) + echo "Usage: $0 { start | stop }" + exit 1 + ;; +esac Deleted: csw/mgar/pkg/ntop/trunk/files/intdef.diff =================================================================== --- csw/mgar/pkg/ntop/trunk/files/intdef.diff 2010-11-11 10:48:07 UTC (rev 11564) +++ csw/mgar/pkg/ntop/trunk/files/intdef.diff 2010-11-11 11:52:33 UTC (rev 11565) @@ -1,767 +0,0 @@ -diff -Nru ntop-3.0pre2.orig/globals-structtypes.h ntop-3.0pre2/globals-structtypes.h ---- ntop-3.0pre2.orig/globals-structtypes.h 2004-03-03 17:14:48.000000000 -0800 -+++ ntop-3.0pre2/globals-structtypes.h 2004-03-11 11:39:45.793529000 -0800 -@@ -138,7 +138,7 @@ - - struct { - unsigned naa:4; -- u_int64_t vendor_specific:60; -+ uint64_t vendor_specific:60; - } wwn_format3; - - struct { -@@ -150,7 +150,7 @@ - struct { - unsigned naa :4; - unsigned ieee_company_id:24; -- u_int64_t vsid :36; /* vendor specific ID */ -+ uint64_t vsid :36; /* vendor specific ID */ - } wwn_format5; - #else - struct { -@@ -166,23 +166,23 @@ - } wwn_format2; - - struct { -- u_int64_t vendor_specific:60; -+ uint64_t vendor_specific:60; - unsigned naa:4; - } wwn_format3; - - struct { -- u_int32_t ip_addr; -+ uint32_t ip_addr; - unsigned reserved :28; - unsigned naa :4; - } wwn_format4; - - struct { -- u_int64_t vsid :36; -+ uint64_t vsid :36; - unsigned ieee_company_id:24; - unsigned naa :4; - } wwn_format5; - #endif -- u_int64_t num; -+ uint64_t num; - } wwn_t; - - typedef struct hostAddr { -diff -Nru ntop-3.0pre2.orig/plugins/sflowPlugin.c ntop-3.0pre2/plugins/sflowPlugin.c ---- ntop-3.0pre2.orig/plugins/sflowPlugin.c 2004-02-23 19:49:44.000000000 -0800 -+++ ntop-3.0pre2/plugins/sflowPlugin.c 2004-03-11 11:41:24.411656000 -0800 -@@ -115,45 +115,45 @@ - /* define my own IP header struct - to ease portability */ - struct myiphdr - { -- u_int8_t version_and_headerLen; -- u_int8_t tos; -- u_int16_t tot_len; -- u_int16_t id; -- u_int16_t frag_off; -- u_int8_t ttl; -- u_int8_t protocol; -- u_int16_t check; -- u_int32_t saddr; -- u_int32_t daddr; -+ uint8_t version_and_headerLen; -+ uint8_t tos; -+ uint16_t tot_len; -+ uint16_t id; -+ uint16_t frag_off; -+ uint8_t ttl; -+ uint8_t protocol; -+ uint16_t check; -+ uint32_t saddr; -+ uint32_t daddr; - }; - - /* same for tcp */ - struct mytcphdr - { -- u_int16_t th_sport; /* source port */ -- u_int16_t th_dport; /* destination port */ -- u_int32_t th_seq; /* sequence number */ -- u_int32_t th_ack; /* acknowledgement number */ -- u_int8_t th_off_and_unused; -- u_int8_t th_flags; -- u_int16_t th_win; /* window */ -- u_int16_t th_sum; /* checksum */ -- u_int16_t th_urp; /* urgent pointer */ -+ uint16_t th_sport; /* source port */ -+ uint16_t th_dport; /* destination port */ -+ uint32_t th_seq; /* sequence number */ -+ uint32_t th_ack; /* acknowledgement number */ -+ uint8_t th_off_and_unused; -+ uint8_t th_flags; -+ uint16_t th_win; /* window */ -+ uint16_t th_sum; /* checksum */ -+ uint16_t th_urp; /* urgent pointer */ - }; - - /* and UDP */ - struct myudphdr { -- u_int16_t uh_sport; /* source port */ -- u_int16_t uh_dport; /* destination port */ -- u_int16_t uh_ulen; /* udp length */ -- u_int16_t uh_sum; /* udp checksum */ -+ uint16_t uh_sport; /* source port */ -+ uint16_t uh_dport; /* destination port */ -+ uint16_t uh_ulen; /* udp length */ -+ uint16_t uh_sum; /* udp checksum */ - }; - - /* and ICMP */ - struct myicmphdr - { -- u_int8_t type; /* message type */ -- u_int8_t code; /* type sub-code */ -+ uint8_t type; /* message type */ -+ uint8_t code; /* type sub-code */ - /* ignore the rest */ - }; - -@@ -163,9 +163,9 @@ - { - union - { -- u_int8_t u6_addr8[16]; -- u_int16_t u6_addr16[8]; -- u_int32_t u6_addr32[4]; -+ uint8_t u6_addr8[16]; -+ uint16_t u6_addr16[8]; -+ uint32_t u6_addr32[4]; - } in6_u; - }; - #endif /* HAVE_IN6_ADDR */ -@@ -181,7 +181,7 @@ - } INMAddress_value; - - typedef struct _INMAddress { -- u_int32_t type; /* enum INMAddress_type */ -+ uint32_t type; /* enum INMAddress_type */ - INMAddress_value address; - } INMAddress; - -@@ -206,38 +206,38 @@ - }; - - typedef struct _INMSampled_header { -- u_int32_t header_protocol; /* (enum INMHeader_protocol) */ -- u_int32_t frame_length; /* Original length of packet before sampling */ -- u_int32_t header_length; /* length of sampled header bytes to follow */ -- u_int8_t header[INM_MAX_HEADER_SIZE]; /* Header bytes */ -+ uint32_t header_protocol; /* (enum INMHeader_protocol) */ -+ uint32_t frame_length; /* Original length of packet before sampling */ -+ uint32_t header_length; /* length of sampled header bytes to follow */ -+ uint8_t header[INM_MAX_HEADER_SIZE]; /* Header bytes */ - } INMSampled_header; - - /* Packet IP version 4 data */ - - typedef struct _INMSampled_ipv4 { -- u_int32_t length; /* The length of the IP packet -+ uint32_t length; /* The length of the IP packet - excluding lower layer encapsulations */ -- u_int32_t protocol; /* IP Protocol type (for example, TCP = 6, UDP = 17) */ -+ uint32_t protocol; /* IP Protocol type (for example, TCP = 6, UDP = 17) */ - struct in_addr src_ip; /* Source IP Address */ - struct in_addr dst_ip; /* Destination IP Address */ -- u_int32_t src_port; /* TCP/UDP source port number or equivalent */ -- u_int32_t dst_port; /* TCP/UDP destination port number or equivalent */ -- u_int32_t tcp_flags; /* TCP flags */ -- u_int32_t tos; /* IP type of service */ -+ uint32_t src_port; /* TCP/UDP source port number or equivalent */ -+ uint32_t dst_port; /* TCP/UDP destination port number or equivalent */ -+ uint32_t tcp_flags; /* TCP flags */ -+ uint32_t tos; /* IP type of service */ - } INMSampled_ipv4; - - /* Packet IP version 6 data */ - - typedef struct _INMSampled_ipv6 { -- u_int32_t length; /* The length of the IP packet -+ uint32_t length; /* The length of the IP packet - excluding lower layer encapsulations */ -- u_int32_t protocol; /* IP Protocol type (for example, TCP = 6, UDP = 17) */ -+ uint32_t protocol; /* IP Protocol type (for example, TCP = 6, UDP = 17) */ - struct in6_addr src_ip; /* Source IP Address */ - struct in6_addr dst_ip; /* Destination IP Address */ -- u_int32_t src_port; /* TCP/UDP source port number or equivalent */ -- u_int32_t dst_port; /* TCP/UDP destination port number or equivalent */ -- u_int32_t tcp_flags; /* TCP flags */ -- u_int32_t tos; /* IP type of service */ -+ uint32_t src_port; /* TCP/UDP source port number or equivalent */ -+ uint32_t dst_port; /* TCP/UDP destination port number or equivalent */ -+ uint32_t tcp_flags; /* TCP flags */ -+ uint32_t tos; /* IP type of service */ - } INMSampled_ipv6; - - -@@ -260,35 +260,35 @@ - /* Extended switch data */ - - typedef struct _INMExtended_switch { -- u_int32_t src_vlan; /* The 802.1Q VLAN id of incomming frame */ -- u_int32_t src_priority; /* The 802.1p priority */ -- u_int32_t dst_vlan; /* The 802.1Q VLAN id of outgoing frame */ -- u_int32_t dst_priority; /* The 802.1p priority */ -+ uint32_t src_vlan; /* The 802.1Q VLAN id of incomming frame */ -+ uint32_t src_priority; /* The 802.1p priority */ -+ uint32_t dst_vlan; /* The 802.1Q VLAN id of outgoing frame */ -+ uint32_t dst_priority; /* The 802.1p priority */ - } INMExtended_switch; - - /* Extended router data */ - - typedef struct _INMExtended_router { - INMAddress nexthop; /* IP address of next hop router */ -- u_int32_t src_mask; /* Source address prefix mask bits */ -- u_int32_t dst_mask; /* Destination address prefix mask bits */ -+ uint32_t src_mask; /* Source address prefix mask bits */ -+ uint32_t dst_mask; /* Destination address prefix mask bits */ - } INMExtended_router; - - /* Extended gateway data */ - - typedef struct _INMExtended_gateway { -- u_int32_t as; /* AS number for this gateway */ -- u_int32_t src_as; -- u_int32_t src_peer_as; -- u_int32_t dst_as_path_length; -- u_int32_t *dst_as_path; -+ uint32_t as; /* AS number for this gateway */ -+ uint32_t src_as; -+ uint32_t src_peer_as; -+ uint32_t dst_as_path_length; -+ uint32_t *dst_as_path; - } INMExtended_gateway; - - /* Extended user data */ - typedef struct _INMExtended_user { -- u_int32_t src_user_len; -+ uint32_t src_user_len; - char *src_user; -- u_int32_t dst_user_len; -+ uint32_t dst_user_len; - char *dst_user; - } INMExtended_user; - -@@ -304,18 +304,18 @@ - /* Format of a single sample */ - - typedef struct _INMFlow_sample { -- u_int32_t sequence_number; /* Incremented with each flow sample -+ uint32_t sequence_number; /* Incremented with each flow sample - generated */ -- u_int32_t source_id; /* fsSourceId */ -- u_int32_t sampling_rate; /* fsPacketSamplingRate */ -- u_int32_t sample_pool; /* Total number of packets that could have been -+ uint32_t source_id; /* fsSourceId */ -+ uint32_t sampling_rate; /* fsPacketSamplingRate */ -+ uint32_t sample_pool; /* Total number of packets that could have been - sampled (i.e. packets skipped by sampling - process + total number of samples) */ -- u_int32_t drops; /* Number of times a packet was dropped due to -+ uint32_t drops; /* Number of times a packet was dropped due to - lack of resources */ -- u_int32_t input; /* SNMP ifIndex of input interface. -+ uint32_t input; /* SNMP ifIndex of input interface. - 0 if interface is not known. */ -- u_int32_t output; /* SNMP ifIndex of output interface, -+ uint32_t output; /* SNMP ifIndex of output interface, - 0 if interface is not known. - Set most significant bit to indicate - multiple destination interfaces -@@ -330,7 +330,7 @@ - 0x80000000 indicates a packet sent to - an unknown number of - interfaces greater than 1.*/ -- u_int32_t packet_data_tag; /* enum INMPacket_information_type */ -+ uint32_t packet_data_tag; /* enum INMPacket_information_type */ - INMPacket_data_type packet_data; /* Information about sampled packet */ - - /* in the sFlow packet spec the next field is the number of extended objects -@@ -352,46 +352,46 @@ - /* Generic interface counters - see RFC 1573, 2233 */ - - typedef struct _INMIf_counters { -- u_int32_t ifIndex; -- u_int32_t ifType; -- u_int64_t ifSpeed; -- u_int32_t ifDirection; /* Derived from MAU MIB (RFC 2239) -+ uint32_t ifIndex; -+ uint32_t ifType; -+ uint64_t ifSpeed; -+ uint32_t ifDirection; /* Derived from MAU MIB (RFC 2239) - 0 = unknown, 1 = full-duplex, - 2 = half-duplex, 3 = in, 4 = out */ -- u_int32_t ifStatus; /* bit field with the following bits assigned: -+ uint32_t ifStatus; /* bit field with the following bits assigned: - bit 0 = ifAdminStatus (0 = down, 1 = up) - bit 1 = ifOperStatus (0 = down, 1 = up) */ -- u_int64_t ifInOctets; -- u_int32_t ifInUcastPkts; -- u_int32_t ifInMulticastPkts; -- u_int32_t ifInBroadcastPkts; -- u_int32_t ifInDiscards; -- u_int32_t ifInErrors; -- u_int32_t ifInUnknownProtos; -- u_int64_t ifOutOctets; -- u_int32_t ifOutUcastPkts; -- u_int32_t ifOutMulticastPkts; -- u_int32_t ifOutBroadcastPkts; -- u_int32_t ifOutDiscards; -- u_int32_t ifOutErrors; -- u_int32_t ifPromiscuousMode; -+ uint64_t ifInOctets; -+ uint32_t ifInUcastPkts; -+ uint32_t ifInMulticastPkts; -+ uint32_t ifInBroadcastPkts; -+ uint32_t ifInDiscards; -+ uint32_t ifInErrors; -+ uint32_t ifInUnknownProtos; -+ uint64_t ifOutOctets; -+ uint32_t ifOutUcastPkts; -+ uint32_t ifOutMulticastPkts; -+ uint32_t ifOutBroadcastPkts; -+ uint32_t ifOutDiscards; -+ uint32_t ifOutErrors; -+ uint32_t ifPromiscuousMode; - } INMIf_counters; - - /* Ethernet interface counters - see RFC 2358 */ - typedef struct _INMEthernet_specific_counters { -- u_int32_t dot3StatsAlignmentErrors; -- u_int32_t dot3StatsFCSErrors; -- u_int32_t dot3StatsSingleCollisionFrames; -- u_int32_t dot3StatsMultipleCollisionFrames; -- u_int32_t dot3StatsSQETestErrors; -- u_int32_t dot3StatsDeferredTransmissions; -- u_int32_t dot3StatsLateCollisions; -- u_int32_t dot3StatsExcessiveCollisions; -- u_int32_t dot3StatsInternalMacTransmitErrors; -- u_int32_t dot3StatsCarrierSenseErrors; -- u_int32_t dot3StatsFrameTooLongs; -- u_int32_t dot3StatsInternalMacReceiveErrors; -- u_int32_t dot3StatsSymbolErrors; -+ uint32_t dot3StatsAlignmentErrors; -+ uint32_t dot3StatsFCSErrors; -+ uint32_t dot3StatsSingleCollisionFrames; -+ uint32_t dot3StatsMultipleCollisionFrames; -+ uint32_t dot3StatsSQETestErrors; -+ uint32_t dot3StatsDeferredTransmissions; -+ uint32_t dot3StatsLateCollisions; -+ uint32_t dot3StatsExcessiveCollisions; -+ uint32_t dot3StatsInternalMacTransmitErrors; -+ uint32_t dot3StatsCarrierSenseErrors; -+ uint32_t dot3StatsFrameTooLongs; -+ uint32_t dot3StatsInternalMacReceiveErrors; -+ uint32_t dot3StatsSymbolErrors; - } INMEthernet_specific_counters; - - typedef struct _INMEthernet_counters { -@@ -407,24 +407,24 @@ - /* Token ring counters - see RFC 1748 */ - - typedef struct _INMTokenring_specific_counters { -- u_int32_t dot5StatsLineErrors; -- u_int32_t dot5StatsBurstErrors; -- u_int32_t dot5StatsACErrors; -- u_int32_t dot5StatsAbortTransErrors; -- u_int32_t dot5StatsInternalErrors; -- u_int32_t dot5StatsLostFrameErrors; -- u_int32_t dot5StatsReceiveCongestions; -- u_int32_t dot5StatsFrameCopiedErrors; -- u_int32_t dot5StatsTokenErrors; -- u_int32_t dot5StatsSoftErrors; -- u_int32_t dot5StatsHardErrors; -- u_int32_t dot5StatsSignalLoss; -- u_int32_t dot5StatsTransmitBeacons; -- u_int32_t dot5StatsRecoverys; -- u_int32_t dot5StatsLobeWires; -- u_int32_t dot5StatsRemoves; -- u_int32_t dot5StatsSingles; -- u_int32_t dot5StatsFreqErrors; -+ uint32_t dot5StatsLineErrors; -+ uint32_t dot5StatsBurstErrors; -+ uint32_t dot5StatsACErrors; -+ uint32_t dot5StatsAbortTransErrors; -+ uint32_t dot5StatsInternalErrors; -+ uint32_t dot5StatsLostFrameErrors; -+ uint32_t dot5StatsReceiveCongestions; -+ uint32_t dot5StatsFrameCopiedErrors; -+ uint32_t dot5StatsTokenErrors; -+ uint32_t dot5StatsSoftErrors; -+ uint32_t dot5StatsHardErrors; -+ uint32_t dot5StatsSignalLoss; -+ uint32_t dot5StatsTransmitBeacons; -+ uint32_t dot5StatsRecoverys; -+ uint32_t dot5StatsLobeWires; -+ uint32_t dot5StatsRemoves; -+ uint32_t dot5StatsSingles; -+ uint32_t dot5StatsFreqErrors; - } INMTokenring_specific_counters; - - typedef struct _INMTokenring_counters { -@@ -435,20 +435,20 @@ - /* 100 BaseVG interface counters - see RFC 2020 */ - - typedef struct _INMVg_specific_counters { -- u_int32_t dot12InHighPriorityFrames; -- u_int64_t dot12InHighPriorityOctets; -- u_int32_t dot12InNormPriorityFrames; -- u_int64_t dot12InNormPriorityOctets; -- u_int32_t dot12InIPMErrors; -- u_int32_t dot12InOversizeFrameErrors; -- u_int32_t dot12InDataErrors; -- u_int32_t dot12InNullAddressedFrames; -- u_int32_t dot12OutHighPriorityFrames; -- u_int64_t dot12OutHighPriorityOctets; -- u_int32_t dot12TransitionIntoTrainings; -- u_int64_t dot12HCInHighPriorityOctets; -- u_int64_t dot12HCInNormPriorityOctets; -- u_int64_t dot12HCOutHighPriorityOctets; -+ uint32_t dot12InHighPriorityFrames; -+ uint64_t dot12InHighPriorityOctets; -+ uint32_t dot12InNormPriorityFrames; -+ uint64_t dot12InNormPriorityOctets; -+ uint32_t dot12InIPMErrors; -+ uint32_t dot12InOversizeFrameErrors; -+ uint32_t dot12InDataErrors; -+ uint32_t dot12InNullAddressedFrames; -+ uint32_t dot12OutHighPriorityFrames; -+ uint64_t dot12OutHighPriorityOctets; -+ uint32_t dot12TransitionIntoTrainings; -+ uint64_t dot12HCInHighPriorityOctets; -+ uint64_t dot12HCInNormPriorityOctets; -+ uint64_t dot12HCOutHighPriorityOctets; - } INMVg_specific_counters; - - typedef struct _INMVg_counters { -@@ -463,12 +463,12 @@ - } INMWan_counters; - - typedef struct _INMVlan_counters { -- u_int32_t vlan_id; -- u_int64_t octets; -- u_int32_t ucastPkts; -- u_int32_t multicastPkts; -- u_int32_t broadcastPkts; -- u_int32_t discards; -+ uint32_t vlan_id; -+ uint64_t octets; -+ uint32_t ucastPkts; -+ uint32_t multicastPkts; -+ uint32_t broadcastPkts; -+ uint32_t discards; - } INMVlan_counters; - - /* Counters data */ -@@ -494,15 +494,15 @@ - } INMCounters_type; - - typedef struct _INMCounters_sample_hdr { -- u_int32_t sequence_number; /* Incremented with each counters sample -+ uint32_t sequence_number; /* Incremented with each counters sample - generated by this source_id */ -- u_int32_t source_id; /* fsSourceId */ -- u_int32_t sampling_interval; /* fsCounterSamplingInterval */ -+ uint32_t source_id; /* fsSourceId */ -+ uint32_t sampling_interval; /* fsCounterSamplingInterval */ - } INMCounters_sample_hdr; - - typedef struct _INMCounters_sample { - INMCounters_sample_hdr hdr; -- u_int32_t counters_type_tag; /* Enum INMCounters_version */ -+ uint32_t counters_type_tag; /* Enum INMCounters_version */ - INMCounters_type counters; /* Counter set for this interface type */ - } INMCounters_sample; - -@@ -523,14 +523,14 @@ - }; - - typedef struct _INMSample_datagram_hdr { -- u_int32_t datagram_version; /* (enum INMDatagram_version) = VERSION2 */ -+ uint32_t datagram_version; /* (enum INMDatagram_version) = VERSION2 */ - INMAddress agent_address; /* IP address of sampling agent */ -- u_int32_t sequence_number; /* Incremented with each sample datagram -+ uint32_t sequence_number; /* Incremented with each sample datagram - generated */ -- u_int32_t uptime; /* Current time (in milliseconds since device -+ uint32_t uptime; /* Current time (in milliseconds since device - last booted). Should be set as close to - datagram transmission time as possible.*/ -- u_int32_t num_samples; /* Number of flow and counters samples to follow */ -+ uint32_t num_samples; /* Number of flow and counters samples to follow */ - } INMSample_datagram_hdr; - - typedef struct _SFSample { -@@ -539,15 +539,15 @@ - - /* the raw pdu */ - u_char *rawSample; -- u_int rawSampleLen; -+ uint rawSampleLen; - -- u_int sampleType; -- u_int samplerId; -+ uint sampleType; -+ uint samplerId; - - /* interface info */ - u_long ifIndex; - u_long networkType; -- u_int64_t ifSpeed; -+ uint64_t ifSpeed; - u_long ifDirection; - u_long ifStatus; - -@@ -570,12 +570,12 @@ - int offsetToIPV4; - struct in_addr dcd_srcIP; - struct in_addr dcd_dstIP; -- u_int dcd_ipProtocol; -- u_int dcd_ipTos; -- u_int dcd_ipTTL; -- u_int dcd_sport; -- u_int dcd_dport; -- u_int dcd_tcpFlags; -+ uint dcd_ipProtocol; -+ uint dcd_ipTos; -+ uint dcd_ipTTL; -+ uint dcd_sport; -+ uint dcd_dport; -+ uint dcd_tcpFlags; - - /* ports */ - u_long inputPort; -@@ -608,9 +608,9 @@ - - /* user id */ - #define SA_MAX_EXTENDED_USER_LEN 200 -- u_int src_user_len; -+ uint src_user_len; - char src_user[SA_MAX_EXTENDED_USER_LEN+1]; -- u_int dst_user_len; -+ uint dst_user_len; - char dst_user[SA_MAX_EXTENDED_USER_LEN+1]; - - /* counter blocks */ -@@ -622,7 +622,7 @@ - #define GETDATA32(target, datap) (target) = ntohl(*(datap)++) - #define GETDATA32_NOBSWAP(target, datap) (target) = *(datap)++ - #define GETDATA64(target, datap) \ -- do { u_int64_t tmpLo, tmpHi; \ -+ do { uint64_t tmpLo, tmpHi; \ - GETDATA32(tmpHi, (datap)); \ - GETDATA32(tmpLo, (datap)); \ - (target) = (tmpHi << 32) + tmpLo; \ -@@ -707,7 +707,7 @@ - u_char *start = (u_char *)sample->header; - u_char *end = start + sample->headerLen; - u_char *ptr = start; -- u_int16_t type_len; -+ uint16_t type_len; - - /* assume not found */ - sample->offsetToIPV4 = -1; -@@ -725,9 +725,9 @@ - - if(type_len == 0x8100) { - /* VLAN - next two bytes */ -- u_int32_t vlanData = (ptr[0] << 8) + ptr[1]; -- u_int32_t vlan = vlanData & 0x0fff; -- u_int32_t priority = vlanData >> 13; -+ uint32_t vlanData = (ptr[0] << 8) + ptr[1]; -+ uint32_t vlan = vlanData & 0x0fff; -+ uint32_t priority = vlanData >> 13; - /* _____________________________________ */ - /* | pri | c | vlan-id | */ - /* ------------------------------------- */ -@@ -973,7 +973,7 @@ - - static u_long *readExtendedRouter(SFSample *sample, u_long *datap, u_char *endPtr) - { -- u_int32_t addrType; -+ uint32_t addrType; - char buf[51]; - GETDATA32(addrType, datap); - if(addrType == INMADDRESSTYPE_IP_V4) GETDATA32_NOBSWAP(sample->nextHop.s_addr, datap); -@@ -1025,7 +1025,7 @@ - traceEvent(CONST_TRACE_INFO, "SFLOW_DEBUG: dst_as_path_len %lu", sample->dst_as_path_len); - } - if(sample->dst_as_path_len > 0) { -- u_int i = 0; -+ uint i = 0; - for(; i < sample->dst_as_path_len; i++) { - if(i == 0) if(debug) traceEvent(CONST_TRACE_INFO, "SFLOW_DEBUG: dst_as_path "); - else if(debug) traceEvent(CONST_TRACE_INFO, "-"); -@@ -1081,11 +1081,11 @@ - - static void receiveSflowSample(SFSample *sample) - { -- u_int numFlowSamples = 0; -- u_int32_t datagramVersion; -- u_int32_t addressType; -+ uint numFlowSamples = 0; -+ uint32_t datagramVersion; -+ uint32_t addressType; - struct in_addr agentIP; -- u_int32_t samplesInPacket; -+ uint32_t samplesInPacket; - struct timeval now; - u_long *datap = (u_long *)sample->rawSample; - -@@ -1129,7 +1129,7 @@ - } - - { /* now iterate and pull out the flows and counters samples */ -- u_int32_t samp = 0; -+ uint32_t samp = 0; - u_char *endPtr = (u_char *)sample->rawSample + sample->rawSampleLen; - - for(; samp < samplesInPacket; samp++) { -@@ -1144,8 +1144,8 @@ - GETDATA32(sample->samplesGenerated, datap); - GETDATA32(sample->samplerId, datap); - if(debug) { -- u_int32_t ds_class = sample->samplerId >> 24; -- u_int32_t ds_index = sample->samplerId & 0x00ffffff; -+ uint32_t ds_class = sample->samplerId >> 24; -+ uint32_t ds_index = sample->samplerId & 0x00ffffff; - traceEvent(CONST_TRACE_INFO, "SFLOW_DEBUG: sampleSequenceNo %lu", sample->samplesGenerated); - traceEvent(CONST_TRACE_INFO, "SFLOW_DEBUG: sourceId %lu:%lu", ds_class, ds_index); - } -@@ -1276,10 +1276,10 @@ - /* assume no extended data */ - sample->extended_data_tag = 0; - { -- u_int x; -+ uint x; - GETDATA32(sample->num_extended, datap); - for(x = 0; x < sample->num_extended; x++) { -- u_int32_t extended_tag; -+ uint32_t extended_tag; - GETDATA32(extended_tag, datap); - switch(extended_tag) { - case INMEXTENDED_SWITCH: -@@ -1344,7 +1344,7 @@ - - /* the generic counters always come first */ - if(debug) { -- u_int64_t cntr64; -+ uint64_t cntr64; - GETDATA64(cntr64, datap); - traceEvent(CONST_TRACE_INFO, "SFLOW_DEBUG: ifInOctets %Lu", cntr64); - GETDATA32(cntr64, datap); -@@ -1393,7 +1393,7 @@ - break; - case INMCOUNTERSVERSION_ETHERNET: - if(debug) { -- u_int32_t cntr32; -+ uint32_t cntr32; - GETDATA32(cntr32, datap); - traceEvent(CONST_TRACE_INFO, "SFLOW_DEBUG: dot3StatsAlignmentErrors %lu", cntr32); - GETDATA32(cntr32, datap); -@@ -1424,7 +1424,7 @@ - break; - case INMCOUNTERSVERSION_TOKENRING: - { -- u_int32_t cntr32; -+ uint32_t cntr32; - GETDATA32(cntr32, datap); - traceEvent(CONST_TRACE_INFO, "SFLOW_DEBUG: dot5StatsLineErrors %lu", cntr32); - GETDATA32(cntr32, datap); -@@ -1468,7 +1468,7 @@ - break; - case INMCOUNTERSVERSION_VG: - if(debug) { -- u_int64_t cntr64; -+ uint64_t cntr64; - GETDATA32(cntr64, datap); - traceEvent(CONST_TRACE_INFO, "SFLOW_DEBUG: dot12InHighPriorityFrames %Lu", cntr64); - GETDATA64(cntr64, datap); -@@ -1504,7 +1504,7 @@ - break; - case INMCOUNTERSVERSION_VLAN: - if(debug) { -- u_int64_t cntr64; -+ uint64_t cntr64; - GETDATA32(sample->in_vlan, datap); - traceEvent(CONST_TRACE_INFO, "SFLOW_DEBUG: in_vlan %lu", sample->in_vlan); - GETDATA64(cntr64, datap); -@@ -1969,26 +1969,26 @@ - /* ****************************** */ - - typedef struct sflowSample { -- u_int32_t datagramVersion; -- u_int32_t addressType; -- u_int32_t agentAddress; -- u_int32_t sequenceNo; -- u_int32_t sysUpTime; -- u_int32_t samplesInPacket; -- u_int32_t sampleType; -- u_int32_t sampleSequenceNo; -- u_int32_t samplerId; -- u_int32_t meanSkipCount; -- u_int32_t samplePool; -- u_int32_t dropEvents; -- u_int32_t inputPort; -- u_int32_t outputPort; -- u_int32_t packet_data_tag; -- u_int32_t headerProtocol; -- u_int32_t sampledPacketSize; -- u_int32_t headerLen; -+ uint32_t datagramVersion; -+ uint32_t addressType; -+ uint32_t agentAddress; -+ uint32_t sequenceNo; -+ uint32_t sysUpTime; -+ uint32_t samplesInPacket; -+ uint32_t sampleType; -+ uint32_t sampleSequenceNo; -+ uint32_t samplerId; -+ uint32_t meanSkipCount; -+ uint32_t samplePool; -+ uint32_t dropEvents; -+ uint32_t inputPort; -+ uint32_t outputPort; -+ uint32_t packet_data_tag; -+ uint32_t headerProtocol; -+ uint32_t sampledPacketSize; -+ uint32_t headerLen; - u_char packetData[DEFAULT_SNAPLEN]; -- u_int32_t extended_data_tag; -+ uint32_t extended_data_tag; - } SflowSample; - - /* **************************************** */ -@@ -2004,10 +2004,10 @@ - /* ntop is reading packets from a file */ - - struct ether_header ehdr; -- u_int caplen = h->caplen; -- u_int length = h->len; -+ uint caplen = h->caplen; -+ uint length = h->len; - unsigned short eth_type; -- u_int8_t flags = 0; -+ uint8_t flags = 0; - struct ip ip; - struct udphdr up; - -@@ -2016,11 +2016,11 @@ - eth_type = ntohs(ehdr.ether_type); - - if(eth_type == ETHERTYPE_IP) { -- u_int plen, hlen; -+ uint plen, hlen; - u_short sport, dport; - - memcpy(&ip, p+sizeof(struct ether_header), sizeof(struct ip)); -- hlen = (u_int)ip.ip_hl * 4; -+ hlen = (uint)ip.ip_hl * 4; - NTOHL(ip.ip_dst.s_addr); NTOHL(ip.ip_src.s_addr); - - plen = length-sizeof(struct ether_header); Added: csw/mgar/pkg/ntop/trunk/files/postinstall =================================================================== --- csw/mgar/pkg/ntop/trunk/files/postinstall (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/postinstall 2010-11-11 11:52:33 UTC (rev 11565) @@ -0,0 +1,21 @@ +#!/sbin/sh + +CONFDIR=$BASEDIR/opt/csw/etc/ntop +DATADIR=$BASEDIR/var/opt/csw/ntop + +PATH=/bin:/usr/bin:"$PATH" +export PATH + +if [ ! -f "$CONFDIR/ntop.conf" ]; then + cp -p $CONFDIR/ntop.conf.CSW $CONFDIR/ntop.conf +fi + +if [ ! -f "$DATADIR/ntop_pw.db" ]; then + if [ ! -d "$DATADIR" ]; then + mkdir -p $DATADIR + chown nobody:nobody $DATADIR + chmod 0711 $DATADIR + fi + $BASEDIR/opt/csw/bin/ntop -P $DATADIR -u nobody --set-admin-password=$ADMIN_PW +fi +echo "\nURL to access ntop is http://hostname:3000" Added: csw/mgar/pkg/ntop/trunk/files/postremove =================================================================== --- csw/mgar/pkg/ntop/trunk/files/postremove (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/postremove 2010-11-11 11:52:33 UTC (rev 11565) @@ -0,0 +1,8 @@ +#!/sbin/sh + +CONFDIR=$BASEDIR/opt/csw/etc/ntop + +if [ -d "$CONFDIR" ]; then + echo "" + echo "You might want to manually remove files in $CONFDIR." +fi Added: csw/mgar/pkg/ntop/trunk/files/request =================================================================== --- csw/mgar/pkg/ntop/trunk/files/request (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/request 2010-11-11 11:52:33 UTC (rev 11565) @@ -0,0 +1,29 @@ +#!/sbin/sh +# +DATADIR=$BASEDIR/var/opt/csw/ntop + +if [ ! -f $DATADIR/ntop_pw.db ]; then + stty -echo + trap "stty echo ; echo 'Interrupted' ; exit 1" 1 2 3 15 + while [ true ]; do + echo "\nPlease enter the password for the admin user: \c" + read admin_pw + if [ `expr "$admin_pw" : '.*'` -ge 5 ];then + echo "\nPlease enter the password again: \c" + read admin_pw1 + if [ "$admin_pw" != "$admin_pw1" ];then + echo "\nPasswords don't match. Please try again." + else + break + fi + else + echo "\nPassword too short (5 characters or more). Please try again." + fi + done + echo "\n" + stty echo +fi +cat > $1 << ! +ADMIN_PW=$admin_pw +! +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Nov 11 13:09:55 2010 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Thu, 11 Nov 2010 12:09:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[11565] csw/mgar/pkg/ntop/trunk In-Reply-To: References: Message-ID: No dia 11 de Novembro de 2010 11:52, escreveu: > +# We don't have a separate devel-package, so this is ok > +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libcpacketPlugin.so > +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libicmpPlugin.so > +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libnetflowPlugin.so > +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libntop.so > +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libntopreport.so > +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/librrdPlugin.so > +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libsflowPlugin.so If it's a general override for the whole package, you can just say: CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink > +# Upstream has chosen it that way... > +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libcpacketPlugin-4.0.3.so|filename=cpacketPlugin.so > +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libicmpPlugin-4.0.3.so|filename=icmpPlugin.so > +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libnetflowPlugin-4.0.3.so|filename=netflowPlugin.so > +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=librrdPlugin-4.0.3.so|filename=rrdPlugin.so > +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libsflowPlugin-4.0.3.so|filename=sflowPlugin.so Where are these libraries installed, /opt/csw/lib or a private subdirectory? > +#CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch|sonames=['libcpacketPlugin-4.0.3.so',|'libicmpPlugin-4.0.3.so',|'libnetflowPlugin-4.0.3.so',|'libntop-4.0.3.so',|'libntopreport-4.0.3.so',|'librrdPlugin-4.0.3.so',|'libsflowPlugin-4.0.3.so']|pkgname=CSWntop|expected=['CSWlib4-0-3']| > +CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch I'll try to improve tag-info syntax for this error tag. By the way, do you know which way does it get mangled before it makes it to the "i checkpkg_override" file? From dmichelsen at users.sourceforge.net Thu Nov 11 14:26:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 13:26:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[11566] csw/mgar/pkg/cpan Message-ID: Revision: 11566 http://gar.svn.sourceforge.net/gar/?rev=11566&view=rev Author: dmichelsen Date: 2010-11-11 13:26:15 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Number-Compare: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Number-Compare/ csw/mgar/pkg/cpan/Number-Compare/branches/ csw/mgar/pkg/cpan/Number-Compare/tags/ csw/mgar/pkg/cpan/Number-Compare/trunk/ csw/mgar/pkg/cpan/Number-Compare/trunk/Makefile csw/mgar/pkg/cpan/Number-Compare/trunk/checksums csw/mgar/pkg/cpan/Number-Compare/trunk/files/ csw/mgar/pkg/cpan/Number-Compare/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Number-Compare/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/Number-Compare/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Number-Compare/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Number-Compare/trunk/Makefile 2010-11-11 13:26:15 UTC (rev 11566) @@ -0,0 +1,26 @@ +GARNAME = Number-Compare +GARVERSION = 0.01 +CATEGORIES = cpan +AUTHOR = RCLAMP + +DESCRIPTION = Numeric comparisons +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmnumbercompare CSWpmnbrcompare + +CATALOGNAME_CSWpmnumbercompare = pm_numbercompare +CATALOGNAME_CSWpmnbrcompare = pm_nbrcompare + +SPKG_DESC_CSWpmnumbercompare = $(DESCRIPTION) +SPKG_DESC_CSWpmnbrcompare = Empty stub as contents has been moved to CSWpmnumbercompare + +RUNTIME_DEP_PKGS_ONLY_CSWpmnbrcompare = CSWpmnumbercompare + +ARCHALL = 1 + +PKGFILES_CSWpmnbrcompare = NOFILES + +include gar/category.mk Added: csw/mgar/pkg/cpan/Number-Compare/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Number-Compare/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Number-Compare/trunk/checksums 2010-11-11 13:26:15 UTC (rev 11566) @@ -0,0 +1 @@ +519a4434e35033e9bd034d27cd2fd299 Number-Compare-0.01.tar.gz Added: csw/mgar/pkg/cpan/Number-Compare/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Number-Compare/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Number-Compare/trunk/files/COPYING 2010-11-11 13:26:15 UTC (rev 11566) @@ -0,0 +1,5 @@ +Copyright (C) 2002 Richard Clamp. All Rights Reserved. + +This module is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 14:38:55 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 13:38:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[11567] csw/mgar/pkg/cpan Message-ID: Revision: 11567 http://gar.svn.sourceforge.net/gar/?rev=11567&view=rev Author: dmichelsen Date: 2010-11-11 13:38:54 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Pod-Readme: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Pod-Readme/ csw/mgar/pkg/cpan/Pod-Readme/branches/ csw/mgar/pkg/cpan/Pod-Readme/tags/ csw/mgar/pkg/cpan/Pod-Readme/trunk/ csw/mgar/pkg/cpan/Pod-Readme/trunk/Makefile csw/mgar/pkg/cpan/Pod-Readme/trunk/checksums csw/mgar/pkg/cpan/Pod-Readme/trunk/files/ csw/mgar/pkg/cpan/Pod-Readme/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Pod-Readme/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/Pod-Readme/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Pod-Readme/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Pod-Readme/trunk/Makefile 2010-11-11 13:38:54 UTC (rev 11567) @@ -0,0 +1,17 @@ +GARNAME = Pod-Readme +GARVERSION = 0.10 +CATEGORIES = cpan +AUTHOR = BIGPRESH + +DESCRIPTION = Convert POD to README file +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmpodreadme +CATALOGNAME = pm_podreadme + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Pod-Readme/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Pod-Readme/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Pod-Readme/trunk/checksums 2010-11-11 13:38:54 UTC (rev 11567) @@ -0,0 +1 @@ +ee7043323b43bbdbfbfecf0e9a32c64a Pod-Readme-0.10.tar.gz Added: csw/mgar/pkg/cpan/Pod-Readme/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Pod-Readme/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Pod-Readme/trunk/files/COPYING 2010-11-11 13:38:54 UTC (rev 11567) @@ -0,0 +1,6 @@ +Copyright (c) 2005,2006 Robert Rothenberg. All rights reserved. +This program is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. + +Some portions are based on L 2.02. + 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 Nov 11 14:42:29 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 13:42:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[11568] csw/mgar/pkg/cpan Message-ID: Revision: 11568 http://gar.svn.sourceforge.net/gar/?rev=11568&view=rev Author: dmichelsen Date: 2010-11-11 13:42:29 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Pod-Tests: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Pod-Tests/ csw/mgar/pkg/cpan/Pod-Tests/branches/ csw/mgar/pkg/cpan/Pod-Tests/tags/ csw/mgar/pkg/cpan/Pod-Tests/trunk/ csw/mgar/pkg/cpan/Pod-Tests/trunk/Makefile csw/mgar/pkg/cpan/Pod-Tests/trunk/checksums csw/mgar/pkg/cpan/Pod-Tests/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Pod-Tests/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/Pod-Tests/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Pod-Tests/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Pod-Tests/trunk/Makefile 2010-11-11 13:42:29 UTC (rev 11568) @@ -0,0 +1,17 @@ +GARNAME = Pod-Tests +GARVERSION = 1.19 +CATEGORIES = cpan +AUTHOR = ADAMK + +DESCRIPTION = Extracts embedded tests and code examples from POD +define BLURB +endef + +PACKAGES = CSWpmpodtests +CATALOGNAME = pm_podtests + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Pod-Tests/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Pod-Tests/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Pod-Tests/trunk/checksums 2010-11-11 13:42:29 UTC (rev 11568) @@ -0,0 +1 @@ +9c1a062bc7689e0c4f94784e3de69f35 Pod-Tests-1.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 14:59:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 13:59:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[11570] csw/mgar/pkg/ntop/trunk Message-ID: Revision: 11570 http://gar.svn.sourceforge.net/gar/?rev=11570&view=rev Author: dmichelsen Date: 2010-11-11 13:59:27 +0000 (Thu, 11 Nov 2010) Log Message: ----------- ntop: Some fixes on startup and configuration Modified Paths: -------------- csw/mgar/pkg/ntop/trunk/Makefile csw/mgar/pkg/ntop/trunk/files/cswntop Added Paths: ----------- csw/mgar/pkg/ntop/trunk/files/ntop.conf.CSW Modified: csw/mgar/pkg/ntop/trunk/Makefile =================================================================== --- csw/mgar/pkg/ntop/trunk/Makefile 2010-11-11 13:51:50 UTC (rev 11569) +++ csw/mgar/pkg/ntop/trunk/Makefile 2010-11-11 13:59:27 UTC (rev 11570) @@ -15,6 +15,13 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES += cswntop +EXPANDVARS += cswntop +DISTFILES += ntop.conf.CSW +EXPANDVARS += ntop.conf.CSW + +INITSMF = /etc/opt/csw/init.d/cswntop + PATCHFILES = 0001-Fix-misplaced-endif.patch PATCHFILES += 0002-Do-not-redeclare-__builtin_alloca.patch PATCHFILES += 0003-Check-for-uint_-in-addition-to-u_int_.patch @@ -47,6 +54,8 @@ sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw +PRESERVECONF = $(sysconfdir)/ntop.conf + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gdbm-lib=/opt/csw/lib CONFIGURE_ARGS += --with-gdbm-include=/opt/csw/include @@ -85,3 +94,8 @@ cp /opt/csw/share/aclocal/libtool.m4 $(WORKSRC)/libtool.m4.in @$(MAKECOOKIE) +post-install-modulated: + ginstall -d $(DESTDIR)/etc/opt/csw/init.d + ginstall $(WORKDIR)/cswntop $(DESTDIR)/etc/opt/csw/init.d/cswntop + ginstall $(WORKDIR)/ntop.conf.CSW $(DESTDIR)$(sysconfdir)/ntop/ntop.conf.CSW + @$(MAKECOOKIE) Modified: csw/mgar/pkg/ntop/trunk/files/cswntop =================================================================== --- csw/mgar/pkg/ntop/trunk/files/cswntop 2010-11-11 13:51:50 UTC (rev 11569) +++ csw/mgar/pkg/ntop/trunk/files/cswntop 2010-11-11 13:59:27 UTC (rev 11570) @@ -3,8 +3,8 @@ # ntop startup script for ntop v3.0 # v1.0 # -BINDIR=/opt/csw/bin -CONF=/opt/csw/etc/ntop/ntop.conf +BINDIR=@bindir@ +CONF=@sysconfdir@/ntop/ntop.conf if [ ! -f "$CONF" ]; then echo "Configuration file not found." @@ -12,7 +12,7 @@ else DATADIR=`/usr/bin/egrep "^\--db-file-path|^-P" "$CONF" | /usr/bin/cut -f2 -d" "` if [ -z "$DATADIR" ]; then - DATADIR=/var/opt/csw/ntop + DATADIR=@localstatedir@/ntop EXTRA="-P ${DATADIR}" fi fi Added: csw/mgar/pkg/ntop/trunk/files/ntop.conf.CSW =================================================================== --- csw/mgar/pkg/ntop/trunk/files/ntop.conf.CSW (rev 0) +++ csw/mgar/pkg/ntop/trunk/files/ntop.conf.CSW 2010-11-11 13:59:27 UTC (rev 11570) @@ -0,0 +1,171 @@ +# +# Configuration sample file for csw ntop v3.0 +# v1.0 +# +# It is strongly recommended that you read ntop documentation +# to know more about configuration parameters. +# +########################## +# CONFIGURATION PARAMETERS +########################## + +#-a | --access-log-file +# Use this parameter to logging HTTP requests. +--access-log-file @localstatedir@/ntop/access.log + +#-b | --disable-decoders +# This parameter disables protocol decoders + +#-c | --sticky-hosts +# Use this parameter to prevent idle hosts from being purged from memory. +# DO NOT USE THIS unless you are on a small, very static network, or you have LOTS of memory. + +#-d | --daemon +# This parameter causes ntop to become a daemon. +--daemon + +#-e | --max-table-rows +# This defines the maximum number of lines that ntop will display on each generated HTML page. + +#-f | --traffic-dump-file +# This parameter causes ntop to read data from a file, typically a tcpdump capture or the output from one of the ntop packet capture options. + +#-g | --track-local-hosts +# Use this parameter to tell ntop to capture data only about local hosts. + +#-i | --interface +# Specifies the network interface or interfaces to be used by ntop for network monitoring. +# Default is the 1st ethernet device, e.g: hme0 +# To monitor NO ethernet interfaces (for example a system collecting data only from netFlow probes), use --interface none + +#-j | --create-other-packets +# This parameter causes ntop to create a dump file of the other network traffic captured. + +#-k | --filter-expression-in-extra-frame +# When this parameter is used, the current filter expression is displayed in an extra frame and thus is always visible. + +#-l | --pcap-log +# This parameter causes a dump file to be created of the network traffic captured by ntop in tcpdump (pcap) format. + +#-m | --local-subnets +# This parameter allows the user to define additional networks and subnetworks whose traffic is also considered local in ntop reports. You can mix CIDR and network/netmask notation. + +#-n | --numeric-ip-addresses +# This parameter causes ntop to skip DNS resolution. + +#-o | --no-mac +# This allows ntop to link the logical addresses to a physical machine with multiple addresses, This is used if you observe ntop being confused by 'changing' addresses. + +#-p | --protocols +# This parameter is used to specify the TCP/UDP protocols that ntop will monitor. +# It can be either a file or a list. To point ntop to a file specify it's name: -p /var/opt/csw/ntop/protocol.list +# Or to give an explicit list: --protocols="HTTP=http|www|https|3128,FTP=ftp|ftp-data" + +#-q | --create-suspicious-packets +# This parameter tells ntop to create a dump file of suspicious packets. + +#-r | --refresh-time +# Specifies the delay (in seconds) between automatic screen updates, The default is 3 seconds. + +#-s | --no-promiscuous +# Use this parameter to prevent from setting the interface(s) into promiscuous mode. + + +#-t | --trace-level +# This parameter specifies the information level of messages that you wish ntop to display (on stdout or to the log), default is --trace-level 3 +#--trace-level 0 # FATALERROR only +#--trace-level 1 # ERROR and above only +#--trace-level 2 # WARNING and above only +#--trace-level 3 # INFO, WARNING and ERRORs - the default +#--trace-level 4 # NOISY - everything +#--trace-level 6 # NOISY + MSGID +#--trace-level 7 # NOISY + MSGID + file/line + +#-u | --user +# Specifies the user ntop should run as after it initializes. +#NOTE: This should not be root unless you really understand the security risks. In order to prevent this by accident, the only way to run ntop as root is to explicitly specify -u root. Dont do it. +--user nobody + +#-x -X +# ntop creates a new hash/list entry for each new host/TCP session seen. + +#-w | --http-server +#-W | --https-server +# These parameters specify the port (and optionally the address (i.e. interface)) of the ntop web server, ntop offers both an http:// and https:// web server. These parameters tell ntop which ports (and interfaces) to offer this web server on. +# Default is -w 3000 -W 0 (https disable) +# Neither - say ntop is running only as a netFlow probe: +# -w 0 -W 0 +# You can also limit ntop to listening on a specific interface. For example: +# -w 127.0.0.1:3000 # Listens only on the loopback interface at port 3000 +--http-server 3000 +--https-server 0 + +#-z | --disable-sessions +# This parameter disables TCP session tracking. Use it for better performance or when you don't really need/care to track sessions. + +#-B | --filter-expression +# Filters allows the user to restrict the traffic seen by ntop on just about any imaginable item, using bpf (Berkeley Packet Filter) expressions, you can check bdf documentation on tcpdump man page. +# NOTE: The filter expression MUST be in quotes. +# -B "net 192.168.1.88/30" +# You can limit traffic to that from (src) or to (dst) a specific host: +# -B "src host www.mycompany.com" +# -B "dst host www.mycompany.com" +# You can limit it to a specific protocol, including src/dst: +# -B "port ssh" +# -B "src port ssh" +# -B "dst port ssh" + +#-C +# This instruments ntop to be used in two configurations: host and network mode. + +#-D | --domain +# This identifies the local domain suffix, e.g. ntop.org. It may be necessary, if ntop is having difficulty determining it from the interface. + +#-F | --flow-spec +# It is used to specify network flows similar to more powerful applications such as NeTraMet. +# The format is =''[,=''] + +#-K | --enable-debug +# Use this parameter to send log messages to the system log instead of stdout. + +#-L | --use-syslog=facility +# Use this parameter to send log messages to the system log instead of stdout. By default, ntop writes it's messages to stdout (the terminal). +--use-syslog=local3 + +#-M | --no-interface-merge +# This option instructs ntop not to merge network interfaces together. This means that ntop will collect statistics for each interface and report them separately. + +#-O | --output-packet-path +# This parameter defines the base path for the ntop-suspicious-pkts.XXX.pcap and normal packet dump files. + +#-P | --db-file-path +#-Q | --spool-file-path +# These parameters specify where ntop stores database files. +# The directories named must allow read/write and file creation by the ntop user. For security, nobody else should have even read access to these files. +# There are two types, temporary - that is ones which need not be retained from ntop run to ntop run, and permanent, which must be retained (or recreated). +# The permanent databases are the preferences, "prefsCache.db" and the password file, "ntop_pw.db". These are stored in the -P | --db-file-path specified location, If only -P | --db-file-path is specified, it is used for both types of databases. +# NOTE: Use absolute paths +--db-file-path /var/opt/csw/ntop + +#-U | --mapper +# Specifies the URL of the mapper.pl utility. + +#--disable-instantsessionpurge +# This switch makes ntop respect the timeouts for completed sessions. It is NOT the default because a busy web server may have 100s or 1000s of completed sessions and this would significantly increase the amount of memory ntop uses. + +#--disable-mutexextrainfo +# On some OSes, the system calls used to collect this informatio (getpid() and gettimeofday()) are expensive. +# This option disables the extra information. + +#--disable-schedyield +# ntop uses sched_yield() calls for better interactive performance. Under some situations, primarily under RedHat Linux 8.0, this can deadlock, causing the ntop web server to stop responding, although ntop appears to still be operational according to the ps command. Use this switch to disable these calls, IF you are seeing deadlocks. + +#--pcap_setnonblock +# Return ntop to the old (v2.1) behavior on a memory error. The default of stopcap enabled makes the web interface available albeit with static content until ntop is shutdown. + +#--skip-version-check +# By default, ntop accesses a remote file to periodically check if the most current version is running. This option disables that check. +--skip-version-check + +--w3c +# By default, ntop generates displayable but not great html. This flag tells ntop to generate 'BETTER' (but not perfect) w3c compliant html 4.01 output. 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 Nov 11 14:51:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 13:51:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11569] csw/mgar/pkg/cpan/Sort-Versions/trunk Message-ID: Revision: 11569 http://gar.svn.sourceforge.net/gar/?rev=11569&view=rev Author: dmichelsen Date: 2010-11-11 13:51:50 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Sort-Versions: Update to mGAR v2, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Sort-Versions/trunk/Makefile csw/mgar/pkg/cpan/Sort-Versions/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Sort-Versions/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Sort-Versions/trunk/files/CSWpmsortver.gspec csw/mgar/pkg/cpan/Sort-Versions/trunk/files/CSWpmsortver.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Sort-Versions/trunk/ Property changes on: csw/mgar/pkg/cpan/Sort-Versions/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Sort-Versions/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Sort-Versions/trunk/Makefile 2010-11-11 13:42:29 UTC (rev 11568) +++ csw/mgar/pkg/cpan/Sort-Versions/trunk/Makefile 2010-11-11 13:51:50 UTC (rev 11569) @@ -3,7 +3,7 @@ CATEGORIES = cpan AUTHOR = EDAVIS -DESCRIPTION = a module for sorting of revision-like numbers. +DESCRIPTION = A module for sorting of revision-like numbers define BLURB Sort::Versions allows easy sorting of mixed non-numeric and numeric strings, like the 'version numbers' that many shared library systems and revision @@ -13,6 +13,20 @@ undoubtedly be found. endef -DISTFILES += $(call admfiles,CSWpmsortver,prototype) +DISTFILES = COPYING +PACKAGES = CSWpmsortversions CSWpmsortver + +CATALOGNAME_CSWpmsortversions = pm_sortversions +CATALOGNAME_CSWpmsortver = pm_sortver + +SPKG_DESC_CSWpmsortversions = $(DESCRIPTION) +SPKG_DESC_CSWpmsortver = Empty stub as contents has been moved to CSWpmsortversions + +RUNTIME_DEP_PKGS_ONLY_CSWpmsortver = CSWpmsortversions + +ARCHALL = 1 + +PKGFILES_CSWpmsortver = NOFILES + include gar/category.mk Modified: csw/mgar/pkg/cpan/Sort-Versions/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Sort-Versions/trunk/checksums 2010-11-11 13:42:29 UTC (rev 11568) +++ csw/mgar/pkg/cpan/Sort-Versions/trunk/checksums 2010-11-11 13:51:50 UTC (rev 11569) @@ -1,3 +1 @@ -0566422480220c4b262d4009fd8846b4 download/CSWpmsortver.gspec -e39e009ee0624bc4dae84684f431916f download/CSWpmsortver.prototype -5434f948fdea6406851c77bebbd0ed19 download/Sort-Versions-1.5.tar.gz +5434f948fdea6406851c77bebbd0ed19 Sort-Versions-1.5.tar.gz Copied: csw/mgar/pkg/cpan/Sort-Versions/trunk/files/COPYING (from rev 11153, csw/mgar/pkg/cpan/Sort-Versions/trunk/files/CSWpmsortver.gspec) =================================================================== --- csw/mgar/pkg/cpan/Sort-Versions/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Sort-Versions/trunk/files/COPYING 2010-11-11 13:51:50 UTC (rev 11569) @@ -0,0 +1,3 @@ +The files in this package are copyright Kenneth J. Albanowski, Ed +Avis, and Matt Johnson. This package is free software; you can +redistribute it and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Sort-Versions/trunk/files/CSWpmsortver.gspec =================================================================== --- csw/mgar/pkg/cpan/Sort-Versions/trunk/files/CSWpmsortver.gspec 2010-11-11 13:42:29 UTC (rev 11568) +++ csw/mgar/pkg/cpan/Sort-Versions/trunk/files/CSWpmsortver.gspec 2010-11-11 13:51:50 UTC (rev 11569) @@ -1,8 +0,0 @@ -%var bitname pm_sortversions -%var pkgname CSWpmsortver -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -The files in this package are copyright Kenneth J. Albanowski, Ed -Avis, and Matt Johnson. This package is free software; you can -redistribute it and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Sort-Versions/trunk/files/CSWpmsortver.prototype =================================================================== --- csw/mgar/pkg/cpan/Sort-Versions/trunk/files/CSWpmsortver.prototype 2010-11-11 13:42:29 UTC (rev 11568) +++ csw/mgar/pkg/cpan/Sort-Versions/trunk/files/CSWpmsortver.prototype 2010-11-11 13:51:50 UTC (rev 11569) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Sort 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Sort/Versions 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Sort/Versions/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Sort::Versions.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Sort 0755 root bin -f none /opt/csw/share/perl/csw/Sort/Versions.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 15:12:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 14:12:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11571] csw/mgar/pkg/cpan/Regexp-Common/trunk Message-ID: Revision: 11571 http://gar.svn.sourceforge.net/gar/?rev=11571&view=rev Author: dmichelsen Date: 2010-11-11 14:12:05 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Regexp-Common: Update to 2010010201 and mGAR v2, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Regexp-Common/trunk/Makefile csw/mgar/pkg/cpan/Regexp-Common/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Regexp-Common/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Regexp-Common/trunk/files/CSWpmregexpcom.gspec csw/mgar/pkg/cpan/Regexp-Common/trunk/files/disable_squares_t.diff Property Changed: ---------------- csw/mgar/pkg/cpan/Regexp-Common/trunk/ Property changes on: csw/mgar/pkg/cpan/Regexp-Common/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Regexp-Common/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Regexp-Common/trunk/Makefile 2010-11-11 13:59:27 UTC (rev 11570) +++ csw/mgar/pkg/cpan/Regexp-Common/trunk/Makefile 2010-11-11 14:12:05 UTC (rev 11571) @@ -1,17 +1,28 @@ GARNAME = Regexp-Common -GARVERSION = 2.120 +GARVERSION = 2010010201 CATEGORIES = cpan AUTHOR = ABIGAIL -DESCRIPTION = provide commonly requested regular expressions +DESCRIPTION = Provide commonly requested regular expressions define BLURB By default, this module exports a single hash (%RE) that stores or generates commonly needed regular expressions (see "List of available patterns"). endef -DISTFILES += CSWpmregexpcom.gspec +DISTFILES = COPYING -# Beware -- Regexp::Common::numbers{square} may be flaky... -#PATCHFILES = disable_squares_t.diff +PACKAGES = CSWpmregexpcommon CSWpmregexpcom +CATALOGNAME_CSWpmregexpcommon = pm_regexpcommon +CATALOGNAME_CSWpmregexpcom = pm_regexpcom + +SPKG_DESC_CSWpmregexpcommon = $(DESCRIPTION) +SPKG_DESC_CSWpmregexpcom = Empty stub as contents has been moved to CSWpmregexpcommon + +RUNTIME_DEPL_PKGS_ONLY_CSWpmregexpcom = CSWpmregexpcommon + +ARCHALL = 1 + +PKGFILES_CSWpmregexpcom = NOFILES + include gar/category.mk Modified: csw/mgar/pkg/cpan/Regexp-Common/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Regexp-Common/trunk/checksums 2010-11-11 13:59:27 UTC (rev 11570) +++ csw/mgar/pkg/cpan/Regexp-Common/trunk/checksums 2010-11-11 14:12:05 UTC (rev 11571) @@ -1,2 +1 @@ -d1025e54688327b79cf647e65e332fee download/CSWpmregexpcom.gspec -a14f2a3c3f2718a567ec26f57a2bae13 download/Regexp-Common-2.120.tar.gz +e4267a626af781ed62c696f05b2b60f3 Regexp-Common-2010010201.tar.gz Copied: csw/mgar/pkg/cpan/Regexp-Common/trunk/files/COPYING (from rev 11153, csw/mgar/pkg/cpan/Regexp-Common/trunk/files/CSWpmregexpcom.gspec) =================================================================== --- csw/mgar/pkg/cpan/Regexp-Common/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Regexp-Common/trunk/files/COPYING 2010-11-11 14:12:05 UTC (rev 11571) @@ -0,0 +1,4 @@ +Copyright (c) 2001, Damian Conway. All Rights Reserved. +This module is free software. It may be used, redistributed +and/or modified under the terms of the Perl Artistic License +(see http://www.perl.com/perl/misc/Artistic.html) Deleted: csw/mgar/pkg/cpan/Regexp-Common/trunk/files/CSWpmregexpcom.gspec =================================================================== --- csw/mgar/pkg/cpan/Regexp-Common/trunk/files/CSWpmregexpcom.gspec 2010-11-11 13:59:27 UTC (rev 11570) +++ csw/mgar/pkg/cpan/Regexp-Common/trunk/files/CSWpmregexpcom.gspec 2010-11-11 14:12:05 UTC (rev 11571) @@ -1,9 +0,0 @@ -%var bitname pm_regexpcom -%var pkgname CSWpmregexpcom -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2001, Damian Conway. All Rights Reserved. -This module is free software. It may be used, redistributed -and/or modified under the terms of the Perl Artistic License -(see http://www.perl.com/perl/misc/Artistic.html) Deleted: csw/mgar/pkg/cpan/Regexp-Common/trunk/files/disable_squares_t.diff =================================================================== --- csw/mgar/pkg/cpan/Regexp-Common/trunk/files/disable_squares_t.diff 2010-11-11 13:59:27 UTC (rev 11570) +++ csw/mgar/pkg/cpan/Regexp-Common/trunk/files/disable_squares_t.diff 2010-11-11 14:12:05 UTC (rev 11571) @@ -1,13 +0,0 @@ ---- Regexp-Common-2.113.orig/t/test_squares.t 2003-03-23 13:41:55.000000000 -0800 -+++ Regexp-Common-2.113/t/test_squares.t 2004-01-09 14:22:30.434940000 -0800 -@@ -8,6 +8,10 @@ - use Regexp::Common; - use t::Common '5.008'; - -+print "1..1\n"; -+print "ok\n"; -+__END__ -+ - local $^W = 0; - - my $MAX_INT32 = 0x7FFFFFFF; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Nov 11 16:20:00 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 11 Nov 2010 15:20:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[11572] csw/mgar/pkg/libldns/trunk/Makefile Message-ID: Revision: 11572 http://gar.svn.sourceforge.net/gar/?rev=11572&view=rev Author: idogan23 Date: 2010-11-11 15:20:00 +0000 (Thu, 11 Nov 2010) Log Message: ----------- ldns: added extra isa sparcv8plus+vis Modified Paths: -------------- csw/mgar/pkg/libldns/trunk/Makefile Modified: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile 2010-11-11 14:12:05 UTC (rev 11571) +++ csw/mgar/pkg/libldns/trunk/Makefile 2010-11-11 15:20:00 UTC (rev 11572) @@ -37,8 +37,9 @@ LICENSE = LICENSE BUILD64 = 1 -EXTRA_BUILD_ISAS_i386 = pentium_pro -EXTRA_BUILD_ISAS_sparc = sparcv8plus +EXTRA_BUILD_ISAS_i386 = pentium_pro +EXTRA_BUILD_ISAS_sparc = sparcv8plus +EXTRA_BUILD_ISAS_sparc += sparcv8plus+vis RUNTIME_DEP_PKGS_CSWlibldns1 += CSWosslrt RUNTIME_DEP_PKGS_CSWlibldnsdevel += CSWlibldns1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Nov 11 17:28:17 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 11 Nov 2010 16:28:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11573] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 11573 http://gar.svn.sourceforge.net/gar/?rev=11573&view=rev Author: idogan23 Date: 2010-11-11 16:28:16 +0000 (Thu, 11 Nov 2010) Log Message: ----------- unbound: split up in multiple packages & extra ISAs Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2010-11-11 15:20:00 UTC (rev 11572) +++ csw/mgar/pkg/unbound/trunk/Makefile 2010-11-11 16:28:16 UTC (rev 11573) @@ -20,6 +20,33 @@ DISTFILES += cswunbound DISTFILES += cswusergroup +EXTRA_BUILD_ISAS_i386 = pentium_pro +EXTRA_BUILD_ISAS_sparc = sparcv8plus + +MERGE_DIRS_isa-sparcv8plus = $(libdir) +MERGE_DIRS_isa-sparcv8plus += $(sbindir) +MERGE_DIRS_isa-pentium_pro = $(libdir) +MERGE_DIRS_isa-pentium_pro += $(sbindir) + +ISAXEC_DIRS = $(sbindir) +ISAEXEC_EXCLUDE_FILES = $(sbindir)/unbound-anchor +ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-checkconf +ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control +ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control-setup +ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-host + +EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro = $(prefix)/sbin/unbound-anchor +EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-checkconf +EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-control +EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-control-setup +EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-host + +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus = $(prefix)/sbin/unbound-anchor +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-checkconf +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-control +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-control-setup +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-host + SPKG_CLASSES_CSWunbound = none cswusergroup cswcpsampleconf cswinitsmf PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswunbound$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/CSWunbound\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/unbound\/unbound.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' @@ -54,14 +81,12 @@ RUNTIME_DEP_PKGS_CSWunbound += CSWosslrt SPKG_DESC_CSWlibunbound2 = Library implementing DNS resolution and validation -#PKGFILES_CSWlibunbound2 += /opt/csw/lib/libunbound.so.2.* PKGFILES_CSWlibunbound2 += $(PKGFILES_RT) RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibldns1 RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWosslrt RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibevent SPKG_DESC_CSWunbound-devel = $(DESCRIPTION) development package -#PKGFILES_CSWunbound-devel += /opt/csw/lib/libunbound.so PKGFILES_CSWunbound-devel += $(PKGFILES_DEVEL) # make test doesn't work for the moment on Solaris This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at opencsw.org Thu Nov 11 17:37:26 2010 From: bonivart at opencsw.org (Peter Bonivart) Date: Thu, 11 Nov 2010 17:37:26 +0100 Subject: [csw-devel] SF.net SVN: gar:[11573] csw/mgar/pkg/unbound/trunk/Makefile In-Reply-To: References: Message-ID: On Thu, Nov 11, 2010 at 5:28 PM, wrote: > ?PROTOTYPE_FILTER = awk '$$3 ~ /\/init.d\/cswunbound$$/ { $$2 = "cswinitsmf" } $$3 ~ /\/CSWunbound\/cswusergroup$$$/ { $$2 = "cswusergroup" } $$3 ~ /\/unbound\/unbound.conf.CSW$$/ { $$2 = "cswcpsampleconf" } { print }' That filter can be replaced by: INITSMF = /etc/opt/csw/init.d/cswunbound USERGROUP = /etc/opt/csw/CSWunbound/cswusergroup SAMPLECONF = /etc/opt/csw/unbound/unbound.conf /peter From dmichelsen at users.sourceforge.net Thu Nov 11 17:59:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 16:59:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[11574] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 11574 http://gar.svn.sourceforge.net/gar/?rev=11574&view=rev Author: dmichelsen Date: 2010-11-11 16:59:30 +0000 (Thu, 11 Nov 2010) Log Message: ----------- unbound: Some minor improvements Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2010-11-11 16:28:16 UTC (rev 11573) +++ csw/mgar/pkg/unbound/trunk/Makefile 2010-11-11 16:59:30 UTC (rev 11574) @@ -20,6 +20,8 @@ DISTFILES += cswunbound DISTFILES += cswusergroup +VENDOR_URL = http://unbound.net + EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv8plus @@ -47,18 +49,16 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-control-setup EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-host -SPKG_CLASSES_CSWunbound = none cswusergroup cswcpsampleconf cswinitsmf -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswunbound$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/CSWunbound\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/unbound\/unbound.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' +# SPKG_CLASSES_CSWunbound = none cswusergroup cswcpsampleconf cswinitsmf +# PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswunbound$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/CSWunbound\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/unbound\/unbound.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' +INITSMF = /etc/opt/csw/init.d/cswunbound +USERGROUP = /etc/opt/csw/pkg/CSWunbound/cswusergroup +SAMPLECONF = /etc/opt/csw/unbound/unbound.conf + # 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 = - -PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 - CONFIGURE_ARGS = $(DIRPATHS) CONFIGUTE_ARGS += --with-solaris-threads CONFIGURE_ARGS += --with-ldns=/opt/csw @@ -92,13 +92,15 @@ # make test doesn't work for the moment on Solaris SKIPTEST = 1 +include gar/category.mk + post-install-modulated: - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 755 $(FILEDIR)/cswunbound $(DESTDIR)/etc/opt/csw/init.d/cswunbound - @ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWunbound - @ginstall -m 755 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWunbound/cswusergroup - @mv $(DESTDIR)/etc/opt/csw/unbound/unbound.conf $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW - @chmod 444 $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW + ginstall -d $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/cswunbound $(DESTDIR)/etc/opt/csw/init.d/cswunbound + ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWunbound + ginstall -m 755 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWunbound/cswusergroup + #mv $(DESTDIR)/etc/opt/csw/unbound/unbound.conf $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW + #chmod 444 $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW + chmod 444 $(DESTDIR)/etc/opt/csw/unbound/unbound.conf @$(MAKECOOKIE) -include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 18:17:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 17:17:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[11575] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 11575 http://gar.svn.sourceforge.net/gar/?rev=11575&view=rev Author: dmichelsen Date: 2010-11-11 17:17:09 +0000 (Thu, 11 Nov 2010) Log Message: ----------- unbound: Remove permissions on default Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2010-11-11 16:59:30 UTC (rev 11574) +++ csw/mgar/pkg/unbound/trunk/Makefile 2010-11-11 17:17:09 UTC (rev 11575) @@ -101,6 +101,5 @@ ginstall -m 755 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWunbound/cswusergroup #mv $(DESTDIR)/etc/opt/csw/unbound/unbound.conf $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW #chmod 444 $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW - chmod 444 $(DESTDIR)/etc/opt/csw/unbound/unbound.conf @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Thu Nov 11 18:18:02 2010 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 11 Nov 2010 18:18:02 +0100 Subject: [csw-devel] SF.net SVN: gar:[11565] csw/mgar/pkg/ntop/trunk In-Reply-To: References: Message-ID: Hi Maciej, Am 11.11.2010 um 13:09 schrieb Maciej (Matchek) Blizinski: > No dia 11 de Novembro de 2010 11:52, > escreveu: >> +# We don't have a separate devel-package, so this is ok >> +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so- >> symlink|file=/opt/csw/lib/libcpacketPlugin.so >> +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so- >> symlink|file=/opt/csw/lib/libicmpPlugin.so >> +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so- >> symlink|file=/opt/csw/lib/libnetflowPlugin.so >> +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so- >> symlink|file=/opt/csw/lib/libntop.so >> +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so- >> symlink|file=/opt/csw/lib/libntopreport.so >> +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so- >> symlink|file=/opt/csw/lib/librrdPlugin.so >> +CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so- >> symlink|file=/opt/csw/lib/libsflowPlugin.so > > If it's a general override for the whole package, you can just say: > > CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink Yes, I know. But I wanted to make explicit which libraries were overridden. >> +# Upstream has chosen it that way... >> +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename| >> soname=libcpacketPlugin-4.0.3.so|filename=cpacketPlugin.so >> +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename| >> soname=libicmpPlugin-4.0.3.so|filename=icmpPlugin.so >> +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename| >> soname=libnetflowPlugin-4.0.3.so|filename=netflowPlugin.so >> +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename| >> soname=librrdPlugin-4.0.3.so|filename=rrdPlugin.so >> +CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename| >> soname=libsflowPlugin-4.0.3.so|filename=sflowPlugin.so > > Where are these libraries installed, /opt/csw/lib or a private > subdirectory? That is in lib/ntop/plugins. There are duplicate ones correctly named in lib/, so I guess it is ok to override the private ones. >> +#CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch|sonames= >> ['libcpacketPlugin >> -4.0.3 >> .so >> ',| >> 'libicmpPlugin >> -4.0.3 >> .so >> ',| >> 'libnetflowPlugin >> -4.0.3 >> .so >> ',| >> 'libntop >> -4.0.3 >> .so >> ',| >> 'libntopreport >> -4.0.3.so',|'librrdPlugin-4.0.3.so',|'libsflowPlugin-4.0.3.so']| >> pkgname=CSWntop|expected=['CSWlib4-0-3']| >> +CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch > > I'll try to improve tag-info syntax for this error tag. By the way, do > you know which way does it get mangled before it makes it to the "i > checkpkg_override" file? Nope, have to look. Best regards -- Dago From dmichelsen at users.sourceforge.net Thu Nov 11 19:32:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 18:32:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[11576] csw/mgar/pkg/cpan/Devel-Size/trunk Message-ID: Revision: 11576 http://gar.svn.sourceforge.net/gar/?rev=11576&view=rev Author: dmichelsen Date: 2010-11-11 18:32:58 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Devel-Size: Update to 0.71 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Devel-Size/trunk/Makefile csw/mgar/pkg/cpan/Devel-Size/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Devel-Size/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Devel-Size/trunk/files/CSWpmdevsize.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Devel-Size/trunk/ Property changes on: csw/mgar/pkg/cpan/Devel-Size/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Devel-Size/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Devel-Size/trunk/Makefile 2010-11-11 17:17:09 UTC (rev 11575) +++ csw/mgar/pkg/cpan/Devel-Size/trunk/Makefile 2010-11-11 18:32:58 UTC (rev 11576) @@ -1,9 +1,9 @@ GARNAME = Devel-Size -GARVERSION = 0.64 +GARVERSION = 0.71 CATEGORIES = cpan -AUTHOR = DSUGAL +AUTHOR = TELS -DESCRIPTION = extension for finding the memory usage of Perl variables +DESCRIPTION = Extension for finding the memory usage of Perl variables define BLURB This module figures out the real sizes of Perl variables in bytes. Call functions with a reference to the variable you want the size of. If the @@ -11,6 +11,10 @@ variable is a hash or an array, use a reference when calling. endef -DISTFILES += CSWpmdevsize.gspec +MASTER_SITES = $(addsuffix devel/,$(CPAN_MIRRORS)) +DISTFILES = COPYING +PACKAGES = CSWpmdevelsize +CATALOGNAME = pm_develsize + include gar/category.mk Modified: csw/mgar/pkg/cpan/Devel-Size/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Devel-Size/trunk/checksums 2010-11-11 17:17:09 UTC (rev 11575) +++ csw/mgar/pkg/cpan/Devel-Size/trunk/checksums 2010-11-11 18:32:58 UTC (rev 11576) @@ -1,2 +1 @@ -222b719069d161e418619e12b67b43b9 download/CSWpmdevsize.gspec -d200be2102275c77e2e3bb18ac6914b4 download/Devel-Size-0.64.tar.gz +9504441ae609b39d70384a9fdc186362 Devel-Size-0.71.tar.gz Added: csw/mgar/pkg/cpan/Devel-Size/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Devel-Size/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Devel-Size/trunk/files/COPYING 2010-11-11 18:32:58 UTC (rev 11576) @@ -0,0 +1,6 @@ +Copyright (C) 2005 Dan Sugalski, Copyright (C) 2007-2008 Tels + +This module is free software; you can redistribute it and/or modify it +under the same terms as Perl v5.8.8. + + Deleted: csw/mgar/pkg/cpan/Devel-Size/trunk/files/CSWpmdevsize.gspec =================================================================== --- csw/mgar/pkg/cpan/Devel-Size/trunk/files/CSWpmdevsize.gspec 2010-11-11 17:17:09 UTC (rev 11575) +++ csw/mgar/pkg/cpan/Devel-Size/trunk/files/CSWpmdevsize.gspec 2010-11-11 18:32:58 UTC (rev 11576) @@ -1,4 +0,0 @@ -%var bitname pm_devsize -%var pkgname CSWpmdevsize -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 19:41:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 18:41:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11577] csw/mgar/pkg/cpan Message-ID: Revision: 11577 http://gar.svn.sourceforge.net/gar/?rev=11577&view=rev Author: dmichelsen Date: 2010-11-11 18:41:39 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Test-use-ok: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Test-use-ok/ csw/mgar/pkg/cpan/Test-use-ok/branches/ csw/mgar/pkg/cpan/Test-use-ok/tags/ csw/mgar/pkg/cpan/Test-use-ok/trunk/ csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile csw/mgar/pkg/cpan/Test-use-ok/trunk/checksums csw/mgar/pkg/cpan/Test-use-ok/trunk/files/ csw/mgar/pkg/cpan/Test-use-ok/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Test-use-ok/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/Test-use-ok/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile 2010-11-11 18:41:39 UTC (rev 11577) @@ -0,0 +1,17 @@ +GARNAME = Test-use-ok +GARVERSION = 0.02 +CATEGORIES = cpan +AUTHOR = AUDREYT + +DESCRIPTION = Alternative to Test::More::use_ok +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmtestuseok +CATALOGNAME = pm_testuseok + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Test-use-ok/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-use-ok/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Test-use-ok/trunk/checksums 2010-11-11 18:41:39 UTC (rev 11577) @@ -0,0 +1 @@ +c49b0bbb37a6764b8b96d9fcef954ba2 Test-use-ok-0.02.tar.gz Added: csw/mgar/pkg/cpan/Test-use-ok/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Test-use-ok/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Test-use-ok/trunk/files/COPYING 2010-11-11 18:41:39 UTC (rev 11577) @@ -0,0 +1,25 @@ +COPYRIGHT + Copyright 2005, 2006 by Audrey Tang . + + This software is released under the MIT license cited below. + + The "MIT" License + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + 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 Nov 11 20:00:42 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 19:00:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11578] csw/mgar/pkg/cpan Message-ID: Revision: 11578 http://gar.svn.sourceforge.net/gar/?rev=11578&view=rev Author: dmichelsen Date: 2010-11-11 19:00:41 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Sub-Install: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Sub-Install/ csw/mgar/pkg/cpan/Sub-Install/branches/ csw/mgar/pkg/cpan/Sub-Install/tags/ csw/mgar/pkg/cpan/Sub-Install/trunk/ csw/mgar/pkg/cpan/Sub-Install/trunk/Makefile csw/mgar/pkg/cpan/Sub-Install/trunk/checksums csw/mgar/pkg/cpan/Sub-Install/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Sub-Install/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/Sub-Install/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Sub-Install/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Sub-Install/trunk/Makefile 2010-11-11 19:00:41 UTC (rev 11578) @@ -0,0 +1,17 @@ +GARNAME = Sub-Install +GARVERSION = 0.925 +CATEGORIES = cpan +AUTHOR = RJBS + +DESCRIPTION = Install subroutines into packages easily +define BLURB +endef + +PACKAGES = CSWpmsubinstall +CATALOGNAME = pm_subinstall + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Sub-Install/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Sub-Install/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Sub-Install/trunk/checksums 2010-11-11 19:00:41 UTC (rev 11578) @@ -0,0 +1 @@ +694aaec771c42280746a9a6279683263 Sub-Install-0.925.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 20:07:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 19:07:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[11579] csw/mgar/pkg/cpan Message-ID: Revision: 11579 http://gar.svn.sourceforge.net/gar/?rev=11579&view=rev Author: dmichelsen Date: 2010-11-11 19:07:30 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Data-OptList: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Data-OptList/ csw/mgar/pkg/cpan/Data-OptList/branches/ csw/mgar/pkg/cpan/Data-OptList/tags/ csw/mgar/pkg/cpan/Data-OptList/trunk/ csw/mgar/pkg/cpan/Data-OptList/trunk/Makefile csw/mgar/pkg/cpan/Data-OptList/trunk/checksums csw/mgar/pkg/cpan/Data-OptList/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Data-OptList/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/Data-OptList/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Data-OptList/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Data-OptList/trunk/Makefile 2010-11-11 19:07:30 UTC (rev 11579) @@ -0,0 +1,19 @@ +GARNAME = Data-OptList +GARVERSION = 0.106 +CATEGORIES = cpan +AUTHOR = RJBS + +DESCRIPTION = Parse and validate simple name/value option pairs +define BLURB +endef + +PACKAGES = CSWpmdataoptlist +CATALOGNAME = pm_dataoptlist + +DEP_PKGS = CSWpmsubinstall + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Data-OptList/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Data-OptList/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Data-OptList/trunk/checksums 2010-11-11 19:07:30 UTC (rev 11579) @@ -0,0 +1 @@ +d2e2e74540f9a388a7d180849d63d03a Data-OptList-0.106.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 20:11:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 19:11:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[11580] csw/mgar/pkg/cpan Message-ID: Revision: 11580 http://gar.svn.sourceforge.net/gar/?rev=11580&view=rev Author: dmichelsen Date: 2010-11-11 19:11:13 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Sub-Exporter: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Sub-Exporter/ csw/mgar/pkg/cpan/Sub-Exporter/branches/ csw/mgar/pkg/cpan/Sub-Exporter/tags/ csw/mgar/pkg/cpan/Sub-Exporter/trunk/ csw/mgar/pkg/cpan/Sub-Exporter/trunk/Makefile csw/mgar/pkg/cpan/Sub-Exporter/trunk/checksums csw/mgar/pkg/cpan/Sub-Exporter/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Sub-Exporter/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/Sub-Exporter/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Sub-Exporter/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Sub-Exporter/trunk/Makefile 2010-11-11 19:11:13 UTC (rev 11580) @@ -0,0 +1,19 @@ +GARNAME = Sub-Exporter +GARVERSION = 0.982 +CATEGORIES = cpan +AUTHOR = RJBS + +DESCRIPTION = A sophisticated exporter for custom-built routines +define BLURB +endef + +PACKAGES = CSWpmsubexporter +CATALOGNAME = pm_subexporter + +DEP_PKGS = CSWpmdataoptlist CSWpmsubinstall + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Sub-Exporter/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Sub-Exporter/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Sub-Exporter/trunk/checksums 2010-11-11 19:11:13 UTC (rev 11580) @@ -0,0 +1 @@ +db90a0d73a5ca2d185dd6c6d2fc848f0 Sub-Exporter-0.982.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 20:22:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 19:22:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[11581] csw/mgar/pkg/cpan Message-ID: Revision: 11581 http://gar.svn.sourceforge.net/gar/?rev=11581&view=rev Author: dmichelsen Date: 2010-11-11 19:22:09 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Check-ISA: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Check-ISA/ csw/mgar/pkg/cpan/Check-ISA/branches/ csw/mgar/pkg/cpan/Check-ISA/tags/ csw/mgar/pkg/cpan/Check-ISA/trunk/ csw/mgar/pkg/cpan/Check-ISA/trunk/Makefile csw/mgar/pkg/cpan/Check-ISA/trunk/checksums csw/mgar/pkg/cpan/Check-ISA/trunk/files/ csw/mgar/pkg/cpan/Check-ISA/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Check-ISA/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/Check-ISA/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Check-ISA/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Check-ISA/trunk/Makefile 2010-11-11 19:22:09 UTC (rev 11581) @@ -0,0 +1,19 @@ +GARNAME = Check-ISA +GARVERSION = 0.04 +CATEGORIES = cpan +AUTHOR = NUFFIN + +DESCRIPTION = DWIM, correct checking of an object's class +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmcheckisa +CATALOGNAME = pm_checkisa + +DEP_PKGS = CSWpmsubexporter CSWpmtestuseok + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Check-ISA/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Check-ISA/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Check-ISA/trunk/checksums 2010-11-11 19:22:09 UTC (rev 11581) @@ -0,0 +1 @@ +7d118aadd4069b4287f309482776a2bd Check-ISA-0.04.tar.gz Added: csw/mgar/pkg/cpan/Check-ISA/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Check-ISA/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Check-ISA/trunk/files/COPYING 2010-11-11 19:22:09 UTC (rev 11581) @@ -0,0 +1,10 @@ +=head1 AUTHOR + +Yuval Kogman Enothingmuch at woobling.orgE + +=head1 COPYRIGHT + + Copyright (c) 2008 Yuval Kogman. All rights reserved + This program is free software; you can redistribute + it and/or modify it under the same terms as Perl itself. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 20:24:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 19:24:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[11582] csw/mgar/pkg/cpan Message-ID: Revision: 11582 http://gar.svn.sourceforge.net/gar/?rev=11582&view=rev Author: dmichelsen Date: 2010-11-11 19:24:49 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Sort-Naturally: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Sort-Naturally/ csw/mgar/pkg/cpan/Sort-Naturally/branches/ csw/mgar/pkg/cpan/Sort-Naturally/tags/ csw/mgar/pkg/cpan/Sort-Naturally/trunk/ csw/mgar/pkg/cpan/Sort-Naturally/trunk/Makefile csw/mgar/pkg/cpan/Sort-Naturally/trunk/checksums csw/mgar/pkg/cpan/Sort-Naturally/trunk/files/ csw/mgar/pkg/cpan/Sort-Naturally/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Sort-Naturally/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/Sort-Naturally/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Sort-Naturally/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Sort-Naturally/trunk/Makefile 2010-11-11 19:24:49 UTC (rev 11582) @@ -0,0 +1,17 @@ +GARNAME = Sort-Naturally +GARVERSION = 1.02 +CATEGORIES = cpan +AUTHOR = SBURKE + +DESCRIPTION = Sort lexically, but sort numeral parts numerically +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmsortnaturally +CATALOGNAME = pm_sortnaturally + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Sort-Naturally/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Sort-Naturally/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Sort-Naturally/trunk/checksums 2010-11-11 19:24:49 UTC (rev 11582) @@ -0,0 +1 @@ +a173f3f8f519ebae6e5e578e843f6e1c Sort-Naturally-1.02.tar.gz Added: csw/mgar/pkg/cpan/Sort-Naturally/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Sort-Naturally/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Sort-Naturally/trunk/files/COPYING 2010-11-11 19:24:49 UTC (rev 11582) @@ -0,0 +1,11 @@ +Copyright 2001, Sean M. Burke , all rights +reserved. + +The programs and documentation in this dist are distributed in +the hope that they will be useful, but without any warranty; without +even the implied warranty of merchantability or fitness for a +particular purpose. + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 11 20:29:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 19:29:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11583] csw/mgar/pkg/cpan Message-ID: Revision: 11583 http://gar.svn.sourceforge.net/gar/?rev=11583&view=rev Author: dmichelsen Date: 2010-11-11 19:29:50 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Term-Size: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Term-Size/ csw/mgar/pkg/cpan/Term-Size/branches/ csw/mgar/pkg/cpan/Term-Size/tags/ csw/mgar/pkg/cpan/Term-Size/trunk/ csw/mgar/pkg/cpan/Term-Size/trunk/Makefile csw/mgar/pkg/cpan/Term-Size/trunk/checksums csw/mgar/pkg/cpan/Term-Size/trunk/files/ csw/mgar/pkg/cpan/Term-Size/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Term-Size/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/Term-Size/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Term-Size/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Term-Size/trunk/Makefile 2010-11-11 19:29:50 UTC (rev 11583) @@ -0,0 +1,15 @@ +GARNAME = Term-Size +GARVERSION = 0.207 +CATEGORIES = cpan +AUTHOR = FERREIRA + +DESCRIPTION = Retrieve terminal size +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmtermsize +CATALOGNAME = pm_termsize + +include gar/category.mk Added: csw/mgar/pkg/cpan/Term-Size/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Term-Size/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Term-Size/trunk/checksums 2010-11-11 19:29:50 UTC (rev 11583) @@ -0,0 +1 @@ +474438fff3f12fca88a23388cc5a7571 Term-Size-0.207.tar.gz Added: csw/mgar/pkg/cpan/Term-Size/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Term-Size/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Term-Size/trunk/files/COPYING 2010-11-11 19:29:50 UTC (rev 11583) @@ -0,0 +1,5 @@ +Tim Goodwin, , 1997-04-23. + +Candidate for maintainership: +Adriano Ferreira, , 2006-05-19. + 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 Nov 11 20:51:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Nov 2010 19:51:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11584] csw/mgar/pkg/cpan Message-ID: Revision: 11584 http://gar.svn.sourceforge.net/gar/?rev=11584&view=rev Author: dmichelsen Date: 2010-11-11 19:51:19 +0000 (Thu, 11 Nov 2010) Log Message: ----------- cpan/Data-TreeDumper: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Data-TreeDumper/ csw/mgar/pkg/cpan/Data-TreeDumper/branches/ csw/mgar/pkg/cpan/Data-TreeDumper/tags/ csw/mgar/pkg/cpan/Data-TreeDumper/trunk/ csw/mgar/pkg/cpan/Data-TreeDumper/trunk/Makefile csw/mgar/pkg/cpan/Data-TreeDumper/trunk/checksums csw/mgar/pkg/cpan/Data-TreeDumper/trunk/files/ csw/mgar/pkg/cpan/Data-TreeDumper/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Data-TreeDumper/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/Data-TreeDumper/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Data-TreeDumper/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Data-TreeDumper/trunk/Makefile 2010-11-11 19:51:19 UTC (rev 11584) @@ -0,0 +1,19 @@ +GARNAME = Data-TreeDumper +GARVERSION = 0.37 +CATEGORIES = cpan +AUTHOR = NKH + +DESCRIPTION = Improved replacement for Data::Dumper +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmdatatreedumper +CATALOGNAME = pm_datatreedumper + +DEP_PKGS = CSWpmcheckisa CSWpmdevelsize CSWpmsortnaturally CSWpmtermsize + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Data-TreeDumper/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Data-TreeDumper/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Data-TreeDumper/trunk/checksums 2010-11-11 19:51:19 UTC (rev 11584) @@ -0,0 +1 @@ +011a5faff9bade1e9f24f4389ede5908 Data-TreeDumper-0.37.tar.gz Added: csw/mgar/pkg/cpan/Data-TreeDumper/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Data-TreeDumper/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Data-TreeDumper/trunk/files/COPYING 2010-11-11 19:51:19 UTC (rev 11584) @@ -0,0 +1,7 @@ +COPYRIGHT AND LICENCE + + Copyright (c) 2003-2008 Nadim Ibn Hamouda el Khemir. All rights + reserved. This program is free software; you can redis- + tribute 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 bdwalton at users.sourceforge.net Fri Nov 12 03:27:54 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Nov 2010 02:27:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[11585] csw/mgar/pkg/apache2/trunk/files/conf_build_scripts Message-ID: Revision: 11585 http://gar.svn.sourceforge.net/gar/?rev=11585&view=rev Author: bdwalton Date: 2010-11-12 02:27:54 +0000 (Fri, 12 Nov 2010) Log Message: ----------- apache2: tweak the conf building script to make build CAS use easier Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/conf_build_scripts Modified: csw/mgar/pkg/apache2/trunk/files/conf_build_scripts =================================================================== --- csw/mgar/pkg/apache2/trunk/files/conf_build_scripts 2010-11-11 19:51:19 UTC (rev 11584) +++ csw/mgar/pkg/apache2/trunk/files/conf_build_scripts 2010-11-12 02:27:54 UTC (rev 11585) @@ -9,24 +9,26 @@ for f in $(find . -type f | grep -v original/ ); do echo "...processing $f" + template=$f.CSW - cat < $f.new + cat < $template PIR=\${PKG_INSTALL_ROOT:-/} AP2_ROOT=\$PIR/$AP2_ROOT AP2_CONF=\$AP2_ROOT/etc +TEMPLATE=\$AP2_CONF/$template if [ "\$1" = install ]; then - cat < \$AP2_CONF/$f.CSW + cat < \$TEMPLATE EOF perl -pi -e 's/\$/\\\$/g' $f -cat $f >> $f.new +cat $f >> $template -cat <> $f.new +cat <> $template EOS if [ ! -f \$AP2_CONF/$f ]; then - cp -p \$AP2_CONF/$f.CSW \$AP2_CONF/$f + cp -p \$TEMPLATE \$AP2_CONF/$f fi else @@ -35,5 +37,5 @@ EOF -mv $f.new $f +rm $f done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Nov 12 03:33:40 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Nov 2010 02:33:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[11586] csw/mgar/pkg/apache2/trunk/files/conf_build_scripts Message-ID: Revision: 11586 http://gar.svn.sourceforge.net/gar/?rev=11586&view=rev Author: bdwalton Date: 2010-11-12 02:33:40 +0000 (Fri, 12 Nov 2010) Log Message: ----------- apache2: do not remove live conf file on build CAS remove step, remove template instead Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/conf_build_scripts Modified: csw/mgar/pkg/apache2/trunk/files/conf_build_scripts =================================================================== --- csw/mgar/pkg/apache2/trunk/files/conf_build_scripts 2010-11-12 02:27:54 UTC (rev 11585) +++ csw/mgar/pkg/apache2/trunk/files/conf_build_scripts 2010-11-12 02:33:40 UTC (rev 11586) @@ -32,7 +32,7 @@ fi else - rm \$AP2_CONF/$f + rm \$TEMPLATE fi EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Nov 12 03:51:53 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Nov 2010 02:51:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11587] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11587 http://gar.svn.sourceforge.net/gar/?rev=11587&view=rev Author: bdwalton Date: 2010-11-12 02:51:53 +0000 (Fri, 12 Nov 2010) Log Message: ----------- apache2: move postinstall functionality to the templated .CSW config files using build CAS Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-12 02:33:40 UTC (rev 11586) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-12 02:51:53 UTC (rev 11587) @@ -212,7 +212,7 @@ @$(MAKECOOKIE) -post-install-modulated: rename-httpd copy-local-files create-templates copy-readmes +post-install-modulated: rename-httpd copy-local-files copy-readmes copy-readmes: @(cd $(WORKDIR); for f in README.CSW*; do \ @@ -235,40 +235,27 @@ @ginstall $(WORKDIR)/update20to22 $(APACHE_ROOT)/sbin @$(MAKECOOKIE) -# Create stock templates -template_list = share/htdocs/index.html -template_list += etc/extra/httpd-autoindex.conf -template_list += etc/extra/httpd-dav.conf -template_list += etc/extra/httpd-default.conf -template_list += etc/extra/httpd-info.conf -template_list += etc/extra/httpd-languages.conf -template_list += etc/extra/httpd-multilang-errordoc.conf -template_list += etc/extra/httpd-userdir.conf -template_list += etc/extra/httpd-vhosts.conf -template_list += etc/extra/httpd-mpm.conf -template_list += etc/magic -template_list += etc/mime.types - create-templates: - @echo " => Creating template files" - @( cd $(DESTDIR)$(prefix)/apache2 ; \ - for file in $(template_list) ; do \ - gmv -v $$file $$file.CSW ; \ - done ) @$(MAKECOOKIE) -post-merge: +post-merge: create-templates + @echo " => Creating template files" + @$(FILEDIR)/conf_build_scripts $(PKGROOT) + @echo " => Modifying template files for specific cases" @(cd $(PKGROOT)/$(prefix)/apache2/etc/; \ - for f in httpd.conf extra/httpd-ssl.conf; do \ - perl -pi -e 's/User.*daemon.*/User \@USER\@/; \ - s/Group.*daemon.*/Group \@GROUP\@/; \ - s/#*ServerName www.example.com/ServerName \@HOSTNAME\@/; \ - s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; \ + for f in httpd.conf.CSW extra/httpd-ssl.conf.CSW; do \ + echo ...$$f; \ + perl -pi -e 's/#*ServerName www.example.com:(80|443)/EOS\necho ServerName `hostname`:$$1 >> \$$TEMPLATE;\ncat <>\$$TEMPLATE/; \ + s/#*ServerAdmin you\@example.com/EOS\necho ServerAdmin root@`hostname` >> \$$TEMPLATE;\ncat <>\$$TEMPLATE/; \ + s/^User.*daemon/User nobody/; \ + s/^Group.*daemon/Group nobody/; \ s/^(LoadModule.*suexec.*)/#$$1/; \ s/^#(Include.*httpd-mpm.conf)/$$1/; \ s/^#(Include.*httpd-ssl.conf)/$$1/' $$f; \ - mv $$f $$f.CSW; \ - done ) + done ) + + + @$(MAKECOOKIE) Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-11-12 02:33:40 UTC (rev 11586) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-11-12 02:51:53 UTC (rev 11587) @@ -31,12 +31,6 @@ 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" - 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 @@ -50,32 +44,6 @@ 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 - if [ ! -f $AP2_CONFDIR/server.crt -a ! -f $AP2_CONFDIR/server.key ]; then echo Generating dummy ssl key and certificate... # this is likely overkill for a dummy cert, but why not This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Nov 12 12:04:39 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 12 Nov 2010 11:04:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11588] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 11588 http://gar.svn.sourceforge.net/gar/?rev=11588&view=rev Author: idogan23 Date: 2010-11-12 11:04:39 +0000 (Fri, 12 Nov 2010) Log Message: ----------- unbound: extra package unbound-host, not using anymore PROTOTYPE_FILTER, added ISA sparcv8plus+vis, cosmetic cleanup Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2010-11-12 02:51:53 UTC (rev 11587) +++ csw/mgar/pkg/unbound/trunk/Makefile 2010-11-12 11:04:39 UTC (rev 11588) @@ -1,7 +1,6 @@ GARNAME = unbound GARVERSION = 1.4.7 CATEGORIES = server - DESCRIPTION = A validating, recursive, and caching DNS resolver define BLUR Unbound is designed as a set of modular components, so that also @@ -9,28 +8,51 @@ a server, but are linked into an application) are easily possible. endef -PACKAGES = CSWunbound CSWlibunbound2 CSWunbound-devel -CATALOGNAME_CSWunbound = unbound -CATALOGNAME_CSWlibunbound2 = libunbound2 -CATALOGNAME_CSWunbound-devel = unbound_devel -LICENSE = LICENSE - +VENDOR_URL = http://www.unbound.net/ MASTER_SITES = http://unbound.net/downloads/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += cswunbound DISTFILES += cswusergroup -VENDOR_URL = http://unbound.net +PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGES = CSWunbound CSWlibunbound2 CSWunbound-devel CSWunbound-host -EXTRA_BUILD_ISAS_i386 = pentium_pro -EXTRA_BUILD_ISAS_sparc = sparcv8plus +# 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) +CONFIGUTE_ARGS += --with-solaris-threads +CONFIGURE_ARGS += --with-ldns=/opt/csw +CONFIGURE_ARGS += --with-ssl=/opt/csw +CONFIGURE_ARGS += --with-libevent=/opt/csw +CONFIGURE_ARGS += --with-libexpat=/opt/csw +CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid +CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw + +# Gost requiers OpenSSL 1.0 +CONFIGURE_ARGS += --disable-gost + +STRIP_LIBTOOL = 0 + +# make test doesn't work for the moment on Solaris +SKIPTEST = 1 + +LICENSE = LICENSE + +EXTRA_BUILD_ISAS_i386 = pentium_pro +EXTRA_BUILD_ISAS_sparc = sparcv8plus +EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis + MERGE_DIRS_isa-sparcv8plus = $(libdir) MERGE_DIRS_isa-sparcv8plus += $(sbindir) MERGE_DIRS_isa-pentium_pro = $(libdir) MERGE_DIRS_isa-pentium_pro += $(sbindir) -ISAXEC_DIRS = $(sbindir) +ISAXEC_DIRS = $(sbindir) ISAEXEC_EXCLUDE_FILES = $(sbindir)/unbound-anchor ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-checkconf ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control @@ -49,57 +71,53 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-control-setup EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-host -# SPKG_CLASSES_CSWunbound = none cswusergroup cswcpsampleconf cswinitsmf -# PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswunbound$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/CSWunbound\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/unbound\/unbound.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis = $(prefix)/sbin/unbound-anchor +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-checkconf +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-control +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-control-setup +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-host -INITSMF = /etc/opt/csw/init.d/cswunbound -USERGROUP = /etc/opt/csw/pkg/CSWunbound/cswusergroup -SAMPLECONF = /etc/opt/csw/unbound/unbound.conf +SPKG_CLASSES_CSWunbound = none cswusergroup cswcpsampleconf cswinitsmf +INITSMF = /etc/opt/csw/init.d/cswunbound +USERGROUP = /etc/opt/csw/CSWunbound/cswusergroup +SAMPLECONF = /etc/opt/csw/unbound/unbound.conf +USERGROUP = /etc/opt/csw/pkg/CSWunbound/cswusergroup -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGUTE_ARGS += --with-solaris-threads -CONFIGURE_ARGS += --with-ldns=/opt/csw -CONFIGURE_ARGS += --with-ssl=/opt/csw -CONFIGURE_ARGS += --with-libevent=/opt/csw -CONFIGURE_ARGS += --with-libexpat=/opt/csw -CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid -CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw - -# Gost requiers OpenSSL 1.0 -CONFIGURE_ARGS += --disable-gost - -STRIP_LIBTOOL = 0 - -SPKG_DESC_CSWunbound = $(DESCRIPTION) +CATALOGNAME_CSWunbound = unbound +SPKG_DESC_CSWunbound = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWunbound += CSWlibunbound2 RUNTIME_DEP_PKGS_CSWunbound += CSWexpat RUNTIME_DEP_PKGS_CSWunbound += CSWlibevent RUNTIME_DEP_PKGS_CSWunbound += CSWlibldns1 RUNTIME_DEP_PKGS_CSWunbound += CSWosslrt -SPKG_DESC_CSWlibunbound2 = Library implementing DNS resolution and validation -PKGFILES_CSWlibunbound2 += $(PKGFILES_RT) +CATALOGNAME_CSWlibunbound2 = libunbound2 +SPKG_DESC_CSWlibunbound2 = Library implementing DNS resolution and validation +PKGFILES_CSWlibunbound2 += $(PKGFILES_RT) RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibldns1 RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWosslrt RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibevent -SPKG_DESC_CSWunbound-devel = $(DESCRIPTION) development package -PKGFILES_CSWunbound-devel += $(PKGFILES_DEVEL) +CATALOGNAME_CSWunbound-devel = unbound_devel +SPKG_DESC_CSWunbound-devel = $(DESCRIPTION) development package +PKGFILES_CSWunbound-devel += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWunbound-devel += CSWlibunbound2 -# make test doesn't work for the moment on Solaris -SKIPTEST = 1 +CATALOGNAME_CSWunbound-host = unbound_host +SPKG_DESC_CSWunbound-host = Unbound DNS lookup utility +PKGFILES_CSWunbound-host += $(sbindir)/unbound-host +PKGFILES_CSWunbound-host += $(mandir)/man1/unbound-host.1 +RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibldns1 +RUNTIME_DEP_PKGS_CSWunbound-host += CSWosslrt +RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibunbound2 +RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibevent include gar/category.mk post-install-modulated: - ginstall -d $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/cswunbound $(DESTDIR)/etc/opt/csw/init.d/cswunbound - ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWunbound - ginstall -m 755 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWunbound/cswusergroup - #mv $(DESTDIR)/etc/opt/csw/unbound/unbound.conf $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW - #chmod 444 $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/cswunbound $(DESTDIR)/etc/opt/csw/init.d/cswunbound + @ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWunbound + @ginstall -m 755 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWunbound/cswusergroup @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Nov 12 13:30:59 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 12 Nov 2010 12:30:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11589] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 11589 http://gar.svn.sourceforge.net/gar/?rev=11589&view=rev Author: idogan23 Date: 2010-11-12 12:30:59 +0000 (Fri, 12 Nov 2010) Log Message: ----------- unbound: fixed EXTRA_BUILD_ISAS_sparc Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2010-11-12 11:04:39 UTC (rev 11588) +++ csw/mgar/pkg/unbound/trunk/Makefile 2010-11-12 12:30:59 UTC (rev 11589) @@ -44,8 +44,7 @@ LICENSE = LICENSE EXTRA_BUILD_ISAS_i386 = pentium_pro -EXTRA_BUILD_ISAS_sparc = sparcv8plus -EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis +EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis MERGE_DIRS_isa-sparcv8plus = $(libdir) MERGE_DIRS_isa-sparcv8plus += $(sbindir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Nov 12 13:54:13 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 12 Nov 2010 12:54:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[11590] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 11590 http://gar.svn.sourceforge.net/gar/?rev=11590&view=rev Author: idogan23 Date: 2010-11-12 12:54:13 +0000 (Fri, 12 Nov 2010) Log Message: ----------- unbound: remove isa sparcv8plus Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2010-11-12 12:30:59 UTC (rev 11589) +++ csw/mgar/pkg/unbound/trunk/Makefile 2010-11-12 12:54:13 UTC (rev 11590) @@ -44,7 +44,7 @@ LICENSE = LICENSE EXTRA_BUILD_ISAS_i386 = pentium_pro -EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis +EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis MERGE_DIRS_isa-sparcv8plus = $(libdir) MERGE_DIRS_isa-sparcv8plus += $(sbindir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Nov 12 18:59:23 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 12 Nov 2010 17:59:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[11591] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 11591 http://gar.svn.sourceforge.net/gar/?rev=11591&view=rev Author: skayser Date: 2010-11-12 17:59:23 +0000 (Fri, 12 Nov 2010) Log Message: ----------- gar: speedup, no need for recursive expansion of $(URLS) Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-11-12 12:54:13 UTC (rev 11590) +++ csw/mgar/gar/v2/gar.lib.mk 2010-11-12 17:59:23 UTC (rev 11591) @@ -27,7 +27,7 @@ #################### FETCH RULES #################### -URLS = $(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(ALLFILES_PATCHFILES))) +URLS := $(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(ALLFILES_PATCHFILES))) # if the caller has defined _postinstall, etc targets for a package, add # these 'dynamic script' targets to our fetch list This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Nov 12 19:17:13 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 12 Nov 2010 18:17:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[11592] csw/mgar/gar Message-ID: Revision: 11592 http://gar.svn.sourceforge.net/gar/?rev=11592&view=rev Author: skayser Date: 2010-11-12 18:17:13 +0000 (Fri, 12 Nov 2010) Log Message: ----------- gar: branch for the removal of svn:externals Added Paths: ----------- csw/mgar/gar/v2-noexternals/ csw/mgar/gar/v2-noexternals/bin/upstream_watch csw/mgar/gar/v2-noexternals/category.mk csw/mgar/gar/v2-noexternals/gar.lib.mk Removed Paths: ------------- csw/mgar/gar/v2-noexternals/bin/upstream_watch csw/mgar/gar/v2-noexternals/category.mk csw/mgar/gar/v2-noexternals/gar.lib.mk Deleted: csw/mgar/gar/v2-noexternals/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2/bin/upstream_watch 2010-10-25 14:13:44 UTC (rev 11395) +++ csw/mgar/gar/v2-noexternals/bin/upstream_watch 2010-11-12 18:17:13 UTC (rev 11592) @@ -1,206 +0,0 @@ -#!/usr/bin/perl -lw -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# 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. -# -# upstream_watch - search for new upstream files -# - -use Env; -use Getopt::Long; - -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Function : compare_versions -# Purpose : Compare version number of two software -# Arguments: $version1 - version number of the first software -# $version2 - version number of the first software -# Returns : 1 if $version1 > $version2 -# 0 if $version1 == $version2 -# -1 if $version1 < $verson2 -# -sub compare_versions -{ - my $version1 = shift; - my $version2 = shift; - - # we consider the version to be composed of several elements separated by '.' ',' or '_' - # an elements can be a string or a number - # at each step we extract the next elements of the two version strings and compare them - while (my ($number1, $string1, $rem1) = ($version1 =~ /^(?:([0-9]+)|([^0-9\.,_]+))[\.,_]?(.*)?$/)) { - - my ($number2, $string2, $rem2) = ($version2 =~ /^(?:([0-9]+)|([^0-9\.,_]+))[\.,_]?(.*)?$/) or - # $versions1 if the same as $versions with additional characters so it must be more recent - # (i.e. 1.2foo is usually more recent than 1.2) - return 1; - - if (defined $number1 and defined $number2) { - my $ret = ($number1 <=> $number2); - return $ret if $ret != 0; - } elsif (defined $string1 and defined $string2) { - # string comparisons is relevevant for comparing - # version strings like 2.a and 2.b - my $ret = ($string1 cmp $string2); - return $ret if $ret != 0; - } elsif (defined $number1 and defined $string2) { - # we suppose that numbers are always greater that string - return 1; - } else { - return -1; - } - - $version1 = $rem1; - $version2 = $rem2; - } - - if ($version2 ne "") { - # $version2 if the same as $version1 with additionnal characters so it must be more recent - # (i.e. 1.2foo is usually more recent than 1.2) - return -1; - } - - return 0; -} - - -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Function : get_file_list -# Purpose : Return the list of files available at a given url -# Arguments: $url - an url -# Returns : the list of files availables at the given url -# -# TODO: find a better way than lftp to do this -# -sub get_file_list_lftp -{ - my $url = shift; - my @file_list; - - my $ftp_proxy_cmd = ""; - my $http_proxy_cmd = ""; - - # lftp doesn't seem to obey the _PROXY env variable - # we must manually set them - $ftp_proxy_cmd = "set ftp:proxy $ENV{FTP_PROXY};" if exists $ENV{FTP_PROXY}; - $ftp_proxy_cmd = "set ftp:proxy $ENV{ftp_proxy};" if exists $ENV{ftp_proxy}; - $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; - $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; - - open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); - - while (my $line = ) { - my @cols = split (/\s+/, $line); - my $filename = $cols[$#cols]; - chomp ($filename); - my $result = rindex($filename, '/'); - if ($result != -1) { - $filename = substr $filename , $result +1 ; - } - push (@file_list, $filename); - } - - close (FH); - - return \@file_list; -} - -sub get_file_list_wget_sourceforge -{ - my $url = shift; - my @file_list; - - my $http_proxy_cmd = ""; - my $wget_command ="wget"; - my $filename = ""; - - # lftp doesn't seem to obey the _PROXY env variable - # we must manually set them - $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; - $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; - $wget_command = "$http_proxy_cmd ; wget --proxy=on" if exists $ENV{http_proxy_cmd}; - - open (FH, "$wget_command -qO- $url 2>/dev/null | grep class | grep selected | grep li | grep Download | "); - - if (my $line = ) { - my @cols = split (/"/, $line); - $filename = $cols[3]; - chomp ($filename); - } - else { - close (FH); - return \@file_list; - } - - close (FH); - - $url = "http://downloads.sourceforge.net" . $filename; - open (FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep package_id= | grep release_id | "); - - while (my $line = ) { - my @cols = split (/>/, $line); - my $filename = $cols[2]; - chomp ($filename); - @cols = split (/ \$help, - "s|use_sf=i" => \$use_sf, - "u|url=s@" => \@urls); - -if ($help) { - print < 0) { - $newest_version = $1; - $newest_file = $file; - } - } - } - } - printf "$newest_file " if $newest_version; -} -printf "\n"; - Copied: csw/mgar/gar/v2-noexternals/bin/upstream_watch (from rev 11397, csw/mgar/gar/v2/bin/upstream_watch) =================================================================== --- csw/mgar/gar/v2-noexternals/bin/upstream_watch (rev 0) +++ csw/mgar/gar/v2-noexternals/bin/upstream_watch 2010-11-12 18:17:13 UTC (rev 11592) @@ -0,0 +1,208 @@ +#!/usr/bin/perl -lw +# +# Copyright 2006 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# 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. +# +# upstream_watch - search for new upstream files +# + +use Env; +use Getopt::Long; + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Function : compare_versions +# Purpose : Compare version number of two software +# Arguments: $version1 - version number of the first software +# $version2 - version number of the first software +# Returns : 1 if $version1 > $version2 +# 0 if $version1 == $version2 +# -1 if $version1 < $verson2 +# +sub compare_versions +{ + my $version1 = shift; + my $version2 = shift; + + # we consider the version to be composed of several elements separated by '.' ',' or '_' + # an elements can be a string or a number + # at each step we extract the next elements of the two version strings and compare them + while (my ($number1, $string1, $rem1) = ($version1 =~ /^(?:([0-9]+)|([^0-9\.,_]+))[\.,_]?(.*)?$/)) { + + my ($number2, $string2, $rem2) = ($version2 =~ /^(?:([0-9]+)|([^0-9\.,_]+))[\.,_]?(.*)?$/) or + # $versions1 if the same as $versions with additional characters so it must be more recent + # (i.e. 1.2foo is usually more recent than 1.2) + return 1; + + if (defined $number1 and defined $number2) { + my $ret = ($number1 <=> $number2); + return $ret if $ret != 0; + } elsif (defined $string1 and defined $string2) { + # string comparisons is relevevant for comparing + # version strings like 2.a and 2.b + my $ret = ($string1 cmp $string2); + return $ret if $ret != 0; + } elsif (defined $number1 and defined $string2) { + # we suppose that numbers are always greater that string + return 1; + } else { + return -1; + } + + $version1 = $rem1; + $version2 = $rem2; + } + + if ($version2 ne "") { + # $version2 if the same as $version1 with additionnal characters so it must be more recent + # (i.e. 1.2foo is usually more recent than 1.2) + return -1; + } + + return 0; +} + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Function : get_file_list +# Purpose : Return the list of files available at a given url +# Arguments: $url - an url +# Returns : the list of files availables at the given url +# +# TODO: find a better way than lftp to do this +# +sub get_file_list_lftp +{ + my $url = shift; + my @file_list; + + my $ftp_proxy_cmd = ""; + my $http_proxy_cmd = ""; + + # lftp doesn't seem to obey the _PROXY env variable + # we must manually set them + $ftp_proxy_cmd = "set ftp:proxy $ENV{FTP_PROXY};" if exists $ENV{FTP_PROXY}; + $ftp_proxy_cmd = "set ftp:proxy $ENV{ftp_proxy};" if exists $ENV{ftp_proxy}; + $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; + $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; + $https_proxy_cmd = "set https:proxy $ENV{HTTPS_PROXY};" if exists $ENV{HTTPS_PROXY}; + $https_proxy_cmd = "set https:proxy $ENV{https_proxy};" if exists $ENV{https_proxy}; + + open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd $https_proxy_cmd open $url/ && ls\" 2>/dev/null |"); + + while (my $line = ) { + my @cols = split (/\s+/, $line); + my $filename = $cols[$#cols]; + chomp ($filename); + my $result = rindex($filename, '/'); + if ($result != -1) { + $filename = substr $filename , $result +1 ; + } + push (@file_list, $filename); + } + + close (FH); + + return \@file_list; +} + +sub get_file_list_wget_sourceforge +{ + my $url = shift; + my @file_list; + + my $http_proxy_cmd = ""; + my $wget_command ="wget"; + my $filename = ""; + + # lftp doesn't seem to obey the _PROXY env variable + # we must manually set them + $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; + $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; + $wget_command = "$http_proxy_cmd ; wget --proxy=on" if exists $ENV{http_proxy_cmd}; + + open (FH, "$wget_command -qO- $url 2>/dev/null | grep class | grep selected | grep li | grep Download | "); + + if (my $line = ) { + my @cols = split (/"/, $line); + $filename = $cols[3]; + chomp ($filename); + } + else { + close (FH); + return \@file_list; + } + + close (FH); + + $url = "http://downloads.sourceforge.net" . $filename; + open (FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep package_id= | grep release_id | "); + + while (my $line = ) { + my @cols = split (/>/, $line); + my $filename = $cols[2]; + chomp ($filename); + @cols = split (/ \$help, + "s|use_sf=i" => \$use_sf, + "u|url=s@" => \@urls); + +if ($help) { + print < 0) { + $newest_version = $1; + $newest_file = $file; + } + } + } + } + printf "$newest_file " if $newest_version; +} +printf "\n"; + Deleted: csw/mgar/gar/v2-noexternals/category.mk =================================================================== --- csw/mgar/gar/v2/category.mk 2010-10-25 14:13:44 UTC (rev 11395) +++ csw/mgar/gar/v2-noexternals/category.mk 2010-11-12 18:17:13 UTC (rev 11592) @@ -1,9 +0,0 @@ -# vim: ft=make ts=4 sw=4 noet -# This makefile is to be included from Makefiles in each category -# directory. - -ifeq (,$(wildcard gar/categories/$(CATEGORIES)/category.mk)) - $(error The category '$(CATEGORIES)' is invalid. Valid categories are $(patsubst gar/categories/%,%,$(wildcard gar/categories/*))) -endif - -include gar/categories/$(CATEGORIES)/category.mk Copied: csw/mgar/gar/v2-noexternals/category.mk (from rev 11398, csw/mgar/gar/v2/category.mk) =================================================================== --- csw/mgar/gar/v2-noexternals/category.mk (rev 0) +++ csw/mgar/gar/v2-noexternals/category.mk 2010-11-12 18:17:13 UTC (rev 11592) @@ -0,0 +1,11 @@ +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +GARDIR ?= gar/ + +ifeq (,$(wildcard $(GARDIR)/categories/$(CATEGORIES)/category.mk)) + $(error The category '$(CATEGORIES)' is invalid. Valid categories are: $(patsubst $(GARDIR)/categories/%,%,$(wildcard $(GARDIR)/categories/*))) +endif + +include $(GARDIR)/categories/$(CATEGORIES)/category.mk Deleted: csw/mgar/gar/v2-noexternals/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-10-25 14:13:44 UTC (rev 11395) +++ csw/mgar/gar/v2-noexternals/gar.lib.mk 2010-11-12 18:17:13 UTC (rev 11592) @@ -1,899 +0,0 @@ -# vim: ft=make ts=4 sw=4 noet -# -# $Id$ -# -# Copyright (C) 2001 Nick Moffitt -# -# 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. -# - -# cookies go here, so we have to be able to find them for -# dependency checking. -VPATH += $(COOKIEDIR) - -# convenience variable to make the cookie. -MAKECOOKIE = mkdir -p $(COOKIEDIR)/$(@D) && date >> $(COOKIEDIR)/$@ - -URLSTRIP = $(subst ://,//,$(1)) - -# if you need to proxy git:// connections, set GIT_USE_PROXY. There is a -# default proxy script that works with the (squid?) proxy at the BO buildfarm. -# override GIT_PROXY_SCRIPT to something else if you need to. -GIT_MAYBEPROXY = $(if $(GIT_USE_PROXY),GIT_PROXY_COMMAND=$(GIT_PROXY_SCRIPT)) -GIT_TREEISH = $(if $(GIT_TREEISH_$(1)),$(GIT_TREEISH_$(1)),HEAD) - -#################### FETCH RULES #################### - -URLS = $(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(ALLFILES_PATCHFILES))) - -# if the caller has defined _postinstall, etc targets for a package, add -# these 'dynamic script' targets to our fetch list -URLS += $(foreach DYN,$(DYNSCRIPTS),dynscr://$(DYN)) - -define gitsubst -$(subst git-git,git,$(if $(findstring $(1)://,$(2)),$(patsubst $(1)%,git-$(1)%,$(call URLSTRIP,$(2))))) -endef - -ifdef GIT_REPOS -URLS += $(foreach R,$(GIT_REPOS),gitrepo://$(call GITPROJ,$(R)) $(foreach gitproto,git http file ssh,$(call gitsubst,$(gitproto),$(R)))) -endif - -# Download the file if and only if it doesn't have a preexisting -# checksum file. Loop through available URLs and stop when you -# get one that doesn't return an error code. -# Note that GAR targets are used to download the URLs, thus: -# 1) we have to strip the colon from the URLs -# 2) the download is very costly with bigger Makefiles as they will be -# re-evaluated for every URL (nested gmake invocation, room for improvement) -$(DOWNLOADDIR)/%: - @if test -f $(COOKIEDIR)/checksum-$*; then : ; else \ - echo " ==> Grabbing $@"; \ - ( for i in $(filter %/$*,$(URLS)); do \ - echo " ==> Trying $$i"; \ - $(MAKE) -s `echo $$i | tr -d :` || continue; \ - mv $(PARTIALDIR)/$* $@; \ - break; \ - done; ) 2>&1 | grep -v '^$(MAKE)'; \ - if test -r $@ ; then : ; else \ - echo '(!!!) Failed to download $@!' 1>&2; \ - false; \ - fi; \ - fi - -gitrepo//%: - @( if [ -d $(GARCHIVEDIR)/$(call GITPROJ,$*) ]; then \ - ( cd $(GARCHIVEDIR)/$(call GITPROJ,$*); \ - $(GIT_MAYBEPROXY) git --bare fetch ) && \ - gln -s $(GARCHIVEDIR)/$(call GITPROJ,$*)/ $(PARTIALDIR)/$(call GITPROJ,$*); \ - else \ - false; \ - fi ) - -# the git remote add commands are so that we can later do a fetch -# to update the code. -# we possibly proxy the git:// references depending on GIT_USE_PROXY -git-http//%: - @git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) - @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ - git remote add origin http://$*; \ - git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) - -git//%: - @$(GIT_MAYBEPROXY) git clone --bare git://$* $(PARTIALDIR)/$(call GITPROJ,$*) - @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ - git remote add origin git://$*; \ - git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) - -git-file//%: - @git clone --bare file:///$* $(PARTIALDIR)/$(call GITPROJ,$*) - @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ - git remote add origin file://$*; \ - git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) - -git-ssh//%: - @git clone --bare ssh://$* $(PARTIALDIR)/$(call GITPROJ,$*) - @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ - git remote add origin ssh://$*; \ - git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) - - -# create ADMSCRIPTS 'on the fly' from variables defined by the caller -# This version is private and should only be called from the non-private -# version directly below -_dynscr//%: - $($(subst .,_,$*)) - -dynscr//%: - $(MAKE) --no-print-directory -n _$@ > $(PARTIALDIR)/$* - -# download an http URL (colons omitted) -http//%: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) http://$* - -https//%: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) https://$* - -# download an ftp URL (colons omitted) -#ftp//%: -# @wget -T 30 -c --passive-ftp -P $(PARTIALDIR) ftp://$* -ftp//%: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) ftp://$* - -# link to a local copy of the file -# (absolute path) -file///%: - @if test -f /$*; then \ - gln -sf /$* $(PARTIALDIR)/$(notdir $*); \ - else \ - false; \ - fi - -# link to a local copy of the file -# (relative path) -file//%: - @if test -f $*; then \ - gln -sf "$(CURDIR)/$*" $(PARTIALDIR)/$(notdir $*); \ - else \ - false; \ - fi - -# Using Jeff Waugh's rsync rule. -# DOES NOT PRESERVE SYMLINKS! -rsync//%: - @rsync -azvLP rsync://$* $(PARTIALDIR)/ - -# Using Jeff Waugh's scp rule -scp//%: - @scp -C $* $(PARTIALDIR)/ - -# Fetch a SVN repo via http -svn-http//%: - @svn co $(SVNHTTP_CO_ARGS) http://$* $(PARTIALDIR)/$(notdir $*) - -svn-https//%: - @svn co $(SVNHTTP_CO_ARGS) https://$* $(PARTIALDIR)/$(notdir $*) - -#################### CHECKSUM RULES #################### - -# check a given file's checksum against $(CHECKSUM_FILE) and -# error out if it mentions the file without an "OK". -# The removal of the download prefix is for legacy checksums. For newstyle -# checksums without path this is not necessary. -checksum-%: $(CHECKSUM_FILE) - @echo " ==> Running checksum on $*" - @if ggrep -- '[ /]$*$$' $(CHECKSUM_FILE); then \ - if cat $(CHECKSUM_FILE) | sed -e 's!download/!!' | (cd $(DOWNLOADDIR); LC_ALL="C" LANG="C" gmd5sum -c 2>&1) | \ - ggrep -- '$*' | ggrep -v ':[ ]\+OK'; then \ - echo '(!!!) $* failed checksum test!' 1>&2; \ - false; \ - else \ - echo 'file $* passes checksum test!'; \ - $(MAKECOOKIE); \ - fi \ - else \ - echo '(!!!) $* not in $(CHECKSUM_FILE) file!' 1>&2; \ - false; \ - fi - -#################### CHECKNEW RULES #################### - -UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) -UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) -SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF)) - -define files2check -$(if $(UFILES_REGEX),$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX))))) -endef - -check-upstream-and-mail: FILES2CHECK = $(call files2check) -check-upstream-and-mail: - @if [ -n '$(FILES2CHECK)' ]; then \ - NEW_FILES=""; \ - PACKAGE_UP_TO_DATE=0; \ - for FILE in $(FILES2CHECK) ""; do \ - [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ - PACKAGE_UP_TO_DATE=1; \ - else \ - if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ - else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ - fi; \ - fi; \ - $(MAKE) checknew-$$FILE >/dev/null; \ - done; \ - if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ -# { echo ""; \ -# echo "Hello dear $(GARNAME) maintainer,"; \ -# echo ""; \ -# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ -# echo ""; \ -# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ -# echo ""; \ -# echo "Questions, problem report or help should be sent to mailto:maintainers at lists.opencsw.org"; \ -# echo ""; \ -# echo "--"; \ -# echo "Kindest regards"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ - echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ - echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ - echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ - echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ - echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ - echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - { echo ""; \ - echo "Hello dear $(GARNAME) maintainer,"; \ - echo ""; \ - echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ - echo ""; \ - echo "The following upstream file(s):"; \ - echo " $$NEW_FILES"; \ - echo ""; \ - echo "is/are available at the following url(s):"; \ - echo " $(UPSTREAM_MASTER_SITES)"; \ - echo ""; \ - echo "Please consider updating your package." ; \ - echo ""; \ - echo "Questions, problem report or help should be sent to mailto:maintainers at lists.opencsw.org"; \ - echo ""; \ - echo "--"; \ - echo "Kindest regards"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - fi; \ - fi - -check-upstream: FILES2CHECK = $(call files2check) -check-upstream: - @if [ -n '$(FILES2CHECK)' ]; then \ - NEW_FILES=""; \ - PACKAGE_UP_TO_DATE=0; \ - for FILE in $(FILES2CHECK) ""; do \ - [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ - PACKAGE_UP_TO_DATE=1; \ - else \ - if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ - else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ - fi; \ - fi; \ - $(MAKE) checknew-$$FILE >/dev/null; \ - done; \ - if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ - else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ - echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ - echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ - echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ - echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ - echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ - echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - fi; \ - fi - -checknew-%: - @$(MAKECOOKIE) - - -#################### GARCHIVE RULES #################### - -# while we're here, let's just handle how to back up our -# checksummed files - -$(GARCHIVEDIR)/%: $(GARCHIVEDIR) - @if [ -h $(DOWNLOADDIR)/$* ]; then :; else \ - gcp -Lr $(DOWNLOADDIR)/$* $@; \ - fi - - -#################### EXTRACT RULES #################### - -TAR_ARGS = --no-same-owner - -# rule to extract uncompressed tarballs -tar-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @gtar $(TAR_ARGS) -xf $(DOWNLOADDIR)/$* -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# rule to extract files with tar xzf -tar-gz-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @gzip -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# rule to extract files with tar and bzip -tar-bz-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @bzip2 -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# rule to extract files with tar and xz -tar-xz-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @xz -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# rule to extract files with tar and lz -tar-lz-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @lzip -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# rule to extract files with tar and lzma -tar-lzma-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @lzma -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# extract compressed single files -gz-extract-%: - @echo " ==> Decompressing $(DOWNLOADDIR)/$*" - @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ - @gzip -d $(WORKDIR)/$* - @$(MAKECOOKIE) - -gz-extract-%: - @echo " ==> Decompressing $(DOWNLOADDIR)/$*" - @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ - @gzip -d $(WORKDIR)/$* - @$(MAKECOOKIE) - -xz-extract-%: - @echo " ==> Decompressing $(DOWNLOADDIR)/$*" - @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ - @xz -d $(WORKDIR)/$* - @$(MAKECOOKIE) - -lz-extract-%: - @echo " ==> Decompressing $(DOWNLOADDIR)/$*" - @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ - @lzip -d $(WORKDIR)/$* - @$(MAKECOOKIE) - -lzma-extract-%: - @echo " ==> Decompressing $(DOWNLOADDIR)/$*" - @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ - @lzma -d $(WORKDIR)/$* - @$(MAKECOOKIE) - -# extra dependency rule for git repos, that will allow the user -# to supply an alternate target at their discretion -git-extract-%: - @echo " ===> Extracting Git Repo $(DOWNLOADDIR)/$* (Treeish: $(call GIT_TREEISH,$*))" - git --bare archive --prefix=$(GARNAME)-$(GARVERSION)/ --remote=file://$(abspath $(DOWNLOADDIR))/$*/ $(call GIT_TREEISH,$*) | gtar -xf - -C $(EXTRACTDIR) - @$(MAKECOOKIE) - -# rule to extract files with unzip -zip-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @unzip $(DOWNLOADDIR)/$* -d $(EXTRACTDIR) - @$(MAKECOOKIE) - -# this is a null extract rule for files which are constant and -# unchanged (not archives) -cp-extract-%: - @echo " ==> Copying $(DOWNLOADDIR)/$*" - @# Make sure to keep symlinks and don't traverse recursive ones - @(cd $(DOWNLOADDIR); tar cf - $*) | (cd $(WORKDIR); tar xf -) - @$(MAKECOOKIE) - -#gets the meat of a .deb into $(WORKSRC) -deb-bin-extract-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @ar x $(DOWNLOADDIR)/$* - @rm debian-binary && \ - mv *.tar.gz $(DOWNLOADDIR) && \ - mkdir $(WORKSRC) && \ - gtar $(TAR_ARGS) -xvz -C $(WORKSRC) \ - -f $(DOWNLOADDIR)/data.tar.gz - @$(MAKECOOKIE) - -### EXTRACT FILE TYPE MAPPINGS ### -# These rules specify which of the above extract action rules to use for a -# given file extension. Often support for a given extract type can be handled -# by simply adding a rule here. - -extract-archive-%.tar: tar-extract-%.tar - @$(MAKECOOKIE) - -extract-archive-%.tar.gz: tar-gz-extract-%.tar.gz - @$(MAKECOOKIE) - -extract-archive-%.tar.Z: tar-gz-extract-%.tar.Z - @$(MAKECOOKIE) - -extract-archive-%.tgz: tar-gz-extract-%.tgz - @$(MAKECOOKIE) - -extract-archive-%.taz: tar-gz-extract-%.taz - @$(MAKECOOKIE) - -extract-archive-%.tar.bz: tar-bz-extract-%.tar.bz - @$(MAKECOOKIE) - -extract-archive-%.tar.bz2: tar-bz-extract-%.tar.bz2 - @$(MAKECOOKIE) - -extract-archive-%.tbz: tar-bz-extract-%.tbz - @$(MAKECOOKIE) - -extract-archive-%.tar.xz: tar-xz-extract-%.tar.xz - @$(MAKECOOKIE) - -extract-archive-%.tar.lz: tar-lz-extract-%.tar.lz - @$(MAKECOOKIE) - -extract-archive-%.tar.lzma: tar-lzma-extract-%.tar.lzma - @$(MAKECOOKIE) - -extract-archive-%.zip: zip-extract-%.zip - @$(MAKECOOKIE) - -extract-archive-%.ZIP: zip-extract-%.ZIP - @$(MAKECOOKIE) - -extract-archive-%.deb: deb-bin-extract-%.deb - @$(MAKECOOKIE) - -extract-archive-%.gz: gz-extract-%.gz - @$(MAKECOOKIE) - -extract-archive-%.bz2: bz-extract-%.bz2 - @$(MAKECOOKIE) - -extract-archive-%.xz: xz-extract-%.xz - @$(MAKECOOKIE) - -extract-archive-%.lz: lz-extract-%.lz - @$(MAKECOOKIE) - -extract-archive-%.lzma: lzma-extract-%.lzma - @$(MAKECOOKIE) - -extract-archive-%.git: git-extract-%.git - @$(MAKECOOKIE) - -extract-copy-%: cp-extract-% - @$(MAKECOOKIE) - -# anything we don't know about, we just assume is already -# uncompressed and unarchived in plain format -extract-archive-%: cp-extract-% - @$(MAKECOOKIE) - -#################### PATCH RULES #################### - -PATCHDIR ?= $(WORKSRC) -PATCHDIRLEVEL ?= 1 -PATCHDIRFUZZ ?= 2 -GARPATCH = gpatch -d$(PATCHDIR) -p$(PATCHDIRLEVEL) -F$(PATCHDIRFUZZ) -BASEWORKSRC = $(shell basename $(WORKSRC)) - -# apply xzipped patches -xz-patch-%: - @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @xz -dc $(DOWNLOADDIR)/$* | $(GARPATCH) - @( cd $(WORKSRC); git add -A; \ - git commit -am "old xz-style patch: $*"; ) - @$(MAKECOOKIE) - -# apply bzipped patches -bz-patch-%: - @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @bzip2 -dc $(DOWNLOADDIR)/$* | $(GARPATCH) - @( cd $(WORKSRC); git add -A; \ - git commit -am "old bz-style patch: $*"; ) - @$(MAKECOOKIE) - -# apply gzipped patches -gz-patch-%: - @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH) - @( cd $(WORKSRC); git add -A; \ - git commit -am "old gz-style patch: $*"; ) - @$(MAKECOOKIE) - -# apply normal patches (git format-patch output or old-style diff -r) -normal-patch-%: - @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @( if ggrep -q 'Subject:' $(abspath $(DOWNLOADDIR)/$*); then \ - cd $(WORKSRC); git am --ignore-space-change --ignore-whitespace $(abspath $(DOWNLOADDIR)/$*); \ - else \ - echo Adding old-style patch...; \ - $(GARPATCH) < $(DOWNLOADDIR)/$*; \ - cd $(WORKSRC); git add -A; \ - git commit -am "old style patch: $*"; \ - fi ) - @$(MAKECOOKIE) - -### PATCH FILE TYPE MAPPINGS ### -# These rules specify which of the above patch action rules to use for a given -# file extension. Often support for a given patch format can be handled by -# simply adding a rule here. - -patch-extract-%.xz: xz-patch-%.xz - @$(MAKECOOKIE) - -patch-extract-%.bz: bz-patch-%.bz - @$(MAKECOOKIE) - -patch-extract-%.bz2: bz-patch-%.bz2 - @$(MAKECOOKIE) - -patch-extract-%.gz: gz-patch-%.gz - @$(MAKECOOKIE) - -patch-extract-%.Z: gz-patch-%.Z - @$(MAKECOOKIE) - -patch-extract-%.diff: normal-patch-%.diff - @$(MAKECOOKIE) - -patch-extract-%.patch: normal-patch-%.patch - @$(MAKECOOKIE) - -patch-extract-%: normal-patch-% - @$(MAKECOOKIE) - -#################### CONFIGURE RULES #################### - -TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconfdir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstatedir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir=$(includedir) --mandir=$(mandir) - -NODIRPATHS += --lispdir - -DIRPATHS = $(filter-out $(addsuffix %,$(NODIRPATHS)), $(TMP_DIRPATHS)) - -# configure a package that has an autoconf-style configure -# script. -configure-%/configure: - @echo " ==> Running configure in $*" - cd $* && $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) - @$(MAKECOOKIE) - -configure-%/autogen.sh: - @echo " ==> Running autogen.sh in $*" - @cd $* && $(CONFIGURE_ENV) ./autogen.sh $(CONFIGURE_ARGS) - @$(MAKECOOKIE) - -# configure a package that uses imake -# FIXME: untested and likely not the right way to handle the -# arguments -configure-%/Imakefile: - @echo " ==> Running xmkmf in $*" - @cd $* && $(CONFIGURE_ENV) xmkmf $(CONFIGURE_ARGS) - @$(MAKECOOKIE) - -configure-%/setup.rb: - @echo " ==> Running setup.rb config in $*" - @( cd $* ; $(CONFIGURE_ENV) ruby ./setup.rb config $(CONFIGURE_ARGS) ) - @$(MAKECOOKIE) - -# WAF build, for details see http://code.google.com/p/waf/ -configure-%/waf: - @echo " ==> Running waf configure in $*" - cd $* && $(CONFIGURE_ENV) ./waf configure $(CONFIGURE_ARGS) - @$(MAKECOOKIE) - -#################### BUILD RULES #################### - -# build from a standard gnu-style makefile's default rule. -build-%/Makefile: - @echo " ==> Running make in $*" - $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) - @$(MAKECOOKIE) - -build-%/makefile: - @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) - @$(MAKECOOKIE) - -build-%/GNUmakefile: - @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) - @$(MAKECOOKIE) - -build-%/Jamfile: - @echo " ==> Running bjam in $*" - @( cd $* ; $(BUILD_ENV) bjam $(JAMFLAGS) $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -# Ruby makefiles -build-%/Rakefile: - @echo " ==> Running rake in $*" - @( cd $* ; $(BUILD_ENV) rake $(RAKEFLAGS) $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -build-%/rakefile: - @echo " ==> Running rake in $*" - @( cd $* ; $(BUILD_ENV) rake $(RAKEFLAGS) $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -build-%/setup.rb: - @echo " ==> Running setup.rb setup in $*" - @( cd $* ; $(BUILD_ENV) ruby ./setup.rb setup $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -# WAF build, for details see http://code.google.com/p/waf/ -build-%/waf: - @echo " ==> Running waf build in $*" - @$(cd $* ; (BUILD_ENV) ./waf build $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -# This can be: build, build_py, build_ext, build_clib, build_scripts -# See setup.py --help-commands for details -PYBUILD_CMD ?= build -build-%/setup.py: - @echo " ==> Running setup.py $(PYBUILD_TYPE) in $*" - @( cd $* ; $(BUILD_ENV) python ./setup.py $(PYBUILD_CMD) $(BUILD_ARGS) ) - @$(MAKECOOKIE) - -#################### CLEAN RULES #################### - -CLEAN_ARGS ?= clean - -# build from a standard gnu-style makefile's default rule. -clean-%/Makefile: - @echo " ==> Running clean in $*" - @$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS) - @rm -f $(COOKIEDIR)/build-$* - -clean-%/makefile: - @echo " ==> Running clean in $*" - @$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS) - @rm -f $(COOKIEDIR)/build-$* - -clean-%/GNUmakefile: - @echo " ==> Running clean in $*" - @$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS) - @rm -f $(COOKIEDIR)/build-$* - -clean-%/Jamfile: - $(error *** Don't know how to clean Jamfiles) - -clean-%/Rakefile: - $(error *** Don't know how to clean Rakefiles) - -clean-%/rakefile: - $(error *** Don't know how to clean Rakefiles) - -clean-%/setup.rb: - $(error *** Don't know how to clean Ruby setups) - -clean-%/setup.py: - $(error *** Don't know how to clean Python builds) - -#################### TEST RULES #################### - -TEST_TARGET ?= test - -# Run tests on pre-built sources -test-%/Makefile: - @echo " ==> Running make $(TEST_TARGET) in $*" - $(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) - @$(MAKECOOKIE) - -test-%/makefile: - @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) - @$(MAKECOOKIE) - -test-%/GNUmakefile: - @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) - @$(MAKECOOKIE) - -# Ruby makefiles -test-%/Rakefile: - @echo " ==> Running rake $(TEST_TARGET) in $*" - @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) - @$(MAKECOOKIE) - -test-%/rakefile: - @echo " ==> Running rake $(TEST_TARGET) in $*" - @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) - @$(MAKECOOKIE) - -test-%/setup.py: - @echo " ==> Running setup.py test in $*" - @( cd $* ; $(TEST_ENV) python ./setup.py test $(TEST_ARGS) ) - @$(MAKECOOKIE) - -################# INSTALL RULES #################### - -# just run make install and hope for the best. -install-%/Makefile: - @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install - @$(MAKECOOKIE) - -install-%/makefile: - @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install - @$(MAKECOOKIE) - -install-%/GNUmakefile: - @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install - @$(MAKECOOKIE) - -# Ruby makefiles -install-%/Rakefile: - @echo " ==> Running rake install in $*" - @( cd $* ; $(INSTALL_ENV) rake $(RAKEFLAGS) $(INSTALL_ARGS) ) - @$(MAKECOOKIE) - -install-%/rakefile: - @echo " ==> Running rake install in $*" - @( cd $* ; $(INSTALL_ENV) rake $(RAKEFLAGS) $(INSTALL_ARGS) ) - @$(MAKECOOKIE) - -install-%/setup.rb: - @echo " ==> Running setup.rb install in $*" - @( cd $* ; $(INSTALL_ENV) ruby ./setup.rb install --prefix=$(DESTDIR) ) - @$(MAKECOOKIE) - -# WAF build, for details see http://code.google.com/p/waf/ -install-%/waf: - @echo " ==> Running waf install in $*" - @$(cd $* ; (INSTALL_ENV) ./waf install $(INSTALL_ARGS) ) - @$(MAKECOOKIE) - -# This can be: install, install_lib, install_headers, install_scripts, -# or install_data. See setup.py --help-commands for details. -PYINSTALL_CMD ?= install -install-%/setup.py: - @echo " ==> Running setup.py $(PYINSTALL_CMD) in $*" - @( cd $* ; $(INSTALL_ENV) python ./setup.py $(PYINSTALL_CMD) $(INSTALL_ARGS) ) - @$(MAKECOOKIE) - -# pkg-config scripts -install-%-config: - mkdir -p $(STAGINGDIR)/$(GARNAME) - cp -f $(DESTDIR)$(bindir)/$*-config $(STAGINGDIR)/$(GARNAME)/ - $(MAKECOOKIE) - -###################################### -# Use a manifest file of the format: -# src:dest[:mode[:owner[:group]]] -# as in... -# ${WORKSRC}/nwall:${bindir}/nwall:2755:root:tty -# ${WORKSRC}/src/foo:${sharedstatedir}/foo -# ${WORKSRC}/yoink:${sysconfdir}/yoink:0600 - -# Okay, so for the benefit of future generations, this is how it -# works: -# -# First of all, we have this file with colon-separated lines. -# The $(shell cat foo) routine turns it into a space-separated -# list of words. The foreach iterates over this list, putting a -# colon-separated record in $(ZORCH) on each pass through. -# -# Next, we have the macro $(MANIFEST_LINE), which splits a record -# into a space-separated list, and $(MANIFEST_SIZE), which -# determines how many elements are in such a list. These are -# purely for convenience, and could be inserted inline if need -# be. -MANIFEST_LINE = $(subst :, ,$(ZORCH)) -MANIFEST_SIZE = $(words $(MANIFEST_LINE)) - -# So the install command takes a variable number of parameters, -# and our records have from two to five elements. Gmake can't do -# any sort of arithmetic, so we can't do any really intelligent -# indexing into the list of parameters. -# -# Since the last three elements of the $(MANIFEST_LINE) are what -# we're interested in, we make a parallel list with the parameter -# switch text (note the dummy elements at the beginning): -MANIFEST_FLAGS = notused notused --mode= --owner= --group= - -# The following environment variables are set before the -# installation boogaloo begins. This ensures that WORKSRC is -# available to the manifest and that all of the location -# variables are suitable for *installation* (that is, using -# DESTDIR) - -MANIFEST_ENV += WORKSRC=$(WORKSRC) -# This was part of the "implicit DESTDIR" regime. However: -# http://gar.lnx-bbc.org/wiki/ImplicitDestdirConsideredHarmful -#MANIFEST_ENV += $(foreach TTT,prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir infodir lispdir includedir mandir,$(TTT)=$(DESTDIR)$($(TTT))) - -# ...and then we join a slice of it with the corresponding slice -# of the $(MANIFEST_LINE), starting at 3 and going to -# $(MANIFEST_SIZE). That's where all the real magic happens, -# right there! -# -# following that, we just splat elements one and two of -# $(MANIFEST_LINE) on the end, since they're the ones that are -# always there. Slap a semicolon on the end, and you've got a -# completed iteration through the foreach! Beaujolais! - -# FIXME: using -D may not be the right thing to do! -install-$(MANIFEST_FILE): - @echo " ==> Installing from $(MANIFEST_FILE)" - $(MANIFEST_ENV) ; $(foreach ZORCH,$(shell cat $(MANIFEST_FILE)), ginstall -Dc $(join $(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_FLAGS)),$(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_LINE))) $(word 1,$(MANIFEST_LINE)) $(word 2,$(MANIFEST_LINE)) ;) - @$(MAKECOOKIE) - -#################### DEPENDENCY RULES #################### - -# These two lines are here to grandfather in all the packages that use -# BUILDDEPS -IMGDEPS += build -build_DEPENDS = $(BUILDDEPS) - -# Standard deps install into the standard install dir. For the -# BBC, we set the includedir to the build tree and the libdir to -# the install tree. Most dependencies work this way. - -$(GARDIR)/%/$(COOKIEDIR)/install: - @echo ' ==> Building $* as a dependency' - @$(MAKE) -C $(GARDIR)/$* install DESTIMG=$(DESTIMG) - -# builddeps need to have everything put in the build DESTIMG -#$(GARDIR)/%/$(COOKIEROOTDIR)/build.d/install: -# @echo ' ==> Building $* as a build dependency' -# @$(MAKE) -C $(GARDIR)/$* install DESTIMG=build - -# Source Deps grab the source code for another package -# XXX: nobody uses this, but it should really be more like -# $(GARDIR)/%/cookies/patch: -srcdep-$(GARDIR)/%: - @echo ' ==> Grabbing source for $* as a dependency' - @$(MAKE) -C $(GARDIR)/$* patch-p extract-p > /dev/null 2>&1 || \ - $(MAKE) -C $(GARDIR)/$* patch - -# Image deps create dependencies on package installations in -# images other than the current package's DESTIMG. -IMGDEP_TARGETS = $(foreach TTT,$($*_DEPENDS),$(subst xyzzy,$(TTT),$(GARDIR)/xyzzy/$(COOKIEROOTDIR)/$*.d/install)) -imgdep-%: - @test -z "$(strip $(IMGDEP_TARGETS))" || $(MAKE) DESTIMG="$*" $(IMGDEP_TARGETS) - -# Igor's info and man gzipper rule -gzip-info-man: gzip-info gzip-man - -gzip-info: - gfind $(DESTDIR) -type f -iname *.info* -not -iname *.gz | \ - gxargs -r gzip --force - -gzip-man: - gfind $(DESTDIR) -type f -iname *.[1-8] -size +2 -print | \ - gxargs -r gzip --force - -compile-elisp: - @(for d in $(ELISP_DIRS); do \ - echo " ===> Compiling .el files in $$d"; \ - cd $(PKGROOT)/$$d; \ - for f in `find . -name "*el"`; do \ - bf=`basename $$f`; \ - bd=`dirname $$f`; \ - cd $$bd; \ - emacs -L $(PKGROOT)/$$d -L $(PKGROOT)/$$d/$$bd $(EXTRA_EMACS_ARGS) -batch -f batch-byte-compile "$$bf"; \ - cd $(PKGROOT)/$$d; \ - done; \ - done) - -include $(addprefix $(GARDIR)/,$(EXTRA_LIBS)) - -# Mmm, yesssss. cookies my preciousssss! Mmm, yes downloads it -# is! We mustn't have nasty little gmakeses deleting our -# precious cookieses now must we? -.PRECIOUS: $(DOWNLOADDIR)/% $(COOKIEDIR)/% $(FILEDIR)/% Copied: csw/mgar/gar/v2-noexternals/gar.lib.mk (from rev 11591, csw/mgar/gar/v2/gar.lib.mk) =================================================================== --- csw/mgar/gar/v2-noexternals/gar.lib.mk (rev 0) +++ csw/mgar/gar/v2-noexternals/gar.lib.mk 2010-11-12 18:17:13 UTC (rev 11592) @@ -0,0 +1,899 @@ +# vim: ft=make ts=4 sw=4 noet +# +# $Id$ +# +# Copyright (C) 2001 Nick Moffitt +# +# 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. +# + +# cookies go here, so we have to be able to find them for +# dependency checking. +VPATH += $(COOKIEDIR) + +# convenience variable to make the cookie. +MAKECOOKIE = mkdir -p $(COOKIEDIR)/$(@D) && date >> $(COOKIEDIR)/$@ + +URLSTRIP = $(subst ://,//,$(1)) + +# if you need to proxy git:// connections, set GIT_USE_PROXY. There is a +# default proxy script that works with the (squid?) proxy at the BO buildfarm. +# override GIT_PROXY_SCRIPT to something else if you need to. +GIT_MAYBEPROXY = $(if $(GIT_USE_PROXY),GIT_PROXY_COMMAND=$(GIT_PROXY_SCRIPT)) +GIT_TREEISH = $(if $(GIT_TREEISH_$(1)),$(GIT_TREEISH_$(1)),HEAD) + +#################### FETCH RULES #################### + +URLS := $(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(ALLFILES_PATCHFILES))) + +# if the caller has defined _postinstall, etc targets for a package, add +# these 'dynamic script' targets to our fetch list +URLS += $(foreach DYN,$(DYNSCRIPTS),dynscr://$(DYN)) + +define gitsubst +$(subst git-git,git,$(if $(findstring $(1)://,$(2)),$(patsubst $(1)%,git-$(1)%,$(call URLSTRIP,$(2))))) +endef + +ifdef GIT_REPOS +URLS += $(foreach R,$(GIT_REPOS),gitrepo://$(call GITPROJ,$(R)) $(foreach gitproto,git http file ssh,$(call gitsubst,$(gitproto),$(R)))) +endif + +# Download the file if and only if it doesn't have a preexisting +# checksum file. Loop through available URLs and stop when you +# get one that doesn't return an error code. +# Note that GAR targets are used to download the URLs, thus: +# 1) we have to strip the colon from the URLs +# 2) the download is very costly with bigger Makefiles as they will be +# re-evaluated for every URL (nested gmake invocation, room for improvement) +$(DOWNLOADDIR)/%: + @if test -f $(COOKIEDIR)/checksum-$*; then : ; else \ + echo " ==> Grabbing $@"; \ + ( for i in $(filter %/$*,$(URLS)); do \ + echo " ==> Trying $$i"; \ + $(MAKE) -s `echo $$i | tr -d :` || continue; \ + mv $(PARTIALDIR)/$* $@; \ + break; \ + done; ) 2>&1 | grep -v '^$(MAKE)'; \ + if test -r $@ ; then : ; else \ + echo '(!!!) Failed to download $@!' 1>&2; \ + false; \ + fi; \ + fi + +gitrepo//%: + @( if [ -d $(GARCHIVEDIR)/$(call GITPROJ,$*) ]; then \ + ( cd $(GARCHIVEDIR)/$(call GITPROJ,$*); \ + $(GIT_MAYBEPROXY) git --bare fetch ) && \ + gln -s $(GARCHIVEDIR)/$(call GITPROJ,$*)/ $(PARTIALDIR)/$(call GITPROJ,$*); \ + else \ + false; \ + fi ) + +# the git remote add commands are so that we can later do a fetch +# to update the code. +# we possibly proxy the git:// references depending on GIT_USE_PROXY +git-http//%: + @git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ + git remote add origin http://$*; \ + git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) + +git//%: + @$(GIT_MAYBEPROXY) git clone --bare git://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ + git remote add origin git://$*; \ + git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) + +git-file//%: + @git clone --bare file:///$* $(PARTIALDIR)/$(call GITPROJ,$*) + @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ + git remote add origin file://$*; \ + git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) + +git-ssh//%: + @git clone --bare ssh://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ + git remote add origin ssh://$*; \ + git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) + + +# create ADMSCRIPTS 'on the fly' from variables defined by the caller +# This version is private and should only be called from the non-private +# version directly below +_dynscr//%: + $($(subst .,_,$*)) + +dynscr//%: + $(MAKE) --no-print-directory -n _$@ > $(PARTIALDIR)/$* + +# download an http URL (colons omitted) +http//%: + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) http://$* + +https//%: + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) https://$* + +# download an ftp URL (colons omitted) +#ftp//%: +# @wget -T 30 -c --passive-ftp -P $(PARTIALDIR) ftp://$* +ftp//%: + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) ftp://$* + +# link to a local copy of the file +# (absolute path) +file///%: + @if test -f /$*; then \ + gln -sf /$* $(PARTIALDIR)/$(notdir $*); \ + else \ + false; \ + fi + +# link to a local copy of the file +# (relative path) +file//%: + @if test -f $*; then \ + gln -sf "$(CURDIR)/$*" $(PARTIALDIR)/$(notdir $*); \ + else \ + false; \ + fi + +# Using Jeff Waugh's rsync rule. +# DOES NOT PRESERVE SYMLINKS! +rsync//%: + @rsync -azvLP rsync://$* $(PARTIALDIR)/ + +# Using Jeff Waugh's scp rule +scp//%: + @scp -C $* $(PARTIALDIR)/ + +# Fetch a SVN repo via http +svn-http//%: + @svn co $(SVNHTTP_CO_ARGS) http://$* $(PARTIALDIR)/$(notdir $*) + +svn-https//%: + @svn co $(SVNHTTP_CO_ARGS) https://$* $(PARTIALDIR)/$(notdir $*) + +#################### CHECKSUM RULES #################### + +# check a given file's checksum against $(CHECKSUM_FILE) and +# error out if it mentions the file without an "OK". +# The removal of the download prefix is for legacy checksums. For newstyle +# checksums without path this is not necessary. +checksum-%: $(CHECKSUM_FILE) + @echo " ==> Running checksum on $*" + @if ggrep -- '[ /]$*$$' $(CHECKSUM_FILE); then \ + if cat $(CHECKSUM_FILE) | sed -e 's!download/!!' | (cd $(DOWNLOADDIR); LC_ALL="C" LANG="C" gmd5sum -c 2>&1) | \ + ggrep -- '$*' | ggrep -v ':[ ]\+OK'; then \ + echo '(!!!) $* failed checksum test!' 1>&2; \ + false; \ + else \ + echo 'file $* passes checksum test!'; \ + $(MAKECOOKIE); \ + fi \ + else \ + echo '(!!!) $* not in $(CHECKSUM_FILE) file!' 1>&2; \ + false; \ + fi + +#################### CHECKNEW RULES #################### + +UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) +UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) +SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF)) + +define files2check +$(if $(UFILES_REGEX),$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX))))) +endef + +check-upstream-and-mail: FILES2CHECK = $(call files2check) +check-upstream-and-mail: + @if [ -n '$(FILES2CHECK)' ]; then \ + NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ + for FILE in $(FILES2CHECK) ""; do \ + [ -n "$$FILE" ] || continue; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ + else \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ + fi; \ + $(MAKE) checknew-$$FILE >/dev/null; \ + done; \ + if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ +# { echo ""; \ +# echo "Hello dear $(GARNAME) maintainer,"; \ +# echo ""; \ +# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ +# echo ""; \ +# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ +# echo ""; \ +# echo "Questions, problem report or help should be sent to mailto:maintainers at lists.opencsw.org"; \ +# echo ""; \ +# echo "--"; \ +# echo "Kindest regards"; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ + fi; \ + else \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ + { echo ""; \ + echo "Hello dear $(GARNAME) maintainer,"; \ + echo ""; \ + echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ + echo ""; \ + echo "The following upstream file(s):"; \ + echo " $$NEW_FILES"; \ + echo ""; \ + echo "is/are available at the following url(s):"; \ + echo " $(UPSTREAM_MASTER_SITES)"; \ + echo ""; \ + echo "Please consider updating your package." ; \ + echo ""; \ + echo "Questions, problem report or help should be sent to mailto:maintainers at lists.opencsw.org"; \ + echo ""; \ + echo "--"; \ + echo "Kindest regards"; \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + fi; \ + fi + +check-upstream: FILES2CHECK = $(call files2check) +check-upstream: + @if [ -n '$(FILES2CHECK)' ]; then \ + NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ + for FILE in $(FILES2CHECK) ""; do \ + [ -n "$$FILE" ] || continue; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ + else \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ + fi; \ + $(MAKE) checknew-$$FILE >/dev/null; \ + done; \ + if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ + fi; \ + else \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ + fi; \ + fi + +checknew-%: + @$(MAKECOOKIE) + + +#################### GARCHIVE RULES #################### + +# while we're here, let's just handle how to back up our +# checksummed files + +$(GARCHIVEDIR)/%: $(GARCHIVEDIR) + @if [ -h $(DOWNLOADDIR)/$* ]; then :; else \ + gcp -Lr $(DOWNLOADDIR)/$* $@; \ + fi + + +#################### EXTRACT RULES #################### + +TAR_ARGS = --no-same-owner + +# rule to extract uncompressed tarballs +tar-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @gtar $(TAR_ARGS) -xf $(DOWNLOADDIR)/$* -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# rule to extract files with tar xzf +tar-gz-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @gzip -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# rule to extract files with tar and bzip +tar-bz-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @bzip2 -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# rule to extract files with tar and xz +tar-xz-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @xz -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# rule to extract files with tar and lz +tar-lz-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @lzip -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# rule to extract files with tar and lzma +tar-lzma-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @lzma -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# extract compressed single files +gz-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @gzip -d $(WORKDIR)/$* + @$(MAKECOOKIE) + +gz-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @gzip -d $(WORKDIR)/$* + @$(MAKECOOKIE) + +xz-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @xz -d $(WORKDIR)/$* + @$(MAKECOOKIE) + +lz-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @lzip -d $(WORKDIR)/$* + @$(MAKECOOKIE) + +lzma-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @lzma -d $(WORKDIR)/$* + @$(MAKECOOKIE) + +# extra dependency rule for git repos, that will allow the user +# to supply an alternate target at their discretion +git-extract-%: + @echo " ===> Extracting Git Repo $(DOWNLOADDIR)/$* (Treeish: $(call GIT_TREEISH,$*))" + git --bare archive --prefix=$(GARNAME)-$(GARVERSION)/ --remote=file://$(abspath $(DOWNLOADDIR))/$*/ $(call GIT_TREEISH,$*) | gtar -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + +# rule to extract files with unzip +zip-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @unzip $(DOWNLOADDIR)/$* -d $(EXTRACTDIR) + @$(MAKECOOKIE) + +# this is a null extract rule for files which are constant and +# unchanged (not archives) +cp-extract-%: + @echo " ==> Copying $(DOWNLOADDIR)/$*" + @# Make sure to keep symlinks and don't traverse recursive ones + @(cd $(DOWNLOADDIR); tar cf - $*) | (cd $(WORKDIR); tar xf -) + @$(MAKECOOKIE) + +#gets the meat of a .deb into $(WORKSRC) +deb-bin-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @ar x $(DOWNLOADDIR)/$* + @rm debian-binary && \ + mv *.tar.gz $(DOWNLOADDIR) && \ + mkdir $(WORKSRC) && \ + gtar $(TAR_ARGS) -xvz -C $(WORKSRC) \ + -f $(DOWNLOADDIR)/data.tar.gz + @$(MAKECOOKIE) + +### EXTRACT FILE TYPE MAPPINGS ### +# These rules specify which of the above extract action rules to use for a +# given file extension. Often support for a given extract type can be handled +# by simply adding a rule here. + +extract-archive-%.tar: tar-extract-%.tar + @$(MAKECOOKIE) + +extract-archive-%.tar.gz: tar-gz-extract-%.tar.gz + @$(MAKECOOKIE) + +extract-archive-%.tar.Z: tar-gz-extract-%.tar.Z + @$(MAKECOOKIE) + +extract-archive-%.tgz: tar-gz-extract-%.tgz + @$(MAKECOOKIE) + +extract-archive-%.taz: tar-gz-extract-%.taz + @$(MAKECOOKIE) + +extract-archive-%.tar.bz: tar-bz-extract-%.tar.bz + @$(MAKECOOKIE) + +extract-archive-%.tar.bz2: tar-bz-extract-%.tar.bz2 + @$(MAKECOOKIE) + +extract-archive-%.tbz: tar-bz-extract-%.tbz + @$(MAKECOOKIE) + +extract-archive-%.tar.xz: tar-xz-extract-%.tar.xz + @$(MAKECOOKIE) + +extract-archive-%.tar.lz: tar-lz-extract-%.tar.lz + @$(MAKECOOKIE) + +extract-archive-%.tar.lzma: tar-lzma-extract-%.tar.lzma + @$(MAKECOOKIE) + +extract-archive-%.zip: zip-extract-%.zip + @$(MAKECOOKIE) + +extract-archive-%.ZIP: zip-extract-%.ZIP + @$(MAKECOOKIE) + +extract-archive-%.deb: deb-bin-extract-%.deb + @$(MAKECOOKIE) + +extract-archive-%.gz: gz-extract-%.gz + @$(MAKECOOKIE) + +extract-archive-%.bz2: bz-extract-%.bz2 + @$(MAKECOOKIE) + +extract-archive-%.xz: xz-extract-%.xz + @$(MAKECOOKIE) + +extract-archive-%.lz: lz-extract-%.lz + @$(MAKECOOKIE) + +extract-archive-%.lzma: lzma-extract-%.lzma + @$(MAKECOOKIE) + +extract-archive-%.git: git-extract-%.git + @$(MAKECOOKIE) + +extract-copy-%: cp-extract-% + @$(MAKECOOKIE) + +# anything we don't know about, we just assume is already +# uncompressed and unarchived in plain format +extract-archive-%: cp-extract-% + @$(MAKECOOKIE) + +#################### PATCH RULES #################### + +PATCHDIR ?= $(WORKSRC) +PATCHDIRLEVEL ?= 1 +PATCHDIRFUZZ ?= 2 +GARPATCH = gpatch -d$(PATCHDIR) -p$(PATCHDIRLEVEL) -F$(PATCHDIRFUZZ) +BASEWORKSRC = $(shell basename $(WORKSRC)) + +# apply xzipped patches +xz-patch-%: + @echo " ==> Applying patch $(DOWNLOADDIR)/$*" + @xz -dc $(DOWNLOADDIR)/$* | $(GARPATCH) + @( cd $(WORKSRC); git add -A; \ + git commit -am "old xz-style patch: $*"; ) + @$(MAKECOOKIE) + +# apply bzipped patches +bz-patch-%: + @echo " ==> Applying patch $(DOWNLOADDIR)/$*" + @bzip2 -dc $(DOWNLOADDIR)/$* | $(GARPATCH) + @( cd $(WORKSRC); git add -A; \ + git commit -am "old bz-style patch: $*"; ) + @$(MAKECOOKIE) + +# apply gzipped patches +gz-patch-%: + @echo " ==> Applying patch $(DOWNLOADDIR)/$*" + @gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH) + @( cd $(WORKSRC); git add -A; \ + git commit -am "old gz-style patch: $*"; ) + @$(MAKECOOKIE) + +# apply normal patches (git format-patch output or old-style diff -r) +normal-patch-%: + @echo " ==> Applying patch $(DOWNLOADDIR)/$*" + @( if ggrep -q 'Subject:' $(abspath $(DOWNLOADDIR)/$*); then \ + cd $(WORKSRC); git am --ignore-space-change --ignore-whitespace $(abspath $(DOWNLOADDIR)/$*); \ + else \ + echo Adding old-style patch...; \ + $(GARPATCH) < $(DOWNLOADDIR)/$*; \ + cd $(WORKSRC); git add -A; \ + git commit -am "old style patch: $*"; \ + fi ) + @$(MAKECOOKIE) + +### PATCH FILE TYPE MAPPINGS ### +# These rules specify which of the above patch action rules to use for a given +# file extension. Often support for a given patch format can be handled by +# simply adding a rule here. + +patch-extract-%.xz: xz-patch-%.xz + @$(MAKECOOKIE) + +patch-extract-%.bz: bz-patch-%.bz + @$(MAKECOOKIE) + +patch-extract-%.bz2: bz-patch-%.bz2 + @$(MAKECOOKIE) + +patch-extract-%.gz: gz-patch-%.gz + @$(MAKECOOKIE) + +patch-extract-%.Z: gz-patch-%.Z + @$(MAKECOOKIE) + +patch-extract-%.diff: normal-patch-%.diff + @$(MAKECOOKIE) + +patch-extract-%.patch: normal-patch-%.patch + @$(MAKECOOKIE) + +patch-extract-%: normal-patch-% + @$(MAKECOOKIE) + +#################### CONFIGURE RULES #################### + +TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconfdir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstatedir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir=$(includedir) --mandir=$(mandir) + +NODIRPATHS += --lispdir + +DIRPATHS = $(filter-out $(addsuffix %,$(NODIRPATHS)), $(TMP_DIRPATHS)) + +# configure a package that has an autoconf-style configure +# script. +configure-%/configure: + @echo " ==> Running configure in $*" + cd $* && $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +configure-%/autogen.sh: + @echo " ==> Running autogen.sh in $*" + @cd $* && $(CONFIGURE_ENV) ./autogen.sh $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +# configure a package that uses imake +# FIXME: untested and likely not the right way to handle the +# arguments +configure-%/Imakefile: + @echo " ==> Running xmkmf in $*" + @cd $* && $(CONFIGURE_ENV) xmkmf $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +configure-%/setup.rb: + @echo " ==> Running setup.rb config in $*" + @( cd $* ; $(CONFIGURE_ENV) ruby ./setup.rb config $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) + +# WAF build, for details see http://code.google.com/p/waf/ +configure-%/waf: + @echo " ==> Running waf configure in $*" + cd $* && $(CONFIGURE_ENV) ./waf configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +#################### BUILD RULES #################### + +# build from a standard gnu-style makefile's default rule. +build-%/Makefile: + @echo " ==> Running make in $*" + $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(MAKECOOKIE) + +build-%/makefile: + @echo " ==> Running make in $*" + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(MAKECOOKIE) + +build-%/GNUmakefile: + @echo " ==> Running make in $*" + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(MAKECOOKIE) + +build-%/Jamfile: + @echo " ==> Running bjam in $*" + @( cd $* ; $(BUILD_ENV) bjam $(JAMFLAGS) $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +# Ruby makefiles +build-%/Rakefile: + @echo " ==> Running rake in $*" + @( cd $* ; $(BUILD_ENV) rake $(RAKEFLAGS) $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +build-%/rakefile: + @echo " ==> Running rake in $*" + @( cd $* ; $(BUILD_ENV) rake $(RAKEFLAGS) $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +build-%/setup.rb: + @echo " ==> Running setup.rb setup in $*" + @( cd $* ; $(BUILD_ENV) ruby ./setup.rb setup $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +# WAF build, for details see http://code.google.com/p/waf/ +build-%/waf: + @echo " ==> Running waf build in $*" + @$(cd $* ; (BUILD_ENV) ./waf build $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +# This can be: build, build_py, build_ext, build_clib, build_scripts +# See setup.py --help-commands for details +PYBUILD_CMD ?= build +build-%/setup.py: + @echo " ==> Running setup.py $(PYBUILD_TYPE) in $*" + @( cd $* ; $(BUILD_ENV) python ./setup.py $(PYBUILD_CMD) $(BUILD_ARGS) ) + @$(MAKECOOKIE) + +#################### CLEAN RULES #################### + +CLEAN_ARGS ?= clean + +# build from a standard gnu-style makefile's default rule. +clean-%/Makefile: + @echo " ==> Running clean in $*" + @$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS) + @rm -f $(COOKIEDIR)/build-$* + +clean-%/makefile: + @echo " ==> Running clean in $*" + @$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS) + @rm -f $(COOKIEDIR)/build-$* + +clean-%/GNUmakefile: + @echo " ==> Running clean in $*" + @$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS) + @rm -f $(COOKIEDIR)/build-$* + +clean-%/Jamfile: + $(error *** Don't know how to clean Jamfiles) + +clean-%/Rakefile: + $(error *** Don't know how to clean Rakefiles) + +clean-%/rakefile: + $(error *** Don't know how to clean Rakefiles) + +clean-%/setup.rb: + $(error *** Don't know how to clean Ruby setups) + +clean-%/setup.py: + $(error *** Don't know how to clean Python builds) + +#################### TEST RULES #################### + +TEST_TARGET ?= test + +# Run tests on pre-built sources +test-%/Makefile: + @echo " ==> Running make $(TEST_TARGET) in $*" + $(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(MAKECOOKIE) + +test-%/makefile: + @echo " ==> Running make $(TEST_TARGET) in $*" + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(MAKECOOKIE) + +test-%/GNUmakefile: + @echo " ==> Running make $(TEST_TARGET) in $*" + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(MAKECOOKIE) + +# Ruby makefiles +test-%/Rakefile: + @echo " ==> Running rake $(TEST_TARGET) in $*" + @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) + @$(MAKECOOKIE) + +test-%/rakefile: + @echo " ==> Running rake $(TEST_TARGET) in $*" + @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) + @$(MAKECOOKIE) + +test-%/setup.py: + @echo " ==> Running setup.py test in $*" + @( cd $* ; $(TEST_ENV) python ./setup.py test $(TEST_ARGS) ) + @$(MAKECOOKIE) + +################# INSTALL RULES #################### + +# just run make install and hope for the best. +install-%/Makefile: + @echo " ==> Running make install in $*" + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(MAKECOOKIE) + +install-%/makefile: + @echo " ==> Running make install in $*" + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(MAKECOOKIE) + +install-%/GNUmakefile: + @echo " ==> Running make install in $*" + @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(MAKECOOKIE) + +# Ruby makefiles +install-%/Rakefile: + @echo " ==> Running rake install in $*" + @( cd $* ; $(INSTALL_ENV) rake $(RAKEFLAGS) $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + +install-%/rakefile: + @echo " ==> Running rake install in $*" + @( cd $* ; $(INSTALL_ENV) rake $(RAKEFLAGS) $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + +install-%/setup.rb: + @echo " ==> Running setup.rb install in $*" + @( cd $* ; $(INSTALL_ENV) ruby ./setup.rb install --prefix=$(DESTDIR) ) + @$(MAKECOOKIE) + +# WAF build, for details see http://code.google.com/p/waf/ +install-%/waf: + @echo " ==> Running waf install in $*" + @$(cd $* ; (INSTALL_ENV) ./waf install $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + +# This can be: install, install_lib, install_headers, install_scripts, +# or install_data. See setup.py --help-commands for details. +PYINSTALL_CMD ?= install +install-%/setup.py: + @echo " ==> Running setup.py $(PYINSTALL_CMD) in $*" + @( cd $* ; $(INSTALL_ENV) python ./setup.py $(PYINSTALL_CMD) $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + +# pkg-config scripts +install-%-config: + mkdir -p $(STAGINGDIR)/$(GARNAME) + cp -f $(DESTDIR)$(bindir)/$*-config $(STAGINGDIR)/$(GARNAME)/ + $(MAKECOOKIE) + +###################################### +# Use a manifest file of the format: +# src:dest[:mode[:owner[:group]]] +# as in... +# ${WORKSRC}/nwall:${bindir}/nwall:2755:root:tty +# ${WORKSRC}/src/foo:${sharedstatedir}/foo +# ${WORKSRC}/yoink:${sysconfdir}/yoink:0600 + +# Okay, so for the benefit of future generations, this is how it +# works: +# +# First of all, we have this file with colon-separated lines. +# The $(shell cat foo) routine turns it into a space-separated +# list of words. The foreach iterates over this list, putting a +# colon-separated record in $(ZORCH) on each pass through. +# +# Next, we have the macro $(MANIFEST_LINE), which splits a record +# into a space-separated list, and $(MANIFEST_SIZE), which +# determines how many elements are in such a list. These are +# purely for convenience, and could be inserted inline if need +# be. +MANIFEST_LINE = $(subst :, ,$(ZORCH)) +MANIFEST_SIZE = $(words $(MANIFEST_LINE)) + +# So the install command takes a variable number of parameters, +# and our records have from two to five elements. Gmake can't do +# any sort of arithmetic, so we can't do any really intelligent +# indexing into the list of parameters. +# +# Since the last three elements of the $(MANIFEST_LINE) are what +# we're interested in, we make a parallel list with the parameter +# switch text (note the dummy elements at the beginning): +MANIFEST_FLAGS = notused notused --mode= --owner= --group= + +# The following environment variables are set before the +# installation boogaloo begins. This ensures that WORKSRC is +# available to the manifest and that all of the location +# variables are suitable for *installation* (that is, using +# DESTDIR) + +MANIFEST_ENV += WORKSRC=$(WORKSRC) +# This was part of the "implicit DESTDIR" regime. However: +# http://gar.lnx-bbc.org/wiki/ImplicitDestdirConsideredHarmful +#MANIFEST_ENV += $(foreach TTT,prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir infodir lispdir includedir mandir,$(TTT)=$(DESTDIR)$($(TTT))) + +# ...and then we join a slice of it with the corresponding slice +# of the $(MANIFEST_LINE), starting at 3 and going to +# $(MANIFEST_SIZE). That's where all the real magic happens, +# right there! +# +# following that, we just splat elements one and two of +# $(MANIFEST_LINE) on the end, since they're the ones that are +# always there. Slap a semicolon on the end, and you've got a +# completed iteration through the foreach! Beaujolais! + +# FIXME: using -D may not be the right thing to do! +install-$(MANIFEST_FILE): + @echo " ==> Installing from $(MANIFEST_FILE)" + $(MANIFEST_ENV) ; $(foreach ZORCH,$(shell cat $(MANIFEST_FILE)), ginstall -Dc $(join $(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_FLAGS)),$(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_LINE))) $(word 1,$(MANIFEST_LINE)) $(word 2,$(MANIFEST_LINE)) ;) + @$(MAKECOOKIE) + +#################### DEPENDENCY RULES #################### + +# These two lines are here to grandfather in all the packages that use +# BUILDDEPS +IMGDEPS += build +build_DEPENDS = $(BUILDDEPS) + +# Standard deps install into the standard install dir. For the +# BBC, we set the includedir to the build tree and the libdir to +# the install tree. Most dependencies work this way. + +$(GARDIR)/%/$(COOKIEDIR)/install: + @echo ' ==> Building $* as a dependency' + @$(MAKE) -C $(GARDIR)/$* install DESTIMG=$(DESTIMG) + +# builddeps need to have everything put in the build DESTIMG +#$(GARDIR)/%/$(COOKIEROOTDIR)/build.d/install: +# @echo ' ==> Building $* as a build dependency' +# @$(MAKE) -C $(GARDIR)/$* install DESTIMG=build + +# Source Deps grab the source code for another package +# XXX: nobody uses this, but it should really be more like +# $(GARDIR)/%/cookies/patch: +srcdep-$(GARDIR)/%: + @echo ' ==> Grabbing source for $* as a dependency' + @$(MAKE) -C $(GARDIR)/$* patch-p extract-p > /dev/null 2>&1 || \ + $(MAKE) -C $(GARDIR)/$* patch + +# Image deps create dependencies on package installations in +# images other than the current package's DESTIMG. +IMGDEP_TARGETS = $(foreach TTT,$($*_DEPENDS),$(subst xyzzy,$(TTT),$(GARDIR)/xyzzy/$(COOKIEROOTDIR)/$*.d/install)) +imgdep-%: + @test -z "$(strip $(IMGDEP_TARGETS))" || $(MAKE) DESTIMG="$*" $(IMGDEP_TARGETS) + +# Igor's info and man gzipper rule +gzip-info-man: gzip-info gzip-man + +gzip-info: + gfind $(DESTDIR) -type f -iname *.info* -not -iname *.gz | \ + gxargs -r gzip --force + +gzip-man: + gfind $(DESTDIR) -type f -iname *.[1-8] -size +2 -print | \ + gxargs -r gzip --force + +compile-elisp: + @(for d in $(ELISP_DIRS); do \ + echo " ===> Compiling .el files in $$d"; \ + cd $(PKGROOT)/$$d; \ + for f in `find . -name "*el"`; do \ + bf=`basename $$f`; \ + bd=`dirname $$f`; \ + cd $$bd; \ + emacs -L $(PKGROOT)/$$d -L $(PKGROOT)/$$d/$$bd $(EXTRA_EMACS_ARGS) -batch -f batch-byte-compile "$$bf"; \ + cd $(PKGROOT)/$$d; \ + done; \ + done) + +include $(addprefix $(GARDIR)/,$(EXTRA_LIBS)) + +# Mmm, yesssss. cookies my preciousssss! Mmm, yes downloads it +# is! We mustn't have nasty little gmakeses deleting our +# precious cookieses now must we? +.PRECIOUS: $(DOWNLOADDIR)/% $(COOKIEDIR)/% $(FILEDIR)/% This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Nov 12 22:24:05 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 12 Nov 2010 21:24:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11593] csw/mgar/gar/v2-noexternals Message-ID: Revision: 11593 http://gar.svn.sourceforge.net/gar/?rev=11593&view=rev Author: skayser Date: 2010-11-12 21:24:05 +0000 (Fri, 12 Nov 2010) Log Message: ----------- gar/v2-noexternals: make GARDIR absolute, propagate GARDIR and MAKEFLAGS to remote build hosts Modified Paths: -------------- csw/mgar/gar/v2-noexternals/category.mk csw/mgar/gar/v2-noexternals/gar.mk csw/mgar/gar/v2-noexternals/gar.pkg.mk Modified: csw/mgar/gar/v2-noexternals/category.mk =================================================================== --- csw/mgar/gar/v2-noexternals/category.mk 2010-11-12 18:17:13 UTC (rev 11592) +++ csw/mgar/gar/v2-noexternals/category.mk 2010-11-12 21:24:05 UTC (rev 11593) @@ -2,7 +2,12 @@ # This makefile is to be included from Makefiles in each category # directory. -GARDIR ?= gar/ +# This is needed by the pkg build approach with gar/ in each pkg build +# directory and is overriden by the "mgar" wrapper which pre-sets GARDIR +# with an absolute path. If we could determine the full path of +# _this_ file's directory, we could use it for both approaches and +# there would be no need to pre-set it for "mgar". +GARDIR ?= $(CURDIR)/gar ifeq (,$(wildcard $(GARDIR)/categories/$(CATEGORIES)/category.mk)) $(error The category '$(CATEGORIES)' is invalid. Valid categories are: $(patsubst $(GARDIR)/categories/%,%,$(wildcard $(GARDIR)/categories/*))) Modified: csw/mgar/gar/v2-noexternals/gar.mk =================================================================== --- csw/mgar/gar/v2-noexternals/gar.mk 2010-11-12 18:17:13 UTC (rev 11592) +++ csw/mgar/gar/v2-noexternals/gar.mk 2010-11-12 21:24:05 UTC (rev 11593) @@ -24,6 +24,7 @@ $(error Your version of 'make' is too old: $(MAKE_VERSION). Please make sure you are using at least 3.81) endif +# Still required? GARDIR should be pre-set by the top-level category.mk GARDIR ?= gar GARBIN = $(GARDIR)/bin @@ -135,7 +136,7 @@ merge-$(2): @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]" $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ - $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ + $(SSH) $$(BUILDHOST) "PATH=$$(PATH) GARDIR=$(GARDIR) MAKEFLAGS=\"$(MAKEFLAGS)\" $(MAKE) -C $$(CURDIR) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ $(MAKE) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ ) @# The next line has intentionally been left blank to explicitly terminate this make rule Modified: csw/mgar/gar/v2-noexternals/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-noexternals/gar.pkg.mk 2010-11-12 18:17:13 UTC (rev 11592) +++ csw/mgar/gar/v2-noexternals/gar.pkg.mk 2010-11-12 21:24:05 UTC (rev 11593) @@ -247,7 +247,7 @@ endif # Where we find our mkpackage global templates -PKGLIB = $(CURDIR)/$(GARDIR)/pkglib +PKGLIB = $(GARDIR)/pkglib PKG_EXPORTS = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN PKG_EXPORTS += CURDIR WORKDIR WORKDIR_FIRSTMOD WORKSRC WORKSRC_FIRSTMOD PKGROOT @@ -866,7 +866,7 @@ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) GAR_PLATFORM=$P _package && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P _package" && \ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin GARDIR=$(GARDIR) MAKEFLAGS=\"$(MAKEFLAGS)\" $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ @@ -881,7 +881,7 @@ echo " (built on this host)";\ $(MAKE) -s GAR_PLATFORM=$P _pkgshow;echo;,\ echo " (built on host '$(PACKAGING_HOST_$P)')";\ - $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) -s GAR_PLATFORM=$P _pkgshow";echo;\ + $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin GARDIR=$(GARDIR) MAKEFLAGS=\"$(MAKEFLAGS)\" $(MAKE) -C $(CURDIR) -s GAR_PLATFORM=$P _pkgshow";echo;\ )\ ) @$(MAKECOOKIE) @@ -892,7 +892,7 @@ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) -s GAR_PLATFORM=$P $* && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P $*" && \ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin GARDIR=$(GARDIR) MAKEFLAGS=\"$(MAKEFLAGS)\" $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P $*" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ 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 Nov 13 13:10:59 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Nov 2010 12:10:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11594] csw/mgar/pkg Message-ID: Revision: 11594 http://gar.svn.sourceforge.net/gar/?rev=11594&view=rev Author: rthurner Date: 2010-11-13 12:10:59 +0000 (Sat, 13 Nov 2010) Log Message: ----------- maven: update to maven3 in a new package Added Paths: ----------- csw/mgar/pkg/maven3/ csw/mgar/pkg/maven3/branches/ csw/mgar/pkg/maven3/tags/ csw/mgar/pkg/maven3/trunk/ csw/mgar/pkg/maven3/trunk/Makefile csw/mgar/pkg/maven3/trunk/checksums csw/mgar/pkg/maven3/trunk/files/ Property changes on: csw/mgar/pkg/maven3/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/maven3/trunk/Makefile =================================================================== --- csw/mgar/pkg/maven3/trunk/Makefile (rev 0) +++ csw/mgar/pkg/maven3/trunk/Makefile 2010-11-13 12:10:59 UTC (rev 11594) @@ -0,0 +1,45 @@ +GARNAME = maven3 +GARVERSION = 3.0 +CATEGORIES = devel +GARCH = all + +DESCRIPTION = Java software project management and comprehension tool +define BLURB +Maven is a software project management and comprehension tool. Based on +the concept of a project object model (POM), Maven can manage a +project's build, reporting and documentation from a central +piece of information. + +Maven's primary goal is to allow a developer to comprehend the complete +state of a development effort in the shortest period of time. In order +to attain this goal there are several areas of conce rn that Maven +attempts to deal with: + + * Making the build process easy + * Providing a uniform build system + * Providing quality project information + * Providing guidelines for best practices development + * Allowing transparent migration to new features +endef + +MASTER_SITES = http://www.powertech.no/apache/dist/maven/binaries/ +DISTFILES = apache-maven-$(GARVERSION)-bin.tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = apache-maven-(\d+(?:\.\d+)*)-bin.tar.gz + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = common + +include gar/category.mk + +install-common: + mkdir -p $(DESTDIR)/opt/csw/bin + rm -rf $(DESTDIR)/opt/csw/share/maven3 + mkdir -p $(DESTDIR)/opt/csw/share/maven3 + cp -r $(WORKDIR)/apache-maven-$(GARVERSION)/ $(DESTDIR)/opt/csw/share/maven3/home + cp $(WORKDIR)/bin-mvn $(DESTDIR)/opt/csw/bin/mvn + chmod +x $(DESTDIR)/opt/csw/bin/mvn + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/maven3/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/maven3/trunk/checksums =================================================================== --- csw/mgar/pkg/maven3/trunk/checksums (rev 0) +++ csw/mgar/pkg/maven3/trunk/checksums 2010-11-13 12:10:59 UTC (rev 11594) @@ -0,0 +1 @@ +505560ca377b990a965c4e4f8da42daa apache-maven-3.0-bin.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Nov 13 13:29:17 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Nov 2010 12:29:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11595] csw/mgar/pkg/mediawiki/trunk Message-ID: Revision: 11595 http://gar.svn.sourceforge.net/gar/?rev=11595&view=rev Author: rthurner Date: 2010-11-13 12:29:17 +0000 (Sat, 13 Nov 2010) Log Message: ----------- mediawiki: update to 1.16.0 Modified Paths: -------------- csw/mgar/pkg/mediawiki/trunk/Makefile csw/mgar/pkg/mediawiki/trunk/checksums Modified: csw/mgar/pkg/mediawiki/trunk/Makefile =================================================================== --- csw/mgar/pkg/mediawiki/trunk/Makefile 2010-11-13 12:10:59 UTC (rev 11594) +++ csw/mgar/pkg/mediawiki/trunk/Makefile 2010-11-13 12:29:17 UTC (rev 11595) @@ -1,5 +1,5 @@ GARNAME = mediawiki -GARVERSION = 1.14.0 +GARVERSION = 1.16.0 CATEGORIES = apps RELVER = $(shell echo $(GARVERSION) |gsed 's/\(^[0-9].*\)\.[0-9]*/\1/') DESCRIPTION = A free software wiki package written in PHP @@ -10,7 +10,7 @@ by many other wikis, including this website, the home of MediaWiki. endef -MASTER_SITES = http://download.wikimedia.org/mediawiki/$(RELVER)/ +MASTER_SITES = http://noc.wikimedia.org/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWmediawiki.postinstall CSWmediawiki.preremove DISTFILES += httpd-mediawiki.conf.CSW README.CSW Modified: csw/mgar/pkg/mediawiki/trunk/checksums =================================================================== --- csw/mgar/pkg/mediawiki/trunk/checksums 2010-11-13 12:10:59 UTC (rev 11594) +++ csw/mgar/pkg/mediawiki/trunk/checksums 2010-11-13 12:29:17 UTC (rev 11595) @@ -1,5 +1 @@ -33cd390e3999854f72a74c4130868326 download/CSWmediawiki.postinstall -d10e35018669fe5531aac76f506110de download/CSWmediawiki.preremove -c0c26fcbbe8f69b3e8c139dcc24e6e5a download/README.CSW -205416295b92698424d1d16cc0cde93a download/httpd-mediawiki.conf.CSW -36bfd924e92b61a6f5fe70c6bc8e5aac download/mediawiki-1.14.0.tar.gz +ddcc4483d34c89c2e61fafb8b97b7890 mediawiki-1.16.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Nov 13 13:39:42 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Nov 2010 12:39:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11596] csw/mgar/pkg/mediawiki/trunk/Makefile Message-ID: Revision: 11596 http://gar.svn.sourceforge.net/gar/?rev=11596&view=rev Author: rthurner Date: 2010-11-13 12:39:42 +0000 (Sat, 13 Nov 2010) Log Message: ----------- mediawiki: update checkpkg Modified Paths: -------------- csw/mgar/pkg/mediawiki/trunk/Makefile Modified: csw/mgar/pkg/mediawiki/trunk/Makefile =================================================================== --- csw/mgar/pkg/mediawiki/trunk/Makefile 2010-11-13 12:29:17 UTC (rev 11595) +++ csw/mgar/pkg/mediawiki/trunk/Makefile 2010-11-13 12:39:42 UTC (rev 11596) @@ -21,7 +21,10 @@ CATALOGNAME_CSWmediawiki = mediawiki SPKG_DESC_CSWmediawiki = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWmediawiki = CSWphp5 CSWapache2c +RUNTIME_DEP_PKGS_CSWmediawiki = CSWphp5 +CHECKPKG_OVERRIDES_CSWmediawiki += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWmediawiki += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWmediawiki += missing-dependency|CSWperl # We define upstream file regex so we can be notifed of # new upstream software release 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 Nov 13 13:42:55 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Nov 2010 12:42:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[11597] csw/mgar/pkg/php5/trunk Message-ID: Revision: 11597 http://gar.svn.sourceforge.net/gar/?rev=11597&view=rev Author: rthurner Date: 2010-11-13 12:42:55 +0000 (Sat, 13 Nov 2010) Log Message: ----------- php5: upgrade to php-5.3.3, comment some inclusions to make it build with gmake makesums Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2010-11-13 12:39:42 UTC (rev 11596) +++ csw/mgar/pkg/php5/trunk/Makefile 2010-11-13 12:42:55 UTC (rev 11597) @@ -1,5 +1,5 @@ GARNAME = php5 -GARVERSION = 5.2.11 +GARVERSION = 5.3.3 CATEGORIES = lang SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g') DISTNAME = $(SF_PROJ)-$(GARVERSION) @@ -61,7 +61,7 @@ # PHP Extensions EXTDIRLIST = $(shell ls -d extensions/*) -include $(foreach X,$(EXTDIRLIST),$(X)/Makefile) +#include $(foreach X,$(EXTDIRLIST),$(X)/Makefile) EXTRA_CFLAGS = -I$(prefix)/include/ncursesw Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2010-11-13 12:39:42 UTC (rev 11596) +++ csw/mgar/pkg/php5/trunk/checksums 2010-11-13 12:42:55 UTC (rev 11597) @@ -1,17 +1 @@ -632cb357e102e18e04bb5666825a912f CSWap2modphp5.postinstall -e1381a4ba49e46b2097b76286a1b36fb CSWap2modphp5.preremove -0dd379f20ceb32fc77bb3a9bf045097f CSWap2modphp5.space -5f0046fe1b3f8e2228fdb165bdbbe73a CSWmodphp5.postinstall -2e5dbed2c9dd5e24c331753984946822 CSWmodphp5.preremove -0dd379f20ceb32fc77bb3a9bf045097f CSWmodphp5.space -98c6458b20eca91982b67c80a0554586 CSWphp5.postinstall -91060cc7c31aa917d88cd537d3d5bb42 configure.diff -a71677d80f5cfd1aeb03547dfdeb705a httpd-php5.conf.CSW -2206431e47c2075c0b9c4a12de5cf791 odbc.diff -230126f76ee6400ccf225bb6a8243532 pdopgsql.diff -d4c93751890b989c5a7b04acb5845fd9 pear.conf.CSW -13db46097c9686302bebf160e2d26ed2 pgsql.diff -286bf34630f5643c25ebcedfec5e0a09 php-5.2.11.tar.bz2 -a450a46ce0ea9fd0c0abe432e750a873 php-bug-45557-fix.diff -670b8fbf4cf9105d72f22dbf4b1e29cd php.ini.CSW -6251f3adcefc6ffa61d6339ac6b2d1eb phpext +21ceeeb232813c10283a5ca1b4c87b48 php-5.3.3.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 Nov 13 14:07:56 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Nov 2010 13:07:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[11598] csw/mgar/pkg Message-ID: Revision: 11598 http://gar.svn.sourceforge.net/gar/?rev=11598&view=rev Author: rthurner Date: 2010-11-13 13:07:55 +0000 (Sat, 13 Nov 2010) Log Message: ----------- tomcat: upgrade to tomcat7 by copying tomcat6 Added Paths: ----------- csw/mgar/pkg/tomcat7/ csw/mgar/pkg/tomcat7/branches/ csw/mgar/pkg/tomcat7/tags/ csw/mgar/pkg/tomcat7/trunk/ csw/mgar/pkg/tomcat7/trunk/Makefile csw/mgar/pkg/tomcat7/trunk/checksums csw/mgar/pkg/tomcat7/trunk/files/ csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.depend csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.gspec csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.prototype csw/mgar/pkg/tomcat7/trunk/files/checkinstall csw/mgar/pkg/tomcat7/trunk/files/cswtomcat7 csw/mgar/pkg/tomcat7/trunk/files/i.smfno csw/mgar/pkg/tomcat7/trunk/files/i.smfyes csw/mgar/pkg/tomcat7/trunk/files/postinstall csw/mgar/pkg/tomcat7/trunk/files/preinstall csw/mgar/pkg/tomcat7/trunk/files/preremove csw/mgar/pkg/tomcat7/trunk/files/space csw/mgar/pkg/tomcat7/trunk/files/svc-tomcat7 csw/mgar/pkg/tomcat7/trunk/files/tomcat7 csw/mgar/pkg/tomcat7/trunk/files/tomcat7.xml Property changes on: csw/mgar/pkg/tomcat7/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/tomcat7/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat7/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/Makefile 2010-11-13 13:07:55 UTC (rev 11598) @@ -0,0 +1,76 @@ +GARNAME = apache-tomcat7 +GARVERSION = 7.0.4 +CATEGORIES = server + +DESCRIPTION = Apache Jakarta Tomcat 7 Servlet/JSP Container +define BLURB +Apache Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed by Sun under the Java Community Process. +endef + +UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-7/ +MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-7/v$(GARVERSION)/bin/ +DISTFILES = apache-tomcat-$(GARVERSION).tar.gz +PKGDIST = apache-tomcat-$(GARVERSION).tar.gz +DISTFILES += CSWtomcat7.gspec CSWtomcat7.prototype CSWtomcat7.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-tomcat7 tomcat7.xml tomcat7 cswtomcat7 +LICENSE = LICENSE + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = v(\d+(?:\.\d+)*) + +#ARCHALL_CSWapache-tomcat7 = 1 + +CONFIGURE_SCRIPTS = none +BUILD_SCRIPTS = none +TEST_SCRIPTS = none +INSTALL_SCRIPTS = tomcat +prefix = / + +include gar/category.mk + +configure-none: + @$(MAKECOOKIE) + +test-none: + @$(MAKECOOKIE) + +build-none: + @$(MAKECOOKIE) + +post-extract: + ( mv $(WORKDIR)/apache-tomcat-$(GARVERSION) $(WORKDIR)/$(DISTNAME) ) + ( OLDDIR=`pwd` && cd $(WORKDIR)/$(DISTNAME)/conf && for i in `find . -type f` ; do mv $$i $$i.CSW ; done && cd $$OLDDIR ) + ( for i in temp work logs conf ; do find $(WORKDIR)/$(DISTNAME)/$$i -type d -exec chmod 0750 {} \; ; find $(WORKDIR)/$(DISTNAME)/$$i -type f -exec chmod 0640 {} \; ; done ) + @$(MAKECOOKIE) + +install-tomcat: + ( mkdir -p $(DESTDIR)/etc/init.d ) + ( mkdir -p $(DESTDIR)/etc/opt/csw ) + ( mkdir -p $(DESTDIR)/etc/rc0.d ) + ( mkdir -p $(DESTDIR)/etc/rc1.d ) + ( mkdir -p $(DESTDIR)/etc/rc2.d ) + ( mkdir -p $(DESTDIR)/etc/rc3.d ) + ( mkdir -p $(DESTDIR)/etc/rcS.d ) + ( mkdir -p $(DESTDIR)/opt/csw/etc/$(GARNAME) ) + ( mkdir -p $(DESTDIR)/var/opt/csw/$(GARNAME) ) + ( mkdir -p $(DESTDIR)/opt/csw/share ) + ( mkdir -p $(DESTDIR)/etc/opt/csw ) + ( cp -fr $(WORKDIR)/$(DISTNAME) $(DESTDIR)/opt/csw/share/$(GARNAME) ) + ( cp -fr $(FILEDIR)/$(GARNAME) $(DESTDIR)/etc/opt/csw/$(GARNAME) ) + ( cp -fr $(FILEDIR)/csw$(GARNAME) $(DESTDIR)/etc/init.d ) + ( mv $(DESTDIR)/opt/csw/share/$(GARNAME)/conf $(DESTDIR)/opt/csw/etc/$(GARNAME)/conf ) + ( mv $(DESTDIR)/opt/csw/share/$(GARNAME)/logs $(DESTDIR)/var/opt/csw/$(GARNAME) ) + ( mv $(DESTDIR)/opt/csw/share/$(GARNAME)/work $(DESTDIR)/var/opt/csw/$(GARNAME) ) + ( mv $(DESTDIR)/opt/csw/share/$(GARNAME)/temp $(DESTDIR)/var/opt/csw/$(GARNAME) ) + ( ln -s /opt/csw/etc/$(GARNAME)/conf $(DESTDIR)/opt/csw/share/$(GARNAME)/conf ) + ( ln -s /var/opt/csw/$(GARNAME)/logs $(DESTDIR)/opt/csw/share/$(GARNAME)/logs ) + ( ln -s /var/opt/csw/$(GARNAME)/work $(DESTDIR)/opt/csw/share/$(GARNAME)/work ) + ( ln -s /var/opt/csw/$(GARNAME)/temp $(DESTDIR)/opt/csw/share/$(GARNAME)/temp ) + ( ln -s /etc/init.d/cswtomcat7 $(DESTDIR)/etc/rc0.d/K17$(GARNAME) ) + ( ln -s /etc/init.d/cswtomcat7 $(DESTDIR)/etc/rc1.d/K17$(GARNAME) ) + ( ln -s /etc/init.d/cswtomcat7 $(DESTDIR)/etc/rc2.d/K17$(GARNAME) ) + ( ln -s /etc/init.d/cswtomcat7 $(DESTDIR)/etc/rc3.d/S51$(GARNAME) ) + ( ln -s /etc/init.d/cswtomcat7 $(DESTDIR)/etc/rcS.d/K17$(GARNAME) ) + @$(MAKECOOKIE) + + + Property changes on: csw/mgar/pkg/tomcat7/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tomcat7/trunk/checksums =================================================================== Added: csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.depend =================================================================== Added: csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.gspec =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.gspec (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.gspec 2010-11-13 13:07:55 UTC (rev 11598) @@ -0,0 +1,5 @@ +%var bitname tomcat6 +%var pkgname CSWtomcat6 +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE Added: csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.prototype =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.prototype (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/files/CSWtomcat7.prototype 2010-11-13 13:07:55 UTC (rev 11598) @@ -0,0 +1,702 @@ +l smfno /etc/rc0.d/K17cswtomcat6=/etc/init.d/cswtomcat6 +l smfno /etc/rc1.d/K17cswtomcat6=/etc/init.d/cswtomcat6 +l smfno /etc/rc2.d/K17cswtomcat6=/etc/init.d/cswtomcat6 +l smfno /etc/rc3.d/S51cswtomcat6=/etc/init.d/cswtomcat6 +l smfno /etc/rcS.d/K17cswtomcat6=/etc/init.d/cswtomcat6 +d smfyes /opt/csw/var/svc 0755 root bin +d smfyes /opt/csw/var/svc/manifest 0755 root bin +d smfyes /opt/csw/var/svc/manifest/network 0755 root bin +f smfyes /opt/csw/var/svc/manifest/network/tomcat6.xml=tomcat6.xml 0644 root bin +d smfyes /opt/csw/lib/svc 0755 root bin +d smfyes /opt/csw/lib/svc/method 0755 root bin +f smfyes /opt/csw/lib/svc/method/svc-tomcat6=svc-tomcat6 0755 root bin +f none /etc/init.d/cswtomcat6 0755 root bin +f none /etc/opt/csw/tomcat6 0644 root bin +s none /etc/rc0.d/K17tomcat6=/etc/init.d/cswtomcat6 +s none /etc/rc1.d/K17tomcat6=/etc/init.d/cswtomcat6 +s none /etc/rc2.d/K17tomcat6=/etc/init.d/cswtomcat6 +s none /etc/rc3.d/S51tomcat6=/etc/init.d/cswtomcat6 +s none /etc/rcS.d/K17tomcat6=/etc/init.d/cswtomcat6 +d none /opt/csw/etc/tomcat6 0755 root bin +d none /opt/csw/etc/tomcat6/conf 0755 tomcat tomcat +f none /opt/csw/etc/tomcat6/conf/catalina.policy.CSW 0640 tomcat tomcat +f none /opt/csw/etc/tomcat6/conf/catalina.properties.CSW 0640 tomcat tomcat +f none /opt/csw/etc/tomcat6/conf/context.xml.CSW 0640 tomcat tomcat +f none /opt/csw/etc/tomcat6/conf/logging.properties.CSW 0640 tomcat tomcat +f none /opt/csw/etc/tomcat6/conf/server.xml.CSW 0640 tomcat tomcat +f none /opt/csw/etc/tomcat6/conf/tomcat-users.xml.CSW 0640 tomcat tomcat +f none /opt/csw/etc/tomcat6/conf/web.xml.CSW 0640 tomcat tomcat +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/tomcat6 0755 root bin +f none /opt/csw/share/tomcat6/LICENSE 0644 root bin +f none /opt/csw/share/tomcat6/NOTICE 0644 root bin +f none /opt/csw/share/tomcat6/RELEASE-NOTES 0644 root bin +f none /opt/csw/share/tomcat6/RUNNING.txt 0644 root bin +d none /opt/csw/share/tomcat6/bin 0755 root bin +f none /opt/csw/share/tomcat6/bin/bootstrap.jar 0644 root bin +f none /opt/csw/share/tomcat6/bin/catalina-tasks.xml 0644 root bin +f none /opt/csw/share/tomcat6/bin/catalina.bat 0644 root bin +f none /opt/csw/share/tomcat6/bin/catalina.sh 0755 root bin +f none /opt/csw/share/tomcat6/bin/commons-daemon.jar 0644 root bin +f none /opt/csw/share/tomcat6/bin/cpappend.bat 0644 root bin +f none /opt/csw/share/tomcat6/bin/digest.bat 0644 root bin +f none /opt/csw/share/tomcat6/bin/digest.sh 0755 root bin +f none /opt/csw/share/tomcat6/bin/jsvc.tar.gz 0644 root bin +f none /opt/csw/share/tomcat6/bin/service.bat 0644 root bin +f none /opt/csw/share/tomcat6/bin/setclasspath.bat 0644 root bin +f none /opt/csw/share/tomcat6/bin/setclasspath.sh 0755 root bin +f none /opt/csw/share/tomcat6/bin/shutdown.bat 0644 root bin +f none /opt/csw/share/tomcat6/bin/shutdown.sh 0755 root bin +f none /opt/csw/share/tomcat6/bin/startup.bat 0644 root bin +f none /opt/csw/share/tomcat6/bin/startup.sh 0755 root bin +f none /opt/csw/share/tomcat6/bin/tomcat-juli.jar 0644 root bin +f none /opt/csw/share/tomcat6/bin/tomcat-native.tar.gz 0644 root bin +f none /opt/csw/share/tomcat6/bin/tomcat6.exe 0644 root bin +f none /opt/csw/share/tomcat6/bin/tomcat6w.exe 0644 root bin +f none /opt/csw/share/tomcat6/bin/tool-wrapper.bat 0644 root bin +f none /opt/csw/share/tomcat6/bin/tool-wrapper.sh 0755 root bin +f none /opt/csw/share/tomcat6/bin/version.bat 0644 root bin +f none /opt/csw/share/tomcat6/bin/version.sh 0755 root bin +s none /opt/csw/share/tomcat6/conf=/opt/csw/etc/tomcat6/conf +d none /opt/csw/share/tomcat6/lib 0755 root bin +f none /opt/csw/share/tomcat6/lib/annotations-api.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/catalina-ant.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/catalina-ha.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/catalina-tribes.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/catalina.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/el-api.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/jasper-el.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/jasper-jdt.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/jasper.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/jsp-api.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/servlet-api.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/tomcat-coyote.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/tomcat-dbcp.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/tomcat-i18n-es.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/tomcat-i18n-fr.jar 0644 root bin +f none /opt/csw/share/tomcat6/lib/tomcat-i18n-ja.jar 0644 root bin +s none /opt/csw/share/tomcat6/logs=/var/opt/csw/tomcat6/logs +s none /opt/csw/share/tomcat6/temp=/var/opt/csw/tomcat6/temp +d none /opt/csw/share/tomcat6/webapps 0755 root bin +d none /opt/csw/share/tomcat6/webapps/ROOT 0755 root bin +f none /opt/csw/share/tomcat6/webapps/ROOT/RELEASE-NOTES.txt 0644 root bin +d none /opt/csw/share/tomcat6/webapps/ROOT/WEB-INF 0755 root bin +f none /opt/csw/share/tomcat6/webapps/ROOT/WEB-INF/web.xml 0644 root bin +f none /opt/csw/share/tomcat6/webapps/ROOT/asf-logo-wide.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/ROOT/build.xml 0644 root bin +f none /opt/csw/share/tomcat6/webapps/ROOT/favicon.ico 0644 root bin +f none /opt/csw/share/tomcat6/webapps/ROOT/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/ROOT/index.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/ROOT/tomcat-power.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/ROOT/tomcat.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/ROOT/tomcat.svg 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/BUILDING.txt 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/NOTICE 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/RELEASE-NOTES.txt 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/RUNNING.txt 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/WEB-INF 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/WEB-INF/web.xml 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/aio.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/api 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/api/index.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/appdev 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/build.xml.txt 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/deployment.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/installation.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/introduction.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/appdev/printer 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/deployment.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/docs 0755 root bin +d none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/docs/appdev 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/docs/appdev/build.xml.txt 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/docs/appdev/web.xml.txt 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/installation.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/introduction.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/processes.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/printer/source.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/processes.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/build.xml 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/docs 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/docs/README.txt 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/sample.war 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/src 0755 root bin +d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/src/mypackage 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/src/mypackage/Hello.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web 0755 root bin +d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web/WEB-INF 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web/WEB-INF/web.xml 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web/hello.jsp 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web/images 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web/images/tomcat.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/sample/web/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/source.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/appdev/web.xml.txt 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/apr.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/architecture 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/architecture/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/architecture/overview.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/architecture/printer 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/architecture/printer/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/architecture/printer/overview.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/architecture/printer/requestProcess.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/architecture/printer/startup.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/architecture/requestProcess 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/architecture/requestProcess.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/architecture/requestProcess/requestProcess.pdf 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/architecture/requestProcess/roseModel.mdl 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/architecture/startup 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/architecture/startup.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/architecture/startup/serverStartup.pdf 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/architecture/startup/serverStartup.txt 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/balancer-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/building.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/cgi-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/changelog.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/class-loader-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/cluster-howto.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/config 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/ajp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-channel.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-deployer.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-interceptor.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-listener.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-manager.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-membership.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-receiver.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-sender.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/cluster-valve.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/cluster.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/context.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/engine.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/executor.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/globalresources.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/host.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/http.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/loader.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/manager.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/config/printer 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/ajp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-channel.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-deployer.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-interceptor.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-listener.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-manager.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-membership.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-receiver.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-sender.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster-valve.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/cluster.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/context.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/engine.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/executor.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/globalresources.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/host.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/http.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/loader.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/manager.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/realm.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/resources.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/server.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/service.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/systemprops.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/printer/valve.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/realm.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/resources.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/server.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/service.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/systemprops.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/config/valve.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/connectors.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/default-servlet.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/deployer-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/developers.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/extras.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/funcspecs 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-admin-apps.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-admin-objects.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-admin-opers.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-default.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-invoker.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-jdbc-realm.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-jndi-realm.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/fs-memory-realm.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/mbean-names.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-admin-apps.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-admin-objects.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-admin-opers.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-default.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-invoker.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-jdbc-realm.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-jndi-realm.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/fs-memory-realm.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/funcspecs/printer/mbean-names.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/html-manager-howto.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/images 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/images/add.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/images/asf-logo.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/images/code.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/images/design.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/images/docs.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/images/fix.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/images/printer.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/images/tomcat.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/images/tomcat.svg 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/images/update.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/images/void.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/introduction.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/jasper-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/jndi-datasource-examples-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/jndi-resources-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/logging.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/manager-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/maven-jars.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/mbeans-descriptor-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/monitoring.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/printer 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/BUILDING.txt 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/NOTICE 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/RUNNING.txt 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/aio.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/apr.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/balancer-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/building.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/cgi-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/changelog.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/class-loader-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/cluster-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/connectors.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/default-servlet.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/deployer-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/developers.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/extras.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/html-manager-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/introduction.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/jasper-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/jndi-datasource-examples-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/jndi-resources-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/logging.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/manager-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/maven-jars.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/mbeans-descriptor-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/monitoring.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/proxy-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/realm-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/security-manager-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/setup.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/ssi-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/ssl-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/virtual-hosting-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/printer/windows-service-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/proxy-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/realm-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/security-manager-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/setup.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/ssi-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/ssl-howto.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/docs/tribes 0755 root bin +f none /opt/csw/share/tomcat6/webapps/docs/tribes/faq.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/tribes/introduction.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/tribes/setup.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/virtual-hosting-howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/docs/windows-service-howto.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples 0755 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF 0755 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/CookieExample.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/CookieExample.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings.properties 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_en.properties 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_es.properties 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/SessionExample.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/SessionExample.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/Entries.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/Entries.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/Entry.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/Entry.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/JspCalendar.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/JspCalendar.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/TableBean.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/cal/TableBean.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/chat 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet$MessageSender.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/checkbox 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/colors 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/dates 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/dates/JspCalendar.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/dates/JspCalendar.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/error 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/error/Smart.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/error/Smart.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTag.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTag.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/LogTag.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/LogTag.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2 0755 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/listeners 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/num 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/servletToJsp.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/servletToJsp.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/sessions 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/util 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/util/HTMLFilter.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/util/HTMLFilter.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/validators 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.java 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp 0755 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp/applet 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp/applet/Clock2.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp/debug-taglib.tld 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp/example-taglib.tld 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp2 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/lib 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/lib/jstl.jar 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/lib/standard.jar 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/tags 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/tags/displayProducts.tag 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/tags/helloWorld.tag 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/tags/panel.tag 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/tags/xhtmlbasic.tag 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/WEB-INF/web.xml 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/index.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp 0755 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/cal 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/Entries.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/Entry.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/JspCalendar.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/TableBean.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/cal1.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/cal1.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/cal2.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/cal2.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/calendar.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/cal/login.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/chat 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/chat/chat.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/chat/chat.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/chat/login.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/chat/login.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/chat/post.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/chat/post.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/checkbox 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/checkbox/CheckTest.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/checkbox/check.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/checkbox/checkresult.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/checkbox/checkresult.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/checkbox/cresult.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/colors 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/colors/ColorGameBean.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/colors/clr.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/colors/colors.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/colors/colrs.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/colors/colrs.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/dates 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/dates/date.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/dates/date.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/dates/date.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/error 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/error/er.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/error/err.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/error/err.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/error/error.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/error/errorpge.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/error/errorpge.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/forward 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/forward/forward.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/forward/forward.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/forward/fwd.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/forward/one.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/forward/one.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/forward/two.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/images 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/images/code.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/images/execute.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/images/read.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/images/return.gif 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/include 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/include/foo.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/include/foo.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/include/foo.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/include/inc.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/include/include.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/include/include.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/index.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2 0755 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/Functions.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/functions.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/functions.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/functions.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/FooBean.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/HelloWorldSimpleTag.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/ShuffleSimpleTag.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/TileSimpleTag.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.jspx 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.jspx.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/svgexample.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jpg 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jspx 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jspx.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/EchoAttributesTag.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/coda.jspf 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/coda.jspf.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/config.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/config.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/config.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/prelude.jspf 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/misc/prelude.jspf.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/BookBean.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/FindBookSimpleTag.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/Functions.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/HelloWorldSimpleTag.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/RepeatSimpleTag.java.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/displayProducts.tag.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/helloWorld.tag.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.tag.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsp2/tagfiles/xhtmlbasic.tag.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv/hello.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv/hello.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv/jts.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/jsptoserv/servletToJsp.java.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/num 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/num/numguess.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/num/numguess.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/num/numguess.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin 0755 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin/applet 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin/applet/Clock2.class 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin/applet/Clock2.java 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin/plugin.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin/plugin.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/plugin/plugin.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/security 0755 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected/error.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected/error.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected/index.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected/index.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected/login.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/security/protected/login.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/sessions 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/sessions/DummyCart.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/sessions/carts.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/sessions/carts.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/sessions/carts.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/sessions/crt.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/simpletag 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/simpletag/foo.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/simpletag/foo.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/simpletag/foo.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/snp 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/snp/snoop.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/snp/snoop.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/snp/snoop.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/source.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/source.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/choose.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/choose.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/choose.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/foreach.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/foreach.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/foreach.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/howto.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/if.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/if.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/if.jsp.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/tagplugin/notes.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/jsp/xml 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/xml/xml.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/xml/xml.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/jsp/xml/xml.jsp.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/servlets 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/servlets/cookies.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/servlets/helloworld.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/examples/servlets/images 0755 root bin +f none /opt/csw/share/tomcat6/webapps/examples/servlets/images/code.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/servlets/images/execute.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/servlets/images/return.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/servlets/index.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/servlets/reqheaders.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/servlets/reqinfo.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/servlets/reqparams.html 0644 root bin +f none /opt/csw/share/tomcat6/webapps/examples/servlets/sessions.html 0644 root bin +d none /opt/csw/share/tomcat6/webapps/host-manager 0755 root bin +d none /opt/csw/share/tomcat6/webapps/host-manager/META-INF 0755 root bin +f none /opt/csw/share/tomcat6/webapps/host-manager/META-INF/context.xml 0644 root bin +d none /opt/csw/share/tomcat6/webapps/host-manager/WEB-INF 0755 root bin +f none /opt/csw/share/tomcat6/webapps/host-manager/WEB-INF/web.xml 0644 root bin +d none /opt/csw/share/tomcat6/webapps/host-manager/images 0755 root bin +f none /opt/csw/share/tomcat6/webapps/host-manager/images/add.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/host-manager/images/asf-logo.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/host-manager/images/code.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/host-manager/images/design.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/host-manager/images/docs.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/host-manager/images/fix.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/host-manager/images/tomcat.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/host-manager/images/update.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/host-manager/images/void.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/host-manager/manager.xml 0644 root bin +d none /opt/csw/share/tomcat6/webapps/manager 0755 root bin +f none /opt/csw/share/tomcat6/webapps/manager/401.jsp 0644 root bin +d none /opt/csw/share/tomcat6/webapps/manager/META-INF 0755 root bin +f none /opt/csw/share/tomcat6/webapps/manager/META-INF/context.xml 0644 root bin +d none /opt/csw/share/tomcat6/webapps/manager/WEB-INF 0755 root bin +f none /opt/csw/share/tomcat6/webapps/manager/WEB-INF/web.xml 0644 root bin +d none /opt/csw/share/tomcat6/webapps/manager/images 0755 root bin +f none /opt/csw/share/tomcat6/webapps/manager/images/add.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/manager/images/asf-logo.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/manager/images/code.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/manager/images/design.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/manager/images/docs.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/manager/images/fix.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/manager/images/tomcat.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/manager/images/update.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/manager/images/void.gif 0644 root bin +f none /opt/csw/share/tomcat6/webapps/manager/sessionDetail.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/manager/sessionsList.jsp 0644 root bin +f none /opt/csw/share/tomcat6/webapps/manager/status.xsd 0644 root bin +f none /opt/csw/share/tomcat6/webapps/manager/xform.xsl 0644 root bin +s none /opt/csw/share/tomcat6/work=/var/opt/csw/tomcat6/work +d none /var/opt/csw/tomcat6 0755 root bin +d none /var/opt/csw/tomcat6/logs 0755 tomcat tomcat +d none /var/opt/csw/tomcat6/temp 0755 tomcat tomcat +d none /var/opt/csw/tomcat6/work 0755 tomcat tomcat +i copyright=CSWtomcat6.copyright +i depend=CSWtomcat6.depend +i pkginfo=CSWtomcat6.pkginfo +i checkinstall +i preremove +i postinstall +i preinstall +i i.smfno +i i.smfyes +i space Added: csw/mgar/pkg/tomcat7/trunk/files/checkinstall =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/checkinstall (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/files/checkinstall 2010-11-13 13:07:55 UTC (rev 11598) @@ -0,0 +1,21 @@ +# tomcat6 - checkinstall script +# +trap `exit 3` 15 + +# Assign Solaris release class to install release specific files +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi +if [ $smf = yes ] +then + CLASSES='none smfyes' +else + CLASSES='none smfno' +fi + +# Make env variables available to other packaging scripts + +cat >$1 <." +while read src dest +do + # Do copy + /usr/bin/cp $src $dest || exit 2 + echo $dest +done +exit 0 Added: csw/mgar/pkg/tomcat7/trunk/files/i.smfyes =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/i.smfyes (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/files/i.smfyes 2010-11-13 13:07:55 UTC (rev 11598) @@ -0,0 +1,20 @@ +# tomcat6 - i.smfyes script +# +# Copy the SMF specific files to the base directory. +# The files specific to SMF are: +# /opt/csw/var/svc +# /opt/csw/var/svc/manifest +# /opt/csw/var/svc/manifest/network +# /opt/csw/var/svc/manifest/network/tomcat6.xml=/tomcat6.xml +# /opt/csw/lib/svc +# /opt/csw/lib/svc/method +# /opt/csw/lib/svc/method/svc-tomcat6 +# +echo "Installing class ." +while read src dest +do + # Do copy + /usr/bin/cp $src $dest || exit 2 + echo $dest +done +exit 0 Added: csw/mgar/pkg/tomcat7/trunk/files/postinstall =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/postinstall (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/files/postinstall 2010-11-13 13:07:55 UTC (rev 11598) @@ -0,0 +1,73 @@ +# daemons are started by default +enable_daemon=yes + +# test the package root dir +if [ "$PKG_ROOT_DIR" = "" ] ; then + PKG_ROOT_DIR="$PKG_INSTALL_ROOT" +fi +# if $PKG_ROOT_DIR is empty then there is no need to set it to / since the loop add it + +# Test if the confiuration file exists. If it does not, then copy the template +# provided with this package. If it exists, then the script notify the user + +for i in `find $PKG_ROOT_DIR/opt/csw/share/tomcat6/conf/ -type file -name "*.CSW"` ; + do newFile=`echo $i | sed -e 's/\.CSW/ /g'` ; + if [ ! -f $newFile ] + then + cp -p $i $newFile ; + else + eval diff $i $newFile > /dev/null + if test $? -eq 1 + then + echo File $newFile already exist and is different from the file included in the package. + echo The latest file is available in $i + echo + fi + fi +done + +# Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +# If defined, autoenable for the specific daemon name takes precedence +if [ "$autoenable_tomcat6" = "no" ] ; then + enable_daemon=no +elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_tomcat6" ] ; then + enable_daemon=no +fi + +# Set variable smf depending on the availability of SMF binaries +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] + then + smf=yes +fi + +# If needed, configure SMF +if [ $smf = yes ] +then + # Register with SMF + echo "Configuring service in SMF" + /usr/sbin/svccfg import /opt/csw/var/svc/manifest/network/tomcat6.xml >/dev/null 2>&1 + /usr/sbin/svcadm disable svc:/network/cswtomcat6 >/dev/null 2>&1 + echo "Tomcat 6 is using Service Management Facility. The FMRI is:" + echo " svc:/network/cswtomcat6:default" +fi + +# If enabled, start the daemon +if [ "$enable_daemon" = "yes" ] ; then + echo "Starting tomcat6" + if [ $smf = no ] + then + /etc/init.d/cswtomcat6 start + else + /usr/sbin/svcadm enable svc:/network/cswtomcat6 + fi +fi + +exit 0 Property changes on: csw/mgar/pkg/tomcat7/trunk/files/postinstall ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/tomcat7/trunk/files/preinstall =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/preinstall (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/files/preinstall 2010-11-13 13:07:55 UTC (rev 11598) @@ -0,0 +1,151 @@ +#!/bin/sh + +# test if the tomcat group exist, if not create it +eval getent group tomcat > /dev/null +if test $? -gt 0 +then + groupadd tomcat > /dev/null + echo group tomcat has been added + + eval getent group tomcat > /dev/null + if test $? -gt 0 + then + echo ERROR: Failed to add group tomcat + exit 1 + fi +fi + +# test if the tomcat user exist, if not create it +eval getent passwd tomcat > /dev/null +if test $? -gt 0 +then + useradd -c "Tomcat service user" -g tomcat -d /opt/csw/share -s /bin/sh tomcat > /dev/null + echo user tomcat has been added + + eval getent passwd tomcat > /dev/null + if test $? -gt 0 + then + echo ERROR: Failed to add user tomcat + exit 1 + fi +fi + +# The following code is designed to handle the case where after removing previous +# CSWtomcat6 package, some files and directories are stillpresent on the file system. +# Some of the directories content may need to be moved from /opt to /var + +# test the package root dir +if [ "$PKG_ROOT_DIR" = "" ] ; then + PKG_ROOT_DIR="$PKG_INSTALL_ROOT" +fi +# if $PKG_ROOT_DIR is empty then there is no need to set it to / since the loop add it + +# For each f the directories that have been moved from /opt to /var +for i in logs temp work ; + + # Test if the directory exist. If not it will be created during install. + # Thus in this case, there is nothing to move + do if [ -d $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i ] + then + # Test if it is a symlink or not. If the symlink already exist, then + # there is nothing to do + if [ ! -h $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i ] + then + # It is not a symlink, then we have to move data. + # Test if the destination eixst or if we have to create it + if [ ! -d $PKG_ROOT_DIR/var/opt/csw/tomcat6/$i ] + then + echo creating $PKG_ROOT_DIR/var/opt/csw/tomcat6/$i + mkdir -p $PKG_ROOT_DIR/var/opt/csw/tomcat6/$i + fi + + # Now destination exist. Need to move data to dest + echo moving files from $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i to $PKG_ROOT_DIR/var/opt/csw/tomcat6/$i + eval mv -f $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i/* $PKG_ROOT_DIR/var/opt/csw/tomcat6/$i + if test $? -gt 0 + then + echo ERROR: Failed to move files $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i/* to $PKG_ROOT_DIR/var/opt/csw/tomcat6/$i + echo ERROR: + echo ERROR: Files may have been partially moved. You have to move files back to $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i + echo ERROR: or finish manually to move content to $PKG_ROOT_DIR/var/opt/csw/tomcat6/$i + echo ERROR: + echo ERROR: Please check that there is not enough space available for $PKG_ROOT_DIR/var/opt/csw/tomcat6/$i. You have to fix the issue before trying again to install this package. + + exit 1 + fi + + rm -fr $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i + eval ln -s $PKG_ROOT_DIR/var/opt/csw/tomcat6/$i $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i + if test $? -gt 0 + then + echo ERROR: Failed to mcreate a symlink from $PKG_ROOT_DIR/var/opt/csw/tomcat6/$i to $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i + echo ERROR: + echo ERROR: Please add the link manually before trying again to install this package. + + exit 1 + fi + + # The following code handles the case where we upgrade from a previous version + # User running tomcat was root. In this case we have to change the owner of + # the catalina.out file, or tomcat will not start. It is also needed to change the other log + # file owner or it may not work in some case (install old version and upgrade on the same day) + + # No need to make more tests. If we are in this case (creation of the /var dir then ln to /opt) + # it means that the file does not belong to tomcat but to root. + if [ "$i" = "logs" ] + then + chown tomcat:tomcat $PKG_ROOT_DIR/var/opt/csw/tomcat6/logs/* + fi + fi + fi +done + +# For each f the directories that have been moved from /opt to somewhere else in /opt +for i in conf ; + + # Test if the directory exist. If not it will be created during install. + # Thus in this case, there is nothing to move + do if [ -d $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i ] + then + # Test if it is a symlink or not. If the symlink already exist, then + # there is nothing to do + if [ ! -h $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i ] + then + # It is not a symlink, then we have to move data. + # Test if the destination eixst or if we have to create it + if [ ! -d $PKG_ROOT_DIR/opt/csw/etc/tomcat6/$i ] + then + echo creating $PKG_ROOT_DIR/opt/csw/etc/tomcat6/$i + mkdir -p $PKG_ROOT_DIR/opt/csw/etc/tomcat6/$i + fi + + # Now destination exist. Need to move data to dest + echo moving files from $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i to $PKG_ROOT_DIR/opt/csw/etc/tomcat6/$i + eval mv -f $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i/* $PKG_ROOT_DIR/opt/csw/etc/tomcat6/$i + if test $? -gt 0 + then + echo ERROR: Failed to move files $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i/* to $PKG_ROOT_DIR/opt/csw/etc/tomcat6/$i + echo ERROR: + echo ERROR: Files may have been partially moved. You have to move files back to $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i + echo ERROR: or finish manually to move content to $PKG_ROOT_DIR/opt/csw/etc/tomcat6/$i + echo ERROR: + echo ERROR: Please check that there is not enough space available for $PKG_ROOT_DIR/opt/csw/etc/tomcat6/$i. You have to fix the issue before trying again to install this package. + + exit 1 + fi + + rm -fr $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i + eval ln -s $PKG_ROOT_DIR/opt/csw/etc/tomcat6/$i $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i + + if test $? -gt 0 + then + echo ERROR: Failed to mcreate a symlink from $PKG_ROOT_DIR/opt/csw/etc/tomcat6/$i to $PKG_ROOT_DIR/opt/csw/share/tomcat6/$i + echo ERROR: + echo ERROR: Please add the link manually before trying again to install this package. + + exit 1 + fi + fi + fi +done + Property changes on: csw/mgar/pkg/tomcat7/trunk/files/preinstall ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/tomcat7/trunk/files/preremove =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/preremove (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/files/preremove 2010-11-13 13:07:55 UTC (rev 11598) @@ -0,0 +1,25 @@ +# tomcat6 - preremove script +# + +# If removing from a filesystem that is not running the OS, exit this script. +if [ ! x"$PKG_INSTALL_ROOT" = x"" ] ; then exit 0 ; fi + +# Stop tomcat6 if it is running. +# If removing from a non-global zone, the service may still be +# installed/running. Errors are ignored if nothing is done. +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; +then smf=yes ; fi + +if [ $smf = yes ] + then + # Disable service + /usr/sbin/svcadm disable -s svc:network/cswtomcat6:default >/dev/null 2>&1 +else + /etc/init.d/cswtomcat6 stop >/dev/null 2>&1 +fi + +if [ $smf = yes ] ; then + # Unregister with SMF + /usr/sbin/svccfg delete svc:network/cswtomcat6:default >/dev/null 2>&1 +fi Property changes on: csw/mgar/pkg/tomcat7/trunk/files/preremove ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/tomcat7/trunk/files/space =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/space (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/files/space 2010-11-13 13:07:55 UTC (rev 11598) @@ -0,0 +1,3 @@ +# No additional space is actually needed. +# In fact, only one set of the Solaris release specific files are installed. +# So the space required for this package is less than what is in pkgmap. Added: csw/mgar/pkg/tomcat7/trunk/files/svc-tomcat7 =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/svc-tomcat7 (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/files/svc-tomcat7 2010-11-13 13:07:55 UTC (rev 11598) @@ -0,0 +1,151 @@ +#!/sbin/sh + +################################################################## +# +# Configuration file documentation +# +# tomcat6 +# +# This file let you change the values of a few variables used +# by the init script to control the environment of tomcat6 +# The list of variables is described below. +# +# The configuration file can be stored in two different path : +# +# /etc/opt/csw +# This directory contain machine specific config files +# +# /opt/csw/etc +# This directory contain global config files +# +# If there exist a /etc/opt/csw/tomcat6 config file, then the +# environment variables defined in this file are used and the +# /opt/csw/etc/tomcat6/conf/tomcat6 file is ignored even if it +# exist. +# +# If there exist only a /opt/csw/etc/tomcat6/conf/tomcat6 config +# file, then the environnement variables defined in this file are +# used. +# +# If no configuration file exist, all the variables needed by +# tomcat6 are let to their default values (see the values +# below). +# +# In all cases, the default values are defined, and supereded +# by the values stored in the configuration file. This is +# necessary to define an environment usuable by tomcat. +# +# Environment variables documentation +# +# JAVA_HOME +# +# JAVA_HOME specify which version of Java should be used +# by tomcat. You can supered the default value in the tomcat6 +# configuration file. The value of this variable must be a path +# pointing to the root of a valid JRE or JDK (the root dir not +# the bin dir !). The default value is /usr/java. +# +# TOMCAT_USER +# +# TOMCAT_USER variable defines the Solaris user running the +# tomcat server. You can supered the default valude in the +# tomcat6 configuration file. The value of this variable must +# be a valid Solaris user (ie: root, nobody). The default value +# is root. +# +# WARNING : By default the directory permissions are set for +# the root user (no write access for 'nobody'). +# The logs are stored in /opt/csw/share/tomcat6/logs, and do belong +# to root user. If you change the TOMCAT_USER, be sure that this +# user can write in the log directory. +# +# The following permissions may also have to be changed : +# . give read access to the conf directory and all its subdirs +# . give write access to the conf dir to let tomcat create new files +# . give write access to the work dir +# + +################################################################## +# Setting the default values +# +# DO NOT EDIT THE FOLLOWING VALUES. +# +# Use the configuration file to supered their value +# + +SPECIFIC_CONFIG_FILE=/etc/opt/csw/tomcat6 +GLOBAL_CONFIG_FILE=/opt/csw/etc/tomcat6/conf/tomcat6 + +JAVA_HOME=/usr/java +TOMCAT_USER=tomcat + +################################################################## +# Add some defines useful for SMF +# + +. /lib/svc/share/smf_include.sh + +################################################################## +# Search for a custom configuration file in the default CSW paths +# + +if [ -f $SPECIFIC_CONFIG_FILE ] +then + echo Using configuration file : $SPECIFIC_CONFIG_FILE + . $SPECIFIC_CONFIG_FILE +else + if [ -f $GLOBAL_CONFIG_FILE ] + then + echo Using configuration file : $GLOBAL_CONFIG_FILE + . $GLOBAL_CONFIG_FILE + fi +fi + +echo "Using Java from : $JAVA_HOME" +echo "Running as : $TOMCAT_USER (please see documentation included in $0 to change user)" + +################################################################## +# Test if java is in the path defined by JAVA_HOME, if not try to +# guess path by testing standard directories +# + +if [ ! -f $JAVA_HOME/bin/java ] +then + echo "Java not found in $JAVA_HOME/bin. Trying /usr/java/bin" + JAVA_HOME=/usr/java + if [ ! -f $JAVA_HOME/bin/java ] + then + echo "Java not found in $JAVA_HOME/bin. Trying /usr/j2se/bin" + JAVA_HOME=/usr/j2se + if [ ! -f $JAVA_HOME/bin/java ] + then + echo "Java not found in $JAVA_HOME/bin" + echo "Java not found !" + exit 1 + fi + fi +fi + +CATALINA_HOME=/opt/csw/share/tomcat6 +export JAVA_HOME +export CATALINA_HOME + +case $1 in +'start') + $CATALINA_HOME/bin/startup.sh + ;; +'stop') + $CATALINA_HOME/bin/shutdown.sh + ;; + +'restart') + $CATALINA_HOME/bin/shutdown.sh + $CATALINA_HOME/bin/startup.sh + ;; +*) + echo "Usage: $0 { start | stop | restart }" + exit 1 + ;; +esac + +exit $SMF_EXIT_OK Added: csw/mgar/pkg/tomcat7/trunk/files/tomcat7 =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/tomcat7 (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/files/tomcat7 2010-11-13 13:07:55 UTC (rev 11598) @@ -0,0 +1,34 @@ +# Environment variables documentation +# +# JAVA_HOME +# +# JAVA_HOME specify which version of Java should be used +# by tomcat. You can supered the default value in the tomcat6 +# configuration file. The value of this variable must be a path +# pointing to the root of a valid JRE or JDK (the root dir not +# the bin dir !). The default value is /usr/java. +# + +# JAVA_HOME=/usr/java + +# TOMCAT_USER +# +# TOMCAT_USER variable defines the Solaris user running the +# tomcat server. You can supered the default valude in the +# tomcat6 configuration file. The value of this variable must +# be a valid Solaris user (ie: root, nobody). The default value +# is tomcat. +# +# WARNING : By default the directory permissions are set for +# the tomcat user (no write access for 'nobody'). +# The logs are stored in /opt/csw/tomcat6/logs, and do belong +# to root user. If you change the TOMCAT_USER, be sure that this +# user can write in the log directory. +# +# The following permissions may also have to be changed : +# . give read access to the conf directory and all its subdirs +# . give write access to the conf dir to let tomcat create new files +# . give write access to the work dir +# + +TOMCAT_USER=tomcat Added: csw/mgar/pkg/tomcat7/trunk/files/tomcat7.xml =================================================================== --- csw/mgar/pkg/tomcat7/trunk/files/tomcat7.xml (rev 0) +++ csw/mgar/pkg/tomcat7/trunk/files/tomcat7.xml 2010-11-13 13:07:55 UTC (rev 11598) @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 Nov 13 14:16:17 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Nov 2010 13:16:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11599] csw/mgar/pkg/tomcat7/trunk Message-ID: Revision: 11599 http://gar.svn.sourceforge.net/gar/?rev=11599&view=rev Author: rthurner Date: 2010-11-13 13:16:17 +0000 (Sat, 13 Nov 2010) Log Message: ----------- tomcat7: checksums Modified Paths: -------------- csw/mgar/pkg/tomcat7/trunk/Makefile csw/mgar/pkg/tomcat7/trunk/checksums Modified: csw/mgar/pkg/tomcat7/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat7/trunk/Makefile 2010-11-13 13:07:55 UTC (rev 11598) +++ csw/mgar/pkg/tomcat7/trunk/Makefile 2010-11-13 13:16:17 UTC (rev 11599) @@ -7,8 +7,7 @@ Apache Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed by Sun under the Java Community Process. endef -UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-7/ -MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-7/v$(GARVERSION)/bin/ +MASTER_SITES = http://mirror.switch.ch/mirror/apache/dist//tomcat/tomcat-7/v7.0.4-beta/bin/ DISTFILES = apache-tomcat-$(GARVERSION).tar.gz PKGDIST = apache-tomcat-$(GARVERSION).tar.gz DISTFILES += CSWtomcat7.gspec CSWtomcat7.prototype CSWtomcat7.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-tomcat7 tomcat7.xml tomcat7 cswtomcat7 Modified: csw/mgar/pkg/tomcat7/trunk/checksums =================================================================== --- csw/mgar/pkg/tomcat7/trunk/checksums 2010-11-13 13:07:55 UTC (rev 11598) +++ csw/mgar/pkg/tomcat7/trunk/checksums 2010-11-13 13:16:17 UTC (rev 11599) @@ -0,0 +1 @@ +340d45b6fb906f6c9a585c2a15167daf apache-tomcat-7.0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Nov 13 14:19:03 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Nov 2010 13:19:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[11600] csw/mgar/pkg/tomcat6/trunk Message-ID: Revision: 11600 http://gar.svn.sourceforge.net/gar/?rev=11600&view=rev Author: rthurner Date: 2010-11-13 13:19:02 +0000 (Sat, 13 Nov 2010) Log Message: ----------- tomcat6: checksum minor version upgrade to 6.0.29 Modified Paths: -------------- csw/mgar/pkg/tomcat6/trunk/Makefile csw/mgar/pkg/tomcat6/trunk/checksums Modified: csw/mgar/pkg/tomcat6/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat6/trunk/Makefile 2010-11-13 13:16:17 UTC (rev 11599) +++ csw/mgar/pkg/tomcat6/trunk/Makefile 2010-11-13 13:19:02 UTC (rev 11600) @@ -1,5 +1,5 @@ -GARNAME = tomcat6 -GARVERSION = 6.0.26 +GARNAME = apache-tomcat6 +GARVERSION = 6.0.29 CATEGORIES = server DESCRIPTION = Apache Jakarta Tomcat 6 Servlet/JSP Container @@ -12,11 +12,13 @@ DISTFILES = apache-tomcat-$(GARVERSION).tar.gz PKGDIST = apache-tomcat-$(GARVERSION).tar.gz DISTFILES += CSWtomcat6.gspec CSWtomcat6.prototype CSWtomcat6.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-tomcat6 tomcat6.xml tomcat6 cswtomcat6 -# DISTFILES += $(call admfiles, CSWtomcat6, depend ) +LICENSE = LICENSE # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = v(\d+(?:\.\d+)*) +#ARCHALL_CSWapache-tomcat6 = 1 + CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none TEST_SCRIPTS = none Modified: csw/mgar/pkg/tomcat6/trunk/checksums =================================================================== --- csw/mgar/pkg/tomcat6/trunk/checksums 2010-11-13 13:16:17 UTC (rev 11599) +++ csw/mgar/pkg/tomcat6/trunk/checksums 2010-11-13 13:19:02 UTC (rev 11600) @@ -1,15 +1 @@ -d41d8cd98f00b204e9800998ecf8427e CSWtomcat6.depend -d47fc99cefd4bbf97b124bc7432f573a CSWtomcat6.gspec -d776b690879dc9fef307de153e499af2 CSWtomcat6.prototype -f9eafa9bfd620324d1270ae8f09a8c89 apache-tomcat-6.0.26.tar.gz -3a7532b44b2b0b0f8688bd5177e2bdea checkinstall -2ead862bc2074b9acef4f10d5becc859 cswtomcat6 -08c55c4f691abf3a0783d5275dbd77e7 i.smfno -5936b013c012eceb670ea715e2812ca4 i.smfyes -3792b87a62c4548dda0d5d34b48dd528 postinstall -e3b7c69c73f9a98477476f91930bfa8b preinstall -b46a7d41733aceecfdcba29e8352517f preremove -f49c3339aa897df97abf1baf54582fb8 space -5ce231c9fafe52180725d4d23a538d9a svc-tomcat6 -bb366a079377af5416672ce5dd2a0f79 tomcat6 -2c0f11da2f8d2c5aefefdd2258661b26 tomcat6.xml +7d614e03d18d3f21fcfdff96f0b6c311 apache-tomcat-6.0.29.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Nov 13 14:21:20 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Nov 2010 13:21:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[11601] csw/mgar/pkg/qt4/trunk Message-ID: Revision: 11601 http://gar.svn.sourceforge.net/gar/?rev=11601&view=rev Author: rthurner Date: 2010-11-13 13:21:19 +0000 (Sat, 13 Nov 2010) Log Message: ----------- qt: checksum for patchlevel version upgrade to qt-4.7.1 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 2010-11-13 13:19:02 UTC (rev 11600) +++ csw/mgar/pkg/qt4/trunk/Makefile 2010-11-13 13:21:19 UTC (rev 11601) @@ -1,5 +1,5 @@ GARNAME = qt4 -GARVERSION = 4.6.0 +GARVERSION = 4.7.1 CATEGORIES = lib DESCRIPTION = TrollTech C++ application framework Modified: csw/mgar/pkg/qt4/trunk/checksums =================================================================== --- csw/mgar/pkg/qt4/trunk/checksums 2010-11-13 13:19:02 UTC (rev 11600) +++ csw/mgar/pkg/qt4/trunk/checksums 2010-11-13 13:21:19 UTC (rev 11601) @@ -1 +1 @@ -2a7b5126f2450d8525af355fc4c12ad6 qt-everywhere-opensource-src-4.6.0.tar.gz +6f88d96507c84e9fea5bf3a71ebeb6d7 qt-everywhere-opensource-src-4.7.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 Sat Nov 13 15:44:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Nov 2010 14:44:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[11602] csw/mgar/pkg/jdk6/trunk/Makefile Message-ID: Revision: 11602 http://gar.svn.sourceforge.net/gar/?rev=11602&view=rev Author: dmichelsen Date: 2010-11-13 14:44:13 +0000 (Sat, 13 Nov 2010) Log Message: ----------- jdk6: Some overrides Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/Makefile Modified: csw/mgar/pkg/jdk6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2010-11-13 13:21:19 UTC (rev 11601) +++ csw/mgar/pkg/jdk6/trunk/Makefile 2010-11-13 14:44:13 UTC (rev 11602) @@ -85,6 +85,15 @@ extract-archive-%.sh: shell-extract-archive-%.sh @$(MAKECOOKIE) +# We package upstream as is, no chance to change anything. +CHECKPKG_OVERRIDES_CSWjdk += surplus-dependency|CSWjdk6 +CHECKPKG_OVERRIDES_CSWjdk6 += binary-architecture-does-not-match-placement +CHECKPKG_OVERRIDES_CSWjdk6 += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWjre += surplus-dependency|CSWjre6 +CHECKPKG_OVERRIDES_CSWjre6 += binary-architecture-does-not-match-placement +CHECKPKG_OVERRIDES_CSWjre6 += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWjre6 += soname-not-found + include gar/category.mk install-custom: @@ -92,7 +101,7 @@ @rm -rf $(DESTDIR)$(prefix)/java @ginstall -d $(DESTDIR)$(prefix)/java/jdk - @(cd $(WORKDIR); pax -r -w $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk) + @(cd $(WORKDIR); pax -r -w -s ',.*/\.git.*,,' $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk) @rm -f $(DESTDIR)$(prefix)/java/jdk/latest @gln -sf jdk6 $(DESTDIR)$(prefix)/java/jdk/latest @rm -f $(DESTDIR)$(prefix)/java/jdk/jdk6 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 Nov 14 02:51:44 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Nov 2010 01:51:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[11603] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11603 http://gar.svn.sourceforge.net/gar/?rev=11603&view=rev Author: bdwalton Date: 2010-11-14 01:51:43 +0000 (Sun, 14 Nov 2010) Log Message: ----------- apache2: enable the build CAS for the CSW templated config files Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-13 14:44:13 UTC (rev 11602) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-14 01:51:43 UTC (rev 11603) @@ -198,6 +198,8 @@ PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/apache2\/etc\/.*CSW/ { $$$$1 = "e"; $$$$2 = "build"; $$$$4 = "?"; $$$$5 = "?"; $$$$6 = "?"}; { print }' + include gar/category.mk CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS) @@ -254,8 +256,5 @@ s/^#(Include.*httpd-mpm.conf)/$$1/; \ s/^#(Include.*httpd-ssl.conf)/$$1/' $$f; \ done ) - - - @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Nov 14 03:57:23 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Nov 2010 02:57:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[11604] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11604 http://gar.svn.sourceforge.net/gar/?rev=11604&view=rev Author: bdwalton Date: 2010-11-14 02:57:23 +0000 (Sun, 14 Nov 2010) Log Message: ----------- apache2: move the ssl dummy cert generation to a separate script and use the build CAS for it Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall Added Paths: ----------- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-14 01:51:43 UTC (rev 11603) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-14 02:57:23 UTC (rev 11604) @@ -40,7 +40,7 @@ DISTFILES += CSWapache2.preinstall CSWapache2.postinstall # Configuration templates -DISTFILES += update20to22 +DISTFILES += update20to22 server.crt.build_cas DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork DISTFILES += README.CSW.apache2rt @@ -256,5 +256,6 @@ s/^#(Include.*httpd-mpm.conf)/$$1/; \ s/^#(Include.*httpd-ssl.conf)/$$1/' $$f; \ done ) + @cp -p $(WORKDIR)/server.crt.build_cas $(PKGROOT)/$(prefix)/apache2/etc/server.crt.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-11-14 01:51:43 UTC (rev 11603) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-11-14 02:57:23 UTC (rev 11604) @@ -44,21 +44,4 @@ EOF fi -if [ ! -f $AP2_CONFDIR/server.crt -a ! -f $AP2_CONFDIR/server.key ]; then - echo Generating dummy ssl key and certificate... - # this is likely overkill for a dummy cert, but why not - umask 0077 - cat </dev/null 2>&1 -TS -Westfarthing -Hobbiton - - -$hostname -bilbo at example.net - - -EOF -fi - exit 0 Added: csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas =================================================================== --- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-14 02:57:23 UTC (rev 11604) @@ -0,0 +1,27 @@ +# On installation, generate a dummy ssl certificate + +PIR=${PKG_INSTALL_ROOT:-/} +AP2_PREFIX=/opt/csw/apache2 +AP2_CONFDIR=$AP2_PREFIX/etc + +if [ "$1" = install ]; then + echo "A dummy file created during ${PKGINST} installation." > ${PIR}/$AP2_CONF/server.crt.CSW + if [ ! -f $PIR/$AP2_CONFDIR/server.crt -a ! -f $PIR/$AP2_CONFDIR/server.key ]; then + echo Generating dummy ssl key and certificate... + # this is likely overkill for a dummy cert, but why not + umask 0077 + cat </dev/null 2>&1 +TS +Westfarthing +Hobbiton + + +$hostname +bilbo at example.net + + +EOF + fi +else + rm ${PIR}/$AP2_CONF/server.crt.CSW +fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Nov 14 14:53:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 14 Nov 2010 13:53:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11605] csw/mgar/pkg/vim/trunk Message-ID: Revision: 11605 http://gar.svn.sourceforge.net/gar/?rev=11605&view=rev Author: dmichelsen Date: 2010-11-14 13:53:50 +0000 (Sun, 14 Nov 2010) Log Message: ----------- vim: Update to 7.3p011, patches do not apply cleanly with git 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 2010-11-14 02:57:23 UTC (rev 11604) +++ csw/mgar/pkg/vim/trunk/Makefile 2010-11-14 13:53:50 UTC (rev 11605) @@ -1,6 +1,6 @@ GARNAME = vim -DISTVERSION = 7.2 -PATCHREV = 320 +DISTVERSION = 7.3 +PATCHREV = 011 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php @@ -25,15 +25,16 @@ MASTER_SITES += ftp://ftp.vim.org/pub/vim/unix/ DISTFILES = $(GARNAME)-$(DISTVERSION).tar.bz2 -DISTFILES += $(GARNAME)-$(DISTVERSION)-lang.tar.gz -DISTFILES += $(GARNAME)-$(DISTVERSION)-extra.tar.gz +# There are no extra files for Vim 7.3, everything is in the main archive. +#DISTFILES += $(GARNAME)-$(DISTVERSION)-lang.tar.gz +#DISTFILES += $(GARNAME)-$(DISTVERSION)-extra.tar.gz DISTFILES += vimrc DISTFILES += vimrc.tiny DISTFILES += gvimrc DISTFILES += COPYING PATCHFILES = $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T)) -PATCHFILES += vimtutor.patch +#PATCHFILES += vimtutor.patch WORKSRC = $(WORKDIR)/$(GARNAME)$(subst .,,$(DISTVERSION)) Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2010-11-14 02:57:23 UTC (rev 11604) +++ csw/mgar/pkg/vim/trunk/checksums 2010-11-14 13:53:50 UTC (rev 11605) @@ -1,328 +1,12 @@ -7c2dc4a956cf315e546e347bc349968c download/7.2.001 -7f16f80814f1e071a689806c2056b39d download/7.2.002 -0de916fdfd450a4a0d95bed44ae2c398 download/7.2.003 -25cc99ad42b25b16a4610e2fad9cdab4 download/7.2.004 -a5b7b1c7c5b75aa7d730b0b9aa491558 download/7.2.005 -a93a72cd40c37da91dc634dc8dddefec download/7.2.006 -c2b2b63dea27ddad92668e63797406c5 download/7.2.007 -e65c8c2223eea5289d8cbef2e867a5de download/7.2.008 -ab1566b69bd0e0c82a866f00675ffe0e download/7.2.009 -d69f559bfb5436c157e8069a829ca50d download/7.2.010 -05334a6bb31402bfd49d82ea6f59a57b download/7.2.011 -a11dcd5552f36544a9e27978b5359935 download/7.2.012 -8bc70978291aadea9c82072b623c955d download/7.2.013 -a87826187cb77ad2e567a40c1609eea4 download/7.2.014 -47a466fbfdbca616f519fc4afa0432df download/7.2.015 -fd08bac73d7ffcabf53bd25a63dff893 download/7.2.016 -0f0284d87f6f52101802dbe1a45d54c3 download/7.2.017 -38d06ba325b716c1177c1012d781bada download/7.2.018 -661ca021fb70c24ef4df229512cfb14b download/7.2.019 -cb2c5ca0f9a9718fb635874925432dd8 download/7.2.020 -9073d2311ae7101c143237a45afb4efa download/7.2.021 -48ccb0deec77a3bb91bf967dacb43492 download/7.2.022 -d77ed8aa4de30d4dbd17a7998ae8f269 download/7.2.023 -cf983237e5e866ef459870fee2754bac download/7.2.024 -ab32defa4b2cfb509ccb34d4858b1223 download/7.2.025 -5e96c227c7765b1e0f03f44cb5b750f6 download/7.2.026 -f26b7ee0f271eacbb3652dbdf92dd860 download/7.2.027 -fc54a3d35bdc7b7a7660c6d2274f7b74 download/7.2.028 -d53630dc8f3a823f54dfba73dcd47b36 download/7.2.029 -208f8ed2db2665ebfc17674f78d47c6d download/7.2.030 -3387583af86faa78e10be979214071f3 download/7.2.031 -eca017686205ec8658bf9fa8c73f7af6 download/7.2.032 -88c91b84ffc772fd57f86475f7ba90f1 download/7.2.033 -c3d6eaaa0b74df423f90afaaafa3a0de download/7.2.034 -f4c35dae581d671dc271407d377f7199 download/7.2.035 -0ae8b6ed636fc013e2fa6bdabc182041 download/7.2.036 -1c6501c366cc8df205955f3e4d3ebba9 download/7.2.037 -ed3479ddb4ded7b74c82af5e50b0e4a6 download/7.2.038 -2a61f28f6f793c5a43abded6e59b6506 download/7.2.039 -4c493255ae227498016f30a0002ec1cc download/7.2.040 -66bde35426c09d9c666e23215f9a19c9 download/7.2.041 -99baedef8a9c908774b7ed74deacf184 download/7.2.042 -87035b208c9377c28d796b1e48ab8aac download/7.2.043 -b127def242996b4e7d7e870cab3e4b45 download/7.2.044 -5233327e4c97d310e3793b223892ea8d download/7.2.045 -9ecfa0454f5a329996b273cb12369962 download/7.2.046 -35e16f4e7198e861a71322fee2cb7909 download/7.2.047 -84ef9658181f49bfbd7a61ec87dd0b8d download/7.2.048 -fc9b65eef81954f6006c307ff11be925 download/7.2.049 -27a9700e39e266a31df702677acea52c download/7.2.050 -89ce3f5b513510fb288a4a301e7494c7 download/7.2.051 -5992bb56b07a9b9b4e3504f1f2f2c79c download/7.2.052 -3fe570c1317fee8a71ede17197358e02 download/7.2.053 -5b047e8e8413c4807d74a6d9716474a2 download/7.2.054 -c276080d95de2fafa9706f247c35ff74 download/7.2.055 -5b65e2654a78dcc4c15dc49dbce5418e download/7.2.056 -cab5a9ddf0ab180089d84bf9ec685574 download/7.2.057 -80991ff846f88222e3266dab6b07e2b8 download/7.2.058 -89cede639caf8beed5ea071790445e26 download/7.2.059 -9781d833263060308a9622dd097ad378 download/7.2.060 -71b4bc625bc1cdd68747262d329db551 download/7.2.061 -9243a773d19966dbfd98b7aff3fe3ab7 download/7.2.062 -08155711f8db2dfce217ec5a34253a76 download/7.2.063 -fd692f9624ec0170800b3d9a2a9a53cb download/7.2.064 -ee1a8dc311c7580608e3bd2196a7d042 download/7.2.065 -8d1d5f8aefabf0abcb54de5247893246 download/7.2.066 -fa0ccca2decdd2db64947658b04b8c99 download/7.2.067 -ca5ab057205023613020ca920d903028 download/7.2.068 -f3e6f3dd76278a9f7e396955faa4ca31 download/7.2.069 -805cdc76da46e73ae908038e09efae16 download/7.2.070 -9224b5e9c85fa4d47d418c248aff542e download/7.2.071 -ab9250d36651dde9267d1241cac9fb74 download/7.2.072 -0d77ee653eabe4b7fdb640d768d7c1be download/7.2.073 -5b0a423e9f3ca07e5c62d4f0f5803a5c download/7.2.074 -d7eccf57f8fc04cf0385f85eff3d989a download/7.2.075 -99750c988d0c48f56cb12a04b78aebc2 download/7.2.076 -1967f5e7fa4cec07bd67cc47925ec3c8 download/7.2.077 -7b285d2ba24fdd2390b4aaba08fcf5f6 download/7.2.078 -a3385578174d3867f17ab287276db49b download/7.2.079 -ea45aa4d1a74989d361b2a29c1e9ff9b download/7.2.080 -3bdf4ec7db7976876a827f2dfa269e89 download/7.2.081 -590c9aa51fcb808ece4b6b4bfaaaaf30 download/7.2.082 -2a10abc536f7a69ff3ef353b55b6cb65 download/7.2.083 -78defaaa03e61955f6624b796efb8655 download/7.2.084 -869116b3e92e944d40a3e03f9a99816f download/7.2.085 -5af26f073ebeba60af90525d68a61725 download/7.2.086 -639d7a80864afe68132725e377f52f19 download/7.2.087 -44b152484534fa23c4ff531316a0e518 download/7.2.088 -990e6a23c4061df0dcc0ab84528a2e1a download/7.2.089 -8985dcfe7df6b439e88554e22cf34919 download/7.2.090 -137faec139470453ca446c015c226e47 download/7.2.091 -e15782bf5892ad787d149491bfe013e7 download/7.2.092 -2198caf9e5f422eacde337e9c27677ab download/7.2.093 -49ab5014904d459e54a667e1433b4bee download/7.2.094 -ba21ee323426561e75ebff23090e4bdb download/7.2.095 -7ffef4a30cdcd6d8426e44d3a25df991 download/7.2.096 -c7264031ad24af960d717189b344e244 download/7.2.097 -dc7b06bb5c5b11a3d487614287d99a6b download/7.2.098 -656c12368934868f35747f3955366142 download/7.2.099 -15dacd715d6f8c655265bbf77ebaddd4 download/7.2.100 -65e59923311b136306284319521d70d7 download/7.2.101 -42e2274c6a3152279720d8623f7916ad download/7.2.102 -654ba716e77d092c1c314fed18c7486d download/7.2.103 -b839c2c957eb3bb7511ace0b61d5d5fe download/7.2.104 -7f37ad0b1573be8bc39a817a21422a4e download/7.2.105 -4801df8c2833a683cd1b2a5870565e41 download/7.2.106 -e6801b619d40efe81428399e26e0486f download/7.2.107 -76f17428d216ec6b29036e22397c2765 download/7.2.108 -db97daa4f1e56440a988e7f5272997c7 download/7.2.109 -b8752c88429f869dec05232db89018e2 download/7.2.110 -e8cdc1e862b60215c12265e44b38239d download/7.2.111 -e933dd778c6f8687cf1f9f3e550e6cc0 download/7.2.112 -861729d9d4dc422e45c22bd8e006fc32 download/7.2.113 -5da3a29b3184af1780a82499343e7587 download/7.2.114 -b35c7b1cfa2a5f7b45829cd09ac27b7a download/7.2.115 -1355cc34fbc7be7eb48fa777e8f49dfb download/7.2.116 -8b9c839ec7448691b0a88475f0d0d4f9 download/7.2.117 -74d97a563ec1b1f1606705097396c391 download/7.2.118 -2ddd84423b902a2b3594c64c567be0b4 download/7.2.119 -5394e442f011d47b6d69a7b03984cdf4 download/7.2.120 -6bdb5e63ca3d79d3dcb7127e14ae3949 download/7.2.121 -36554c0103cafc8759f3e71ccd56c56f download/7.2.122 -841c74d1f3cb8380fa5713d5b9ca2c98 download/7.2.123 -2489ebcb72280dd50b8756e4ab7d36ed download/7.2.124 -10b15d637133b73d825650363d863b58 download/7.2.125 -b31534667bb741e21479b1e3757c9e21 download/7.2.126 -71e87e78bea69d8876ff7f6d824c8986 download/7.2.127 -21da01d371757282bfd402ddd91005ba download/7.2.128 -e890b630efa3847c8cdee2f197145b6c download/7.2.129 -d3fe3bf37d5c0940f3e751f41d92e817 download/7.2.130 -3c2aaa22914d06a65bf0f212e43c3ace download/7.2.131 -379aa718df5dbcde8215fc4d94062d9f download/7.2.132 -6d51f9deb4c2604692f532c118b73ef8 download/7.2.133 -4acae77b2a217e1cb47040c08e28180d download/7.2.134 -4d30bf2c9d2973f5dd1c12468123dc41 download/7.2.135 -f2ae8cc595933938ee608e040d1256a5 download/7.2.136 -c613c1e0fac319f05ffe1fa7e27d6600 download/7.2.137 -e7d02c3dea47fa579366bb1cd025ce5e download/7.2.138 -04f7131164b3f46d6365a8faea0e32c6 download/7.2.139 -e1c0e4fbd985f5a2e5a24a4cfab1112c download/7.2.140 -e5a9c7ef44a38057c0c5c1191d9cdf77 download/7.2.141 -f08f7f966749c2ef20ff87dfeb9bef62 download/7.2.142 -6b132dad3ad947662d1c370193a14218 download/7.2.143 -4e2a1d1cb12198a783759f88e6c64fc4 download/7.2.144 -38877e2ac720e45e5d62cd1089167db3 download/7.2.145 -cb97aca73a1f4fdd2fac894bba7e43ae download/7.2.146 -4219afedebf0172118f2d078d9012995 download/7.2.147 -49ca89a47315f512c7ee06f5b2617a90 download/7.2.148 -9197a669e4ee024c1a9218e861e21c7e download/7.2.149 -cbdf7ce960ad4646a8884e51bc7e037e download/7.2.150 -56b24ce6e78e71c64d05fda51748b01c download/7.2.151 -7c088583f063cd09d26f7291d9f5817b download/7.2.152 -e966483b6755f4e7b2cd92708a8ff656 download/7.2.153 -27bcb5f1d5932ee7eaae40ba0a4eb968 download/7.2.154 -611ab5b97cd9d87a1be0a84e3006b17a download/7.2.155 -27fb40dbdb85052a598be88f205484c6 download/7.2.156 -93a85a3606193b8875f0eba05dba3be3 download/7.2.157 -808ba7888bdfdf559366dfdf1446dab5 download/7.2.158 -08bd6d6db2e029beab84b32bf36494e0 download/7.2.159 -c07df493053267849115b579928a4dae download/7.2.160 -e44297c9ed5928e55ca43b4e2b3509ce download/7.2.161 -0d4768bd2395f3ebf3ebd7fa4979288c download/7.2.162 -032f90bcee8f36ad7b77a17bb76719f0 download/7.2.163 -21341ed82eb080e590d15dd6368e8d78 download/7.2.164 -51de241d7d03200a7b3490f40256c633 download/7.2.165 -9c645166c92865d644fd232760b56494 download/7.2.166 -a29266c1573ff106366ebdbd460b17ce download/7.2.167 -09105d79266562b6afe0179c07149738 download/7.2.168 -36d18f0e42f0c24722116cb823b52c8a download/7.2.169 -a00979f910f29d5062faf15e8670735b download/7.2.170 -439a415dab8a77790c7da1526da083f9 download/7.2.171 -3defcc24541cd3d62fda6cfb4af6ba4b download/7.2.172 -5f16d8af9b11f44c8e104abc942152c2 download/7.2.173 -4949fe9f14ac4f7b2717ddb05968285c download/7.2.174 -7462cd9ba69a7eb674aa8e5653fdad63 download/7.2.175 -4b5c77673b5d62f1a94e4d605e92d81e download/7.2.176 -cde1647ab09a432c134d6fbae5ca15dc download/7.2.177 -5a126dd404945088b61aaf9d8c2effaa download/7.2.178 -a15fe587377fac500d0fae2b1c3adbbf download/7.2.179 -d4db5a69da98dbda41429d66e339e515 download/7.2.180 -8b9dee3c4aeeb563cbff6f3cf0357675 download/7.2.181 -d5d50f1da385bee588348aaaa5bb2dd7 download/7.2.182 -77e46725488937910d1cf051760ad11d download/7.2.183 -3bdbab52e0ac635962ce9983ef1d9f01 download/7.2.184 -fa88ae980d6e68f9aa9f9b257f1f3e71 download/7.2.185 -2262a6034d4cf01859a1d36982f38505 download/7.2.186 -c98b89c2594d7127574d0bd9838f241a download/7.2.187 -8efff5f82388c43183739c280249b643 download/7.2.188 -bab560f5a4b1809c2859ab632f037135 download/7.2.189 -63098e6cdb253d83c30f42d3d4469900 download/7.2.190 -87a02a6db9029357d7e248bcf4923330 download/7.2.191 -88102a28fb2139fe14a66b2970958166 download/7.2.192 -66a202b39e36ac062db1432896d8d988 download/7.2.193 -3ba1ab13de695c1422e0cda65c03503d download/7.2.194 -a42b79c5328c30b0951ce67da505a3f4 download/7.2.195 -f1ece679735785c46b58ed4d791b3880 download/7.2.196 -352908f71b12a7a30aafd985c338d247 download/7.2.197 -2a4764a5df5c1d18e4c7fee81074f55c download/7.2.198 -61a30d8c51533f08a94ba23025a12f11 download/7.2.199 -1a21534f09d529a9096c5e9b978187e9 download/7.2.200 -61e01d2aef1d5c1c3b40d5e927bd83c9 download/7.2.201 -30df1365ef27c34558d4322cb71c5d83 download/7.2.202 -24ae52da6519c8f8fbd08676c64eac75 download/7.2.203 -e75f99a06eb7a03a5cf854505b1d795d download/7.2.204 -3e2da4100f83cf2d308545d0c822a196 download/7.2.205 -4895874100f932e15a8c661fb40a19b1 download/7.2.206 -e3345b11c12eedd8871b2eeb811c9234 download/7.2.207 -a7f6deca2df02cc4d23274f3104b94d1 download/7.2.208 -62e83a3e30fe5b6f96ba276a342faf1c download/7.2.209 -296e40f03bf6243583541ca440af802c download/7.2.210 -3714237966fa05c9cae8fd4518a42ac4 download/7.2.211 -3537ef914ffbe5acbdede8d3581ecf41 download/7.2.212 -9f4b0f8a1dc9c3720eca6028c987fa01 download/7.2.213 -fb46e419802a06e26d8531628f50aca9 download/7.2.214 -388c0884878256fca9db1fb1fe9df98e download/7.2.215 -cd568cf0b9b751b9ff1151fa6f5f0ae0 download/7.2.216 -288d5ee4b5ff25caa79446a95cb3ee98 download/7.2.217 -d86a84a239c25dda5101aac8c365154c download/7.2.218 -9c0f11d3c52d1756381231e1c0a6156d download/7.2.219 -bfed5d4e0bcae8eb7a7e0806d4367e0a download/7.2.220 -3b169a3f976cf1808b12230dd24c0ff5 download/7.2.221 -a3f9c7d976ad8a49250d0ff3130b6390 download/7.2.222 -3ca61604214ef919b7bfe4b24eb69518 download/7.2.223 -5c550bd6e2111c10407b7aca009b1242 download/7.2.224 -b3ae8fa424e01a0fc67c9ed7393b422e download/7.2.225 -6057e1247bd3b1538eef15c532caf881 download/7.2.226 -932e2a5394788124cbda950bfff327ff download/7.2.227 -b97e5d33fa4fb8a1ea1308558bb33d41 download/7.2.228 -2107c7d981ca14d8e795ae744a903106 download/7.2.229 -7e98ae111e74676ef88c5e3edce785ed download/7.2.230 -2abbb80186d28da703eb329d4247dd41 download/7.2.231 -5e5cfa4e5ee34cbbdd01c27ece1b7398 download/7.2.232 -9fa12db95776e9174ca7c95172a48838 download/7.2.233 -a46776a6914ec2972ada91b33b0cfb39 download/7.2.234 -4121105bf052ebac02bd9891c232137a download/7.2.235 -e9ca47c42d7de7b27910e3b35e533ecd download/7.2.236 -f48f3e3f58a7a82a1c14fd61072c69f0 download/7.2.237 -5b9cc79b5448fb71ac1b2870a861119d download/7.2.238 -28a8a33a3e2ceef51f838c2dc9fceac2 download/7.2.239 -212989ec4f90d697183c7cfb363cd453 download/7.2.240 -45f0effee324a20881e254c1b59dd5f8 download/7.2.241 -464fc788e592b19cd4d8a21d3d8b789e download/7.2.242 -eb8132b8f89393e7f39734e607fc3925 download/7.2.243 -15c654c51220c2ad94b47d6013626aef download/7.2.244 -d5ecb198dfea237e96b5ae12b9381383 download/7.2.245 -d91e62d4152877db281fdaa797cfe0c3 download/7.2.246 -a4dbbffc8ec2b377e1a1eb8279ff611c download/7.2.247 -9d97db1b426ab2c56a8e4281233c7d5f download/7.2.248 -947568ba23d4560e6292f6f1846120c4 download/7.2.249 -73948226c417143bce66ba6244443aed download/7.2.250 -2e351cf03bbcb927d93bafd8166dd82d download/7.2.251 -11cef6808a278694c61ba2c74f3911b0 download/7.2.252 -ed1731b8c74ee27d129bbc78e178da2f download/7.2.253 -1703bec4ee7a155037d3373d23bc7ca1 download/7.2.254 -57f31a4f4afc9a0ea60829bf9d36b380 download/7.2.255 -19df6e42d09a76e7c219b172204bf66a download/7.2.256 -c4775d1a1c37f288803f5d11d8d94865 download/7.2.257 -a62aae9b8281bd7e1d144c6534a27b68 download/7.2.258 -91d775ed9329eec16882eeca04708dec download/7.2.259 -d6bcf89bb0a04ce25d94f8bc0b3ba747 download/7.2.260 -7313b1644f7184ea116a0e7cccc42124 download/7.2.261 -75b2f61f81ff9af8e7f83d1885e9487f download/7.2.262 -e98be83507f72cff814aa89456fb38ee download/7.2.263 -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 -d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz -f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 -f31314c40819d3414d77ea286770c17f download/vimrc -1965bc951c0a190faaa665996b1b287e download/vimrc.tiny -582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.patch +aa5582d8289b43255f45d4bb6f62e140 7.3.001 +2949cbdfe86f533c487fd144c5935c7a 7.3.002 +9059db41cf3a468935745242cb9c0514 7.3.003 +9aaa4490d2fbf9a1e780a151fb41f279 7.3.004 +bf5b5fad8c4de23449fa7c7c01969369 7.3.005 +f53d95dfb1eee5f5f769594174d0e9d4 7.3.006 +a7a4c56110662bc3ba6fbb2fd645d94f 7.3.007 +be756a231afe754d004b6c8a9d12bb50 7.3.008 +f4ed2feff44e2c1898fd5e60f9f97b0d 7.3.009 +4fffed01d3683b0b8b23df600a0bada2 7.3.010 +4ee8f06dce300c0be029bf00b03ef093 7.3.011 +5b9510a17074e2b37d8bb38ae09edbf2 vim-7.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Nov 14 18:05:18 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Nov 2010 17:05:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[11606] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11606 http://gar.svn.sourceforge.net/gar/?rev=11606&view=rev Author: bdwalton Date: 2010-11-14 17:05:18 +0000 (Sun, 14 Nov 2010) Log Message: ----------- apache2: tweak the post-merge build CAS creation Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-14 13:53:50 UTC (rev 11605) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-14 17:05:18 UTC (rev 11606) @@ -248,8 +248,8 @@ @(cd $(PKGROOT)/$(prefix)/apache2/etc/; \ for f in httpd.conf.CSW extra/httpd-ssl.conf.CSW; do \ echo ...$$f; \ - perl -pi -e 's/#*ServerName www.example.com:(80|443)/EOS\necho ServerName `hostname`:$$1 >> \$$TEMPLATE;\ncat <>\$$TEMPLATE/; \ - s/#*ServerAdmin you\@example.com/EOS\necho ServerAdmin root@`hostname` >> \$$TEMPLATE;\ncat <>\$$TEMPLATE/; \ + perl -pi -e 's/#*ServerName www.example.com:(80|443)/EOS\necho ServerName `hostname`:$$1 >> \$$TEMPLATE\ncat <>\$$TEMPLATE/; \ + s/#*ServerAdmin you\@example.com/EOS\necho ServerAdmin root@`hostname` >> \$$TEMPLATE\ncat <>\$$TEMPLATE/; \ s/^User.*daemon/User nobody/; \ s/^Group.*daemon/Group nobody/; \ s/^(LoadModule.*suexec.*)/#$$1/; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Nov 14 19:49:34 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Nov 2010 18:49:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[11607] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11607 http://gar.svn.sourceforge.net/gar/?rev=11607&view=rev Author: bdwalton Date: 2010-11-14 18:49:34 +0000 (Sun, 14 Nov 2010) Log Message: ----------- apache2: simplify delivery of build class template configs by placing them in the real files and having transforms applied by build script instead of delivering as a side effect of the .CSW version Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/apache2/trunk/files/build_cas_template Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/conf_build_scripts Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-14 17:05:18 UTC (rev 11606) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-14 18:49:34 UTC (rev 11607) @@ -242,20 +242,14 @@ post-merge: create-templates - @echo " => Creating template files" - @$(FILEDIR)/conf_build_scripts $(PKGROOT) - @echo " => Modifying template files for specific cases" - @(cd $(PKGROOT)/$(prefix)/apache2/etc/; \ - for f in httpd.conf.CSW extra/httpd-ssl.conf.CSW; do \ - echo ...$$f; \ - perl -pi -e 's/#*ServerName www.example.com:(80|443)/EOS\necho ServerName `hostname`:$$1 >> \$$TEMPLATE\ncat <>\$$TEMPLATE/; \ - s/#*ServerAdmin you\@example.com/EOS\necho ServerAdmin root@`hostname` >> \$$TEMPLATE\ncat <>\$$TEMPLATE/; \ - s/^User.*daemon/User nobody/; \ - s/^Group.*daemon/Group nobody/; \ - s/^(LoadModule.*suexec.*)/#$$1/; \ - s/^#(Include.*httpd-mpm.conf)/$$1/; \ - s/^#(Include.*httpd-ssl.conf)/$$1/' $$f; \ - done ) - @cp -p $(WORKDIR)/server.crt.build_cas $(PKGROOT)/$(prefix)/apache2/etc/server.crt.CSW + @echo " => Creating template files and CAS shell scripts..." + @( cd $(PKGROOT)/opt/csw/apache2/etc; \ + for f in *conf extra/* mime* magic*; do \ + echo "...$$f"; \ + mv $$f $$f.CSW; \ + $(abspath $(FILEDIR))/build_cas_template $$f > $$f; \ + done ) + @echo " => Creating ssl server.crt build CAS template." + @cp -p $(WORKDIR)/server.crt.build_cas $(PKGROOT)/$(prefix)/apache2/etc/server.crt @$(MAKECOOKIE) Added: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-14 18:49:34 UTC (rev 11607) @@ -0,0 +1,28 @@ +#!/bin/bash + +cat < $template -PIR=\${PKG_INSTALL_ROOT:-/} -AP2_ROOT=\$PIR/$AP2_ROOT -AP2_CONF=\$AP2_ROOT/etc -TEMPLATE=\$AP2_CONF/$template - -if [ "\$1" = install ]; then - cat < \$TEMPLATE -EOF - -perl -pi -e 's/\$/\\\$/g' $f -cat $f >> $template - -cat <> $template -EOS - -if [ ! -f \$AP2_CONF/$f ]; then - cp -p \$TEMPLATE \$AP2_CONF/$f -fi - -else - rm \$TEMPLATE -fi - -EOF - -rm $f -done 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 Nov 14 21:50:19 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Nov 2010 20:50:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11608] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 11608 http://gar.svn.sourceforge.net/gar/?rev=11608&view=rev Author: bdwalton Date: 2010-11-14 20:50:19 +0000 (Sun, 14 Nov 2010) Log Message: ----------- gar/v2: tweak the heuristic that determines git vs non-git patches Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-11-14 18:49:34 UTC (rev 11607) +++ csw/mgar/gar/v2/gar.lib.mk 2010-11-14 20:50:19 UTC (rev 11608) @@ -516,7 +516,7 @@ # apply normal patches (git format-patch output or old-style diff -r) normal-patch-%: @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @( if ggrep -q 'Subject:' $(abspath $(DOWNLOADDIR)/$*); then \ + @( if ggrep -q 'diff --git' $(abspath $(DOWNLOADDIR)/$*); then \ cd $(WORKSRC); git am --ignore-space-change --ignore-whitespace $(abspath $(DOWNLOADDIR)/$*); \ else \ echo Adding old-style 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 Nov 14 23:18:19 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 14 Nov 2010 22:18:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11609] csw/mgar/pkg/trac/trunk Message-ID: Revision: 11609 http://gar.svn.sourceforge.net/gar/?rev=11609&view=rev Author: rthurner Date: 2010-11-14 22:18:18 +0000 (Sun, 14 Nov 2010) Log Message: ----------- trac: upgrade to trac-0.12.1, and add some checkpkg ignores not necessary before 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 2010-11-14 20:50:19 UTC (rev 11608) +++ csw/mgar/pkg/trac/trunk/Makefile 2010-11-14 22:18:18 UTC (rev 11609) @@ -1,7 +1,7 @@ # $Id$ GARNAME = Trac -GARVERSION = 0.11.7 +GARVERSION = 0.12.1 CATEGORIES = python DESCRIPTION = Integrated SCM and Project Management @@ -25,6 +25,13 @@ CATALOGNAME_CSWtrac = trac SPKG_DESC_CSWtrac = Integrated SCM and Project Management +CHECKPKG_OVERRIDES_CSWtrac += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWtrac += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWpysetuptools +CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWgenshi +CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWpythonsvn + + TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/trac/trunk/checksums =================================================================== --- csw/mgar/pkg/trac/trunk/checksums 2010-11-14 20:50:19 UTC (rev 11608) +++ csw/mgar/pkg/trac/trunk/checksums 2010-11-14 22:18:18 UTC (rev 11609) @@ -1 +1 @@ -3cd96dad0e4f25d977c422fd6e985e99 Trac-0.11.7.tar.gz +35a9c53ec35466b24a535d19bb6cdfa2 Trac-0.12.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Nov 14 23:33:03 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Nov 2010 22:33:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[11610] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11610 http://gar.svn.sourceforge.net/gar/?rev=11610&view=rev Author: bdwalton Date: 2010-11-14 22:33:03 +0000 (Sun, 14 Nov 2010) Log Message: ----------- apache2: update prototype for changes in build CAS handling Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-14 22:18:18 UTC (rev 11609) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-14 22:33:03 UTC (rev 11610) @@ -198,7 +198,7 @@ PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/apache2\/etc\/.*CSW/ { $$$$1 = "e"; $$$$2 = "build"; $$$$4 = "?"; $$$$5 = "?"; $$$$6 = "?"}; { print }' +PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"; $$$$4 = "?"; $$$$5 ="?"; $$$$6 = "?"}; {print}' include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Nov 14 23:54:13 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Nov 2010 22:54:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[11611] csw/mgar/pkg/apache2/trunk/files/build_cas_template Message-ID: Revision: 11611 http://gar.svn.sourceforge.net/gar/?rev=11611&view=rev Author: bdwalton Date: 2010-11-14 22:54:13 +0000 (Sun, 14 Nov 2010) Log Message: ----------- apache2: correct the CAS building script Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/build_cas_template Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-14 22:33:03 UTC (rev 11610) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-14 22:54:13 UTC (rev 11611) @@ -3,17 +3,17 @@ cat < Revision: 11612 http://gar.svn.sourceforge.net/gar/?rev=11612&view=rev Author: bdwalton Date: 2010-11-14 23:58:34 +0000 (Sun, 14 Nov 2010) Log Message: ----------- apache2: modify the build CAS perl substitutions Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/build_cas_template Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-14 22:54:13 UTC (rev 11611) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-14 23:58:34 UTC (rev 11612) @@ -12,10 +12,9 @@ if [ "\$1" = install ]; then if [ ! -f "\$CONF_FILE" ]; then cp -p \$CONF_FILE.CSW \$CONF_FILE - host=\`hostname\` perl -pi \ - -e "s/#*ServerName www.example.com(80|443)/ServerName \$host:\\\$1/;" \ - -e "s/#*ServerAdmin you\@example.com/ServerAdmin root@\$host/;" \ + -e "s/#*ServerName.*www.example.com/ServerName \`hostname\`/;" \ + -e "s/#*ServerAdmin you\@example.com/ServerAdmin root@\`hostname\`/;" \ -e "s/^User.*daemon/User nobody/;" \ -e "s/^Group.*daemon/Group nobody/;" \ -e "s/^(LoadModule.*suexec.*)/#\$1/;" \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Nov 15 02:14:32 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 01:14:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11613] csw/mgar/pkg/apache2/trunk/files/build_cas_template Message-ID: Revision: 11613 http://gar.svn.sourceforge.net/gar/?rev=11613&view=rev Author: bdwalton Date: 2010-11-15 01:14:32 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: fix a few escaping issues in the build CAS creation script Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/build_cas_template Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-14 23:58:34 UTC (rev 11612) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 01:14:32 UTC (rev 11613) @@ -17,9 +17,9 @@ -e "s/#*ServerAdmin you\@example.com/ServerAdmin root@\`hostname\`/;" \ -e "s/^User.*daemon/User nobody/;" \ -e "s/^Group.*daemon/Group nobody/;" \ - -e "s/^(LoadModule.*suexec.*)/#\$1/;" \ - -e "s/^#(Include.*httpd-mpm.conf)/\$1/;" \ - -e "s/^#(Include.*httpd-ssl.conf)/\$1/;" \$CONF_FILE + -e 's/^(LoadModule.*suexec.*)/#\$1/;' \ + -e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \ + -e 's/^#(Include.*httpd-ssl.conf)/\$1/;' \$CONF_FILE fi else # preserve ourselves with no changes 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 Nov 15 02:42:27 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 01:42:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[11614] csw/mgar/pkg/apache2/trunk/files/build_cas_template Message-ID: Revision: 11614 http://gar.svn.sourceforge.net/gar/?rev=11614&view=rev Author: bdwalton Date: 2010-11-15 01:42:27 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: escape an @ in the build CAS script substitution list Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/build_cas_template Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 01:14:32 UTC (rev 11613) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 01:42:27 UTC (rev 11614) @@ -14,7 +14,7 @@ cp -p \$CONF_FILE.CSW \$CONF_FILE perl -pi \ -e "s/#*ServerName.*www.example.com/ServerName \`hostname\`/;" \ - -e "s/#*ServerAdmin you\@example.com/ServerAdmin root@\`hostname\`/;" \ + -e "s/#*ServerAdmin you\@example.com/ServerAdmin root\@\`hostname\`/;" \ -e "s/^User.*daemon/User nobody/;" \ -e "s/^Group.*daemon/Group nobody/;" \ -e 's/^(LoadModule.*suexec.*)/#\$1/;' \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Nov 15 02:56:22 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 01:56:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11615] csw/mgar/pkg/apache2/trunk/files/build_cas_template Message-ID: Revision: 11615 http://gar.svn.sourceforge.net/gar/?rev=11615&view=rev Author: bdwalton Date: 2010-11-15 01:56:22 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: set explicit ownership/perms on conf files after substitutions in build CAS script Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/build_cas_template Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 01:42:27 UTC (rev 11614) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 01:56:22 UTC (rev 11615) @@ -20,6 +20,9 @@ -e 's/^(LoadModule.*suexec.*)/#\$1/;' \ -e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \ -e 's/^#(Include.*httpd-ssl.conf)/\$1/;' \$CONF_FILE + + chown root:bin \$CONF_FILE + chmod 644 \$CONF_FILE fi else # preserve ourselves with no changes 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 Nov 15 02:58:17 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 01:58:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11616] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11616 http://gar.svn.sourceforge.net/gar/?rev=11616&view=rev Author: bdwalton Date: 2010-11-15 01:58:17 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: do not use ? instead of owner group and permissions in the prototype for the files marked as build CAS Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-15 01:56:22 UTC (rev 11615) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-15 01:58:17 UTC (rev 11616) @@ -198,7 +198,7 @@ PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"; $$$$4 = "?"; $$$$5 ="?"; $$$$6 = "?"}; {print}' +PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; {print}' include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Nov 15 03:10:14 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 02:10:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[11617] csw/mgar/pkg/apache2/trunk/files/build_cas_template Message-ID: Revision: 11617 http://gar.svn.sourceforge.net/gar/?rev=11617&view=rev Author: bdwalton Date: 2010-11-15 02:10:14 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: ensure the conf file build CAS script indicates to user whether or not file is being touched Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/build_cas_template Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 01:58:17 UTC (rev 11616) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 02:10:14 UTC (rev 11617) @@ -11,6 +11,7 @@ if [ "\$1" = install ]; then if [ ! -f "\$CONF_FILE" ]; then + echo "Installing \$CONF_FILE from CSW template." cp -p \$CONF_FILE.CSW \$CONF_FILE perl -pi \ -e "s/#*ServerName.*www.example.com/ServerName \`hostname\`/;" \ @@ -23,6 +24,8 @@ chown root:bin \$CONF_FILE chmod 644 \$CONF_FILE + else + echo "Not updating \$CONF_FILE. It already exists." fi else # preserve ourselves with no changes 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 Nov 15 03:13:32 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 02:13:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11618] csw/mgar/pkg/apache2/trunk/files/build_cas_template Message-ID: Revision: 11618 http://gar.svn.sourceforge.net/gar/?rev=11618&view=rev Author: bdwalton Date: 2010-11-15 02:13:32 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: drive update20to22 in the build CAS templates so it can be removed from the postinstall Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/build_cas_template Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 02:10:14 UTC (rev 11617) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 02:13:32 UTC (rev 11618) @@ -26,6 +26,10 @@ chmod 644 \$CONF_FILE else echo "Not updating \$CONF_FILE. It already exists." + if [ -n "`grep mod_auth.so \$CONF_FILE`" ]; then + echo "Updating the syntax to 2.2 format though..." + \${PIR}/\$AP2_DIR/sbin/update20to22 \$CONF_FILE + fi fi else # preserve ourselves with no changes 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 Nov 15 03:17:14 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 02:17:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[11619] csw/mgar/pkg/apache2/trunk/files/build_cas_template Message-ID: Revision: 11619 http://gar.svn.sourceforge.net/gar/?rev=11619&view=rev Author: bdwalton Date: 2010-11-15 02:17:14 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: add another escape in the build CAS template creation script Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/build_cas_template Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 02:13:32 UTC (rev 11618) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 02:17:14 UTC (rev 11619) @@ -26,7 +26,7 @@ chmod 644 \$CONF_FILE else echo "Not updating \$CONF_FILE. It already exists." - if [ -n "`grep mod_auth.so \$CONF_FILE`" ]; then + if [ -n "\`grep mod_auth.so \$CONF_FILE\`" ]; then echo "Updating the syntax to 2.2 format though..." \${PIR}/\$AP2_DIR/sbin/update20to22 \$CONF_FILE fi 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 Nov 15 03:27:46 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 02:27:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[11620] csw/mgar/pkg/apache2/trunk/files/build_cas_template Message-ID: Revision: 11620 http://gar.svn.sourceforge.net/gar/?rev=11620&view=rev Author: bdwalton Date: 2010-11-15 02:27:45 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: ensure the build script sends stdout to stderr so the build CAS does not make user info statements into the file content Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/build_cas_template Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 02:17:14 UTC (rev 11619) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 02:27:45 UTC (rev 11620) @@ -11,7 +11,7 @@ if [ "\$1" = install ]; then if [ ! -f "\$CONF_FILE" ]; then - echo "Installing \$CONF_FILE from CSW template." + echo "Installing \$CONF_FILE from CSW template." >&2 cp -p \$CONF_FILE.CSW \$CONF_FILE perl -pi \ -e "s/#*ServerName.*www.example.com/ServerName \`hostname\`/;" \ @@ -25,10 +25,10 @@ chown root:bin \$CONF_FILE chmod 644 \$CONF_FILE else - echo "Not updating \$CONF_FILE. It already exists." + echo "Not updating \$CONF_FILE. It already exists." >&2 if [ -n "\`grep mod_auth.so \$CONF_FILE\`" ]; then echo "Updating the syntax to 2.2 format though..." - \${PIR}/\$AP2_DIR/sbin/update20to22 \$CONF_FILE + \${PIR}/\$AP2_DIR/sbin/update20to22 \$CONF_FILE >&2 fi fi else 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 Nov 15 03:39:30 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 02:39:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[11621] csw/mgar/pkg/apache2/trunk/files/build_cas_template Message-ID: Revision: 11621 http://gar.svn.sourceforge.net/gar/?rev=11621&view=rev Author: bdwalton Date: 2010-11-15 02:39:29 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: enchance and extend user messages for the build CAS tempalted files Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/build_cas_template Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 02:27:45 UTC (rev 11620) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 02:39:29 UTC (rev 11621) @@ -11,7 +11,7 @@ if [ "\$1" = install ]; then if [ ! -f "\$CONF_FILE" ]; then - echo "Installing \$CONF_FILE from CSW template." >&2 + echo "Installing $1 from CSW template." >&2 cp -p \$CONF_FILE.CSW \$CONF_FILE perl -pi \ -e "s/#*ServerName.*www.example.com/ServerName \`hostname\`/;" \ @@ -25,13 +25,14 @@ chown root:bin \$CONF_FILE chmod 644 \$CONF_FILE else - echo "Not updating \$CONF_FILE. It already exists." >&2 + echo "Not updating $1. It already exists." >&2 if [ -n "\`grep mod_auth.so \$CONF_FILE\`" ]; then echo "Updating the syntax to 2.2 format though..." \${PIR}/\$AP2_DIR/sbin/update20to22 \$CONF_FILE >&2 fi fi else + echo "Not removing $1." >&2 # preserve ourselves with no changes cat \$CONF_FILE fi 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 Nov 15 03:50:07 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 02:50:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[11622] csw/mgar/pkg/apache2/trunk/files/server.crt. build_cas Message-ID: Revision: 11622 http://gar.svn.sourceforge.net/gar/?rev=11622&view=rev Author: bdwalton Date: 2010-11-15 02:50:06 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: a few minor tweaks to the server.crt key generation build CAS script Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas Modified: csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas =================================================================== --- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-15 02:39:29 UTC (rev 11621) +++ csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-15 02:50:06 UTC (rev 11622) @@ -1,13 +1,14 @@ -# On installation, generate a dummy ssl certificate +#!/bin/sh +# On installation, generate a dummy ssl certificate (if required) + PIR=${PKG_INSTALL_ROOT:-/} AP2_PREFIX=/opt/csw/apache2 AP2_CONFDIR=$AP2_PREFIX/etc if [ "$1" = install ]; then - echo "A dummy file created during ${PKGINST} installation." > ${PIR}/$AP2_CONF/server.crt.CSW if [ ! -f $PIR/$AP2_CONFDIR/server.crt -a ! -f $PIR/$AP2_CONFDIR/server.key ]; then - echo Generating dummy ssl key and certificate... + echo Generating dummy ssl key and certificate... >&2 # this is likely overkill for a dummy cert, but why not umask 0077 cat </dev/null 2>&1 @@ -16,12 +17,13 @@ Hobbiton -$hostname +`hostname` bilbo at example.net EOF fi else - rm ${PIR}/$AP2_CONF/server.crt.CSW + # this is so that the build class picks up the file and re-instates it + cat ${PIR}/$AP2_CONF/server.crt fi 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 Nov 15 03:53:20 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 02:53:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[11623] csw/mgar/pkg/apache2/trunk/files/server.crt. build_cas Message-ID: Revision: 11623 http://gar.svn.sourceforge.net/gar/?rev=11623&view=rev Author: bdwalton Date: 2010-11-15 02:53:20 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: tweak the owner/perm settings on a generated ssl key/crt pair Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas Modified: csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas =================================================================== --- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-15 02:50:06 UTC (rev 11622) +++ csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-15 02:53:20 UTC (rev 11623) @@ -10,7 +10,6 @@ if [ ! -f $PIR/$AP2_CONFDIR/server.crt -a ! -f $PIR/$AP2_CONFDIR/server.key ]; then echo Generating dummy ssl key and certificate... >&2 # this is likely overkill for a dummy cert, but why not - umask 0077 cat </dev/null 2>&1 TS Westfarthing @@ -22,6 +21,8 @@ EOF + chmod 600 $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt + chown root:bin $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt fi else # this is so that the build class picks up the file and re-instates it 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 Nov 15 03:56:27 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 02:56:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[11624] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11624 http://gar.svn.sourceforge.net/gar/?rev=11624&view=rev Author: bdwalton Date: 2010-11-15 02:56:27 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: update prototype filter for server.crt file handline; ensure the post-merge routine sets tight perms on this too Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-15 02:53:20 UTC (rev 11623) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-15 02:56:27 UTC (rev 11624) @@ -198,7 +198,7 @@ PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; {print}' +PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; $$$$3 ~ /server.crt/ { $$$$4 = "0600" }; {print}' include gar/category.mk @@ -250,6 +250,7 @@ $(abspath $(FILEDIR))/build_cas_template $$f > $$f; \ done ) @echo " => Creating ssl server.crt build CAS template." - @cp -p $(WORKDIR)/server.crt.build_cas $(PKGROOT)/$(prefix)/apache2/etc/server.crt + @(cp -p $(WORKDIR)/server.crt.build_cas $(PKGROOT)/$(prefix)/apache2/etc/server.crt; \ + chmod 600 $(PKGROOT/$(prefix)/apache2/etc/server.crt ) @$(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 Mon Nov 15 03:58:27 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 02:58:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[11625] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 11625 http://gar.svn.sourceforge.net/gar/?rev=11625&view=rev Author: bdwalton Date: 2010-11-15 02:58:27 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: fix missing ) typo Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-15 02:56:27 UTC (rev 11624) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-15 02:58:27 UTC (rev 11625) @@ -251,6 +251,6 @@ done ) @echo " => Creating ssl server.crt build CAS template." @(cp -p $(WORKDIR)/server.crt.build_cas $(PKGROOT)/$(prefix)/apache2/etc/server.crt; \ - chmod 600 $(PKGROOT/$(prefix)/apache2/etc/server.crt ) + chmod 600 $(PKGROOT)/$(prefix)/apache2/etc/server.crt ) @$(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 Mon Nov 15 04:08:53 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 03:08:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11626] csw/mgar/pkg/apache2/trunk/files/server.crt. build_cas Message-ID: Revision: 11626 http://gar.svn.sourceforge.net/gar/?rev=11626&view=rev Author: bdwalton Date: 2010-11-15 03:08:52 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: fix server.crt remove stage to use correct variable name Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas Modified: csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas =================================================================== --- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-15 02:58:27 UTC (rev 11625) +++ csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-15 03:08:52 UTC (rev 11626) @@ -26,5 +26,5 @@ fi else # this is so that the build class picks up the file and re-instates it - cat ${PIR}/$AP2_CONF/server.crt + cat $PIR/$AP2_CONFDIR/server.crt fi 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 Nov 15 04:25:15 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 03:25:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11627] csw/mgar/pkg/apache2/trunk/files/build_cas_template Message-ID: Revision: 11627 http://gar.svn.sourceforge.net/gar/?rev=11627&view=rev Author: bdwalton Date: 2010-11-15 03:25:15 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: redirect output in build CAS so file does not end up with comment as content Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/build_cas_template Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 03:08:52 UTC (rev 11626) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-15 03:25:15 UTC (rev 11627) @@ -27,7 +27,7 @@ else echo "Not updating $1. It already exists." >&2 if [ -n "\`grep mod_auth.so \$CONF_FILE\`" ]; then - echo "Updating the syntax to 2.2 format though..." + echo "Updating the syntax to 2.2 format though..." >&2 \${PIR}/\$AP2_DIR/sbin/update20to22 \$CONF_FILE >&2 fi fi 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 Nov 15 04:34:49 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Nov 2010 03:34:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[11628] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11628 http://gar.svn.sourceforge.net/gar/?rev=11628&view=rev Author: bdwalton Date: 2010-11-15 03:34:49 +0000 (Mon, 15 Nov 2010) Log Message: ----------- apache2: completely remove postinstall script as it now lives in build CAS files Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-15 03:25:15 UTC (rev 11627) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-15 03:34:49 UTC (rev 11628) @@ -37,7 +37,7 @@ # Standard package bits DISTFILES += CSWapache2.killproc cswapache2 -DISTFILES += CSWapache2.preinstall CSWapache2.postinstall +DISTFILES += CSWapache2.preinstall # Configuration templates DISTFILES += update20to22 server.crt.build_cas Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-11-15 03:25:15 UTC (rev 11627) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2010-11-15 03:34:49 UTC (rev 11628) @@ -1,47 +0,0 @@ -#!/bin/sh - -ROOT=${PKG_INSTALL_ROOT:-/} -CSW_PREFIX=${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 -# For use in config files and certificate generation -hostname=`hostname` -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#' - 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 - -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 Mon Nov 15 10:38:36 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Nov 2010 09:38:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[11629] csw/mgar/pkg/gtar/trunk Message-ID: Revision: 11629 http://gar.svn.sourceforge.net/gar/?rev=11629&view=rev Author: dmichelsen Date: 2010-11-15 09:38:36 +0000 (Mon, 15 Nov 2010) Log Message: ----------- gtar: Update to 1.25 Modified Paths: -------------- csw/mgar/pkg/gtar/trunk/Makefile csw/mgar/pkg/gtar/trunk/checksums Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2010-11-15 03:34:49 UTC (rev 11628) +++ csw/mgar/pkg/gtar/trunk/Makefile 2010-11-15 09:38:36 UTC (rev 11629) @@ -1,5 +1,5 @@ GARNAME = tar -GARVERSION = 1.24 +GARVERSION = 1.25 CATEGORIES = utils DESCRIPTION = GNU tape archiver Modified: csw/mgar/pkg/gtar/trunk/checksums =================================================================== --- csw/mgar/pkg/gtar/trunk/checksums 2010-11-15 03:34:49 UTC (rev 11628) +++ csw/mgar/pkg/gtar/trunk/checksums 2010-11-15 09:38:36 UTC (rev 11629) @@ -1 +1 @@ -6f84e44a332449844995874cf5245094 tar-1.24.tar.gz +0e48e9e473a72f135d0ebbc8af2762cc tar-1.25.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 15 10:44:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Nov 2010 09:44:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[11630] csw/mgar/pkg/vim/trunk/Makefile Message-ID: Revision: 11630 http://gar.svn.sourceforge.net/gar/?rev=11630&view=rev Author: dmichelsen Date: 2010-11-15 09:44:07 +0000 (Mon, 15 Nov 2010) Log Message: ----------- vim: Add checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2010-11-15 09:38:36 UTC (rev 11629) +++ csw/mgar/pkg/vim/trunk/Makefile 2010-11-15 09:44:07 UTC (rev 11630) @@ -62,6 +62,15 @@ # Note: Tests require controlling terminal TEST_TARGET = test +CHECKPKG_OVERRIDES_CSWvim += surplus-dependency|CSWvimrt +# We have .el files, but that is purely optional +CHECKPKG_OVERRIDES_CSWvimrt += missing-dependency|CSWemacscommon +# Some tools need Perl and one is hardcoded to CSW Perl: +# /opt/csw/share/vim/vim73/tools/efm_perl.pl +# Maybe the tools should be separated package depending on CSWperl. +# Overwrite for the moment. +CHECKPKG_OVERRIDES_CSWvimrt += missing-dependency|CSWperl + include gar/category.mk post-configure: make-interps-lazy 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 Nov 15 16:06:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Nov 2010 15:06:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11631] csw/mgar/pkg/vim/trunk Message-ID: Revision: 11631 http://gar.svn.sourceforge.net/gar/?rev=11631&view=rev Author: dmichelsen Date: 2010-11-15 15:06:33 +0000 (Mon, 15 Nov 2010) Log Message: ----------- vim: Update to current patchlevel Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vim/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/vim/trunk/files/fix-alignment64-spell.c.diff csw/mgar/pkg/vim/trunk/files/vimtutor.patch Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2010-11-15 09:44:07 UTC (rev 11630) +++ csw/mgar/pkg/vim/trunk/Makefile 2010-11-15 15:06:33 UTC (rev 11631) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.3 -PATCHREV = 011 +PATCHREV = 055 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php @@ -25,16 +25,12 @@ MASTER_SITES += ftp://ftp.vim.org/pub/vim/unix/ DISTFILES = $(GARNAME)-$(DISTVERSION).tar.bz2 -# There are no extra files for Vim 7.3, everything is in the main archive. -#DISTFILES += $(GARNAME)-$(DISTVERSION)-lang.tar.gz -#DISTFILES += $(GARNAME)-$(DISTVERSION)-extra.tar.gz DISTFILES += vimrc DISTFILES += vimrc.tiny DISTFILES += gvimrc DISTFILES += COPYING PATCHFILES = $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T)) -#PATCHFILES += vimtutor.patch WORKSRC = $(WORKDIR)/$(GARNAME)$(subst .,,$(DISTVERSION)) Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2010-11-15 09:44:07 UTC (rev 11630) +++ csw/mgar/pkg/vim/trunk/checksums 2010-11-15 15:06:33 UTC (rev 11631) @@ -9,4 +9,48 @@ f4ed2feff44e2c1898fd5e60f9f97b0d 7.3.009 4fffed01d3683b0b8b23df600a0bada2 7.3.010 4ee8f06dce300c0be029bf00b03ef093 7.3.011 +89faf7d5eef1d1d50b657fe34ee7c90b 7.3.012 +6a029d61f7d51c1bea55330732676319 7.3.013 +d0109c0c413c405fdb827ec20f3903d8 7.3.014 +4db0a869dbe00c360541ad2c1ca87a2d 7.3.015 +e0c634532a865d7ed47942080e371b3e 7.3.016 +f52aa5bc3df02c3bb4c75849b2b5f431 7.3.017 +02270ecbc1dc2f57de80441ac7cdd0f0 7.3.018 +5c1be1a0a107261e0a716c877c82fc97 7.3.019 +ef09917435a7cab9382abe3708cf5152 7.3.020 +53c90651baf1b4b28c99947de58deb91 7.3.021 +c4cb1bf3fa0a45d9cad997cd02fa9439 7.3.022 +1e34e216b0e419096f796d3511ce88da 7.3.023 +5c2ff27d8ce8d1aeb42ff16ca1cb89c2 7.3.024 +69b3e00a17230da16d3be4b96f125196 7.3.025 +687a80a82d05e8e91e9ee659b3e0dd67 7.3.026 +1994a0d1e52111b9fa1b999745da93b8 7.3.027 +2438a52f25cf167bbf5711fc8c7323d7 7.3.028 +302ca6aa621c215736f3db069f8c2285 7.3.029 +ceb0e12297907b13dd39fafffa731c62 7.3.030 +acb42f7f4545a63d35396360dc2799ff 7.3.031 +56c9d1681bfc9fe5e76c281b905f0ad8 7.3.032 +4a399b6f1bcde6d991088118f5a58222 7.3.033 +40580589a13a36cc72a600200b93b8d2 7.3.034 +8f7a617b0cf8fea46e4b1557bc286fda 7.3.035 +3ac58b7fe8347ad87f3628bfb4970f1b 7.3.036 +d83c7635e8b65db98a377f3cc7b72ce0 7.3.037 +a310c68726540ac1a0759ef12778bed1 7.3.038 +6b7243d85b86e03b4a782e4bf6d7646e 7.3.039 +8aa33a527433f1907b72ac7c514d455d 7.3.040 +979abe1512bc48dbaed028a23cb2f6cc 7.3.041 +984ce81978ef2b12b3a09986d37e4719 7.3.042 +27b2418128b4322c3cb92b13d577ad6c 7.3.043 +c29e637b242682dc6df544a0bc89abc4 7.3.044 +bd6ac17eecf226a2d6a31e4fb9069ded 7.3.045 +d97f518c548de06b11b5682f2ca4d9a9 7.3.046 +ae37e72299f02ea1b7f2bb59932ed306 7.3.047 +39aaaf13dfef317febb2442626f262f1 7.3.048 +6469fb212e95ad83c21aaaaf8aee0f3a 7.3.049 +e40dc723ef91adee9854faceaba1e201 7.3.050 +5611eda78907716863ebd6ebd19a000f 7.3.051 +01011da656094510c1cdabbc80c129b9 7.3.052 +faaf035020dcf22b57fa76c998e4553b 7.3.053 +90bd11788f022dc1107f93e702734a2a 7.3.054 +5b4fe73d1c47ab36a6b0a8f5ddd2fe65 7.3.055 5b9510a17074e2b37d8bb38ae09edbf2 vim-7.3.tar.bz2 Deleted: csw/mgar/pkg/vim/trunk/files/fix-alignment64-spell.c.diff =================================================================== --- csw/mgar/pkg/vim/trunk/files/fix-alignment64-spell.c.diff 2010-11-15 09:44:07 UTC (rev 11630) +++ csw/mgar/pkg/vim/trunk/files/fix-alignment64-spell.c.diff 2010-11-15 15:06:33 UTC (rev 11631) @@ -1,74 +0,0 @@ -Index: spell.c -=================================================================== -RCS file: /cvsroot/vim/vim7/src/spell.c,v -retrieving revision 1.121 -diff -c -r1.121 spell.c -*** src/spell.c 9 Dec 2008 21:34:19 -0000 1.121 ---- src/spell.c 28 Jan 2009 20:32:04 -0000 -*************** -*** 2335,2348 **** - if (curline) - break; /* only check cursor line */ - - /* Advance to next line. */ - if (dir == BACKWARD) - { -- /* If we are back at the starting line and searched it again there -- * is no match, give up. */ -- if (lnum == wp->w_cursor.lnum && wrapped) -- break; -- - if (lnum > 1) - --lnum; - else if (!p_ws) ---- 2335,2348 ---- - if (curline) - break; /* only check cursor line */ - -+ /* If we are back at the starting line and searched it again there -+ * is no match, give up. */ -+ if (lnum == wp->w_cursor.lnum && wrapped) -+ break; -+ - /* Advance to next line. */ - if (dir == BACKWARD) - { - if (lnum > 1) - --lnum; - else if (!p_ws) -*************** -*** 4961,4968 **** - typedef struct sblock_S sblock_T; - struct sblock_S - { -- sblock_T *sb_next; /* next block in list */ - int sb_used; /* nr of bytes already in use */ - char_u sb_data[1]; /* data, actually longer */ - }; - ---- 4961,4968 ---- - typedef struct sblock_S sblock_T; - struct sblock_S - { - int sb_used; /* nr of bytes already in use */ -+ sblock_T *sb_next; /* next block in list */ - char_u sb_data[1]; /* data, actually longer */ - }; - -*************** -*** 15011,15017 **** - - case 0: - /* -! * Lenghts are equal, thus changes must result in same length: An - * insert is only possible in combination with a delete. - * 1: check if for identical strings - */ ---- 15011,15017 ---- - - case 0: - /* -! * Lengths are equal, thus changes must result in same length: An - * insert is only possible in combination with a delete. - * 1: check if for identical strings - */ Deleted: csw/mgar/pkg/vim/trunk/files/vimtutor.patch =================================================================== --- csw/mgar/pkg/vim/trunk/files/vimtutor.patch 2010-11-15 09:44:07 UTC (rev 11630) +++ csw/mgar/pkg/vim/trunk/files/vimtutor.patch 2010-11-15 15:06:33 UTC (rev 11631) @@ -1,13 +0,0 @@ -*** src/vimtutor.o Thu Dec 18 23:27:44 2008 ---- src/vimtutor Thu Dec 18 23:28:10 2008 -*************** -*** 1,5 **** ---- 1,8 ---- - #! /bin/sh - -+ PATH=`dirname $0`:$PATH -+ export PATH -+ - # Start Vim on a copy of the tutor file. - - # Usage: vimtutor [-g] [xx] 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 Nov 15 16:07:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Nov 2010 15:07:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[11632] csw/mgar/pkg/gvim/trunk Message-ID: Revision: 11632 http://gar.svn.sourceforge.net/gar/?rev=11632&view=rev Author: dmichelsen Date: 2010-11-15 15:07:57 +0000 (Mon, 15 Nov 2010) Log Message: ----------- gvim: Update to 7.3p055, switch from CSW X11 to SUNW X11 Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gvim/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/gvim/trunk/files/fix-alignment64-spell.c.diff csw/mgar/pkg/gvim/trunk/files/vimtutor.patch Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2010-11-15 15:06:33 UTC (rev 11631) +++ csw/mgar/pkg/gvim/trunk/Makefile 2010-11-15 15:07:57 UTC (rev 11632) @@ -1,6 +1,6 @@ GARNAME = vim -DISTVERSION = 7.2 -PATCHREV = 320 +DISTVERSION = 7.3 +PATCHREV = 055 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php @@ -21,19 +21,13 @@ MASTER_SITES += ftp://ftp.vim.org/pub/vim/unix/ DISTFILES = $(GARNAME)-$(DISTVERSION).tar.bz2 -DISTFILES += $(GARNAME)-$(DISTVERSION)-lang.tar.gz -DISTFILES += $(GARNAME)-$(DISTVERSION)-extra.tar.gz DISTFILES += gvim.desktop DISTFILES += COPYING PATCHFILES = $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T)) -PATCHFILES += vimtutor.patch WORKSRC = $(WORKDIR)/$(GARNAME)$(subst .,,$(DISTVERSION)) -EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib -EXTRA_LDFLAGS = -R /opt/csw/X11/lib - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-global-runtime=$(sharedstatedir)/$(GARNAME) CONFIGURE_ARGS += --with-features=huge @@ -42,22 +36,21 @@ CONFIGURE_ARGS += --enable-cscope CONFIGURE_ARGS += --with-vim-name="vim-x11" CONFIGURE_ARGS += --enable-gui=gnome2 -CONFIGURE_ARGS += --x-includes=/opt/csw/X11/include -CONFIGURE_ARGS += --x-libraries=/opt/csw/X11/lib - BUILD_ARGS = "VIMRCLOC=/opt/csw/share/vim" BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim72" PATCHDIRLEVEL = 0 RUNTIME_DEP_PKGS_CSWgvim = CSWvimrt CSWbonobo2 CSWfconfig CSWftype2 CSWgconf2 -RUNTIME_DEP_PKGS_CSWgvim += CSWggettextrt CSWglib2 CSWgnomekeyring CSWgnomevfs2 CSWgtk2 +RUNTIME_DEP_PKGS_CSWgvim += CSWggettextrt CSWglib2 CSWgnomevfs2 CSWgtk2 RUNTIME_DEP_PKGS_CSWgvim += CSWiconv CSWlibart CSWlibatk CSWlibbonoboui CSWlibcairo RUNTIME_DEP_PKGS_CSWgvim += CSWlibgnome CSWlibgnomecanvas CSWlibgnomeui CSWlibpopt -RUNTIME_DEP_PKGS_CSWgvim += CSWlibxml2 CSWlibxrender CSWncurses CSWorbit2 CSWpango -RUNTIME_DEP_PKGS_CSWgvim += CSWperl CSWpng CSWzlib CSWlibx11 +RUNTIME_DEP_PKGS_CSWgvim += CSWncurses CSWorbit2 CSWpango +# It is ok to depend on the base files +CHECKPKG_OVERRIDES_CSWgvim += surplus-dependency|CSWvimrt + INSTALL_SCRIPTS = minimal # Note: Tests require controlling terminal Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2010-11-15 15:06:33 UTC (rev 11631) +++ csw/mgar/pkg/gvim/trunk/checksums 2010-11-15 15:07:57 UTC (rev 11632) @@ -1,326 +1,56 @@ -7c2dc4a956cf315e546e347bc349968c download/7.2.001 -7f16f80814f1e071a689806c2056b39d download/7.2.002 -0de916fdfd450a4a0d95bed44ae2c398 download/7.2.003 -25cc99ad42b25b16a4610e2fad9cdab4 download/7.2.004 -a5b7b1c7c5b75aa7d730b0b9aa491558 download/7.2.005 -a93a72cd40c37da91dc634dc8dddefec download/7.2.006 -c2b2b63dea27ddad92668e63797406c5 download/7.2.007 -e65c8c2223eea5289d8cbef2e867a5de download/7.2.008 -ab1566b69bd0e0c82a866f00675ffe0e download/7.2.009 -d69f559bfb5436c157e8069a829ca50d download/7.2.010 -05334a6bb31402bfd49d82ea6f59a57b download/7.2.011 -a11dcd5552f36544a9e27978b5359935 download/7.2.012 -8bc70978291aadea9c82072b623c955d download/7.2.013 -a87826187cb77ad2e567a40c1609eea4 download/7.2.014 -47a466fbfdbca616f519fc4afa0432df download/7.2.015 -fd08bac73d7ffcabf53bd25a63dff893 download/7.2.016 -0f0284d87f6f52101802dbe1a45d54c3 download/7.2.017 -38d06ba325b716c1177c1012d781bada download/7.2.018 -661ca021fb70c24ef4df229512cfb14b download/7.2.019 -cb2c5ca0f9a9718fb635874925432dd8 download/7.2.020 -9073d2311ae7101c143237a45afb4efa download/7.2.021 -48ccb0deec77a3bb91bf967dacb43492 download/7.2.022 -d77ed8aa4de30d4dbd17a7998ae8f269 download/7.2.023 -cf983237e5e866ef459870fee2754bac download/7.2.024 -ab32defa4b2cfb509ccb34d4858b1223 download/7.2.025 -5e96c227c7765b1e0f03f44cb5b750f6 download/7.2.026 -f26b7ee0f271eacbb3652dbdf92dd860 download/7.2.027 -fc54a3d35bdc7b7a7660c6d2274f7b74 download/7.2.028 -d53630dc8f3a823f54dfba73dcd47b36 download/7.2.029 -208f8ed2db2665ebfc17674f78d47c6d download/7.2.030 -3387583af86faa78e10be979214071f3 download/7.2.031 -eca017686205ec8658bf9fa8c73f7af6 download/7.2.032 -88c91b84ffc772fd57f86475f7ba90f1 download/7.2.033 -c3d6eaaa0b74df423f90afaaafa3a0de download/7.2.034 -f4c35dae581d671dc271407d377f7199 download/7.2.035 -0ae8b6ed636fc013e2fa6bdabc182041 download/7.2.036 -1c6501c366cc8df205955f3e4d3ebba9 download/7.2.037 -ed3479ddb4ded7b74c82af5e50b0e4a6 download/7.2.038 -2a61f28f6f793c5a43abded6e59b6506 download/7.2.039 -4c493255ae227498016f30a0002ec1cc download/7.2.040 -66bde35426c09d9c666e23215f9a19c9 download/7.2.041 -99baedef8a9c908774b7ed74deacf184 download/7.2.042 -87035b208c9377c28d796b1e48ab8aac download/7.2.043 -b127def242996b4e7d7e870cab3e4b45 download/7.2.044 -5233327e4c97d310e3793b223892ea8d download/7.2.045 -9ecfa0454f5a329996b273cb12369962 download/7.2.046 -35e16f4e7198e861a71322fee2cb7909 download/7.2.047 -84ef9658181f49bfbd7a61ec87dd0b8d download/7.2.048 -fc9b65eef81954f6006c307ff11be925 download/7.2.049 -27a9700e39e266a31df702677acea52c download/7.2.050 -89ce3f5b513510fb288a4a301e7494c7 download/7.2.051 -5992bb56b07a9b9b4e3504f1f2f2c79c download/7.2.052 -3fe570c1317fee8a71ede17197358e02 download/7.2.053 -5b047e8e8413c4807d74a6d9716474a2 download/7.2.054 -c276080d95de2fafa9706f247c35ff74 download/7.2.055 -5b65e2654a78dcc4c15dc49dbce5418e download/7.2.056 -cab5a9ddf0ab180089d84bf9ec685574 download/7.2.057 -80991ff846f88222e3266dab6b07e2b8 download/7.2.058 -89cede639caf8beed5ea071790445e26 download/7.2.059 -9781d833263060308a9622dd097ad378 download/7.2.060 -71b4bc625bc1cdd68747262d329db551 download/7.2.061 -9243a773d19966dbfd98b7aff3fe3ab7 download/7.2.062 -08155711f8db2dfce217ec5a34253a76 download/7.2.063 -fd692f9624ec0170800b3d9a2a9a53cb download/7.2.064 -ee1a8dc311c7580608e3bd2196a7d042 download/7.2.065 -8d1d5f8aefabf0abcb54de5247893246 download/7.2.066 -fa0ccca2decdd2db64947658b04b8c99 download/7.2.067 -ca5ab057205023613020ca920d903028 download/7.2.068 -f3e6f3dd76278a9f7e396955faa4ca31 download/7.2.069 -805cdc76da46e73ae908038e09efae16 download/7.2.070 -9224b5e9c85fa4d47d418c248aff542e download/7.2.071 -ab9250d36651dde9267d1241cac9fb74 download/7.2.072 -0d77ee653eabe4b7fdb640d768d7c1be download/7.2.073 -5b0a423e9f3ca07e5c62d4f0f5803a5c download/7.2.074 -d7eccf57f8fc04cf0385f85eff3d989a download/7.2.075 -99750c988d0c48f56cb12a04b78aebc2 download/7.2.076 -1967f5e7fa4cec07bd67cc47925ec3c8 download/7.2.077 -7b285d2ba24fdd2390b4aaba08fcf5f6 download/7.2.078 -a3385578174d3867f17ab287276db49b download/7.2.079 -ea45aa4d1a74989d361b2a29c1e9ff9b download/7.2.080 -3bdf4ec7db7976876a827f2dfa269e89 download/7.2.081 -590c9aa51fcb808ece4b6b4bfaaaaf30 download/7.2.082 -2a10abc536f7a69ff3ef353b55b6cb65 download/7.2.083 -78defaaa03e61955f6624b796efb8655 download/7.2.084 -869116b3e92e944d40a3e03f9a99816f download/7.2.085 -5af26f073ebeba60af90525d68a61725 download/7.2.086 -639d7a80864afe68132725e377f52f19 download/7.2.087 -44b152484534fa23c4ff531316a0e518 download/7.2.088 -990e6a23c4061df0dcc0ab84528a2e1a download/7.2.089 -8985dcfe7df6b439e88554e22cf34919 download/7.2.090 -137faec139470453ca446c015c226e47 download/7.2.091 -e15782bf5892ad787d149491bfe013e7 download/7.2.092 -2198caf9e5f422eacde337e9c27677ab download/7.2.093 -49ab5014904d459e54a667e1433b4bee download/7.2.094 -ba21ee323426561e75ebff23090e4bdb download/7.2.095 -7ffef4a30cdcd6d8426e44d3a25df991 download/7.2.096 -c7264031ad24af960d717189b344e244 download/7.2.097 -dc7b06bb5c5b11a3d487614287d99a6b download/7.2.098 -656c12368934868f35747f3955366142 download/7.2.099 -15dacd715d6f8c655265bbf77ebaddd4 download/7.2.100 -65e59923311b136306284319521d70d7 download/7.2.101 -42e2274c6a3152279720d8623f7916ad download/7.2.102 -654ba716e77d092c1c314fed18c7486d download/7.2.103 -b839c2c957eb3bb7511ace0b61d5d5fe download/7.2.104 -7f37ad0b1573be8bc39a817a21422a4e download/7.2.105 -4801df8c2833a683cd1b2a5870565e41 download/7.2.106 -e6801b619d40efe81428399e26e0486f download/7.2.107 -76f17428d216ec6b29036e22397c2765 download/7.2.108 -db97daa4f1e56440a988e7f5272997c7 download/7.2.109 -b8752c88429f869dec05232db89018e2 download/7.2.110 -e8cdc1e862b60215c12265e44b38239d download/7.2.111 -e933dd778c6f8687cf1f9f3e550e6cc0 download/7.2.112 -861729d9d4dc422e45c22bd8e006fc32 download/7.2.113 -5da3a29b3184af1780a82499343e7587 download/7.2.114 -b35c7b1cfa2a5f7b45829cd09ac27b7a download/7.2.115 -1355cc34fbc7be7eb48fa777e8f49dfb download/7.2.116 -8b9c839ec7448691b0a88475f0d0d4f9 download/7.2.117 -74d97a563ec1b1f1606705097396c391 download/7.2.118 -2ddd84423b902a2b3594c64c567be0b4 download/7.2.119 -5394e442f011d47b6d69a7b03984cdf4 download/7.2.120 -6bdb5e63ca3d79d3dcb7127e14ae3949 download/7.2.121 -36554c0103cafc8759f3e71ccd56c56f download/7.2.122 -841c74d1f3cb8380fa5713d5b9ca2c98 download/7.2.123 -2489ebcb72280dd50b8756e4ab7d36ed download/7.2.124 -10b15d637133b73d825650363d863b58 download/7.2.125 -b31534667bb741e21479b1e3757c9e21 download/7.2.126 -71e87e78bea69d8876ff7f6d824c8986 download/7.2.127 -21da01d371757282bfd402ddd91005ba download/7.2.128 -e890b630efa3847c8cdee2f197145b6c download/7.2.129 -d3fe3bf37d5c0940f3e751f41d92e817 download/7.2.130 -3c2aaa22914d06a65bf0f212e43c3ace download/7.2.131 -379aa718df5dbcde8215fc4d94062d9f download/7.2.132 -6d51f9deb4c2604692f532c118b73ef8 download/7.2.133 -4acae77b2a217e1cb47040c08e28180d download/7.2.134 -4d30bf2c9d2973f5dd1c12468123dc41 download/7.2.135 -f2ae8cc595933938ee608e040d1256a5 download/7.2.136 -c613c1e0fac319f05ffe1fa7e27d6600 download/7.2.137 -e7d02c3dea47fa579366bb1cd025ce5e download/7.2.138 -04f7131164b3f46d6365a8faea0e32c6 download/7.2.139 -e1c0e4fbd985f5a2e5a24a4cfab1112c download/7.2.140 -e5a9c7ef44a38057c0c5c1191d9cdf77 download/7.2.141 -f08f7f966749c2ef20ff87dfeb9bef62 download/7.2.142 -6b132dad3ad947662d1c370193a14218 download/7.2.143 -4e2a1d1cb12198a783759f88e6c64fc4 download/7.2.144 -38877e2ac720e45e5d62cd1089167db3 download/7.2.145 -cb97aca73a1f4fdd2fac894bba7e43ae download/7.2.146 -4219afedebf0172118f2d078d9012995 download/7.2.147 -49ca89a47315f512c7ee06f5b2617a90 download/7.2.148 -9197a669e4ee024c1a9218e861e21c7e download/7.2.149 -cbdf7ce960ad4646a8884e51bc7e037e download/7.2.150 -56b24ce6e78e71c64d05fda51748b01c download/7.2.151 -7c088583f063cd09d26f7291d9f5817b download/7.2.152 -e966483b6755f4e7b2cd92708a8ff656 download/7.2.153 -27bcb5f1d5932ee7eaae40ba0a4eb968 download/7.2.154 -611ab5b97cd9d87a1be0a84e3006b17a download/7.2.155 -27fb40dbdb85052a598be88f205484c6 download/7.2.156 -93a85a3606193b8875f0eba05dba3be3 download/7.2.157 -808ba7888bdfdf559366dfdf1446dab5 download/7.2.158 -08bd6d6db2e029beab84b32bf36494e0 download/7.2.159 -c07df493053267849115b579928a4dae download/7.2.160 -e44297c9ed5928e55ca43b4e2b3509ce download/7.2.161 -0d4768bd2395f3ebf3ebd7fa4979288c download/7.2.162 -032f90bcee8f36ad7b77a17bb76719f0 download/7.2.163 -21341ed82eb080e590d15dd6368e8d78 download/7.2.164 -51de241d7d03200a7b3490f40256c633 download/7.2.165 -9c645166c92865d644fd232760b56494 download/7.2.166 -a29266c1573ff106366ebdbd460b17ce download/7.2.167 -09105d79266562b6afe0179c07149738 download/7.2.168 -36d18f0e42f0c24722116cb823b52c8a download/7.2.169 -a00979f910f29d5062faf15e8670735b download/7.2.170 -439a415dab8a77790c7da1526da083f9 download/7.2.171 -3defcc24541cd3d62fda6cfb4af6ba4b download/7.2.172 -5f16d8af9b11f44c8e104abc942152c2 download/7.2.173 -4949fe9f14ac4f7b2717ddb05968285c download/7.2.174 -7462cd9ba69a7eb674aa8e5653fdad63 download/7.2.175 -4b5c77673b5d62f1a94e4d605e92d81e download/7.2.176 -cde1647ab09a432c134d6fbae5ca15dc download/7.2.177 -5a126dd404945088b61aaf9d8c2effaa download/7.2.178 -a15fe587377fac500d0fae2b1c3adbbf download/7.2.179 -d4db5a69da98dbda41429d66e339e515 download/7.2.180 -8b9dee3c4aeeb563cbff6f3cf0357675 download/7.2.181 -d5d50f1da385bee588348aaaa5bb2dd7 download/7.2.182 -77e46725488937910d1cf051760ad11d download/7.2.183 -3bdbab52e0ac635962ce9983ef1d9f01 download/7.2.184 -fa88ae980d6e68f9aa9f9b257f1f3e71 download/7.2.185 -2262a6034d4cf01859a1d36982f38505 download/7.2.186 -c98b89c2594d7127574d0bd9838f241a download/7.2.187 -8efff5f82388c43183739c280249b643 download/7.2.188 -bab560f5a4b1809c2859ab632f037135 download/7.2.189 -63098e6cdb253d83c30f42d3d4469900 download/7.2.190 -87a02a6db9029357d7e248bcf4923330 download/7.2.191 -88102a28fb2139fe14a66b2970958166 download/7.2.192 -66a202b39e36ac062db1432896d8d988 download/7.2.193 -3ba1ab13de695c1422e0cda65c03503d download/7.2.194 -a42b79c5328c30b0951ce67da505a3f4 download/7.2.195 -f1ece679735785c46b58ed4d791b3880 download/7.2.196 -352908f71b12a7a30aafd985c338d247 download/7.2.197 -2a4764a5df5c1d18e4c7fee81074f55c download/7.2.198 -61a30d8c51533f08a94ba23025a12f11 download/7.2.199 -1a21534f09d529a9096c5e9b978187e9 download/7.2.200 -61e01d2aef1d5c1c3b40d5e927bd83c9 download/7.2.201 -30df1365ef27c34558d4322cb71c5d83 download/7.2.202 -24ae52da6519c8f8fbd08676c64eac75 download/7.2.203 -e75f99a06eb7a03a5cf854505b1d795d download/7.2.204 -3e2da4100f83cf2d308545d0c822a196 download/7.2.205 -4895874100f932e15a8c661fb40a19b1 download/7.2.206 -e3345b11c12eedd8871b2eeb811c9234 download/7.2.207 -a7f6deca2df02cc4d23274f3104b94d1 download/7.2.208 -62e83a3e30fe5b6f96ba276a342faf1c download/7.2.209 -296e40f03bf6243583541ca440af802c download/7.2.210 -3714237966fa05c9cae8fd4518a42ac4 download/7.2.211 -3537ef914ffbe5acbdede8d3581ecf41 download/7.2.212 -9f4b0f8a1dc9c3720eca6028c987fa01 download/7.2.213 -fb46e419802a06e26d8531628f50aca9 download/7.2.214 -388c0884878256fca9db1fb1fe9df98e download/7.2.215 -cd568cf0b9b751b9ff1151fa6f5f0ae0 download/7.2.216 -288d5ee4b5ff25caa79446a95cb3ee98 download/7.2.217 -d86a84a239c25dda5101aac8c365154c download/7.2.218 -9c0f11d3c52d1756381231e1c0a6156d download/7.2.219 -bfed5d4e0bcae8eb7a7e0806d4367e0a download/7.2.220 -3b169a3f976cf1808b12230dd24c0ff5 download/7.2.221 -a3f9c7d976ad8a49250d0ff3130b6390 download/7.2.222 -3ca61604214ef919b7bfe4b24eb69518 download/7.2.223 -5c550bd6e2111c10407b7aca009b1242 download/7.2.224 -b3ae8fa424e01a0fc67c9ed7393b422e download/7.2.225 -6057e1247bd3b1538eef15c532caf881 download/7.2.226 -932e2a5394788124cbda950bfff327ff download/7.2.227 -b97e5d33fa4fb8a1ea1308558bb33d41 download/7.2.228 -2107c7d981ca14d8e795ae744a903106 download/7.2.229 -7e98ae111e74676ef88c5e3edce785ed download/7.2.230 -2abbb80186d28da703eb329d4247dd41 download/7.2.231 -5e5cfa4e5ee34cbbdd01c27ece1b7398 download/7.2.232 -9fa12db95776e9174ca7c95172a48838 download/7.2.233 -a46776a6914ec2972ada91b33b0cfb39 download/7.2.234 -4121105bf052ebac02bd9891c232137a download/7.2.235 -e9ca47c42d7de7b27910e3b35e533ecd download/7.2.236 -f48f3e3f58a7a82a1c14fd61072c69f0 download/7.2.237 -5b9cc79b5448fb71ac1b2870a861119d download/7.2.238 -28a8a33a3e2ceef51f838c2dc9fceac2 download/7.2.239 -212989ec4f90d697183c7cfb363cd453 download/7.2.240 -45f0effee324a20881e254c1b59dd5f8 download/7.2.241 -464fc788e592b19cd4d8a21d3d8b789e download/7.2.242 -eb8132b8f89393e7f39734e607fc3925 download/7.2.243 -15c654c51220c2ad94b47d6013626aef download/7.2.244 -d5ecb198dfea237e96b5ae12b9381383 download/7.2.245 -d91e62d4152877db281fdaa797cfe0c3 download/7.2.246 -a4dbbffc8ec2b377e1a1eb8279ff611c download/7.2.247 -9d97db1b426ab2c56a8e4281233c7d5f download/7.2.248 -947568ba23d4560e6292f6f1846120c4 download/7.2.249 -73948226c417143bce66ba6244443aed download/7.2.250 -2e351cf03bbcb927d93bafd8166dd82d download/7.2.251 -11cef6808a278694c61ba2c74f3911b0 download/7.2.252 -ed1731b8c74ee27d129bbc78e178da2f download/7.2.253 -1703bec4ee7a155037d3373d23bc7ca1 download/7.2.254 -57f31a4f4afc9a0ea60829bf9d36b380 download/7.2.255 -19df6e42d09a76e7c219b172204bf66a download/7.2.256 -c4775d1a1c37f288803f5d11d8d94865 download/7.2.257 -a62aae9b8281bd7e1d144c6534a27b68 download/7.2.258 -91d775ed9329eec16882eeca04708dec download/7.2.259 -d6bcf89bb0a04ce25d94f8bc0b3ba747 download/7.2.260 -7313b1644f7184ea116a0e7cccc42124 download/7.2.261 -75b2f61f81ff9af8e7f83d1885e9487f download/7.2.262 -e98be83507f72cff814aa89456fb38ee download/7.2.263 -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 +aa5582d8289b43255f45d4bb6f62e140 7.3.001 +2949cbdfe86f533c487fd144c5935c7a 7.3.002 +9059db41cf3a468935745242cb9c0514 7.3.003 +9aaa4490d2fbf9a1e780a151fb41f279 7.3.004 +bf5b5fad8c4de23449fa7c7c01969369 7.3.005 +f53d95dfb1eee5f5f769594174d0e9d4 7.3.006 +a7a4c56110662bc3ba6fbb2fd645d94f 7.3.007 +be756a231afe754d004b6c8a9d12bb50 7.3.008 +f4ed2feff44e2c1898fd5e60f9f97b0d 7.3.009 +4fffed01d3683b0b8b23df600a0bada2 7.3.010 +4ee8f06dce300c0be029bf00b03ef093 7.3.011 +89faf7d5eef1d1d50b657fe34ee7c90b 7.3.012 +6a029d61f7d51c1bea55330732676319 7.3.013 +d0109c0c413c405fdb827ec20f3903d8 7.3.014 +4db0a869dbe00c360541ad2c1ca87a2d 7.3.015 +e0c634532a865d7ed47942080e371b3e 7.3.016 +f52aa5bc3df02c3bb4c75849b2b5f431 7.3.017 +02270ecbc1dc2f57de80441ac7cdd0f0 7.3.018 +5c1be1a0a107261e0a716c877c82fc97 7.3.019 +ef09917435a7cab9382abe3708cf5152 7.3.020 +53c90651baf1b4b28c99947de58deb91 7.3.021 +c4cb1bf3fa0a45d9cad997cd02fa9439 7.3.022 +1e34e216b0e419096f796d3511ce88da 7.3.023 +5c2ff27d8ce8d1aeb42ff16ca1cb89c2 7.3.024 +69b3e00a17230da16d3be4b96f125196 7.3.025 +687a80a82d05e8e91e9ee659b3e0dd67 7.3.026 +1994a0d1e52111b9fa1b999745da93b8 7.3.027 +2438a52f25cf167bbf5711fc8c7323d7 7.3.028 +302ca6aa621c215736f3db069f8c2285 7.3.029 +ceb0e12297907b13dd39fafffa731c62 7.3.030 +acb42f7f4545a63d35396360dc2799ff 7.3.031 +56c9d1681bfc9fe5e76c281b905f0ad8 7.3.032 +4a399b6f1bcde6d991088118f5a58222 7.3.033 +40580589a13a36cc72a600200b93b8d2 7.3.034 +8f7a617b0cf8fea46e4b1557bc286fda 7.3.035 +3ac58b7fe8347ad87f3628bfb4970f1b 7.3.036 +d83c7635e8b65db98a377f3cc7b72ce0 7.3.037 +a310c68726540ac1a0759ef12778bed1 7.3.038 +6b7243d85b86e03b4a782e4bf6d7646e 7.3.039 +8aa33a527433f1907b72ac7c514d455d 7.3.040 +979abe1512bc48dbaed028a23cb2f6cc 7.3.041 +984ce81978ef2b12b3a09986d37e4719 7.3.042 +27b2418128b4322c3cb92b13d577ad6c 7.3.043 +c29e637b242682dc6df544a0bc89abc4 7.3.044 +bd6ac17eecf226a2d6a31e4fb9069ded 7.3.045 +d97f518c548de06b11b5682f2ca4d9a9 7.3.046 +ae37e72299f02ea1b7f2bb59932ed306 7.3.047 +39aaaf13dfef317febb2442626f262f1 7.3.048 +6469fb212e95ad83c21aaaaf8aee0f3a 7.3.049 +e40dc723ef91adee9854faceaba1e201 7.3.050 +5611eda78907716863ebd6ebd19a000f 7.3.051 +01011da656094510c1cdabbc80c129b9 7.3.052 +faaf035020dcf22b57fa76c998e4553b 7.3.053 +90bd11788f022dc1107f93e702734a2a 7.3.054 +5b4fe73d1c47ab36a6b0a8f5ddd2fe65 7.3.055 +5b9510a17074e2b37d8bb38ae09edbf2 vim-7.3.tar.bz2 Deleted: csw/mgar/pkg/gvim/trunk/files/fix-alignment64-spell.c.diff =================================================================== --- csw/mgar/pkg/gvim/trunk/files/fix-alignment64-spell.c.diff 2010-11-15 15:06:33 UTC (rev 11631) +++ csw/mgar/pkg/gvim/trunk/files/fix-alignment64-spell.c.diff 2010-11-15 15:07:57 UTC (rev 11632) @@ -1,74 +0,0 @@ -Index: spell.c -=================================================================== -RCS file: /cvsroot/vim/vim7/src/spell.c,v -retrieving revision 1.121 -diff -c -r1.121 spell.c -*** src/spell.c 9 Dec 2008 21:34:19 -0000 1.121 ---- src/spell.c 28 Jan 2009 20:32:04 -0000 -*************** -*** 2335,2348 **** - if (curline) - break; /* only check cursor line */ - - /* Advance to next line. */ - if (dir == BACKWARD) - { -- /* If we are back at the starting line and searched it again there -- * is no match, give up. */ -- if (lnum == wp->w_cursor.lnum && wrapped) -- break; -- - if (lnum > 1) - --lnum; - else if (!p_ws) ---- 2335,2348 ---- - if (curline) - break; /* only check cursor line */ - -+ /* If we are back at the starting line and searched it again there -+ * is no match, give up. */ -+ if (lnum == wp->w_cursor.lnum && wrapped) -+ break; -+ - /* Advance to next line. */ - if (dir == BACKWARD) - { - if (lnum > 1) - --lnum; - else if (!p_ws) -*************** -*** 4961,4968 **** - typedef struct sblock_S sblock_T; - struct sblock_S - { -- sblock_T *sb_next; /* next block in list */ - int sb_used; /* nr of bytes already in use */ - char_u sb_data[1]; /* data, actually longer */ - }; - ---- 4961,4968 ---- - typedef struct sblock_S sblock_T; - struct sblock_S - { - int sb_used; /* nr of bytes already in use */ -+ sblock_T *sb_next; /* next block in list */ - char_u sb_data[1]; /* data, actually longer */ - }; - -*************** -*** 15011,15017 **** - - case 0: - /* -! * Lenghts are equal, thus changes must result in same length: An - * insert is only possible in combination with a delete. - * 1: check if for identical strings - */ ---- 15011,15017 ---- - - case 0: - /* -! * Lengths are equal, thus changes must result in same length: An - * insert is only possible in combination with a delete. - * 1: check if for identical strings - */ Deleted: csw/mgar/pkg/gvim/trunk/files/vimtutor.patch =================================================================== --- csw/mgar/pkg/gvim/trunk/files/vimtutor.patch 2010-11-15 15:06:33 UTC (rev 11631) +++ csw/mgar/pkg/gvim/trunk/files/vimtutor.patch 2010-11-15 15:07:57 UTC (rev 11632) @@ -1,13 +0,0 @@ -*** src/vimtutor.o Thu Dec 18 23:27:44 2008 ---- src/vimtutor Thu Dec 18 23:28:10 2008 -*************** -*** 1,5 **** ---- 1,8 ---- - #! /bin/sh - -+ PATH=`dirname $0`:$PATH -+ export PATH -+ - # Start Vim on a copy of the tutor file. - - # Usage: vimtutor [-g] [xx] 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 Nov 15 22:24:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Nov 2010 21:24:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[11633] csw/mgar/pkg/maven3/trunk/Makefile Message-ID: Revision: 11633 http://gar.svn.sourceforge.net/gar/?rev=11633&view=rev Author: dmichelsen Date: 2010-11-15 21:24:47 +0000 (Mon, 15 Nov 2010) Log Message: ----------- maven3: Adjust build recipe Modified Paths: -------------- csw/mgar/pkg/maven3/trunk/Makefile Modified: csw/mgar/pkg/maven3/trunk/Makefile =================================================================== --- csw/mgar/pkg/maven3/trunk/Makefile 2010-11-15 15:07:57 UTC (rev 11632) +++ csw/mgar/pkg/maven3/trunk/Makefile 2010-11-15 21:24:47 UTC (rev 11633) @@ -1,7 +1,6 @@ GARNAME = maven3 GARVERSION = 3.0 CATEGORIES = devel -GARCH = all DESCRIPTION = Java software project management and comprehension tool define BLURB @@ -23,23 +22,29 @@ endef MASTER_SITES = http://www.powertech.no/apache/dist/maven/binaries/ -DISTFILES = apache-maven-$(GARVERSION)-bin.tar.gz +DISTNAME = apache-maven-$(GARVERSION) +DISTFILES = $(DISTNAME)-bin.tar.gz +LICENSE = LICENSE.txt + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = apache-maven-(\d+(?:\.\d+)*)-bin.tar.gz CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = -INSTALL_SCRIPTS = common +INSTALL_SCRIPTS = custom +ARCHALL = 1 + include gar/category.mk -install-common: +install-custom: MAVENHOME=$(DESTDIR)$(sharedstatedir)/maven3/home +install-custom: mkdir -p $(DESTDIR)/opt/csw/bin - rm -rf $(DESTDIR)/opt/csw/share/maven3 - mkdir -p $(DESTDIR)/opt/csw/share/maven3 - cp -r $(WORKDIR)/apache-maven-$(GARVERSION)/ $(DESTDIR)/opt/csw/share/maven3/home - cp $(WORKDIR)/bin-mvn $(DESTDIR)/opt/csw/bin/mvn - chmod +x $(DESTDIR)/opt/csw/bin/mvn + rm -rf $(MAVENHOME) + mkdir -p $(MAVENHOME) + (cd $(WORKDIR)/$(DISTNAME); pax -r -w -s ',.*/\.git.*,,' . $(MAVENHOME)) + #cp $(WORKDIR)/bin-mvn $(DESTDIR)/opt/csw/bin/mvn + #chmod +x $(DESTDIR)/opt/csw/bin/mvn $(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 Tue Nov 16 02:41:06 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 16 Nov 2010 01:41:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[11634] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11634 http://gar.svn.sourceforge.net/gar/?rev=11634&view=rev Author: bdwalton Date: 2010-11-16 01:41:06 +0000 (Tue, 16 Nov 2010) Log Message: ----------- apache2: change the way server.{crt,key} are handled to prevent possibly storing sentitive info in /tmp during removal (package upgrade) Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-15 21:24:47 UTC (rev 11633) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-16 01:41:06 UTC (rev 11634) @@ -198,7 +198,7 @@ PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; $$$$3 ~ /server.crt/ { $$$$4 = "0600" }; {print}' +PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; $$$$3 ~ /server.crt.CSW/ { $$$$1 = "e"; $$$$2 = "build"; $$$$4 = "0600" }; {print}' include gar/category.mk @@ -250,7 +250,6 @@ $(abspath $(FILEDIR))/build_cas_template $$f > $$f; \ done ) @echo " => Creating ssl server.crt build CAS template." - @(cp -p $(WORKDIR)/server.crt.build_cas $(PKGROOT)/$(prefix)/apache2/etc/server.crt; \ - chmod 600 $(PKGROOT)/$(prefix)/apache2/etc/server.crt ) + @(cp -p $(WORKDIR)/server.crt.build_cas $(PKGROOT)/$(prefix)/apache2/etc/server.crt.CSW; \ + chmod 600 $(PKGROOT)/$(prefix)/apache2/etc/server.crt.CSW ) @$(MAKECOOKIE) - Modified: csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas =================================================================== --- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-15 21:24:47 UTC (rev 11633) +++ csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-16 01:41:06 UTC (rev 11634) @@ -9,6 +9,10 @@ if [ "$1" = install ]; then if [ ! -f $PIR/$AP2_CONFDIR/server.crt -a ! -f $PIR/$AP2_CONFDIR/server.key ]; then echo Generating dummy ssl key and certificate... >&2 + # this gets captured and placed by the build CAS + echo This is a dummy file but still a part of CSWapache2 + echo Please do not remove. + # this is likely overkill for a dummy cert, but why not cat </dev/null 2>&1 TS @@ -24,7 +28,9 @@ chmod 600 $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt chown root:bin $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt fi -else - # this is so that the build class picks up the file and re-instates it - cat $PIR/$AP2_CONFDIR/server.crt fi + +# No output on a remove action will see the file purged. +# As this is server.crt.CSW, that doesn't matter. The +# real files will be left behind in place whether they +# are the pretend or replaced with real files by the admin. 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 Nov 16 03:30:15 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 16 Nov 2010 02:30:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11635] csw/mgar/pkg/apache2/trunk/files/server.crt. build_cas Message-ID: Revision: 11635 http://gar.svn.sourceforge.net/gar/?rev=11635&view=rev Author: bdwalton Date: 2010-11-16 02:30:15 +0000 (Tue, 16 Nov 2010) Log Message: ----------- apache2: ensure the ssl cert build script always outputs data for the dummy file; notify admin that cert files are not touched during install if they exist Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas Modified: csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas =================================================================== --- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-16 01:41:06 UTC (rev 11634) +++ csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-16 02:30:15 UTC (rev 11635) @@ -7,11 +7,12 @@ AP2_CONFDIR=$AP2_PREFIX/etc if [ "$1" = install ]; then + # this gets captured and placed by the build CAS + echo This is a dummy file but still a part of CSWapache2 + echo Please do not remove. + if [ ! -f $PIR/$AP2_CONFDIR/server.crt -a ! -f $PIR/$AP2_CONFDIR/server.key ]; then echo Generating dummy ssl key and certificate... >&2 - # this gets captured and placed by the build CAS - echo This is a dummy file but still a part of CSWapache2 - echo Please do not remove. # this is likely overkill for a dummy cert, but why not cat </dev/null 2>&1 @@ -27,6 +28,8 @@ EOF chmod 600 $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt chown root:bin $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt + else + echo "Not touching existing SSL files." >&2 fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Nov 16 08:45:10 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 16 Nov 2010 07:45:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11636] csw/mgar/pkg/cups/trunk Message-ID: Revision: 11636 http://gar.svn.sourceforge.net/gar/?rev=11636&view=rev Author: wahwah Date: 2010-11-16 07:45:10 +0000 (Tue, 16 Nov 2010) Log Message: ----------- cups: Version bump to 1.4.5 Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/cups/trunk/checksums Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2010-11-16 02:30:15 UTC (rev 11635) +++ csw/mgar/pkg/cups/trunk/Makefile 2010-11-16 07:45:10 UTC (rev 11636) @@ -3,7 +3,7 @@ # $Id$ GARNAME = cups -GARVERSION = 1.4.4 +GARVERSION = 1.4.5 CATEGORIES = net define BLURB Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2010-11-16 02:30:15 UTC (rev 11635) +++ csw/mgar/pkg/cups/trunk/checksums 2010-11-16 07:45:10 UTC (rev 11636) @@ -1 +1 @@ -8776403ad60fea9e85eab9c04d88560d cups-1.4.4-source.tar.bz2 +50729f6fc46ba54223e0eaf5009f3419 cups-1.4.5-source.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Nov 16 13:08:08 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 16 Nov 2010 12:08:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11637] csw/mgar/pkg/fio/trunk Message-ID: Revision: 11637 http://gar.svn.sourceforge.net/gar/?rev=11637&view=rev Author: skayser Date: 2010-11-16 12:08:07 +0000 (Tue, 16 Nov 2010) Log Message: ----------- fio: bump to 1.44.2 to fix assembler issues on x86 Modified Paths: -------------- csw/mgar/pkg/fio/trunk/Makefile csw/mgar/pkg/fio/trunk/checksums csw/mgar/pkg/fio/trunk/files/changelog.CSW Modified: csw/mgar/pkg/fio/trunk/Makefile =================================================================== --- csw/mgar/pkg/fio/trunk/Makefile 2010-11-16 07:45:10 UTC (rev 11636) +++ csw/mgar/pkg/fio/trunk/Makefile 2010-11-16 12:08:07 UTC (rev 11637) @@ -1,7 +1,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) GARNAME = fio -GARVERSION = 1.44 +GARVERSION = 1.44.2 CATEGORIES = apps DESCRIPTION = Flexible I/O Tester Modified: csw/mgar/pkg/fio/trunk/checksums =================================================================== --- csw/mgar/pkg/fio/trunk/checksums 2010-11-16 07:45:10 UTC (rev 11636) +++ csw/mgar/pkg/fio/trunk/checksums 2010-11-16 12:08:07 UTC (rev 11637) @@ -1 +1 @@ -d89b1511edd8426f29aab8e17691583f fio-1.44.tar.gz +ea2765f6cbc5922b0b500dd7ae0f5d92 fio-1.44.2.tar.gz Modified: csw/mgar/pkg/fio/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/fio/trunk/files/changelog.CSW 2010-11-16 07:45:10 UTC (rev 11636) +++ csw/mgar/pkg/fio/trunk/files/changelog.CSW 2010-11-16 12:08:07 UTC (rev 11637) @@ -1,5 +1,5 @@ -fio (1.44,REV=2010.10.26) +fio (1.44.2,REV=2010.11.16) * Initial release. - -- Sebastian Kayser Tue, 26 Oct 2010 00:44:25 +0200 + -- Sebastian Kayser Tue, 16 Nov 2010 13:07:30 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Tue Nov 16 19:05:34 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Tue, 16 Nov 2010 18:05:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[11638] csw/mgar/pkg/cswutils/trunk/files/checkpkg Message-ID: Revision: 11638 http://gar.svn.sourceforge.net/gar/?rev=11638&view=rev Author: theferret Date: 2010-11-16 18:05:33 +0000 (Tue, 16 Nov 2010) Log Message: ----------- cswutils/checkpkg: modded pkg len check Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/files/checkpkg Modified: csw/mgar/pkg/cswutils/trunk/files/checkpkg =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/checkpkg 2010-11-16 12:08:07 UTC (rev 11637) +++ csw/mgar/pkg/cswutils/trunk/files/checkpkg 2010-11-16 18:05:33 UTC (rev 11638) @@ -207,8 +207,8 @@ print basedir="'$basedir'" fi -if [[ ${#software} -gt 20 ]] ; then errmsg $f: software name greater than 20 chars ; fi -if [[ ${#pkgname} -gt 20 ]] ; then errmsg $f: pkg name greater than 20 chars; fi +if [[ ${#software} -gt 29 ]] ; then errmsg $f: software name greater than 29 chars ; fi +if [[ ${#pkgname} -gt 32 ]] ; then errmsg $f: pkg name greater than 32 chars; fi if [ "$software" = "" ] ; then errmsg $f: software field not set properly in NAME ; fi if [ "$pkgname" = "" ] ; then errmsg $f: pkgname field blank ; fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Tue Nov 16 19:10:43 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Tue, 16 Nov 2010 18:10:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11639] csw/mgar/pkg/cswutils/trunk/files/cpan2pkg Message-ID: Revision: 11639 http://gar.svn.sourceforge.net/gar/?rev=11639&view=rev Author: theferret Date: 2010-11-16 18:10:43 +0000 (Tue, 16 Nov 2010) Log Message: ----------- cswutils/cpan2pkg: bumped len to 29 Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/files/cpan2pkg Modified: csw/mgar/pkg/cswutils/trunk/files/cpan2pkg =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/cpan2pkg 2010-11-16 18:05:33 UTC (rev 11638) +++ csw/mgar/pkg/cswutils/trunk/files/cpan2pkg 2010-11-16 18:10:43 UTC (rev 11639) @@ -34,7 +34,7 @@ our $pgm = $0; our $cswdir = '/opt/csw'; our $makecmd = "$cswdir/bin/gmake"; -our $maxsoftnmlen = 20; +our $maxsoftnmlen = 29; our $bwurl = 'http://www.opencsw.org'; our $bwfsearch = '/filesearch.php'; our @msearchpath = ( # Perl module search path 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 Nov 17 02:18:42 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 17 Nov 2010 01:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[11640] csw/mgar/pkg/apache2/branches/fs-rework/ Message-ID: Revision: 11640 http://gar.svn.sourceforge.net/gar/?rev=11640&view=rev Author: bdwalton Date: 2010-11-17 01:18:42 +0000 (Wed, 17 Nov 2010) Log Message: ----------- apache2: add fs-rework branch to tackle etc/ and var/ moves Added Paths: ----------- csw/mgar/pkg/apache2/branches/fs-rework/ 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 Nov 17 11:51:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Nov 2010 10:51:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11641] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 11641 http://gar.svn.sourceforge.net/gar/?rev=11641&view=rev Author: wahwah Date: 2010-11-17 10:51:53 +0000 (Wed, 17 Nov 2010) Log Message: ----------- Revert "mGAR v2: checkpkg, README, the list of dependencies to run the unit tests on Ubuntu." This reverts commit 46b7b6bd95a737c1f65a8e1d60bf07e1cd3301de. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2010-11-17 01:18:42 UTC (rev 11640) +++ csw/mgar/gar/v2/lib/python/README 2010-11-17 10:51:53 UTC (rev 11641) @@ -13,16 +13,3 @@ Known problems: - libmagic fails sometimes when processing the whole catalog - -Dependencies: - -It's possible to develop checkpkg on a non-Solaris platform, using unit -tests as means to run various bits of code. Here's the dependency list -for Ubuntu. - - python-cheetah - python-hachoir-parser - python-magic - python-mox - python-progressbar - python-yaml 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 Nov 17 11:52:17 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Nov 2010 10:52:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11642] csw/mgar/gar/v2/.gitignore Message-ID: Revision: 11642 http://gar.svn.sourceforge.net/gar/?rev=11642&view=rev Author: wahwah Date: 2010-11-17 10:52:17 +0000 (Wed, 17 Nov 2010) Log Message: ----------- mGAR v2: Adding a .gitignore file Added Paths: ----------- csw/mgar/gar/v2/.gitignore Added: csw/mgar/gar/v2/.gitignore =================================================================== --- csw/mgar/gar/v2/.gitignore (rev 0) +++ csw/mgar/gar/v2/.gitignore 2010-11-17 10:52:17 UTC (rev 11642) @@ -0,0 +1,2 @@ +*.pyc +*.swp 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 Nov 17 11:52:52 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Nov 2010 10:52:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[11643] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11643 http://gar.svn.sourceforge.net/gar/?rev=11643&view=rev Author: wahwah Date: 2010-11-17 10:52:51 +0000 (Wed, 17 Nov 2010) Log Message: ----------- mGAR checkpkg: Moved hachoir_parser dependent classes to a separate file. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_stats.py csw/mgar/gar/v2/lib/python/sharedlib_utils.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/inspective_package.py Added: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py (rev 0) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2010-11-17 10:52:51 UTC (rev 11643) @@ -0,0 +1,146 @@ +import package +import os +import re +import logging +import hachoir_parser as hp +import sharedlib_utils +import magic + +"""This file isolates code dependent on hachoir parser. + +hachoir parser takes quite a while to import. +""" + +# Suppress unhelpful warnings +# http://bitbucket.org/haypo/hachoir/issue/23 +import hachoir_core.config +hachoir_core.config.quiet = True + +class InspectivePackage(package.DirectoryFormatPackage): + """Extends DirectoryFormatPackage to allow package inspection.""" + + def GetFilesMetadata(self): + """Returns a data structure with all the files plus their metadata. + + [ + { + "path": ..., + "mime_type": ..., + }, + ] + """ + if not self.files_metadata: + self.CheckPkgpathExists() + self.files_metadata = [] + files_root = os.path.join(self.directory, "root") + if not os.path.exists(files_root): + return self.files_metadata + all_files = self.GetAllFilePaths() + def StripRe(x, strip_re): + return re.sub(strip_re, "", x) + root_re = re.compile(r"^root/") + file_magic = FileMagic() + for file_path in all_files: + full_path = unicode(self.MakeAbsolutePath(file_path)) + file_info = { + "path": StripRe(file_path, root_re), + "mime_type": file_magic.GetFileMimeType(full_path) + } + if not file_info["mime_type"]: + logging.error("Could not establish the mime type of %s", + full_path) + # We really don't want that, as it misses binaries. + raise package.PackageError("Could not establish the mime type of %s" + % full_path) + if sharedlib_utils.IsBinary(file_info): + parser = hp.createParser(full_path) + if not parser: + logging.warning("Can't parse file %s", file_path) + else: + file_info["mime_type_by_hachoir"] = parser.mime_type + machine_id = parser["/header/machine"].value + file_info["machine_id"] = machine_id + file_info["endian"] = parser["/header/endian"].display + self.files_metadata.append(file_info) + return self.files_metadata + + def ListBinaries(self): + """Lists all the binaries from a given package. + + Original checkpkg code: + + ######################################### + # find all executables and dynamic libs,and list their filenames. + listbinaries() { + if [ ! -d $1 ] ; then + print errmsg $1 not a directory + rm -rf $EXTRACTDIR + exit 1 + fi + find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' + } + + Returns a list of absolute paths. + + Now that there are files_metadata, this function can safely go away, once + all its callers are modified to use files_metadata instead. + """ + if self.binaries is None: + self.CheckPkgpathExists() + files_metadata = self.GetFilesMetadata() + self.binaries = [] + # The nested for-loop looks inefficient. + for file_info in files_metadata: + if sharedlib_utils.IsBinary(file_info): + self.binaries.append(file_info["path"]) + self.binaries.sort() + return self.binaries + + +class FileMagic(object): + """Libmagic sometimes returns None, which I think is a bug. + Trying to come up with a way to work around that. It might not even be + very helpful, but at least detects the issue and tries to work around it. + """ + + def __init__(self): + self.cookie_count = 0 + self.magic_cookie = None + + def _GetCookie(self): + magic_cookie = magic.open(self.cookie_count) + self.cookie_count += 1 + magic_cookie.load() + magic_cookie.setflags(magic.MAGIC_MIME) + return magic_cookie + + def _LazyInit(self): + if not self.magic_cookie: + self.magic_cookie = self._GetCookie() + + def GetFileMimeType(self, full_path): + """Trying to run magic.file() a few times, not accepting None.""" + self._LazyInit() + mime = None + for i in xrange(10): + mime = self.magic_cookie.file(full_path) + if mime: + break; + else: + # Returned mime is null. Re-initializing the cookie and trying again. + logging.error("magic_cookie.file(%s) returned None. Retrying.", + full_path) + self.magic_cookie = self._GetCookie() + return mime + + +class InspectiveCswSrv4File(package.CswSrv4File): + """Allows to get the inspective version of the dir format pkg.""" + + # The presence of this method makes it explicit that we want an inspective + # version of the directory format package. + def GetInspectivePkg(self): + return self.GetDirFormatPackage() + + def GetDirFormatClass(self): + return InspectivePackage Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-11-17 10:52:17 UTC (rev 11642) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-11-17 10:52:51 UTC (rev 11643) @@ -38,10 +38,6 @@ REVISION_ADDED = "revision number added" PKG_URL_TMPL = "http://www.opencsw.org/packages/%s" CATALOG_URL = "http://mirror.opencsw.org/opencsw/current/i386/5.10/catalog" -BIN_MIMETYPES = ( - 'application/x-executable', - 'application/x-sharedlib', -) SUBMITPKG_TMPL = """From: $from To: $to #if $cc @@ -589,20 +585,3 @@ if entry["class"]: # might be None self.classes.add(entry["class"]) return self.classes - - -def IsBinary(file_info): - """Returns True or False depending on file metadata.""" - is_a_binary = False - if "mime_type" not in file_info: - # This would be a problem in the data. - return False - if not file_info["mime_type"]: - # This should never happen, but it seems to have happened at least once. - # TODO: Find the affected data and figure out why. - raise PackageError("file_info is missing mime_type:" % file_info) - for mimetype in BIN_MIMETYPES: - if mimetype in file_info["mime_type"]: - is_a_binary = True - break - return is_a_binary Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2010-11-17 10:52:17 UTC (rev 11642) +++ csw/mgar/gar/v2/lib/python/package.py 2010-11-17 10:52:51 UTC (rev 11643) @@ -2,10 +2,8 @@ import datetime import difflib -import hachoir_parser as hp import hashlib import logging -import magic import os import re import shutil @@ -17,12 +15,6 @@ import opencsw import overrides -# Suppress unhelpful warnings -# http://bitbucket.org/haypo/hachoir/issue/23 -import hachoir_core.config -hachoir_core.config.quiet = True - - ADMIN_FILE_CONTENT = """ basedir=default runlevel=nocheck @@ -178,7 +170,7 @@ if len(dirs) != 1: raise Error("Need exactly one package in the package stream: " "%s." % (dirs)) - self.dir_format_pkg = DirectoryFormatPackage(dirs[0]) + self.dir_format_pkg = self.DIR_FORMAT_CLS(dirs[0]) self.transformed = True def GetDirFormatPkg(self): @@ -211,7 +203,8 @@ def GetPkgchkOutput(self): """Returns: (exit code, stdout, stderr).""" args = ["pkgchk", "-d", self.GetGunzippedPath(), "all"] - pkgchk_proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + pkgchk_proc = subprocess.Popen( + args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = pkgchk_proc.communicate() ret = pkgchk_proc.wait() return ret, stdout, stderr @@ -226,7 +219,12 @@ logging.debug("Removing %s", repr(self.workdir)) shutil.rmtree(self.workdir) + def GetDirFormatClass(self): + # Derived classes can override this class member and use other classes for + # the directory format package. + return DirectoryFormatPackage + class DirectoryFormatPackage(ShellMixin, object): """Represents a package in the directory format. @@ -373,83 +371,6 @@ raise PackageError("%s does not exist or is not a directory" % self.directory) - def GetFilesMetadata(self): - """Returns a data structure with all the files plus their metadata. - - [ - { - "path": ..., - "mime_type": ..., - }, - ] - """ - if not self.files_metadata: - self.CheckPkgpathExists() - self.files_metadata = [] - files_root = os.path.join(self.directory, "root") - if not os.path.exists(files_root): - return self.files_metadata - all_files = self.GetAllFilePaths() - def StripRe(x, strip_re): - return re.sub(strip_re, "", x) - root_re = re.compile(r"^root/") - file_magic = FileMagic() - for file_path in all_files: - full_path = unicode(self.MakeAbsolutePath(file_path)) - file_info = { - "path": StripRe(file_path, root_re), - "mime_type": file_magic.GetFileMimeType(full_path) - } - if not file_info["mime_type"]: - logging.error("Could not establish the mime type of %s", - full_path) - # We really don't want that, as it misses binaries. - raise PackageError("Could not establish the mime type of %s" - % full_path) - if opencsw.IsBinary(file_info): - parser = hp.createParser(full_path) - if not parser: - logging.warning("Can't parse file %s", file_path) - else: - file_info["mime_type_by_hachoir"] = parser.mime_type - machine_id = parser["/header/machine"].value - file_info["machine_id"] = machine_id - file_info["endian"] = parser["/header/endian"].display - self.files_metadata.append(file_info) - return self.files_metadata - - def ListBinaries(self): - """Lists all the binaries from a given package. - - Original checkpkg code: - - ######################################### - # find all executables and dynamic libs,and list their filenames. - listbinaries() { - if [ ! -d $1 ] ; then - print errmsg $1 not a directory - rm -rf $EXTRACTDIR - exit 1 - fi - find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' - } - - Returns a list of absolute paths. - - Now that there are files_metadata, this function can safely go away, once - all its callers are modified to use files_metadata instead. - """ - if self.binaries is None: - self.CheckPkgpathExists() - files_metadata = self.GetFilesMetadata() - self.binaries = [] - # The nested for-loop looks inefficient. - for file_info in files_metadata: - if opencsw.IsBinary(file_info): - self.binaries.append(file_info["path"]) - self.binaries.sort() - return self.binaries - def GetAllFilePaths(self): """Returns a list of all paths from the package.""" if not self.file_paths: @@ -529,44 +450,6 @@ def MakeAbsolutePath(self, p): return os.path.join(self.pkgpath, p) - - -class FileMagic(object): - """Libmagic sometimes returns None, which I think is a bug. - Trying to come up with a way to work around that. - """ - - def __init__(self): - self.cookie_count = 0 - self.magic_cookie = None - - def _GetCookie(self): - magic_cookie = magic.open(self.cookie_count) - self.cookie_count += 1 - magic_cookie.load() - magic_cookie.setflags(magic.MAGIC_MIME) - return magic_cookie - - def _LazyInit(self): - if not self.magic_cookie: - self.magic_cookie = self._GetCookie() - - def GetFileMimeType(self, full_path): - """Trying to run magic.file() a few times, not accepting None.""" - self._LazyInit() - mime = None - for i in xrange(10): - mime = self.magic_cookie.file(full_path) - if mime: - break; - else: - # Returned mime is null. Re-initializing the cookie and trying again. - logging.error("magic_cookie.file(%s) returned None. Retrying.", - full_path) - self.magic_cookie = self._GetCookie() - return mime - - class PackageComparator(object): def __init__(self, file_name_a, file_name_b, Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-11-17 10:52:17 UTC (rev 11642) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-11-17 10:52:51 UTC (rev 11643) @@ -986,7 +986,7 @@ pkginfo_arch = pkg_data["pkginfo"]["ARCH"] files_metadata = pkg_data["files_metadata"] for file_metadata in files_metadata: - if opencsw.IsBinary(file_metadata): + if su.IsBinary(file_metadata): machine = HACHOIR_MACHINES[file_metadata["machine_id"]] if machine["type"] != pkginfo_arch: error_mgr.ReportError( Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2010-11-17 10:52:17 UTC (rev 11642) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2010-11-17 10:52:51 UTC (rev 11643) @@ -103,9 +103,9 @@ return True return False - def GetDirFormatPkg(self): + def GetInspectivePkg(self): if not self.dir_format_pkg: - self.dir_format_pkg = self.srv4_pkg.GetDirFormatPkg() + self.dir_format_pkg = self.srv4_pkg.GetInspectivePkg() return self.dir_format_pkg def GetMtime(self): @@ -125,7 +125,7 @@ raise def GetBinaryDumpInfo(self): - dir_pkg = self.GetDirFormatPkg() + dir_pkg = self.GetInspectivePkg() # Binaries. This could be split off to a separate function. # man ld.so.1 for more info on this hack env = copy.copy(os.environ) @@ -145,7 +145,7 @@ return binaries_dump_info def GetBasicStats(self): - dir_pkg = self.GetDirFormatPkg() + dir_pkg = self.GetInspectivePkg() basic_stats = {} basic_stats["stats_version"] = PACKAGE_STATS_VERSION basic_stats["pkg_path"] = self.srv4_pkg.pkg_path @@ -158,7 +158,7 @@ return basic_stats def GetOverrides(self): - dir_pkg = self.GetDirFormatPkg() + dir_pkg = self.GetInspectivePkg() override_list = dir_pkg.GetOverrides() def OverrideToDict(override): return { @@ -171,7 +171,7 @@ def GetLddMinusRlines(self): """Returns ldd -r output.""" - dir_pkg = self.GetDirFormatPkg() + dir_pkg = self.GetInspectivePkg() binaries = dir_pkg.ListBinaries() ldd_output = {} for binary in binaries: @@ -205,7 +205,7 @@ 0000000000 U abort 0000097616 T aliases_lookup """ - dir_pkg = self.GetDirFormatPkg() + dir_pkg = self.GetInspectivePkg() binaries = dir_pkg.ListBinaries() defined_symbols = {} @@ -254,7 +254,7 @@ """The list of variables needs to be synchronized with the one at the top of this class. """ - dir_pkg = self.GetDirFormatPkg() + dir_pkg = self.GetInspectivePkg() logging.debug("Collecting %s package statistics.", repr(dir_pkg.pkgname)) override_dicts = self.GetOverrides() pkg_stats = { Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-11-17 10:52:17 UTC (rev 11642) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2010-11-17 10:52:51 UTC (rev 11643) @@ -15,6 +15,10 @@ AMD64_PATHS = ('amd64',) LEGIT_CHAR_RE = re.compile(r"[a-zA-Z0-9\+]+") SONAME_VERSION_RE = re.compile("^(?P.*)\.so\.(?P[\d\.]+)$") +BIN_MIMETYPES = ( + 'application/x-executable', + 'application/x-sharedlib', +) class SonameParsingException(Exception): @@ -228,3 +232,20 @@ if substring_set: current_substring = list(substring_set)[0] return current_substring + + +def IsBinary(file_info): + """Returns True or False depending on file metadata.""" + is_a_binary = False + if "mime_type" not in file_info: + # This would be a problem in the data. + return False + if not file_info["mime_type"]: + # This should never happen, but it seems to have happened at least once. + # TODO: Find the affected data and figure out why. + raise PackageError("file_info is missing mime_type:" % file_info) + for mimetype in BIN_MIMETYPES: + if mimetype in file_info["mime_type"]: + is_a_binary = True + break + return is_a_binary 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 Nov 17 11:53:17 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Nov 2010 10:53:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11644] csw/mgar/gar/v2/lib/python/opencsw.py Message-ID: Revision: 11644 http://gar.svn.sourceforge.net/gar/?rev=11644&view=rev Author: wahwah Date: 2010-11-17 10:53:17 +0000 (Wed, 17 Nov 2010) Log Message: ----------- mGAR v2: known pkgname prefixes moved to the top of opencsw.py, removed obsolete comments. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-11-17 10:52:51 UTC (rev 11643) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-11-17 10:53:17 UTC (rev 11644) @@ -38,6 +38,7 @@ REVISION_ADDED = "revision number added" PKG_URL_TMPL = "http://www.opencsw.org/packages/%s" CATALOG_URL = "http://mirror.opencsw.org/opencsw/current/i386/5.10/catalog" +KNOWN_PKGNAME_PREFIXES = ["SUNW", "FJSV", "CSW"] SUBMITPKG_TMPL = """From: $from To: $to #if $cc @@ -435,10 +436,9 @@ SUNWbashS --> sunw_bash_s SUNWPython --> sunw_python - Incomprehensible, but unit tested! + This function is incomprehensible, but unit tested! """ - known_prefixes = ["SUNW", "FJSV", "CSW"] - for prefix in known_prefixes: + for prefix in KNOWN_PKGNAME_PREFIXES: if pkgname.startswith(prefix): unused, tmp_prefix, the_rest = pkgname.partition(prefix) pkgname = tmp_prefix + "_" + the_rest @@ -467,12 +467,6 @@ catalogname_list = copy.copy(catalogname_list) if len(catalogname_list) == 1: return catalogname_list[0] - #current_substring = catalogname_list.pop() - #while catalogname_list and current_substring: - # substring_set = su.LongestCommonSubstring(current_substring, - # catalogname_list.pop()) - # if substring_set: - # current_substring = list(substring_set)[0] current_substring = su.CollectionLongestCommonSubstring(catalogname_list) # If it's something like foo_, make it foo. while current_substring and not current_substring[-1].isalnum(): 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 Nov 17 11:53:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Nov 2010 10:53:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[11645] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 11645 http://gar.svn.sourceforge.net/gar/?rev=11645&view=rev Author: wahwah Date: 2010-11-17 10:53:42 +0000 (Wed, 17 Nov 2010) Log Message: ----------- mGAR v2: checkpkg, updating pkgname and catalogname lengths, as discussed on the mailing list. http://lists.opencsw.org/pipermail/maintainers/2010-November/013130.html Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-11-17 10:53:17 UTC (rev 11644) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-11-17 10:53:42 UTC (rev 11645) @@ -56,8 +56,8 @@ } ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") EMAIL_RE = re.compile(r"^.*@opencsw.org$") -MAX_CATALOGNAME_LENGTH = 20 -MAX_PKGNAME_LENGTH = 20 +MAX_CATALOGNAME_LENGTH = 29 +MAX_PKGNAME_LENGTH = 32 ARCH_LIST = opencsw.ARCHITECTURES VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" # Pkgnames matching these regexes must not be ARCHALL = 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 Nov 17 15:16:26 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Nov 2010 14:16:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[11646] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11646 http://gar.svn.sourceforge.net/gar/?rev=11646&view=rev Author: wahwah Date: 2010-11-17 14:16:25 +0000 (Wed, 17 Nov 2010) Log Message: ----------- mGAR v2: checkpkg, a bugfix after refactoring. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/package_stats.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2010-11-17 10:53:42 UTC (rev 11645) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2010-11-17 14:16:25 UTC (rev 11646) @@ -140,7 +140,7 @@ # The presence of this method makes it explicit that we want an inspective # version of the directory format package. def GetInspectivePkg(self): - return self.GetDirFormatPackage() + return self.GetDirFormatPkg() def GetDirFormatClass(self): return InspectivePackage Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2010-11-17 10:53:42 UTC (rev 11645) +++ csw/mgar/gar/v2/lib/python/package.py 2010-11-17 14:16:25 UTC (rev 11646) @@ -170,7 +170,7 @@ if len(dirs) != 1: raise Error("Need exactly one package in the package stream: " "%s." % (dirs)) - self.dir_format_pkg = self.DIR_FORMAT_CLS(dirs[0]) + self.dir_format_pkg = self.GetDirFormatClass()(dirs[0]) self.transformed = True def GetDirFormatPkg(self): Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2010-11-17 10:53:42 UTC (rev 11645) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2010-11-17 14:16:25 UTC (rev 11646) @@ -11,7 +11,7 @@ import catalog import checkpkg import database -import package +import inspective_package import opencsw import overrides import models as m @@ -459,7 +459,7 @@ def StatsListFromCatalog(file_name_list, catalog_file_name=None, debug=False): - packages = [package.CswSrv4File(x, debug) for x in file_name_list] + packages = [inspective_package.InspectiveCswSrv4File(x, debug) for x in file_name_list] if catalog_file_name: catalog_obj = catalog.OpencswCatalog(catalog_file_name) md5s_by_basename = catalog_obj.GetDataByBasename() 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 Nov 17 16:14:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Nov 2010 15:14:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11647] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 11647 http://gar.svn.sourceforge.net/gar/?rev=11647&view=rev Author: dmichelsen Date: 2010-11-17 15:14:59 +0000 (Wed, 17 Nov 2010) Log Message: ----------- openldap: Additional overrides, use variables in cswopenldap, make sure 2.4 gets linked in .so Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/files/cswopenldap Removed Paths: ------------- csw/mgar/pkg/openldap/trunk/files/svc-openldap Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-11-17 14:16:25 UTC (rev 11646) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-11-17 15:14:59 UTC (rev 11647) @@ -18,8 +18,10 @@ DISTFILES = $(SOURCEFILES) DISTFILES += CSWoldap.postinstall DISTFILES += README.CSW openldaprc -DISTFILES += cswopenldap openldap.xml svc-openldap +DISTFILES += cswopenldap openldap.xml +EXPANDVARS = cswopenldap + PATCHFILES_isa-sparcv8-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff PATCHFILES_isa-sparcv9-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff PATCHFILES_isa-i386-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff @@ -63,6 +65,9 @@ EXTRA_LIB = $(EXTRA_LIB_garversion-$(GARVERSION)) EXTRA_INC = $(EXTRA_INC_garversion-$(GARVERSION)) +# Not released yet. +#EXTRA_LDFLAGS = -L$(libdir)/libnet-new + sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw @@ -123,6 +128,12 @@ EXTRA_PAX_ARGS = -s,.*/opt/csw/libexec/sparcv9/openldap/back_perl.*,, EXTRA_PAX_ARGS = -s,.*/opt/csw/libexec/amd64/openldap/back_perl.*,, +# Make sure we do not use the 2.3 .so-links in any case +EXTRA_MERGE_EXCLUDE_FILES_isa-i386-garversion-2.3.43 = .*\.so +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64-garversion-2.3.43 = .*\.so +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-2.3.43 = .*\.so +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9-garversion-2.3.43 = .*\.so + PKGFILES_CSWoldapclient = $(bindir)/.* PKGFILES_CSWoldapclient += $(mandir)/man1/.* @@ -136,13 +147,13 @@ INITSMF = /opt/csw/etc/init.d/cswopenldap CHECKPKG_OVERRIDES_CSWoldap += init-file-wrong-location|/opt/csw/etc/init.d/cswopenldap -ARCHALL_CSWoldapdevel = 1 -#CHECKPKG_OVERRIDES_CSWoldapdevel += archall-devel-package +# New libnet not released yet +CHECKPKG_OVERRIDES_CSWoldap += deprecated-library +CHECKPKG_OVERRIDES_CSWoldapclient += deprecated-library +CHECKPKG_OVERRIDES_CSWoldaprt += deprecated-library -#CHECKPKG_OVERRIDES_CSWoldapdevel += archall-with-arch-paths|/opt/csw/lib/sparcv9/liblber.so -#CHECKPKG_OVERRIDES_CSWoldapdevel += archall-with-arch-paths|/opt/csw/lib/sparcv9/libldap.so -#CHECKPKG_OVERRIDES_CSWoldapdevel += archall-with-arch-paths|/opt/csw/lib/sparcv9/libldap_r.so -#CHECKPKG_OVERRIDES_CSWoldaprt += non-uniform-lib-versions-in-package|sonames=['liblber-2.3.so.0',|'liblber-2.4.so.2',|'libldap-2.3.so.0',|'libldap-2.4.so.2',|'libldap_r-2.3.so.0',|'libldap_r-2.4.so.2'] +# Split libraries later +CHECKPKG_OVERRIDES_CSWoldaprt += non-uniform-lib-versions-in-package include gar/category.mk @@ -150,7 +161,7 @@ DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) post-merge: - ginstall -D $(DOWNLOADDIR)/cswopenldap \ + ginstall -D $(WORKDIR)/cswopenldap \ $(PKGROOT)/opt/csw/etc/init.d/cswopenldap - $(foreach F,$(EXTRA_DOCS),ginstall --mode=644 -D $(DOWNLOADDIR)/$F $(PKGROOT)$(docdir)/$(GARNAME)/$F;) + $(foreach F,$(EXTRA_DOCS),ginstall --mode=644 -D $(WORKDIR)/$F $(PKGROOT)$(docdir)/$(GARNAME)/$F;) @$(MAKECOOKIE) Modified: csw/mgar/pkg/openldap/trunk/files/cswopenldap =================================================================== --- csw/mgar/pkg/openldap/trunk/files/cswopenldap 2010-11-17 14:16:25 UTC (rev 11646) +++ csw/mgar/pkg/openldap/trunk/files/cswopenldap 2010-11-17 15:14:59 UTC (rev 11647) @@ -30,8 +30,8 @@ # arbitrary flags to slapd. RETVAL=0 -SLAPD=/opt/csw/libexec/slapd -SLURPD=/opt/csw/libexec/slurpd +SLAPD=@libexecdir@/slapd +SLURPD=@libexecdir@/slurpd # Source startup options [ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh @@ -92,7 +92,7 @@ fi printf "%-60s" "Starting openldap-slurpd: " - /opt/csw/libexec/slurpd \ + $SLURPD \ `[ -n "$SLURPD_DEBUG_LEVEL" ] && echo "-d $SLURPD_DEBUG_LEVEL"` \ `[ -n "$SLURPD_SYSLOG_LEVEL" ] && echo "-s $SLURPD_SYSLOG_LEVEL"` \ `[ -n "$SLURPD_CONFIG_FILE" ] && echo "-f $SLURPD_CONFIG_FILE"` \ Deleted: csw/mgar/pkg/openldap/trunk/files/svc-openldap =================================================================== --- csw/mgar/pkg/openldap/trunk/files/svc-openldap 2010-11-17 14:16:25 UTC (rev 11646) +++ csw/mgar/pkg/openldap/trunk/files/svc-openldap 2010-11-17 15:14:59 UTC (rev 11647) @@ -1,175 +0,0 @@ -#!/bin/sh -# Start script for CSW www.blastwave.org package of Openldap. -# slapd and slurpd can be started by this script. -# For either daemon to start, the minimum requirement is that -# /opt/csw/etc/openldap/slapd.conf must exist. It does not -# exist after the initial package installation, since you may -# only be using openldap as a client. -# -# Startup options may be overriden by creating and editing either -# /opt/csw/etc/openldaprc or /etc/opt/csw/openldaprc. The template -# for openldaprc is in /opt/csw/share/doc/openldap. You must use -# this template. -# -# For example, -# mkdir -p /etc/opt/csw -# cp /opt/csw/share/doc/openldap/openldaprc /etc/opt/csw/ -# -# If no openldaprc file is available, the daemon starts with defaults -# and slurpd is not started. -# -# To start slurpd, set SLURPD_START=true in openldaprc -# -# 2005-08-11 Applied patch from Martin Foster to fix the problem -# when multiple uri are on the -h option. -# 2006-02-03 Add SMF include -# 2006-06-11 Included patch from Ben Klang. This update allows you -# to define use a configuration directory for the 'config' -# backend, cn=config. The option to use a configuration file -# is still enabled, if you do not want to use a the new backend. -# The option SLAPD_EXTRA is added to openldaprc to pass -# arbitrary flags to slapd. - -. /lib/svc/share/smf_include.sh - -RETVAL=0 -SLAPD=/opt/csw/libexec/slapd -SLURPD=/opt/csw/libexec/slurpd - -# Source startup options -[ -r /opt/csw/etc/openldaprc ] && . /opt/csw/etc/openldaprc -[ -r /etc/opt/csw/openldaprc ] && . /etc/opt/csw/openldaprc - -# Make sure required vars are set. Actually these are the compiled defaults -DEF_SLAPD_CONFIG_FILE=/opt/csw/etc/openldap/slapd.conf -DEF_SLAPD_CONFIG_DIR=/opt/csw/etc/openldap/slapd.d - -# If a conf file has been created, assume we should start up. - -start_it() { - # If none of the default or defined configuration files or directories - # exist, exit this script. - ([ ! -r "$DEF_SLAPD_CONFIG_FILE" ] && [ ! -x "$DEF_SLAPD_CONFIG_DIR" ] && [ ! -r "$SLAPD_CONFIG_FILE" ] && [ ! -x "$SLAPD_CONFIG_DIR" ]) && \ - return 1 - - if kill -0 `pgrep -x slapd` > /dev/null 2>&1 ; then - echo "openldap-slapd (`pgrep -x slapd`) seems to be running." - return 1 - fi - - printf "%-60s" "Starting openldap-slapd: " - START="$SLAPD" - - if [ -n "$SLAPD_IPV4_ONLY" ] ; then START="$START -4"; fi - if [ -n "$SLAPD_IPV6_ONLY" ] ; then START="$START -6"; fi - if [ -n "$SLAPD_DEBUG_LEVEL" ] ; then START="$START -d $SLAPD_DEBUG_LEVEL"; fi - if [ -n "$SLAPD_CONFIG_FILE" ] ; then START="$START -f $SLAPD_CONFIG_FILE"; fi - if [ -n "$SLAPD_CONFIG_DIR" ] ; then START="$START -F $SLAPD_CONFIG_DIR"; fi - if [ -n "$SLAPD_GROUP" ] ; then START="$START -g $SLAPD_GROUP"; fi - if [ -n "$SLAPD_URL_LIST" ] ; then START="$START -h \"$SLAPD_URL_LIST\""; fi - if [ -n "$SLAPD_SYSLOG_FACILITY" ] ; then START="$START -l $SLAPD_SYSLOG_FACILITY"; fi - if [ -n "$SLAPD_SERVICE_NAME" ] ; then START="$START -n $SLAPD_SERVICE_NAME"; fi - if [ -n "$SLAPD_DIRECTORY" ] ; then START="$START -r $SLAPD_DIRECTORY"; fi - if [ -n "$SLAPD_SYSLOG_LEVEL" ] ; then START="$START -s $SLAPD_SYSLOG_LEVEL"; fi - if [ -n "$SLAPD_SYNTAX_CHECK" ] ; then START="$START -t"; fi - if [ -n "$SLAPD_USER" ] ; then START="$START -u $SLAPD_USER"; fi - if [ -n "$SLAPD_EXTRA" ] ; then START="$START $SLAPD_EXTRA"; fi - - # Run it - sh -c "$START" - - RETVAL=$? - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - return 1 - fi - - [ -z "$SLURPD_START" ] && return 0 - - if kill -0 `pgrep -x slurpd` > /dev/null 2>&1 ; then - echo "openldap-slurpd (`pgrep -x slurpd`) seems to be running." - return 1 - fi - - printf "%-60s" "Starting openldap-slurpd: " - /opt/csw/libexec/slurpd \ - `[ -n "$SLURPD_DEBUG_LEVEL" ] && echo "-d $SLURPD_DEBUG_LEVEL"` \ - `[ -n "$SLURPD_SYSLOG_LEVEL" ] && echo "-s $SLURPD_SYSLOG_LEVEL"` \ - `[ -n "$SLURPD_CONFIG_FILE" ] && echo "-f $SLURPD_CONFIG_FILE"` \ - `[ -n "$SLURPD_REPL_LOG_FILE" ] && echo "-r $SLURPD_REPL_LOG_FILE"` \ - `[ -n "$SLURPD_TMP_DIR" ] && echo "-t $SLURPD_TMP_DIR"` \ - `[ -n "$SLURPD_ONE_SHOT" ] && echo "-o"` \ - `[ -n "$SLURPD_SERVICE_NAME" ] && echo "-n $SLURPD_SERVICE_NAME"` \ - >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - return 1 - fi - - return 0 -} - -stop_it() { - - [ "`pgrep -x slapd`x" = "x" ] && echo "openldap-slapd is not running." && return 1 - - printf "%-60s" "Shutting down openldap-slapd: " - if test -n "`pgrep -x slapd`" ; then - kill `pgrep -x slapd` >/dev/null 2>&1 - RETVAL=$? - else - RETVAL=1 - fi - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - fi - - [ -z "$SLURPD_START" ] && return 0 - printf "%-60s" "Shutting down openldap-slurpd: " - if test -n "`pgrep -x slurpd`" ; then - kill `pgrep -x slurpd` >/dev/null 2>&1 - RETVAL=$? - else - RETVAL=1 - fi - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - fi - - echo "" - return 0 -} - -case $1 in - start) - start_it - ;; - - stop) - stop_it - ;; - - restart) - stop_it - while pgrep -x slapd > /dev/null - do - sleep 3 - done - start_it - ;; - - *) - echo "Usage: $0 { start | stop | restart } " - ;; -esac - -exit $RETVAL 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 Nov 17 17:00:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Nov 2010 16:00:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[11648] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 11648 http://gar.svn.sourceforge.net/gar/?rev=11648&view=rev Author: dmichelsen Date: 2010-11-17 16:00:37 +0000 (Wed, 17 Nov 2010) Log Message: ----------- openldap: Fix bdb directory in postinstall Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-11-17 15:14:59 UTC (rev 11647) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-11-17 16:00:37 UTC (rev 11648) @@ -21,6 +21,7 @@ DISTFILES += cswopenldap openldap.xml EXPANDVARS = cswopenldap +EXPANDVARS += CSWoldap.postinstall PATCHFILES_isa-sparcv8-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff PATCHFILES_isa-sparcv9-garversion-2.4.23 = patch-oldap-2.4.16-ntlm.diff @@ -58,10 +59,14 @@ EXTRA_DOCS = README.CSW $(PATCHFILES) openldaprc +# This is old, stick to BerkeleyDB 4.4 EXTRA_LIB_garversion-2.3.43 = $(prefix)/bdb44/lib EXTRA_INC_garversion-2.3.43 = $(prefix)/bdb44/include -EXTRA_LIB_garversion-2.4.23 = $(prefix)/bdb48/lib -EXTRA_INC_garversion-2.4.23 = $(prefix)/bdb48/include + +# This is also used during EXPANDVARS +bdbdir = $(prefix)/bdb48 +EXTRA_LIB_garversion-2.4.23 = $(bdbdir)/lib +EXTRA_INC_garversion-2.4.23 = $(bdbdir)/include EXTRA_LIB = $(EXTRA_LIB_garversion-$(GARVERSION)) EXTRA_INC = $(EXTRA_INC_garversion-$(GARVERSION)) Modified: csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall =================================================================== --- csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall 2010-11-17 15:14:59 UTC (rev 11647) +++ csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall 2010-11-17 16:00:37 UTC (rev 11648) @@ -8,31 +8,33 @@ chroot $PKG_INSTALL_ROOT /opt/csw/bin/libtool --finish /opt/csw/libexec/openldap >/dev/null 2>&1 # Build log file name -installlog=${BASEDIR}/opt/csw/var/openldap/install-`date '+%Y%m%d%H%M%S'` +installdir=${BASEDIR}@localstatedir@/openldap +installlog=${installdir}/install-`date '+%Y%m%d%H%M%S'` # Upgrade and verify bdb database files for openldap. # -DB_HOME=${BASEDIR}/opt/csw/var/openldap-data +DB_HOME=${BASEDIR}@localstatedir@/openldap-data if [ -f ${BASEDIR}$DB_HOME/*.bdb ] ; then cd ${BASEDIR}$DB_HOME # Update the database environment to the new value + mkdir -p ${installdir} echo "Running db_recover on $DB_HOME" >>$installlog - chroot $PKG_INSTALL_ROOT /opt/csw/bdb4/bin/db_recover -h $DB_HOME >>$installlog 2>&1 + chroot $PKG_INSTALL_ROOT @bdbdir@/bin/db_recover -h $DB_HOME >>$installlog 2>&1 # Upgrade each file. This does nothing if no upgrade is needed. echo "Running db_upgrade on $DB_HOME" >>$installlog for each_db in `ls *.bdb` do - chroot $PKG_INSTALL_ROOT /opt/csw/bdb4/bin/db_upgrade -h $DB_HOME $each_db >>$installlog 2>&1 + chroot $PKG_INSTALL_ROOT @bdbdir@/bin/db_upgrade -h $DB_HOME $each_db >>$installlog 2>&1 done # Verify each file echo "Running db_verify on $DB_HOME" >>$installlog for each_db in `ls *.bdb` do - chroot $PKG_INSTALL_ROOT /opt/csw/bdb4/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 + chroot $PKG_INSTALL_ROOT @bdbdir@/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 done fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 17 17:49:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Nov 2010 16:49:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11649] csw/mgar/pkg/openldap/trunk/files/CSWoldap. postinstall Message-ID: Revision: 11649 http://gar.svn.sourceforge.net/gar/?rev=11649&view=rev Author: dmichelsen Date: 2010-11-17 16:49:39 +0000 (Wed, 17 Nov 2010) Log Message: ----------- openldap: Remove libtool finishing in postinstall as .la-files are no longer shipped Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall Modified: csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall =================================================================== --- csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall 2010-11-17 16:00:37 UTC (rev 11648) +++ csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall 2010-11-17 16:49:39 UTC (rev 11649) @@ -4,9 +4,6 @@ # if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi -# Run libtool to 'finish' library installation -chroot $PKG_INSTALL_ROOT /opt/csw/bin/libtool --finish /opt/csw/libexec/openldap >/dev/null 2>&1 - # Build log file name installdir=${BASEDIR}@localstatedir@/openldap installlog=${installdir}/install-`date '+%Y%m%d%H%M%S'` 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 Nov 17 17:53:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Nov 2010 16:53:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[11650] csw/mgar/pkg/openldap/trunk/files/CSWoldap. postinstall Message-ID: Revision: 11650 http://gar.svn.sourceforge.net/gar/?rev=11650&view=rev Author: dmichelsen Date: 2010-11-17 16:53:36 +0000 (Wed, 17 Nov 2010) Log Message: ----------- openldap: Make sure log directory exists Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall Modified: csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall =================================================================== --- csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall 2010-11-17 16:49:39 UTC (rev 11649) +++ csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall 2010-11-17 16:53:36 UTC (rev 11650) @@ -7,6 +7,7 @@ # Build log file name installdir=${BASEDIR}@localstatedir@/openldap installlog=${installdir}/install-`date '+%Y%m%d%H%M%S'` +mkdir -p ${installdir} # Upgrade and verify bdb database files for openldap. # @@ -16,7 +17,6 @@ cd ${BASEDIR}$DB_HOME # Update the database environment to the new value - mkdir -p ${installdir} echo "Running db_recover on $DB_HOME" >>$installlog chroot $PKG_INSTALL_ROOT @bdbdir@/bin/db_recover -h $DB_HOME >>$installlog 2>&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 Nov 17 18:16:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Nov 2010 17:16:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[11651] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 11651 http://gar.svn.sourceforge.net/gar/?rev=11651&view=rev Author: dmichelsen Date: 2010-11-17 17:16:16 +0000 (Wed, 17 Nov 2010) Log Message: ----------- openldap: Enable BDB backend by default Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-11-17 16:53:36 UTC (rev 11650) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-11-17 17:16:16 UTC (rev 11651) @@ -169,4 +169,6 @@ ginstall -D $(WORKDIR)/cswopenldap \ $(PKGROOT)/opt/csw/etc/init.d/cswopenldap $(foreach F,$(EXTRA_DOCS),ginstall --mode=644 -D $(WORKDIR)/$F $(PKGROOT)$(docdir)/$(GARNAME)/$F;) + @# Enable BDB backend so OpenLDAP can start + perl -pi -e 's/#\s*(modulepath)/$$1/; s/#\s*(moduleload\s*back_bdb.la)/$$1/' $(PKGROOT)$(sysconfdir)/openldap/slapd.conf @$(MAKECOOKIE) 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 Nov 17 20:41:34 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 17 Nov 2010 19:41:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[11652] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 11652 http://gar.svn.sourceforge.net/gar/?rev=11652&view=rev Author: rthurner Date: 2010-11-17 19:41:34 +0000 (Wed, 17 Nov 2010) Log Message: ----------- mercurial: update to hg-1.7.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 2010-11-17 17:16:16 UTC (rev 11651) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-11-17 19:41:34 UTC (rev 11652) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.7 +GARVERSION = 1.7.1 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-11-17 17:16:16 UTC (rev 11651) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-11-17 19:41:34 UTC (rev 11652) @@ -1 +1 @@ -698948ff128d265db55bee8149445556 mercurial-1.7.tar.gz +b14caa0f9e4dd5acbf9e9a6059c37fd3 mercurial-1.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Nov 18 00:01:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Nov 2010 23:01:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11653] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 11653 http://gar.svn.sourceforge.net/gar/?rev=11653&view=rev Author: wahwah Date: 2010-11-17 23:01:18 +0000 (Wed, 17 Nov 2010) Log Message: ----------- mGAR v2: checkpkg, README, the list of dependencies to run the unit tests on Ubuntu. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2010-11-17 19:41:34 UTC (rev 11652) +++ csw/mgar/gar/v2/lib/python/README 2010-11-17 23:01:18 UTC (rev 11653) @@ -13,3 +13,16 @@ Known problems: - libmagic fails sometimes when processing the whole catalog + +Dependencies: + +It's possible to develop checkpkg on a non-Solaris platform, using unit +tests as means to run various bits of code. Here's the dependency list +for Ubuntu. + + python-cheetah + python-hachoir-parser + python-magic + python-mox + python-progressbar + python-yaml 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 Nov 18 00:01:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Nov 2010 23:01:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[11654] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 11654 http://gar.svn.sourceforge.net/gar/?rev=11654&view=rev Author: wahwah Date: 2010-11-17 23:01:46 +0000 (Wed, 17 Nov 2010) Log Message: ----------- Revert "mGAR v2: checkpkg, README, the list of dependencies to run the unit tests on Ubuntu." This reverts commit 46b7b6bd95a737c1f65a8e1d60bf07e1cd3301de. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2010-11-17 23:01:18 UTC (rev 11653) +++ csw/mgar/gar/v2/lib/python/README 2010-11-17 23:01:46 UTC (rev 11654) @@ -13,16 +13,3 @@ Known problems: - libmagic fails sometimes when processing the whole catalog - -Dependencies: - -It's possible to develop checkpkg on a non-Solaris platform, using unit -tests as means to run various bits of code. Here's the dependency list -for Ubuntu. - - python-cheetah - python-hachoir-parser - python-magic - python-mox - python-progressbar - python-yaml 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 Nov 18 00:02:12 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Nov 2010 23:02:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[11655] csw/mgar/gar/v2/lib/python/pkg-review-template.html Message-ID: Revision: 11655 http://gar.svn.sourceforge.net/gar/?rev=11655&view=rev Author: wahwah Date: 2010-11-17 23:02:12 +0000 (Wed, 17 Nov 2010) Log Message: ----------- mGAR v2: pkgdb, adding soname to the binaries_dump_info section. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkg-review-template.html Modified: csw/mgar/gar/v2/lib/python/pkg-review-template.html =================================================================== --- csw/mgar/gar/v2/lib/python/pkg-review-template.html 2010-11-17 23:01:46 UTC (rev 11654) +++ csw/mgar/gar/v2/lib/python/pkg-review-template.html 2010-11-17 23:02:12 UTC (rev 11655) @@ -264,6 +264,20 @@
  • base name: $bin.base_name
    • +#if 'soname' in $bin +
  • + soname: + +
    • +#end if
  • runpath:
      #for runpath_el in $bin.runpath 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 Nov 18 00:08:10 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Nov 2010 23:08:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[11656] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 11656 http://gar.svn.sourceforge.net/gar/?rev=11656&view=rev Author: wahwah Date: 2010-11-17 23:08:10 +0000 (Wed, 17 Nov 2010) Log Message: ----------- mGAR v2: checkpkg, adding Ubuntu dependencies to the README file. This is the most bizarre change, that gets applied and reverted and applied again in subversion, even though I didn't make any more changes to it since. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2010-11-17 23:02:12 UTC (rev 11655) +++ csw/mgar/gar/v2/lib/python/README 2010-11-17 23:08:10 UTC (rev 11656) @@ -13,3 +13,17 @@ Known problems: - libmagic fails sometimes when processing the whole catalog + + +Dependencies: + +It's possible to develop checkpkg on a non-Solaris platform, using unit +tests as means to run various bits of code. Here's the dependency list +for Ubuntu. + + python-cheetah + python-hachoir-parser + python-magic + python-mox + python-progressbar + python-yaml 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 Nov 18 12:33:33 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 18 Nov 2010 11:33:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11657] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11657 http://gar.svn.sourceforge.net/gar/?rev=11657&view=rev Author: wahwah Date: 2010-11-18 11:33:33 +0000 (Thu, 18 Nov 2010) Log Message: ----------- mGAR v2: a bugfix for checkpkg_inspect_stats.py Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/package_stats.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-11-17 23:08:10 UTC (rev 11656) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-11-18 11:33:33 UTC (rev 11657) @@ -26,6 +26,7 @@ import database import package +import inspective_package import package_checks import package_stats import models as m @@ -1063,7 +1064,7 @@ md5s.append(arg) else: filenames.append(arg) - srv4_pkgs = [package.CswSrv4File(x) for x in filenames] + srv4_pkgs = [inspective_package.InspectiveCswSrv4File(x) for x in filenames] pkgstat_objs = [] bar = progressbar.ProgressBar() bar.maxval = len(md5s) + len(srv4_pkgs) Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2010-11-17 23:08:10 UTC (rev 11656) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2010-11-18 11:33:33 UTC (rev 11657) @@ -244,15 +244,20 @@ sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } return sym - def CollectStats(self, force=False): + def CollectStats(self, force=False, register_files=False): """Lazy stats collection.""" if force or not self.StatsExist(): - return self._CollectStats() + return self._CollectStats(register_files=register_files) return self.ReadSavedStats() - def _CollectStats(self): + def _CollectStats(self, register_files): """The list of variables needs to be synchronized with the one at the top of this class. + + Args: + register_files: Whether to register all files in the database, so that + they can be used for file collision checking. + """ dir_pkg = self.GetInspectivePkg() logging.debug("Collecting %s package statistics.", repr(dir_pkg.pkgname)) 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 Nov 18 16:29:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Nov 2010 15:29:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[11658] csw/mgar/pkg/phpldapadmin/trunk/Makefile Message-ID: Revision: 11658 http://gar.svn.sourceforge.net/gar/?rev=11658&view=rev Author: dmichelsen Date: 2010-11-18 15:29:52 +0000 (Thu, 18 Nov 2010) Log Message: ----------- phpldapadmin: Add full dependencies Modified Paths: -------------- csw/mgar/pkg/phpldapadmin/trunk/Makefile Modified: csw/mgar/pkg/phpldapadmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpldapadmin/trunk/Makefile 2010-11-18 11:33:33 UTC (rev 11657) +++ csw/mgar/pkg/phpldapadmin/trunk/Makefile 2010-11-18 15:29:52 UTC (rev 11658) @@ -21,6 +21,12 @@ UPSTREAM_MASTER_SITES = https://sourceforge.net/projects/phpldapadmin/files/ UFILES_REGEX = (\d+(?:\.\d+)*).tgz +RUNTIME_DEP_PKGS = CSWapache2 +RUNTIME_DEP_PKGS += CSWap2modphp5 +RUNTIME_DEP_PKGS += CSWphp5session +RUNTIME_DEP_PKGS += CSWphp5gettext +RUNTIME_DEP_PKGS += CSWphp5ldap + SPKG_SOURCEURL = http://phpldapadmin.sourceforge.net/ CONFIGURE_SCRIPTS = 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 Nov 18 16:48:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Nov 2010 15:48:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11659] csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/ Makefile Message-ID: Revision: 11659 http://gar.svn.sourceforge.net/gar/?rev=11659&view=rev Author: dmichelsen Date: 2010-11-18 15:48:59 +0000 (Thu, 18 Nov 2010) Log Message: ----------- openssh-5.6p1+lpk: Also deploy openssh-lpk schema into openldap schema directory Modified Paths: -------------- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile Modified: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile =================================================================== --- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile 2010-11-18 15:29:52 UTC (rev 11658) +++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile 2010-11-18 15:48:59 UTC (rev 11659) @@ -67,6 +67,7 @@ PKGFILES_CSWosshlpk = $(sbindir)/sshd-lpk PKGFILES_CSWosshlpk += $(docdir)/openssh_lpk/.* +PKGFILES_CSWosshlpk += $(sysconfdir)/openldap.* PKGFILES_CSWosshclient = $(bindir)/.* PKGFILES_CSWosshclient += $(docdir)/openssh_client/.* @@ -216,6 +217,8 @@ install-doc-files-lpk-yes: ginstall -d $(PKGROOT)/$(docdir)/openssh_lpk cd $(WORKSRC) && ginstall $(DOCFILES_LPK) $(PKGROOT)/$(docdir)/openssh_lpk/ + ginstall -d $(PKGROOT)$(sysconfdir)/openldap/schema + ginstall $(WORKSRC)/openssh-lpk_openldap.schema $(PKGROOT)$(sysconfdir)/openldap/schema/openssh-lpk.schema install-config-files: # we change some default value in the server config file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Nov 18 23:05:11 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 18 Nov 2010 22:05:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[11660] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 11660 http://gar.svn.sourceforge.net/gar/?rev=11660&view=rev Author: chninkel Date: 2010-11-18 22:05:11 +0000 (Thu, 18 Nov 2010) Log Message: ----------- openssl: updated to 0.9.8p Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2010-11-18 15:48:59 UTC (rev 11659) +++ csw/mgar/pkg/openssl/trunk/Makefile 2010-11-18 22:05:11 UTC (rev 11660) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = openssl -GARVERSION = 0.9.8o +GARVERSION = 0.9.8p CATEGORIES = lib DESCRIPTION = The Open Source toolkit for SSL and TLS @@ -153,8 +153,8 @@ # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine ifdef PKCS11 - PATCHFILES += pkcs11_engine-0.9.8h.patch.2008-07-29 - CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)) + PATCHFILES += pkcs11_engine-0.9.8o.patch.2010-09-03 + CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) endif include gar/category.mk Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2010-11-18 15:48:59 UTC (rev 11659) +++ csw/mgar/pkg/openssl/trunk/checksums 2010-11-18 22:05:11 UTC (rev 11660) @@ -1 +1 @@ -63ddc5116488985e820075e65fbe6aa4 openssl-0.9.8o.tar.gz +7f24047f70364c9eabc94899e356ce39 openssl-0.9.8p.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 Nov 19 10:12:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Nov 2010 09:12:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[11661] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 11661 http://gar.svn.sourceforge.net/gar/?rev=11661&view=rev Author: dmichelsen Date: 2010-11-19 09:12:38 +0000 (Fri, 19 Nov 2010) Log Message: ----------- openldap: Add note about enhancing ldap.conf.5 Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-11-18 22:05:11 UTC (rev 11660) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-11-19 09:12:38 UTC (rev 11661) @@ -30,6 +30,12 @@ PATCHFILES += patch-libtool-64bit.diff DISTFILES += patch-oldap-2.4.16-ntlm.diff +# Maybe in +# /opt/csw/share/man/man5/ldap.conf.5 +# the string +# /usr/local/var/ldapi +# should be replaced by something more sane in the future. + NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tgz,$(SOURCEFILES)) LICENSE = COPYRIGHT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Fri Nov 19 13:46:13 2010 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Fri, 19 Nov 2010 12:46:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[11662] csw/mgar/pkg/lang-python/django-auth-ldap/trunk/ Makefile Message-ID: Revision: 11662 http://gar.svn.sourceforge.net/gar/?rev=11662&view=rev Author: khabermann Date: 2010-11-19 12:46:13 +0000 (Fri, 19 Nov 2010) Log Message: ----------- django-auth-ldap: override for pkg name length removed Modified Paths: -------------- csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile Modified: csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile 2010-11-19 09:12:38 UTC (rev 11661) +++ csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile 2010-11-19 12:46:13 UTC (rev 11662) @@ -9,8 +9,6 @@ RUNTIME_DEP_PKGS += CSWpy-django RUNTIME_DEP_PKGS += CSWpy-ldap -CHECKPKG_OVERRIDES_CSWpy-django-auth-ldap += pkgname-too-long - # checkpkg can't detect python run time dependencies CHECKPKG_OVERRIDES_CSWpy-django-auth-ldap += surplus-dependency|CSWpy-ldap CHECKPKG_OVERRIDES_CSWpy-django-auth-ldap += surplus-dependency|CSWpy-django 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 Nov 19 14:38:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Nov 2010 13:38:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11663] csw/mgar/pkg/libsigsegv/trunk Message-ID: Revision: 11663 http://gar.svn.sourceforge.net/gar/?rev=11663&view=rev Author: dmichelsen Date: 2010-11-19 13:38:17 +0000 (Fri, 19 Nov 2010) Log Message: ----------- libsigsegv: Split according to new policy Modified Paths: -------------- csw/mgar/pkg/libsigsegv/trunk/Makefile csw/mgar/pkg/libsigsegv/trunk/checksums Modified: csw/mgar/pkg/libsigsegv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigsegv/trunk/Makefile 2010-11-19 12:46:13 UTC (rev 11662) +++ csw/mgar/pkg/libsigsegv/trunk/Makefile 2010-11-19 13:38:17 UTC (rev 11663) @@ -1,8 +1,8 @@ GARNAME = libsigsegv -GARVERSION = 2.8 +GARVERSION = 2.9 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 2.6 2.8 +MODULATIONS_GARVERSION = 2.6 2.9 DESCRIPTION = A library for catching and handling segmentation faults define BLURB @@ -20,6 +20,27 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWlibsigsegv0 +PACKAGES += CSWlibsigsegv2 +PACKAGES += CSWlibsigsegv-devel +PACKAGES += CSWlibsigsegv + +CATALOGNAME_CSWlibsigsegv0 = libsigsegv0 +CATALOGNAME_CSWlibsigsegv2 = libsigsegv2 +CATALOGNAME_CSWlibsigsegv-devel = libsigsegv_devel +CATALOGNAME_CSWlibsigsegv = libsigsegv + +SPKG_DESC_CSWlibsigsegv0 = A library for catching and handling segmentation faults, libsigsegv.so.0 +SPKG_DESC_CSWlibsigsegv2 = A library for catching and handling segmentation faults, libsigsegv.so.2 +SPKG_DESC_CSWlibsigsegv = Empty stub as contents has been moved to CSWlibsigsegv0 +SPKG_DESC_CSWlibsigsegv-devel = Development files for libsigsegv + +# This is a legacy stub dependency only. Remove after last package to CSWlibsigsegv has been updated. +RUNTIME_DEP_PKGS_CSWlibsigsegv = CSWlibsigsegv0 +CHECKPKG_OVERRIDES_CSWlibsigsegv += surplus-dependency|CSWlibsigsegv0 + +ARCHALL_CSWlibsigsegv = 1 + SPKG_SOURCEURL = http://www.gnu.org/software/libsigsegv/ BUILD64 = 1 @@ -33,8 +54,14 @@ MERGE_SCRIPTS_isa-default64-garversion-2.6 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-2.6 = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-2.8 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-2.8 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-2.8 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-2.9 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-2.9 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-2.9 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +PKGFILES_CSWlibsigsegv0 += $(call baseisadirs,$(libdir),[^/]*\.so\.0\.[0-9\.]+) +PKGFILES_CSWlibsigsegv2 += $(call baseisadirs,$(libdir),[^/]*\.so\.2\.[0-9\.]+) +PKGFILES_CSWlibsigsegv = NOFILES +PKGFILES_CSWlibsigsegv-devel = $(PKGFILES_DEVEL) + + include gar/category.mk Modified: csw/mgar/pkg/libsigsegv/trunk/checksums =================================================================== --- csw/mgar/pkg/libsigsegv/trunk/checksums 2010-11-19 12:46:13 UTC (rev 11662) +++ csw/mgar/pkg/libsigsegv/trunk/checksums 2010-11-19 13:38:17 UTC (rev 11663) @@ -1,2 +1,2 @@ 7e24993730649d13c6eabc28bd24de35 libsigsegv-2.6.tar.gz -ebe554e26870d8bc200ef3e3539ffd7c libsigsegv-2.8.tar.gz +0bef39a96abacabec6a191dc7fd42ba3 libsigsegv-2.9.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 Nov 19 14:40:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Nov 2010 13:40:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11664] csw/mgar/pkg/zutils/trunk Message-ID: Revision: 11664 http://gar.svn.sourceforge.net/gar/?rev=11664&view=rev Author: dmichelsen Date: 2010-11-19 13:40:39 +0000 (Fri, 19 Nov 2010) Log Message: ----------- zutils: Update to 0.9 Modified Paths: -------------- csw/mgar/pkg/zutils/trunk/Makefile csw/mgar/pkg/zutils/trunk/checksums csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch Added Paths: ----------- csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch Removed Paths: ------------- csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch Modified: csw/mgar/pkg/zutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/zutils/trunk/Makefile 2010-11-19 13:38:17 UTC (rev 11663) +++ csw/mgar/pkg/zutils/trunk/Makefile 2010-11-19 13:40:39 UTC (rev 11664) @@ -1,5 +1,5 @@ GARNAME = zutils -GARVERSION = 0.7 +GARVERSION = 0.8 CATEGORIES = utils DESCRIPTION = Utilities to deal with compressed and non-compressed files @@ -14,15 +14,19 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/zutils/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Use-inttypes-instead-of-stdint.patch +PATCHFILES = 0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch PATCHFILES += 0002-Use-correct-path-on-testsuite.patch PATCHFILES += 0003-Use-Zutils-instead-of-zutils.patch +PATCHFILES += 0004-Fix-ambinguity-to-str.insert.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD_DEP_PKGS = CSWhelp2man CSWlzip + +# The lzip binary is used from the scripts which is not detected by checkpkg RUNTIME_DEP_PKGS = CSWlzip +CHECKPKG_OVERRIDES_CSWzutils += surplus-dependency|CSWlzip VENDOR_URL = http://www.nongnu.org/zutils/zutils.html Modified: csw/mgar/pkg/zutils/trunk/checksums =================================================================== --- csw/mgar/pkg/zutils/trunk/checksums 2010-11-19 13:38:17 UTC (rev 11663) +++ csw/mgar/pkg/zutils/trunk/checksums 2010-11-19 13:40:39 UTC (rev 11664) @@ -1,4 +1 @@ -649455382564a2724f207badf40a26eb 0001-Use-inttypes-instead-of-stdint.patch -fce5a15a5f23bb5e3e44009823031c5f 0002-Use-correct-path-on-testsuite.patch -b6d252ee0235190dac20876097d451d0 0003-Use-Zutils-instead-of-zutils.patch -c9163bbaf3c6e84044b86b58fa9fe3ff zutils-0.7.tar.gz +e7607d23b62ef3c4c74baed04a79ec6d zutils-0.8.tar.gz Deleted: csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch 2010-11-19 13:38:17 UTC (rev 11663) +++ csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch 2010-11-19 13:40:39 UTC (rev 11664) @@ -1,26 +0,0 @@ -From 7e91887f79edf0b1893f2a0e0ddd0f6c96d5d239 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 19 Feb 2010 16:44:13 +0100 -Subject: [PATCH 1/2] Use inttypes instead of stdint - ---- - main.cc | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/main.cc b/main.cc -index eba364b..75765c2 100644 ---- a/main.cc -+++ b/main.cc -@@ -33,7 +33,8 @@ - #include - #include - #include --#include -+#include -+#include - #include - #include - #include --- -1.6.5.1 - Copied: csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch (from rev 11660, csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch) =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch (rev 0) +++ csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch 2010-11-19 13:40:39 UTC (rev 11664) @@ -0,0 +1,69 @@ +From 58974984d2356dbe92326769535f7ca7eb6c6588 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 19 Nov 2010 14:30:36 +0100 +Subject: [PATCH] Use inttypes.h instead of stdint.h and add signal.h + +--- + main.cc | 3 ++- + zcmp.cc | 2 +- + zdiff.cc | 3 ++- + zutils.cc | 2 +- + 4 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/main.cc b/main.cc +index bc7c5fb..fc598df 100644 +--- a/main.cc ++++ b/main.cc +@@ -28,7 +28,8 @@ + #include + #include + #include +-#include ++#include ++#include + #include + #include + #if defined(__MSVCRT__) || defined(__OS2__) +diff --git a/zcmp.cc b/zcmp.cc +index caa7852..32275b6 100644 +--- a/zcmp.cc ++++ b/zcmp.cc +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #if defined(__MSVCRT__) || defined(__OS2__) +diff --git a/zdiff.cc b/zdiff.cc +index d01f492..138a75b 100644 +--- a/zdiff.cc ++++ b/zdiff.cc +@@ -27,7 +27,8 @@ + #include + #include + #include +-#include ++#include ++#include + #include + #include + #if defined(__MSVCRT__) || defined(__OS2__) +diff --git a/zutils.cc b/zutils.cc +index 5451534..367e933 100644 +--- a/zutils.cc ++++ b/zutils.cc +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +-- +1.7.3 + Modified: csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch 2010-11-19 13:38:17 UTC (rev 11663) +++ csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch 2010-11-19 13:40:39 UTC (rev 11664) @@ -1,14 +1,14 @@ -From 5a911b56730fe7fb0d792ebafa6197ead63c4f5d Mon Sep 17 00:00:00 2001 +From bcb402f846f5eeb9d1a3cc4ac1c3c7f9aaf24cd9 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen Date: Fri, 19 Feb 2010 16:44:26 +0100 -Subject: [PATCH 2/2] Use correct path on testsuite +Subject: [PATCH 1/3] Use correct path on testsuite --- testsuite/check.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/testsuite/check.sh b/testsuite/check.sh -index 1c8b249..11e8171 100755 +index 073843e..fa5727c 100755 --- a/testsuite/check.sh +++ b/testsuite/check.sh @@ -5,6 +5,10 @@ @@ -23,5 +23,5 @@ export LC_ALL objdir=`pwd` -- -1.6.5.1 +1.7.3 Modified: csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch 2010-11-19 13:38:17 UTC (rev 11663) +++ csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch 2010-11-19 13:40:39 UTC (rev 11664) @@ -1,124 +1,61 @@ -From 594dfe11efc4dd32d988e96e74b7c164e1ac9718 Mon Sep 17 00:00:00 2001 +From 6b133e98acfe1262b598878f1c3dc5e91c5ea587 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Tue, 23 Feb 2010 15:55:20 +0100 -Subject: [PATCH] Use Zutils instead of zutils +Date: Fri, 19 Nov 2010 14:09:29 +0100 +Subject: [PATCH 3/3] Use Zutils instead of zutils --- - zcat.in | 6 +++--- - zdiff.in | 4 ++-- - zgrep.in | 6 +++--- - ztest.in | 6 +++--- - 4 files changed, 11 insertions(+), 11 deletions(-) + zcat.in | 2 +- + zegrep.in | 2 +- + zfgrep.in | 2 +- + zgrep.in | 2 +- + ztest.in | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zcat.in b/zcat.in -index 010b7bb..3d133a9 100644 +index d88eef1..fb080d9 100644 --- a/zcat.in +++ b/zcat.in -@@ -67,7 +67,7 @@ done - - if [ $# = 0 ] ; then - bindir=`echo "$0" | sed -e 's,[^/]*$,,'` -- prog_name=`"${bindir}"zutils -t` -+ prog_name=`"${bindir}"Zutils -t` - case "${prog_name}" in - bzip2) prog="bzip2 -cdfq" ;; - gzip) prog="gzip -cdfq ${gz_args}" ;; -@@ -75,7 +75,7 @@ if [ $# = 0 ] ; then - xz) prog="xz -cdfq ${xz_args}" ;; - *) prog=cat ;; - esac -- { "${bindir}"zutils -m ${prog_name} ; cat ; } | ${prog} | cat ${args} -+ { "${bindir}"Zutils -m ${prog_name} ; cat ; } | ${prog} | cat ${args} - exit $? - fi - -@@ -98,7 +98,7 @@ for i in "$@" ; do - fi - fi - bindir=`echo "$0" | sed -e 's,[^/]*$,,'` -- prog_name=`"${bindir}"zutils -t -- "$i"` -+ prog_name=`"${bindir}"Zutils -t -- "$i"` - case "${prog_name}" in - bzip2) prog="bzip2 -cdfq" ;; - gzip) prog="gzip -cdfq ${gz_args}" ;; -diff --git a/zdiff.in b/zdiff.in -index 0ece51f..fc1d4e1 100644 ---- a/zdiff.in -+++ b/zdiff.in -@@ -120,13 +120,13 @@ prog1= - prog2= +@@ -1,3 +1,3 @@ + #! /bin/sh bindir=`echo "$0" | sed -e 's,[^/]*$,,'` - if [ -f "${file1}" ] ; then -- prog_name=`"${bindir}"zutils -t -- "${file1}"` -+ prog_name=`"${bindir}"Zutils -t -- "${file1}"` - case "${prog_name}" in - bzip2 | gzip | lzip | xz) prog1=${prog_name} ;; - esac - fi - if [ -f "${file2}" ] ; then -- prog_name=`"${bindir}"zutils -t -- "${file2}"` -+ prog_name=`"${bindir}"Zutils -t -- "${file2}"` - case "${prog_name}" in - bzip2 | gzip | lzip | xz) prog2=${prog_name} ;; - esac +-exec "${bindir}"zutils --zcat "$@" ++exec "${bindir}"Zutils --zcat "$@" +diff --git a/zegrep.in b/zegrep.in +index e01f655..d2dc371 100644 +--- a/zegrep.in ++++ b/zegrep.in +@@ -1,3 +1,3 @@ + #! /bin/sh + bindir=`echo "$0" | sed -e 's,[^/]*$,,'` +-exec "${bindir}"zutils --zgrep -E "$@" ++exec "${bindir}"Zutils --zgrep -E "$@" +diff --git a/zfgrep.in b/zfgrep.in +index a3d54f3..74c6a95 100644 +--- a/zfgrep.in ++++ b/zfgrep.in +@@ -1,3 +1,3 @@ + #! /bin/sh + bindir=`echo "$0" | sed -e 's,[^/]*$,,'` +-exec "${bindir}"zutils --zgrep -F "$@" ++exec "${bindir}"Zutils --zgrep -F "$@" diff --git a/zgrep.in b/zgrep.in -index 3298646..1d9b34a 100644 +index bfbc490..ba5a3de 100644 --- a/zgrep.in +++ b/zgrep.in -@@ -85,12 +85,12 @@ fi - - if [ $# = 0 ] ; then - bindir=`echo "$0" | sed -e 's,[^/]*$,,'` -- prog_name=`"${bindir}"zutils -t` -+ prog_name=`"${bindir}"Zutils -t` - case "${prog_name}" in - bzip2 | gzip | lzip | xz) prog="${prog_name} -cdfq" ;; - *) prog=cat ;; - esac -- { "${bindir}"zutils -m ${prog_name} ; cat ; } | ${prog} | grep ${args} -+ { "${bindir}"Zutils -m ${prog_name} ; cat ; } | ${prog} | grep ${args} - exit $? - fi - -@@ -110,7 +110,7 @@ for i in "$@" ; do - fi - fi - bindir=`echo "$0" | sed -e 's,[^/]*$,,'` -- prog_name=`"${bindir}"zutils -t -- "$i"` -+ prog_name=`"${bindir}"Zutils -t -- "$i"` - case "${prog_name}" in - bzip2 | gzip | lzip | xz) prog="${prog_name} -cdfq" ;; - *) prog=cat ;; +@@ -1,3 +1,3 @@ + #! /bin/sh + bindir=`echo "$0" | sed -e 's,[^/]*$,,'` +-exec "${bindir}"zutils --zgrep "$@" ++exec "${bindir}"Zutils --zgrep "$@" diff --git a/ztest.in b/ztest.in -index f56c853..a9973d7 100644 +index cc7dc9b..f973603 100644 --- a/ztest.in +++ b/ztest.in -@@ -60,14 +60,14 @@ done - - if [ $# = 0 ] ; then - bindir=`echo "$0" | sed -e 's,[^/]*$,,'` -- prog=`"${bindir}"zutils -t` -+ prog=`"${bindir}"Zutils -t` - case "${prog}" in - bzip2 | gzip | lzip | xz) - ;; - *) echo "$0: Unknown data format read from stdin" 1>&2 - exit 1 ;; - esac -- { "${bindir}"zutils -m ${prog} ; cat ; } | ${prog} -t ${args} -+ { "${bindir}"Zutils -m ${prog} ; cat ; } | ${prog} -t ${args} - exit $? - fi - -@@ -87,7 +87,7 @@ for i in "$@" ; do - fi - fi - bindir=`echo "$0" | sed -e 's,[^/]*$,,'` -- prog=`"${bindir}"zutils -t -- "$i"` -+ prog=`"${bindir}"Zutils -t -- "$i"` - case "${prog}" in - bzip2 | gzip | lzip | xz) - ;; +@@ -1,3 +1,3 @@ + #! /bin/sh + bindir=`echo "$0" | sed -e 's,[^/]*$,,'` +-exec "${bindir}"zutils --ztest "$@" ++exec "${bindir}"Zutils --ztest "$@" -- -1.6.6 +1.7.3 Added: csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch (rev 0) +++ csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch 2010-11-19 13:40:39 UTC (rev 11664) @@ -0,0 +1,25 @@ +From f0b61c050f2b244a33a7c19b8c2164d95725470d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 19 Nov 2010 14:28:47 +0100 +Subject: [PATCH 4/4] Fix ambinguity to str.insert + +--- + zcat.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/zcat.cc b/zcat.cc +index f813bbe..34a37f3 100644 +--- a/zcat.cc ++++ b/zcat.cc +@@ -45,7 +45,7 @@ public: + str[i] = '0'; + } + if( first_digit_pos > 0 ) str[--first_digit_pos] = '1'; +- else str.insert( 0, 1, '1' ); ++ else str.insert( (unsigned) 0, 1, '1' ); + } + + int sprint( uint8_t * const buf ) +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 19 16:49:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Nov 2010 15:49:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[11665] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 11665 http://gar.svn.sourceforge.net/gar/?rev=11665&view=rev Author: dmichelsen Date: 2010-11-19 15:49:54 +0000 (Fri, 19 Nov 2010) Log Message: ----------- doxygen: Update to 1.7.2 Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/doxygen/trunk/checksums Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2010-11-19 13:40:39 UTC (rev 11664) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2010-11-19 15:49:54 UTC (rev 11665) @@ -1,5 +1,5 @@ GARNAME = doxygen -GARVERSION = 1.7.1 +GARVERSION = 1.7.2 CATEGORIES = utils DESCRIPTION = A documentation system for programming languages @@ -48,6 +48,9 @@ # for these tiny examples seems overkill. CHECKPKG_OVERRIDES_CSWdoxygendoc = missing-dependency|CSWpython +# I can't get -norunpath to CXX, override for now +CHECKPKG_OVERRIDES_CSWdoxygen += bad-rpath-entry + include gar/category.mk # For 'dot' Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2010-11-19 13:40:39 UTC (rev 11664) +++ csw/mgar/pkg/doxygen/trunk/checksums 2010-11-19 15:49:54 UTC (rev 11665) @@ -1 +1 @@ -13e76e10fb55581a16ee04de35c264f0 doxygen-1.7.1.src.tar.gz +d5f3e32474186abc64288db6b8ffd7f0 doxygen-1.7.2.src.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 Fri Nov 19 21:40:36 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 19 Nov 2010 20:40:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[11666] csw/mgar/pkg/openssl/trunk/files Message-ID: Revision: 11666 http://gar.svn.sourceforge.net/gar/?rev=11666&view=rev Author: chninkel Date: 2010-11-19 20:40:35 +0000 (Fri, 19 Nov 2010) Log Message: ----------- openssl: fixed shared libs package compliance Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2010-11-19 15:49:54 UTC (rev 11665) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2010-11-19 20:40:35 UTC (rev 11666) @@ -70,11 +70,15 @@ f none /opt/csw/include/openssl/x509v3.h 0644 root bin f none /opt/csw/lib/libssl.a 0644 root bin f none /opt/csw/lib/libcrypto.a 0644 root bin +s none /opt/csw/lib/libcrypto.so=libcrypto.so.0.9.8 +s none /opt/csw/lib/libssl.so=libssl.so.0.9.8 d none /opt/csw/lib/pentium_pro 0755 root bin f none /opt/csw/lib/pentium_pro/libcrypto.a 0644 root bin f none /opt/csw/lib/pentium_pro/libssl.a 0644 root bin f none /opt/csw/lib/amd64/libcrypto.a 0644 root bin f none /opt/csw/lib/amd64/libssl.a 0644 root bin +s none /opt/csw/lib/amd64/libcrypto.so=libcrypto.so.0.9.8 +s none /opt/csw/lib/amd64/libssl.so=libssl.so.0.9.8 d none /opt/csw/lib/pkgconfig 0755 root bin f none /opt/csw/lib/pkgconfig/libcrypto.pc 0644 root bin f none /opt/csw/lib/pkgconfig/libssl.pc 0644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2010-11-19 15:49:54 UTC (rev 11665) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2010-11-19 20:40:35 UTC (rev 11666) @@ -70,10 +70,14 @@ f none /opt/csw/include/openssl/x509v3.h 0644 root bin f none /opt/csw/lib/libssl.a 0644 root bin f none /opt/csw/lib/libcrypto.a 0644 root bin +s none /opt/csw/lib/libcrypto.so=libcrypto.so.0.9.8 +s none /opt/csw/lib/libssl.so=libssl.so.0.9.8 f none /opt/csw/lib/sparcv8plus+vis/libcrypto.a 0644 root bin f none /opt/csw/lib/sparcv8plus+vis/libssl.a 0644 root bin f none /opt/csw/lib/sparcv9/libcrypto.a 0644 root bin f none /opt/csw/lib/sparcv9/libssl.a 0644 root bin +s none /opt/csw/lib/sparcv9/libcrypto.so=libcrypto.so.0.9.8 +s none /opt/csw/lib/sparcv9/libcrypto.so.0=libcrypto.so.0.9.8 d none /opt/csw/lib/pkgconfig 0755 root bin f none /opt/csw/lib/pkgconfig/libcrypto.pc 0644 root bin f none /opt/csw/lib/pkgconfig/libssl.pc 0644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 2010-11-19 15:49:54 UTC (rev 11665) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 2010-11-19 20:40:35 UTC (rev 11666) @@ -1,6 +1,4 @@ -s none /opt/csw/lib/amd64/libcrypto.so=libcrypto.so.0.9.8 f none /opt/csw/lib/amd64/libcrypto.so.0.9.8 0755 root bin -s none /opt/csw/lib/amd64/libssl.so=libssl.so.0.9.8 f none /opt/csw/lib/amd64/libssl.so.0.9.8 0755 root bin d none /opt/csw/lib/engines 0755 root bin f none /opt/csw/lib/engines/lib4758cca.so 0555 root bin @@ -12,10 +10,8 @@ f none /opt/csw/lib/engines/libnuron.so 0555 root bin f none /opt/csw/lib/engines/libsureware.so 0555 root bin f none /opt/csw/lib/engines/libubsec.so 0555 root bin -s none /opt/csw/lib/libcrypto.so=libcrypto.so.0.9.8 f none /opt/csw/lib/libcrypto.so.0.9.7 0555 root bin f none /opt/csw/lib/libcrypto.so.0.9.8 0555 root bin -s none /opt/csw/lib/libssl.so=libssl.so.0.9.8 f none /opt/csw/lib/libssl.so.0.9.7 0555 root bin f none /opt/csw/lib/libssl.so.0.9.8 0555 root bin d none /opt/csw/lib/pentium_pro 0755 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2010-11-19 15:49:54 UTC (rev 11665) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2010-11-19 20:40:35 UTC (rev 11666) @@ -8,10 +8,8 @@ f none /opt/csw/lib/engines/libnuron.so 0555 root bin f none /opt/csw/lib/engines/libsureware.so 0555 root bin f none /opt/csw/lib/engines/libubsec.so 0555 root bin -s none /opt/csw/lib/libcrypto.so=libcrypto.so.0.9.8 f none /opt/csw/lib/libcrypto.so.0.9.7 0555 root bin f none /opt/csw/lib/libcrypto.so.0.9.8 0555 root bin -s none /opt/csw/lib/libssl.so=libssl.so.0.9.8 f none /opt/csw/lib/libssl.so.0.9.7 0555 root bin f none /opt/csw/lib/libssl.so.0.9.8 0555 root bin f none /opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.7 0755 root bin @@ -20,8 +18,6 @@ f none /opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.8 0755 root bin f none /opt/csw/lib/sparcv9/libcrypto.so.0.9.7 0755 root bin f none /opt/csw/lib/sparcv9/libcrypto.so.0.9.8 0755 root bin -s none /opt/csw/lib/sparcv9/libcrypto.so=libcrypto.so.0.9.8 -s none /opt/csw/lib/sparcv9/libcrypto.so.0=libcrypto.so.0.9.8 s none /opt/csw/lib/sparcv9/libssl.so=libssl.so.0.9.8 s none /opt/csw/lib/sparcv9/libssl.so.0=libssl.so.0.9.8 f none /opt/csw/lib/sparcv9/libssl.so.0.9.7 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 19 22:12:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Nov 2010 21:12:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11667] csw/mgar/pkg/doxygen/trunk/Makefile Message-ID: Revision: 11667 http://gar.svn.sourceforge.net/gar/?rev=11667&view=rev Author: dmichelsen Date: 2010-11-19 21:12:15 +0000 (Fri, 19 Nov 2010) Log Message: ----------- doxygen: Add note about different Perl Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2010-11-19 20:40:35 UTC (rev 11666) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2010-11-19 21:12:15 UTC (rev 11667) @@ -51,6 +51,10 @@ # I can't get -norunpath to CXX, override for now CHECKPKG_OVERRIDES_CSWdoxygen += bad-rpath-entry +# Use CSW Perl instead of #!/usr/local/bin/perl in +# /opt/csw/share/doc/doxygen/examples/Makefile +# some time... + include gar/category.mk # For 'dot' 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 Nov 20 01:12:32 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 20 Nov 2010 00:12:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11668] csw/mgar/pkg/bash/trunk/Makefile Message-ID: Revision: 11668 http://gar.svn.sourceforge.net/gar/?rev=11668&view=rev Author: chninkel Date: 2010-11-20 00:12:32 +0000 (Sat, 20 Nov 2010) Log Message: ----------- bash: added rbash symlink Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-11-19 21:12:15 UTC (rev 11667) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-11-20 00:12:32 UTC (rev 11668) @@ -100,4 +100,5 @@ done ) ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)$(docdir)/$(GARNAME)/changelog.CSW ginstall -D $(WORKDIR_FIRSTMOD)/shells $(PKGROOT)/etc/shells + ( cd "$(PKGROOT)/$(bindir)" && rm -f rbash && ln -sf bash rbash ) rm -f $(PKGROOT)/$(infodir)/bash.info 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 Nov 20 01:14:58 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 20 Nov 2010 00:14:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[11669] csw/mgar/pkg/bash/trunk/files/changelog.CSW Message-ID: Revision: 11669 http://gar.svn.sourceforge.net/gar/?rev=11669&view=rev Author: chninkel Date: 2010-11-20 00:14:58 +0000 (Sat, 20 Nov 2010) Log Message: ----------- bash: updated changelog Modified Paths: -------------- csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-11-20 00:12:32 UTC (rev 11668) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-11-20 00:14:58 UTC (rev 11669) @@ -1,3 +1,9 @@ +bash (4.1.07,REV=2010.11.20) unstable + + * Added missing rbash symlink (Closes: #4600) + + -- Yann Rouillard Sat, 20 Nov 2010 01:14:21 +0100 + bash (4.1.07,REV=2010.09.01) unstable * Added bash patches bash41-006 and bash41-007. 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 Nov 20 01:37:00 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 20 Nov 2010 00:37:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[11670] csw/mgar/pkg/bash/trunk/Makefile Message-ID: Revision: 11670 http://gar.svn.sourceforge.net/gar/?rev=11670&view=rev Author: chninkel Date: 2010-11-20 00:37:00 +0000 (Sat, 20 Nov 2010) Log Message: ----------- bash: removed checkpkg overrides no longer useful Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-11-20 00:14:58 UTC (rev 11669) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-11-20 00:37:00 UTC (rev 11670) @@ -80,9 +80,6 @@ ##### Build and installation information ##### -CHECKPKG_OVERRIDES_CSWbash += action-class-only-in-pkginfo|build - - 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 chninkel at users.sourceforge.net Sat Nov 20 01:47:06 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 20 Nov 2010 00:47:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[11671] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 11671 http://gar.svn.sourceforge.net/gar/?rev=11671&view=rev Author: chninkel Date: 2010-11-20 00:47:05 +0000 (Sat, 20 Nov 2010) Log Message: ----------- openssl: fixed compliance errors and updated changelog Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2010-11-20 00:37:00 UTC (rev 11670) +++ csw/mgar/pkg/openssl/trunk/Makefile 2010-11-20 00:47:05 UTC (rev 11671) @@ -53,6 +53,10 @@ CHECKPKG_OVERRIDES_CSWosslutils += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWosslrt += surplus-dependency|CSWcacertificates + +# this package doesn't yet obey the new shared libraries standard +CHECKPKG_OVERRIDES_CSWosslrt += non-uniform-lib-versions-in-package|sonames=['libcrypto.so.0.9.7',|'libcrypto.so.0.9.8',|'libssl.so.0.9.7',|'libssl.so.0.9.8'] + # we will not recompile old 0.9.7 version for now ifeq ($(shell /usr/bin/uname -p),sparc) CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.7 @@ -75,10 +79,6 @@ endif -CHECKPKG_OVERRIDES_CSWossldevel += surplus-dependency|CSWosslrt - - - ###### Upstream and opencsw files information ####### MASTER_SITES = http://www.openssl.org/source/ http://openssl.org/news/ Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2010-11-20 00:37:00 UTC (rev 11670) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2010-11-20 00:47:05 UTC (rev 11671) @@ -77,7 +77,7 @@ f none /opt/csw/lib/sparcv9/libcrypto.a 0644 root bin f none /opt/csw/lib/sparcv9/libssl.a 0644 root bin s none /opt/csw/lib/sparcv9/libcrypto.so=libcrypto.so.0.9.8 -s none /opt/csw/lib/sparcv9/libcrypto.so.0=libcrypto.so.0.9.8 +s none /opt/csw/lib/sparcv9/libssl.so=libssl.so.0.9.8 d none /opt/csw/lib/pkgconfig 0755 root bin f none /opt/csw/lib/pkgconfig/libcrypto.pc 0644 root bin f none /opt/csw/lib/pkgconfig/libssl.pc 0644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2010-11-20 00:37:00 UTC (rev 11670) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2010-11-20 00:47:05 UTC (rev 11671) @@ -18,10 +18,10 @@ f none /opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.8 0755 root bin f none /opt/csw/lib/sparcv9/libcrypto.so.0.9.7 0755 root bin f none /opt/csw/lib/sparcv9/libcrypto.so.0.9.8 0755 root bin -s none /opt/csw/lib/sparcv9/libssl.so=libssl.so.0.9.8 -s none /opt/csw/lib/sparcv9/libssl.so.0=libssl.so.0.9.8 +s none /opt/csw/lib/sparcv9/libcrypto.so.0=libcrypto.so.0.9.8 f none /opt/csw/lib/sparcv9/libssl.so.0.9.7 0755 root bin f none /opt/csw/lib/sparcv9/libssl.so.0.9.8 0755 root bin +s none /opt/csw/lib/sparcv9/libssl.so.0=libssl.so.0.9.8 d none /opt/csw/share/doc/openssl_rt 0755 root bin d none /opt/csw/ssl 0755 root bin s none /opt/csw/ssl/certs=../etc/ssl/certs Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2010-11-20 00:37:00 UTC (rev 11670) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2010-11-20 00:47:05 UTC (rev 11671) @@ -1,3 +1,9 @@ +openssl (0.9.8p,REV=2010.11.20) unstable + + * New upstream version. + + -- Yann Rouillard Sat, 20 Nov 2010 01:46:26 +0100 + openssl (0.9.8o,REV=2010.09.01) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Nov 20 11:34:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 20 Nov 2010 10:34:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11672] csw/mgar/pkg Message-ID: Revision: 11672 http://gar.svn.sourceforge.net/gar/?rev=11672&view=rev Author: dmichelsen Date: 2010-11-20 10:34:17 +0000 (Sat, 20 Nov 2010) Log Message: ----------- openjdk: Initial commit, does not compile yet Added Paths: ----------- csw/mgar/pkg/openjdk/ csw/mgar/pkg/openjdk/branches/ csw/mgar/pkg/openjdk/tags/ csw/mgar/pkg/openjdk/trunk/ csw/mgar/pkg/openjdk/trunk/Makefile csw/mgar/pkg/openjdk/trunk/checksums csw/mgar/pkg/openjdk/trunk/files/ Property changes on: csw/mgar/pkg/openjdk/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/openjdk/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjdk/trunk/Makefile (rev 0) +++ csw/mgar/pkg/openjdk/trunk/Makefile 2010-11-20 10:34:17 UTC (rev 11672) @@ -0,0 +1,85 @@ +GARNAME = openjdk +SPKG_VERSION = 7.ea.b118.11 +GARVERSION = 7.b118.11 +CATEGORIES = lang + +DESCRIPTION = OpenJDK 7 +define BLURB +endef + +MASTER_SITES = http://www.java.net/download/openjdk/jdk7/promoted/b118/ + +SUFFIXES_sparc = sparc sparcv9 +SUFFIXES_i386 = i586 x64 +SUFFIXES = $(SUFFIXES_sparc) $(SUFFIXES_i386) + +DISTNAME = jdk$(SPKG_VERSION) +DISTFILES = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh) + +DISTFILES = openjdk-7-ea-src-b118-11_nov_2010.zip +DISTFILES += $(foreach S,$(SUFFIXES),jdk-7-ea-plug-b118-solaris-$S-11_nov_2010.jar) +NOEXTRACT = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-7-ea-plug-b118-solaris-$S-11_nov_2010.jar) + +SPKG_SOURCEURL = http://download.java.net/openjdk/jdk7/ + +PACKAGES = CSWopenjdk7 + +CATALOGNAME_CSWopenjdk7 = openjdk7 + +LICENSE = COPYRIGHT + +SPKG_DESC_CSWopenjdk7 = Open Java Development Kit 7 + +MANPAGES_JRE = java.1 javaws.1 keytool.1 orbd.1 pack200.1 policytool.1 rmid.1 rmiregistry.1 +MANPAGES_JRE += servertool.1 tnameserv.1 unpack200.1 + +MANPAGE_REGEX = ($(shell echo $(MANPAGES_JRE) | perl -lne 's/\./\\./g;print join("|",split)')) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +PKGFILES_CSWjdk = $(prefix)/java/jdk/latest + +PKGFILES_CSWjre = $(prefix)/java/jre/latest +PKGFILES_CSWjre += $(prefix)/java/man + +PKGFILES_CSWjre6 = $(prefix)/java/jdk/$(DISTNAME)/jre/.* +PKGFILES_CSWjre6 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/$(MANPAGE_REGEX) +PKGFILES_CSWjre6 += $(prefix)/java/jre/jre$(SPKG_VERSION) +PKGFILES_CSWjre6 += $(prefix)/java/jre/jre6 + +# rule to extract files with shell +# Clear DISPLAY or the installer will bring up advertisement +shell-extract-archive-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); DISPLAY= MORE="-10000" sh $$D -noregister) + @$(MAKECOOKIE) + +extract-archive-%.sh: shell-extract-archive-%.sh + @$(MAKECOOKIE) + +include gar/category.mk + +install-custom: + @echo " ==> Installing $(GARNAME)" + + @rm -rf $(DESTDIR)$(prefix)/java + @ginstall -d $(DESTDIR)$(prefix)/java/jdk + @(cd $(WORKDIR); pax -r -w -s ',.*/\.git.*,,' $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk) + @rm -f $(DESTDIR)$(prefix)/java/jdk/latest + @gln -sf jdk6 $(DESTDIR)$(prefix)/java/jdk/latest + @rm -f $(DESTDIR)$(prefix)/java/jdk/jdk6 + @gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk/jdk6 + + @ginstall -d $(DESTDIR)$(prefix)/java/jre + @rm -f $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + @gln -sf ../jdk/$(DISTNAME)/jre $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + @rm -f $(DESTDIR)$(prefix)/java/jre/latest + @gln -sf jre6 $(DESTDIR)$(prefix)/java/jre/latest + @rm -f $(DESTDIR)$(prefix)/java/jre/jre6 + @gln -sf jre$(SPKG_VERSION) $(DESTDIR)$(prefix)/java/jre/jre6 + + @gln -sf ../man $(DESTDIR)$(prefix)/java/jdk/$(DISTNAME)/jre/man + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/openjdk/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/openjdk/trunk/checksums =================================================================== --- csw/mgar/pkg/openjdk/trunk/checksums (rev 0) +++ csw/mgar/pkg/openjdk/trunk/checksums 2010-11-20 10:34:17 UTC (rev 11672) @@ -0,0 +1,5 @@ +d94e25f3856434680763fc9936bf30a7 jdk-7-ea-plug-b118-solaris-i586-11_nov_2010.jar +8abc3e571938b432e8caa0628c736fe7 jdk-7-ea-plug-b118-solaris-sparc-11_nov_2010.jar +ce8df696713b9a188abf99b153f85708 jdk-7-ea-plug-b118-solaris-sparcv9-11_nov_2010.jar +c042d7e770548e2a793bbc9e507a244e jdk-7-ea-plug-b118-solaris-x64-11_nov_2010.jar +ed700f3ed910f1c162a336c34ee6f197 openjdk-7-ea-src-b118-11_nov_2010.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 21 15:27:50 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 21 Nov 2010 14:27:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11673] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 11673 http://gar.svn.sourceforge.net/gar/?rev=11673&view=rev Author: chninkel Date: 2010-11-21 14:27:49 +0000 (Sun, 21 Nov 2010) Log Message: ----------- cyrus_imapd: switched to dynamic prototype Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 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/CSWcyrusimapd.prototype csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.prototype csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.prototype Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2010-11-20 10:34:17 UTC (rev 11672) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2010-11-21 14:27:49 UTC (rev 11673) @@ -33,20 +33,77 @@ SPKG_DESC_CSWcyrusimapd = Pop and Imap server from the Cyrus mail system CATALOGNAME_CSWcyrusimapd = cyrus_imapd -RUNTIME_DEP_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWtcpwrap CSWnetsnmp CSWpcrert -SPKG_CLASSES_CSWcyrusimapd = none services cswpreserveconf cswinitsmf +RUNTIME_DEP_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWnetsnmp CSWpcrert CSWzlib +#SPKG_CLASSES_CSWcyrusimapd = none services cswpreserveconf cswinitsmf SPKG_DESC_CSWcyrusimapdutils = Various admin utilities for Cyrus Imapd/Popd CATALOGNAME_CSWcyrusimapdutils = cyrus_imapd_utils -RUNTIME_DEP_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWpcrert -SPKG_CLASSES_CSWcyrusimapdutils = none +RUNTIME_DEP_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWpcrert CSWzlib +#SPKG_CLASSES_CSWcyrusimapdutils = none SPKG_DESC_CSWpmcyrus = Perl interface to Cyrus Imap functions CATALOGNAME_CSWpmcyrus = pm_cyrus -RUNTIME_DEP_PKGS_CSWpmcyrus = CSWperl CSWbdb42 CSWosslrt CSWsasl -SPKG_CLASSES_CSWpmcyrus = none +RUNTIME_DEP_PKGS_CSWpmcyrus = CSWperl CSWbdb42 CSWosslrt CSWsasl CSWzlib +#SPKG_CLASSES_CSWpmcyrus = none +PKGFILES_CSWcyrusimapd = $(sbindir)/arbitronsort +PKGFILES_CSWcyrusimapd += $(sbindir)/cyrus-dohash +PKGFILES_CSWcyrusimapd += $(sbindir)/masssievec +PKGFILES_CSWcyrusimapd += $(sbindir)/migrate-metadata +PKGFILES_CSWcyrusimapd += $(sbindir)/cyrus-mkdirs +PKGFILES_CSWcyrusimapd += $(sbindir)/cyrus-mknewsgroups +PKGFILES_CSWcyrusimapd += $(sbindir)/cyrus-rehash +PKGFILES_CSWcyrusimapd += $(sbindir)/translatesieve +PKGFILES_CSWcyrusimapd += $(sbindir)/cyrus-undohash +PKGFILES_CSWcyrusimapd += $(sbindir)/sievec +PKGFILES_CSWcyrusimapd += $(sbindir)/cyrus-master +PKGFILES_CSWcyrusimapd += $(sbindir)/make_md5 +PKGFILES_CSWcyrusimapd += $(sbindir)/make_sha1 +PKGFILES_CSWcyrusimapd += $(sbindir)/reconstruct +PKGFILES_CSWcyrusimapd += $(sbindir)/quota +PKGFILES_CSWcyrusimapd += $(sbindir)/ipurge +PKGFILES_CSWcyrusimapd += $(sbindir)/cyrdump +PKGFILES_CSWcyrusimapd += $(sbindir)/chk_cyrus +PKGFILES_CSWcyrusimapd += $(sbindir)/cvt_cyrusdb +PKGFILES_CSWcyrusimapd += $(sbindir)/deliver +PKGFILES_CSWcyrusimapd += $(sbindir)/ctl_mboxlist +PKGFILES_CSWcyrusimapd += $(sbindir)/ctl_deliver +PKGFILES_CSWcyrusimapd += $(sbindir)/ctl_cyrusdb +PKGFILES_CSWcyrusimapd += $(sbindir)/squatter +PKGFILES_CSWcyrusimapd += $(sbindir)/mbexamine +PKGFILES_CSWcyrusimapd += $(sbindir)/mbpath +PKGFILES_CSWcyrusimapd += $(sbindir)/cyr_expire +PKGFILES_CSWcyrusimapd += $(sbindir)/arbitron +PKGFILES_CSWcyrusimapd += $(sbindir)/tls_prune +PKGFILES_CSWcyrusimapd += $(sysconfdir)/cyrus +PKGFILES_CSWcyrusimapd += $(docdir)/cyrus_imapd/.* +PKGFILES_CSWcyrusimapd += $(mandir)/man5/.* +PKGFILES_CSWcyrusimapd += $(mandir)/man8/.* +PKGFILES_CSWcyrusimapd += $(libexecdir)/cyrus +PKGFILES_CSWcyrusimapd += $(sysconfdir)/cyrus/imapd.conf.CSW +PKGFILES_CSWcyrusimapd += $(sysconfdir)/cyrus/cyrus.conf.CSW +PKGFILES_CSWcyrusimapd += $(localstatedir)/cyrus +PKGFILES_CSWcyrusimapd += $(sysconfdir)/init.d/cswcyrus +PKGFILES_CSWcyrusimapd += $(localstatedir)/svc/manifest/network/cswcyrus.xml +PRESERVECONF = $(sysconfdir)/cyrus/imapd.conf +PRESERVECONF += $(sysconfdir)/cyrus/cyrus.conf +INITSMF = $(sysconfdir)/init.d/cswcyrus +ETCSERVICES = /etc/opt/csw/pkg/CSWcyrusimapd/services + +LICENSE = COPYRIGHT + +PKGFILES_CSWcyrusimapdutils = $(bindir)/.* +PKGFILES_CSWcyrusimapd += $(mandir)/man1/.* +PKGFILES_CSWcyrusimapd += $(docdir)/cyrus_imapd_utils/.* + +PKGFILES_CSWpmcyrus = $(perllib)/.* +PKGFILES_CSWpmcyrus += $(mandir)/man3/Cyrus::.* +PKGFILES_CSWpmcyrus += $(docdir)/pm_cyrus/.* + + +CHECKPKG_OVERRIDES_CSWcyrusimapdutils += surplus-dependency|CSWpmcyrus + ###### Upstream and opencsw files information ####### MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(GARVERSION)/ @@ -57,14 +114,12 @@ DISTNAME = $(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz -DISTFILES += CSWcyrusimapd.prototype CSWcyrusimapd.preinstall CSWcyrusimapd.checkinstall +DISTFILES += CSWcyrusimapd.preinstall CSWcyrusimapd.checkinstall DISTFILES += cyrus_imapd.changelog.CSW README.CSW -DISTFILES += i.services r.services services +DISTFILES += services DISTFILES += cswcyrus cswcyrus.xml DISTFILES += imapd.conf cyrus.conf -DISTFILES += CSWpmcyrus.prototype -DISTFILES += CSWcyrusimapdutils.prototype DISTFILES += cyrus_imapd_utils.changelog.CSW DISTFILES += pm_cyrus.changelog.CSW @@ -96,6 +151,12 @@ # PATCHFILES += 0001-Force-linkage-to-libperl.so.patch +# Fix config2header so it works with argument like +# "CC=/path/to/CC arg1 arg2" +# mandatory to work with assignment like +# "CC="/opt/SUNWspro/bin/cc -xrunpath" +PATCHFILES += 0002-fix-config2header.patch + #GARCOMPILER = GNU #GNU_CC_OPT = -g #GNU_LD_OPT = -g @@ -116,6 +177,7 @@ CONFIGURE_ARGS += --enable-murder CONFIGURE_ARGS += --enable-replication CONFIGURE_ARGS += --with-snmp=$(prefix) +CONFIGURE_ARGS += --with-libwrap=$(prefix) # we add the args so perl libraries are installed # in the correct path @@ -162,8 +224,7 @@ post-merge: # we provide our class action scripts to modify /etc/inet/services - ginstall $(WORKDIR_FIRSTMOD)/*.services $(WORKDIR)/ - ginstall -D $(WORKDIR_FIRSTMOD)/services $(PKGROOT)/etc/inet/services + ginstall -D $(WORKDIR_FIRSTMOD)/services $(PKGROOT)/etc/opt/csw/pkg/CSWcyrusimapd/services # configuration and init file installation ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus" "$(PKGROOT)/etc/opt/csw/init.d/cswcyrus" @@ -171,6 +232,14 @@ ginstall -D "$(WORKDIR_FIRSTMOD)/imapd.conf" "$(PKGROOT)/$(sysconfdir)/cyrus/imapd.conf.CSW" ginstall -D "$(WORKDIR_FIRSTMOD)/cyrus.conf" "$(PKGROOT)/$(sysconfdir)/cyrus/cyrus.conf.CSW" + ( cd "$(PKGROOT)$(libexecdir)/cyrus/" && \ + for E in sievec cyrus-master make_md5 make_sha1 \ + reconstruct quota ipurge cyrdump chk_cyrus \ + cvt_cyrusdb deliver ctl_mboxlist ctl_deliver \ + ctl_cyrusdb squatter mbexamine mbpath cyr_expire \ + arbitron tls_prune; do \ + mv -f $$E ../../sbin/$$E && ln -sf ../../sbin/$$E; \ + done ) # we install binary under tools as part of the package cp -r $(WORKSRC_FIRSTMOD)/tools/* $(PKGROOT)$(sbindir) @@ -198,4 +267,7 @@ # we fix some permission problems chmod -R u+w "$(PKGROOT)/" + # let's remove pod files + gfind $(PKGROOT)$(perllib) -name "perllocal.pod" -exec rm '{}' ';' + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2010-11-20 10:34:17 UTC (rev 11672) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.prototype 2010-11-21 14:27:49 UTC (rev 11673) @@ -1,268 +0,0 @@ -i i.services -i r.services -e services /etc/inet/services 0444 root sys -d none /opt/csw/etc/cyrus 0755 root bin -d none /opt/csw/etc/pkg/CSWcyrusimapd 0755 root bin -f cswinitsmf /etc/opt/csw/init.d/cswcyrus 0755 root bin -f none /var/opt/csw/svc/manifest/network/cswcyrus.xml 0644 root sys -f preserveconf /opt/csw/etc/cyrus/imapd.conf.CSW 0640 root mail -f preserveconf /opt/csw/etc/cyrus/cyrus.conf.CSW 0640 root mail -d none /opt/csw/var/cyrus 0755 cyrus mail -d none /opt/csw/var/cyrus/sieve 0755 cyrus mail -d none /opt/csw/var/cyrus/config 0755 cyrus mail -d none /opt/csw/var/cyrus/config/proc 0755 cyrus mail -d none /opt/csw/var/cyrus/config/db 0755 cyrus mail -d none /opt/csw/var/cyrus/config/socket 0755 cyrus mail -d none /opt/csw/var/cyrus/config/log 0755 cyrus mail -d none /opt/csw/var/cyrus/config/msg 0755 cyrus mail -d none /opt/csw/var/cyrus/config/ptclient 0755 cyrus mail -d none /opt/csw/var/cyrus/mail 0755 cyrus mail -d none /opt/csw/var/cyrus/mail/stage. 0755 cyrus mail -f none /opt/csw/share/man/man3/imclient.3 0644 root bin -f none /opt/csw/share/man/man5/imapd.conf.5 0644 root bin -f none /opt/csw/share/man/man5/krb.equiv.5 0644 root bin -f none /opt/csw/share/man/man5/cyrus.conf.5 0644 root bin -f none /opt/csw/share/man/man8/arbitron.8 0644 root bin -f none /opt/csw/share/man/man8/cyr_expire.8 0644 root bin -f none /opt/csw/share/man/man8/deliver.8 0644 root bin -f none /opt/csw/share/man/man8/fud.8 0644 root bin -f none /opt/csw/share/man/man8/imapd.8 0644 root bin -f none /opt/csw/share/man/man8/pop3d.8 0644 root bin -f none /opt/csw/share/man/man8/quota.8 0644 root bin -f none /opt/csw/share/man/man8/reconstruct.8 0644 root bin -f none /opt/csw/share/man/man8/rmnews.8 0644 root bin -f none /opt/csw/share/man/man8/syncnews.8 0644 root bin -f none /opt/csw/share/man/man8/mbpath.8 0644 root bin -f none /opt/csw/share/man/man8/timsieved.8 0644 root bin -f none /opt/csw/share/man/man8/cyrus-master.8 0644 root bin -f none /opt/csw/share/man/man8/lmtpd.8 0644 root bin -f none /opt/csw/share/man/man8/idled.8 0644 root bin -f none /opt/csw/share/man/man8/ctl_mboxlist.8 0644 root bin -f none /opt/csw/share/man/man8/ctl_deliver.8 0644 root bin -f none /opt/csw/share/man/man8/ctl_cyrusdb.8 0644 root bin -f none /opt/csw/share/man/man8/ipurge.8 0644 root bin -f none /opt/csw/share/man/man8/tls_prune.8 0644 root bin -f none /opt/csw/share/man/man8/squatter.8 0644 root bin -f none /opt/csw/share/man/man8/cvt_cyrusdb.8 0644 root bin -f none /opt/csw/share/man/man8/notifyd.8 0644 root bin -f none /opt/csw/share/man/man8/chk_cyrus.8 0644 root bin -f none /opt/csw/share/man/man8/mbexamine.8 0644 root bin -f none /opt/csw/share/man/man8/nntpd.8 0644 root bin -f none /opt/csw/share/man/man8/fetchnews.8 0644 root bin -f none /opt/csw/share/man/man8/smmapd.8 0644 root bin -f none /opt/csw/share/man/man8/sync_client.8 0644 root bin -f none /opt/csw/share/man/man8/sync_server.8 0644 root bin -f none /opt/csw/share/man/man8/sync_reset.8 0644 root bin -f none /opt/csw/share/man/man8/unexpunge.8 0644 root bin -f none /opt/csw/share/man/man8/make_md5.8 0644 root bin -f none /opt/csw/share/man/man8/make_sha1.8 0644 root bin -f none /opt/csw/libexec/cyrus/sievec 0755 root bin -s none /opt/csw/sbin/sievec=../libexec/cyrus/sievec -s none /opt/csw/sbin/cyrus-master=../libexec/cyrus/cyrus-master -f none /opt/csw/libexec/cyrus/cyrus-master 0755 root bin -f none /opt/csw/libexec/cyrus/cyr_df 0755 root bin -f none /opt/csw/libexec/cyrus/imapd 0755 root bin -f none /opt/csw/libexec/cyrus/pop3d 0755 root bin -f none /opt/csw/libexec/cyrus/fud 0755 root bin -f none /opt/csw/libexec/cyrus/lmtpd 0755 root bin -f none /opt/csw/libexec/cyrus/smmapd 0755 root bin -f none /opt/csw/libexec/cyrus/reconstruct 0755 root bin -f none /opt/csw/libexec/cyrus/pop3proxyd 0755 root bin -f none /opt/csw/libexec/cyrus/unexpunge 0755 root bin -f none /opt/csw/libexec/cyrus/idled 0755 root bin -f none /opt/csw/libexec/cyrus/mupdate 0755 root bin -f none /opt/csw/libexec/cyrus/sync_client 0755 root bin -f none /opt/csw/libexec/cyrus/sync_server 0755 root bin -f none /opt/csw/libexec/cyrus/sync_reset 0755 root bin -f none /opt/csw/libexec/cyrus/make_md5 0755 root bin -s none /opt/csw/sbin/make_md5=../libexec/cyrus/make_md5 -f none /opt/csw/libexec/cyrus/make_sha1 0755 root bin -s none /opt/csw/sbin/make_sha1=../libexec/cyrus/make_sha1 -f none /opt/csw/libexec/cyrus/proxyd 0755 root bin -s none /opt/csw/sbin/reconstruct=../libexec/cyrus/reconstruct -f none /opt/csw/libexec/cyrus/quota 0755 root bin -s none /opt/csw/sbin/quota=../libexec/cyrus/quota -f none /opt/csw/libexec/cyrus/ipurge 0755 root bin -s none /opt/csw/sbin/ipurge=../libexec/cyrus/ipurge -f none /opt/csw/libexec/cyrus/cyrdump 0755 root bin -s none /opt/csw/sbin/cyrdump=../libexec/cyrus/cyrdump -f none /opt/csw/libexec/cyrus/chk_cyrus 0755 root bin -s none /opt/csw/sbin/chk_cyrus=../libexec/cyrus/chk_cyrus -f none /opt/csw/libexec/cyrus/cvt_cyrusdb 0755 root bin -s none /opt/csw/sbin/cvt_cyrusdb=../libexec/cyrus/cvt_cyrusdb -f none /opt/csw/libexec/cyrus/deliver 0755 root bin -s none /opt/csw/sbin/deliver=../libexec/cyrus/deliver -f none /opt/csw/libexec/cyrus/ctl_mboxlist 0755 root bin -s none /opt/csw/sbin/ctl_mboxlist=../libexec/cyrus/ctl_mboxlist -f none /opt/csw/libexec/cyrus/ctl_deliver 0755 root bin -s none /opt/csw/sbin/ctl_deliver=../libexec/cyrus/ctl_deliver -f none /opt/csw/libexec/cyrus/ctl_cyrusdb 0755 root bin -s none /opt/csw/sbin/ctl_cyrusdb=../libexec/cyrus/ctl_cyrusdb -f none /opt/csw/libexec/cyrus/squatter 0755 root bin -s none /opt/csw/sbin/squatter=../libexec/cyrus/squatter -f none /opt/csw/libexec/cyrus/mbexamine 0755 root bin -s none /opt/csw/sbin/mbexamine=../libexec/cyrus/mbexamine -f none /opt/csw/libexec/cyrus/mbpath 0755 root bin -s none /opt/csw/sbin/mbpath=../libexec/cyrus/mbpath -f none /opt/csw/libexec/cyrus/cyr_expire 0755 root bin -s none /opt/csw/sbin/cyr_expire=../libexec/cyrus/cyr_expire -f none /opt/csw/libexec/cyrus/arbitron 0755 root bin -s none /opt/csw/sbin/arbitron=../libexec/cyrus/arbitron -f none /opt/csw/libexec/cyrus/tls_prune 0755 root bin -s none /opt/csw/sbin/tls_prune=../libexec/cyrus/tls_prune -f none /opt/csw/libexec/cyrus/timsieved 0755 root bin -f none /opt/csw/libexec/cyrus/notifyd 0755 root bin -f none /opt/csw/sbin/arbitronsort 0755 root bin -f none /opt/csw/sbin/cyrus-dohash 0755 root bin -f none /opt/csw/sbin/masssievec 0755 root bin -f none /opt/csw/sbin/migrate-metadata 0755 root bin -f none /opt/csw/sbin/cyrus-mkdirs 0755 root bin -f none /opt/csw/sbin/cyrus-mknewsgroups 0755 root bin -f none /opt/csw/sbin/cyrus-rehash 0755 root bin -f none /opt/csw/sbin/translatesieve 0755 root bin -f none /opt/csw/sbin/cyrus-undohash 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/cyrus_imapd 0755 root bin -f none /opt/csw/share/doc/cyrus_imapd/altnamespace.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/anoncvs.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/bugs.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/changes.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/cyrusv2.mc 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/faq.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/feedback.html 0644 root bin -d none /opt/csw/share/doc/cyrus_imapd/html 0755 root bin -f none /opt/csw/share/doc/cyrus_imapd/index.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-admin-mb.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-auth.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-compile.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-configure.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-murder.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-netnews.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-perf.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-prereq.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-replication.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/replication_examples 0644 root bin -d none /opt/csw/share/doc/cyrus_imapd/man 0755 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/arbitron.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/chk_cyrus.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/ctl_cyrusdb.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/ctl_deliver.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/ctl_mboxlist.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/cvt_cyrusdb.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/cyr_expire.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/cyrus.conf.5.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/deliver.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/fetchnews.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/fud.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/idled.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/imapd.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/imapd.conf.5.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/imclient.3.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/imtest.1.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/installsieve.1.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/ipurge.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/krb.equiv.5.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/lmtpd.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/lmtptest.1.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/cyrus-master.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/mbexamine.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/mbpath.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/mupdatetest.1.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/nntpd.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/nntptest.1.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/notifyd.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/pop3d.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/pop3test.1.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/quota.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/reconstruct.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/rmnews.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/sivtest.1.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/smmapd.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/smtptest.1.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/squatter.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/syncnews.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/timsieved.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/tls_prune.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/cyradm.1.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/sieveshell.1.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/master.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/make_md5.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/unexpunge.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/sync_server.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/sync_reset.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man/sync_client.8.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-sieve.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-snmpmon.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-testing.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-upgrade.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install-virtdomains.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/install.html 0644 root bin -d none /opt/csw/share/doc/cyrus_imapd/internal 0755 root bin -d none /opt/csw/share/doc/cyrus_imapd/internal/CVS 0755 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/CVS/Root 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/CVS/Repository 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/CVS/Entries 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/prot-events 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/bytecode 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/hacking 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/locking 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/database-formats.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/prot.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/internationalization.html 0755 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/mailbox-format.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/master-state-machine.fig 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/specials 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/var_directory_structure 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/uuid 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/internal/replication_protocol 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/mailing-list.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/man.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/murder.fig 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/murder.png 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/netnews.fig 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/netnews.png 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/notes.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/os.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/overview.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/questions.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/readme.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/sieve-protocol.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/sieve.html 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/specs.html 0644 root bin -d none /opt/csw/share/doc/cyrus_imapd/text 0755 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/htmlstrip.c 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/Makefile 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/altnamespace 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/anoncvs 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/bugs 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/changes 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/faq 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/feedback 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/index 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-admin-mb 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-auth 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-compile 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-configure 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-murder 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-netnews 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-perf 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-prereq 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-sieve 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-snmpmon 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-testing 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-upgrade 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-virtdomains 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install-replication 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/install 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/mailing-list 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/man 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/notes 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/os 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/overview 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/questions 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/readme 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/sieve-protocol 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/sieve 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/text/specs 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/README.CSW 0644 root bin -f none /opt/csw/share/doc/cyrus_imapd/changelog.CSW 0644 root bin Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.prototype =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.prototype 2010-11-20 10:34:17 UTC (rev 11672) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapdutils.prototype 2010-11-21 14:27:49 UTC (rev 11673) @@ -1,20 +0,0 @@ -f none /opt/csw/bin/cyradm 0755 root bin -f none /opt/csw/bin/imtest 0755 root bin -l none /opt/csw/bin/pop3test=imtest -l none /opt/csw/bin/nntptest=imtest -l none /opt/csw/bin/lmtptest=imtest -l none /opt/csw/bin/smtptest=imtest -l none /opt/csw/bin/mupdatetest=imtest -l none /opt/csw/bin/sivtest=imtest -f none /opt/csw/bin/sieveshell 0755 root bin -f none /opt/csw/share/man/man1/cyradm.1 0444 root bin -f none /opt/csw/share/man/man1/imtest.1 0644 root bin -f none /opt/csw/share/man/man1/pop3test.1 0644 root bin -f none /opt/csw/share/man/man1/nntptest.1 0644 root bin -f none /opt/csw/share/man/man1/lmtptest.1 0644 root bin -f none /opt/csw/share/man/man1/smtptest.1 0644 root bin -f none /opt/csw/share/man/man1/sivtest.1 0644 root bin -f none /opt/csw/share/man/man1/mupdatetest.1 0644 root bin -f none /opt/csw/share/man/man1/sieveshell.1 0644 root bin -d none /opt/csw/share/doc/cyrus_imapd_utils 0755 root bin -f none /opt/csw/share/doc/cyrus_imapd_utils/changelog.CSW 0644 root bin Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.prototype =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.prototype 2010-11-20 10:34:17 UTC (rev 11672) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWpmcyrus.prototype 2010-11-21 14:27:49 UTC (rev 11673) @@ -1,24 +0,0 @@ -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Cyrus 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Cyrus/IMAP 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Cyrus/IMAP/IMAP.so 0555 root bin -f none /opt/csw/lib/perl/csw/auto/Cyrus/IMAP/IMAP.bs 0444 root bin -d none /opt/csw/lib/perl/csw/auto/Cyrus/SIEVE 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Cyrus/SIEVE/managesieve 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Cyrus/SIEVE/managesieve/managesieve.so 0555 root bin -f none /opt/csw/lib/perl/csw/auto/Cyrus/SIEVE/managesieve/managesieve.bs 0444 root bin -d none /opt/csw/lib/perl/csw/Cyrus 0755 root bin -f none /opt/csw/lib/perl/csw/Cyrus/IMAP.pm 0444 root bin -d none /opt/csw/lib/perl/csw/Cyrus/IMAP 0755 root bin -f none /opt/csw/lib/perl/csw/Cyrus/IMAP/Admin.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Cyrus/IMAP/IMSP.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Cyrus/IMAP/Shell.pm 0444 root bin -d none /opt/csw/lib/perl/csw/Cyrus/SIEVE 0755 root bin -f none /opt/csw/lib/perl/csw/Cyrus/SIEVE/managesieve.pm 0444 root bin -f none /opt/csw/share/man/man3/Cyrus::IMAP.3perl 0444 root bin -f none /opt/csw/share/man/man3/Cyrus::IMAP::Admin.3perl 0444 root bin -f none /opt/csw/share/man/man3/Cyrus::IMAP::IMSP.3perl 0444 root bin -f none /opt/csw/share/man/man3/Cyrus::IMAP::Shell.3perl 0444 root bin -f none /opt/csw/share/man/man3/Cyrus::SIEVE::managesieve.3perl 0444 root bin -f none /opt/csw/share/doc/pm_cyrus/changelog.CSW 0644 root bin Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2010-11-20 10:34:17 UTC (rev 11672) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2010-11-21 14:27:49 UTC (rev 11673) @@ -1,3 +1,11 @@ +cyrus_imapd (2.3.16,REV=2010.11.21) unstable + + * Added missing zlib dependancy. + * Removed useless tcpwrap depandancy. + * [gar] switched do dynamic prototype. + + -- Yann Rouillard Sun, 21 Nov 2010 15:25:09 +0100 + 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 2010-11-20 10:34:17 UTC (rev 11672) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2010-11-21 14:27:49 UTC (rev 11673) @@ -1,3 +1,10 @@ +cyrus_imapd\xC3_utils (2.3.16,REV=2010.11.21) unstable + + * Added missing zlib dependancy. + * [gar] switched do dynamic prototype. + + -- Yann Rouillard Sun, 21 Nov 2010 15:25:09 +0100 + 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 2010-11-20 10:34:17 UTC (rev 11672) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2010-11-21 14:27:49 UTC (rev 11673) @@ -1,3 +1,10 @@ +pm_cyrus (2.3.16,REV=2010.11.21) unstable + + * Added missing zlib dependancy. + * [gar] switched do dynamic prototype. + + -- Yann Rouillard Sun, 21 Nov 2010 15:25:09 +0100 + 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 rthurner at users.sourceforge.net Sun Nov 21 16:25:23 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 21 Nov 2010 15:25:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[11674] csw/mgar/pkg/php5/trunk Message-ID: Revision: 11674 http://gar.svn.sourceforge.net/gar/?rev=11674&view=rev Author: rthurner Date: 2010-11-21 15:25:23 +0000 (Sun, 21 Nov 2010) Log Message: ----------- php-5.3.3: bug 45557 is fixed now Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/php5/trunk/files/php-bug-45557-fix.diff Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2010-11-21 14:27:49 UTC (rev 11673) +++ csw/mgar/pkg/php5/trunk/Makefile 2010-11-21 15:25:23 UTC (rev 11674) @@ -57,7 +57,6 @@ PKGFILES_CSWphp5devel += $(mandir)/man1/phpize.1 PATCHFILES += configure.diff -PATCHFILES += php-bug-45557-fix.diff # PHP Extensions EXTDIRLIST = $(shell ls -d extensions/*) @@ -79,6 +78,8 @@ CONFIGURE_ARGS += --enable-spl=shared CONFIGURE_ARGS += --with-pcre-regex CONFIGURE_ARGS += --with-pear=shared +CONFIGURE_ARGS += --with-pear=shared +CONFIGURE_ARGS += --with-libxml-dir=$(prefix) # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 Deleted: csw/mgar/pkg/php5/trunk/files/php-bug-45557-fix.diff =================================================================== --- csw/mgar/pkg/php5/trunk/files/php-bug-45557-fix.diff 2010-11-21 14:27:49 UTC (rev 11673) +++ csw/mgar/pkg/php5/trunk/files/php-bug-45557-fix.diff 2010-11-21 15:25:23 UTC (rev 11674) @@ -1,60 +0,0 @@ -diff -up php-5.2.9/ext/libxml/libxml.c.visibility php-5.2.9/ext/libxml/libxml.c ---- php-5.2.9/ext/libxml/libxml.c.visibility 2008-01-30 16:31:42.000000000 +0100 -+++ php-5.2.9/ext/libxml/libxml.c 2008-07-18 20:23:14.000000000 +0200 -@@ -523,7 +523,7 @@ static void php_libxml_internal_error_ha - } - } - --void php_libxml_ctx_error(void *ctx, const char *msg, ...) -+PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...) - { - va_list args; - va_start(args, msg); -@@ -531,7 +531,7 @@ void php_libxml_ctx_error(void *ctx, con - va_end(args); - } - --void php_libxml_ctx_warning(void *ctx, const char *msg, ...) -+PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...) - { - va_list args; - va_start(args, msg); -@@ -974,7 +974,7 @@ PHP_LIBXML_API int php_libxml_decrement_ - return ret_refcount; - } - --void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC) -+PHP_LIBXML_API void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC) - { - if (!node) { - return; -@@ -1010,7 +1010,7 @@ void php_libxml_node_free_resource(xmlNo - } - } - --void php_libxml_node_decrement_resource(php_libxml_node_object *object TSRMLS_DC) -+PHP_LIBXML_API void php_libxml_node_decrement_resource(php_libxml_node_object *object TSRMLS_DC) - { - int ret_refcount = -1; - xmlNodePtr nodep; -diff -up php-5.2.9/ext/libxml/php_libxml.h.visibility php-5.2.9/ext/libxml/php_libxml.h ---- php-5.2.9/ext/libxml/php_libxml.h.visibility 2008-01-30 12:31:47.000000000 +0100 -+++ php-5.2.9/ext/libxml/php_libxml.h 2008-07-18 20:23:01.000000000 +0200 -@@ -84,12 +84,12 @@ PHP_LIBXML_API int php_libxml_decrement_ - PHP_LIBXML_API xmlNodePtr php_libxml_import_node(zval *object TSRMLS_DC); - PHP_LIBXML_API int php_libxml_register_export(zend_class_entry *ce, php_libxml_export_node export_function); - /* When an explicit freeing of node and children is required */ --void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC); -+PHP_LIBXML_API void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC); - /* When object dtor is called as node may still be referenced */ --void php_libxml_node_decrement_resource(php_libxml_node_object *object TSRMLS_DC); -+PHP_LIBXML_API void php_libxml_node_decrement_resource(php_libxml_node_object *object TSRMLS_DC); - PHP_LIBXML_API void php_libxml_error_handler(void *ctx, const char *msg, ...); --void php_libxml_ctx_warning(void *ctx, const char *msg, ...); --void php_libxml_ctx_error(void *ctx, const char *msg, ...); -+PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...); -+PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...); - PHP_LIBXML_API int php_libxml_xmlCheckUTF8(const unsigned char *s); - PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC); - PHP_LIBXML_API void php_libxml_issue_error(int level, const char *msg TSRMLS_DC); - 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 Nov 21 17:18:41 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Nov 2010 16:18:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[11675] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11675 http://gar.svn.sourceforge.net/gar/?rev=11675&view=rev Author: bdwalton Date: 2010-11-21 16:18:40 +0000 (Sun, 21 Nov 2010) Log Message: ----------- apache2: drop the ssl dummy cert stuff and leave httpd-ssl.conf disabled by default Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/files/build_cas_template Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-21 15:25:23 UTC (rev 11674) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-21 16:18:40 UTC (rev 11675) @@ -40,7 +40,7 @@ DISTFILES += CSWapache2.preinstall # Configuration templates -DISTFILES += update20to22 server.crt.build_cas +DISTFILES += update20to22 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork DISTFILES += README.CSW.apache2rt @@ -198,7 +198,7 @@ PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; $$$$3 ~ /server.crt.CSW/ { $$$$1 = "e"; $$$$2 = "build"; $$$$4 = "0600" }; {print}' +PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; {print}' include gar/category.mk @@ -249,7 +249,4 @@ mv $$f $$f.CSW; \ $(abspath $(FILEDIR))/build_cas_template $$f > $$f; \ done ) - @echo " => Creating ssl server.crt build CAS template." - @(cp -p $(WORKDIR)/server.crt.build_cas $(PKGROOT)/$(prefix)/apache2/etc/server.crt.CSW; \ - chmod 600 $(PKGROOT)/$(prefix)/apache2/etc/server.crt.CSW ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-21 15:25:23 UTC (rev 11674) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-21 16:18:40 UTC (rev 11675) @@ -19,8 +19,7 @@ -e "s/^User.*daemon/User nobody/;" \ -e "s/^Group.*daemon/Group nobody/;" \ -e 's/^(LoadModule.*suexec.*)/#\$1/;' \ - -e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \ - -e 's/^#(Include.*httpd-ssl.conf)/\$1/;' \$CONF_FILE + -e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \$CONF_FILE chown root:bin \$CONF_FILE chmod 644 \$CONF_FILE Deleted: csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas =================================================================== --- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-21 15:25:23 UTC (rev 11674) +++ csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas 2010-11-21 16:18:40 UTC (rev 11675) @@ -1,39 +0,0 @@ -#!/bin/sh - -# On installation, generate a dummy ssl certificate (if required) - -PIR=${PKG_INSTALL_ROOT:-/} -AP2_PREFIX=/opt/csw/apache2 -AP2_CONFDIR=$AP2_PREFIX/etc - -if [ "$1" = install ]; then - # this gets captured and placed by the build CAS - echo This is a dummy file but still a part of CSWapache2 - echo Please do not remove. - - if [ ! -f $PIR/$AP2_CONFDIR/server.crt -a ! -f $PIR/$AP2_CONFDIR/server.key ]; then - echo Generating dummy ssl key and certificate... >&2 - - # this is likely overkill for a dummy cert, but why not - cat </dev/null 2>&1 -TS -Westfarthing -Hobbiton - - -`hostname` -bilbo at example.net - - -EOF - chmod 600 $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt - chown root:bin $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt - else - echo "Not touching existing SSL files." >&2 - fi -fi - -# No output on a remove action will see the file purged. -# As this is server.crt.CSW, that doesn't matter. The -# real files will be left behind in place whether they -# are the pretend or replaced with real files by the admin. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 21 18:07:29 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 21 Nov 2010 17:07:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[11676] csw/mgar/pkg/openssl/trunk/files Message-ID: Revision: 11676 http://gar.svn.sourceforge.net/gar/?rev=11676&view=rev Author: chninkel Date: 2010-11-21 17:07:28 +0000 (Sun, 21 Nov 2010) Log Message: ----------- openssl: added pkcs 11 files (wip) Added Paths: ----------- csw/mgar/pkg/openssl/trunk/files/README.pkcs11 csw/mgar/pkg/openssl/trunk/files/pkcs11_engine-0.9.8l.patch.2009-11-19 csw/mgar/pkg/openssl/trunk/files/pkcs11_engine-0.9.8o.patch.2010-09-03 Added: csw/mgar/pkg/openssl/trunk/files/README.pkcs11 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/README.pkcs11 (rev 0) +++ csw/mgar/pkg/openssl/trunk/files/README.pkcs11 2010-11-21 17:07:28 UTC (rev 11676) @@ -0,0 +1,242 @@ +PKCS#11 engine support for OpenSSL 0.9.8l +========================================= + +[Nov 19, 2009] + +Contents: + +Overview +Revisions of the patch for 0.9.8 branch +FAQs +Feedback + +Overview +======== + +This patch containing code available in OpenSolaris adds support for PKCS#11 +engine into OpenSSL and implements PKCS#11 v2.20. It is to be applied against +OpenSSL 0.9.8l source code distribution as shipped by OpenSSL.Org. Your system +must provide PKCS#11 backend otherwise the patch is useless. You provide the +PKCS#11 library name during the build configuration phase, see below. + +Patch can be applied like this: + + # NOTE: use gtar if on Solaris + tar xfzv openssl-0.9.8l.tar.gz + # now download the patch to the current directory + # ... + cd openssl-0.9.8l + # NOTE: must use gpatch if on Solaris (is part of the system) + patch -p1 < path-to/pkcs11_engine-0.9.8l.patch.2009-11-19 + +It is designed to support pure acceleration for RSA, DSA, DH and all the +symetric ciphers and message digest algorithms that PKCS#11 and OpenSSL share +except for missing support for patented algorithms MDC2, RC3, RC5 and IDEA. + +According to the PKCS#11 providers installed on your machine, it can support +following mechanisms: + + RSA, DSA, DH, RAND, DES-CBC, DES-EDE3-CBC, DES-ECB, DES-EDE3, RC4, + AES-128-CBC, AES-192-CBC, AES-256-CBC, AES-128-ECB, AES-192-ECB, + AES-256-ECB, AES-128-CTR, AES-192-CTR, AES-256-CTR, MD5, SHA1, SHA224, + SHA256, SHA384, SHA512 + +Note that for AES counter mode the application must provide their own EVP +functions since OpenSSL doesn't support counter mode through EVP yet. You may +see OpenSSH source code (cipher.c) to get the idea how to do that. SunSSH is an +example of code that uses the PKCS#11 engine and deals with the fork-safety +problem (see engine.c and packet.c files if interested). + +You must provide the location of PKCS#11 library in your system to the +configure script. You will be instructed to do that when you try to run the +config script: + + $ ./config + Operating system: i86pc-whatever-solaris2 + Configuring for solaris-x86-cc + You must set --pk11-libname for PKCS#11 library. + See README.pkcs11 for more information. + +Taking openCryptoki project on Linux AMD64 box as an example, you would run +configure script like this: + + ./config --pk11-libname=/usr/lib64/pkcs11/PKCS11_API.so + +To check whether newly built openssl really supports PKCS#11 it's enough to run +"apps/openssl engine" and look for "(pkcs11) PKCS #11 engine support" in the +output. If you see no PKCS#11 engine support check that the built openssl binary +and the PKCS#11 library from --pk11-libname don't conflict on 32/64 bits. + +The patch, during various phases of development, was tested on Solaris against +PKCS#11 engine available from Solaris Cryptographic Framework (Solaris 10 and +OpenSolaris) and also on Linux using PKCS#11 libraries from openCryptoki project +(see openCryptoki website http://sourceforge.net/projects/opencryptoki for more +information). Some Linux distributions even ship those libraries with the +system. The patch should work on any system that is supported by OpenSSL itself +and has functional PKCS#11 library. + +The patch contains "RSA Security Inc. PKCS #11 Cryptographic Token Interface +(Cryptoki)" - files cryptoki.h, pkcs11.h, pkcs11f.h and pkcs11t.h which are +copyrighted by RSA Security Inc., see pkcs11.h for more information. + +Other added/modified code in this patch is copyrighted by Sun Microsystems, +Inc. and is released under the OpenSSL license (see LICENSE file for more +information). + +Revisions of the patch for 0.9.8 branch +======================================= + +2009-11-19 +- adjusted for OpenSSL version 0.9.8l + +- bugs and RFEs: + + 6479874 OpenSSL should support RSA key by reference/hardware keystores + 6896677 PKCS#11 engine's hw_pk11_err.h needs to be split + 6732677 make check to trigger Solaris specific code automatic in the + PKCS#11 engine + +2009-03-11 +- adjusted for OpenSSL version 0.9.8j + +- README.pkcs11 moved out of the patch, and is shipped together with it in a + tarball instead so that it can be read before the patch is applied. + +- fixed bugs: + + 6804216 pkcs#11 engine should support a key length range for RC4 + 6734038 Apache SSL web server using the pkcs11 engine fails to start if + meta slot is disabled + +2008-12-02 +- fixed bugs and RFEs (most of the work done by Vladimir Kotal) + + 6723504 more granular locking in PKCS#11 engine + 6667128 CRYPTO_LOCK_PK11_ENGINE assumption does not hold true + 6710420 PKCS#11 engine source should be lint clean + 6747327 PKCS#11 engine atfork handlers need to be aware of guys who take + it seriously + 6746712 PKCS#11 engine source code should be cstyle clean + 6731380 return codes of several functions are not checked in the PKCS#11 + engine code + 6746735 PKCS#11 engine should use extended FILE space API + 6734038 Apache SSL web server using the pkcs11 engine fails to start if + meta slot is disabled + +2008-08-01 +- fixed bug + + 6731839 OpenSSL PKCS#11 engine no longer uses n2cp for symmetric ciphers + and digests + +- Solaris specific code for slot selection made automatic + +2008-07-29 +- update the patch to OpenSSL 0.9.8h version +- pkcs11t.h updated to the latest version: + + 6545665 make CKM_AES_CTR available to non-kernel users + +- fixed bugs in the engine code: + + 6602801 PK11_SESSION cache has to employ reference counting scheme for + asymmetric key operations + 6605538 pkcs11 functions C_FindObjects[{Init,Final}]() not called + atomically + 6607307 pkcs#11 engine can't read RSA private keys + 6652362 pk11_RSA_finish() is cutting corners + 6662112 pk11_destroy_{rsa,dsa,dh}_key_objects() use locking in + suboptimal way + 6666625 pk11_destroy_{rsa,dsa,dh}_key_objects() should be more + resilient to destroy failures + 6667273 OpenSSL engine should not use free() but OPENSSL_free() + 6670363 PKCS#11 engine fails to reuse existing symmetric keys + 6678135 memory corruption in pk11_DH_generate_key() in pkcs#11 engine + 6678503 DSA signature conversion in pk11_dsa_do_verify() ignores size + of big numbers leading to failures + 6706562 pk11_DH_compute_key() returns 0 in case of failure instead of + -1 + 6706622 pk11_load_{pub,priv}key create corrupted RSA key references + 6707129 return values from BN_new() in pk11_DH_generate_key() are not + checked + 6707274 DSA/RSA/DH PKCS#11 engine operations need to be resistant to + structure reuse + 6707782 OpenSSL PKCS#11 engine pretends to be aware of + OPENSSL_NO_{RSA,DSA,DH} + defines but fails miserably + 6709966 make check_new_*() to return values to indicate cache hit/miss + 6705200 pk11_dh struct initialization in PKCS#11 engine is missing + generate_params parameter + 6709513 PKCS#11 engine sets IV length even for ECB modes + 6728296 buffer length not initialized for C_(En|De)crypt_Final() in the + PKCS#11 engine + 6728871 PKCS#11 engine must reset global_session in pk11_finish() + +- new features and enhancements: + + 6562155 OpenSSL pkcs#11 engine needs support for SHA224/256/384/512 + 6685012 OpenSSL pkcs#11 engine needs support for new cipher modes + 6725903 OpenSSL PKCS#11 engine shouldn't use soft token for symmetric + ciphers and digests + +2007-10-15 +- update for 0.9.8f version +- update for "6607670 teach pkcs#11 engine how to use keys be reference" + +2007-10-02 +- draft for "6607670 teach pkcs#11 engine how to use keys be reference" +- draft for "6607307 pkcs#11 engine can't read RSA private keys" + +2007-09-26 +- 6375348 Using pkcs11 as the SSLCryptoDevice with Apache/OpenSSL causes + significant performance drop +- 6573196 memory is leaked when OpenSSL is used with PKCS#11 engine + +2007-05-25 +- 6558630 race in OpenSSL pkcs11 engine when using symetric block ciphers + +2007-05-19 +- initial patch for 0.9.8e using latest OpenSolaris code + +FAQs +==== + +(1) my build failed on Linux distro with this error: + +../libcrypto.a(hw_pk11.o): In function `pk11_library_init': +hw_pk11.c:(.text+0x20f5): undefined reference to `pthread_atfork' + +Answer: + + - don't use "no-threads" when configuring + - if you didn't then OpenSSL failed to create a threaded library by + default. You may manually edit Configure and try again. Look for the + architecture that Configure printed, for example: + +Configured for linux-elf. + + - then edit Configure, find string "linux-elf" (inluding the quotes), + and add flags to support threads to the 4th column of the 2nd string. + If you build with GCC then adding "-pthread" should be enough. With + "linux-elf" as an example, you would add " -pthread" right after + "-D_REENTRANT", like this: + +....-O3 -fomit-frame-pointer -Wall::-D_REENTRANT -pthread::-ldl:..... + +(2) I'm using MinGW/MSYS environment and get undeclared reference error for +pthread_atfork() function when trying to build OpenSSL with the patch. + +Answer: + + Sorry, pthread_atfork() is not implemented in the current pthread-win32 + (as of Nov 2009). You can not use the patch there. + + +Feedback +======== + +Please send feedback to security-discuss at opensolaris.org. The patch was +created by Jan.Pechanec at Sun.COM from code available in OpenSolaris. + +Latest version should be always available on http://blogs.sun.com/janp. + Added: csw/mgar/pkg/openssl/trunk/files/pkcs11_engine-0.9.8l.patch.2009-11-19 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/pkcs11_engine-0.9.8l.patch.2009-11-19 (rev 0) +++ csw/mgar/pkg/openssl/trunk/files/pkcs11_engine-0.9.8l.patch.2009-11-19 2010-11-21 17:07:28 UTC (rev 11676) @@ -0,0 +1,12674 @@ +diff -cr openssl-0.9.8l/Configure openssl-0.9.8l-with_pkcs11_engine/Configure +*** openssl-0.9.8l/Configure Thu Nov 5 13:07:06 2009 +--- openssl-0.9.8l-with_pkcs11_engine/Configure Thu Nov 19 17:16:33 2009 +*************** +*** 12,18 **** + + # see INSTALL for instructions. + +! my $usage="Usage: Configure [no- ...] [enable- ...] [experimental- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; + + # Options: + # +--- 12,18 ---- + + # see INSTALL for instructions. + +! my $usage="Usage: Configure --pk11-libname=PK11_LIB_LOCATION [no- ...] [enable- ...] [experimental- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; + + # Options: + # +*************** +*** 21,26 **** +--- 21,29 ---- + # --prefix prefix for the OpenSSL include, lib and bin directories + # (Default: the OPENSSLDIR directory) + # ++ # --pk11-libname PKCS#11 library name. ++ # (Default: none) ++ # + # --install_prefix Additional prefix for package builders (empty by + # default). This needn't be set in advance, you can + # just as well use "make INSTALL_PREFIX=/whatever install". +*************** +*** 580,585 **** +--- 583,591 ---- + my $idx_ranlib = $idx++; + my $idx_arflags = $idx++; + ++ # PKCS#11 engine patch ++ my $pk11_libname=""; ++ + my $prefix=""; + my $openssldir=""; + my $exe_ext=""; +*************** +*** 812,817 **** +--- 818,827 ---- + { + $flags.=$_." "; + } ++ elsif (/^--pk11-libname=(.*)$/) ++ { ++ $pk11_libname=$1; ++ } + elsif (/^--prefix=(.*)$/) + { + $prefix=$1; +*************** +*** 943,948 **** +--- 953,965 ---- + exit 0; + } + ++ if (! $pk11_libname) ++ { ++ print STDERR "You must set --pk11-libname for PKCS#11 library.\n"; ++ print STDERR "See README.pkcs11 for more information.\n"; ++ exit 1; ++ } ++ + if ($target =~ m/^CygWin32(-.*)$/) { + $target = "Cygwin".$1; + } +*************** +*** 1103,1108 **** +--- 1120,1127 ---- + if ($flags ne "") { $cflags="$flags$cflags"; } + else { $no_user_cflags=1; } + ++ $cflags="-DPK11_LIB_LOCATION=\"$pk11_libname\" $cflags"; ++ + # Kerberos settings. The flavor must be provided from outside, either through + # the script "config" or manually. + if (!$no_krb5) +*************** +*** 1456,1461 **** +--- 1475,1481 ---- + s/^VERSION=.*/VERSION=$version/; + s/^MAJOR=.*/MAJOR=$major/; + s/^MINOR=.*/MINOR=$minor/; ++ s/^PK11_LIB_LOCATION=.*/PK11_LIB_LOCATION=$pk11_libname/; + s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$shlib_version_number/; + s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/; + s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/; +diff -cr openssl-0.9.8l/Makefile openssl-0.9.8l-with_pkcs11_engine/Makefile +*** openssl-0.9.8l/Makefile Thu Nov 5 17:15:53 2009 +--- openssl-0.9.8l-with_pkcs11_engine/Makefile Thu Nov 19 17:28:00 2009 +*************** +*** 11,21 **** + SHLIB_VERSION_HISTORY= + SHLIB_MAJOR=0 + SHLIB_MINOR=9.8 +! SHLIB_EXT= +! PLATFORM=dist +! OPTIONS= no-camellia no-capieng no-cms no-gmp no-jpake no-krb5 no-mdc2 no-montasm no-rc5 no-rfc3779 no-seed no-shared no-zlib no-zlib-dynamic +! CONFIGURE_ARGS=dist +! SHLIB_TARGET= + + # HERE indicates where this Makefile lives. This can be used to indicate + # where sub-Makefiles are expected to be. Currently has very limited usage, +--- 11,21 ---- + SHLIB_VERSION_HISTORY= + SHLIB_MAJOR=0 + SHLIB_MINOR=9.8 +! SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR) +! PLATFORM=solaris64-x86_64-gcc +! OPTIONS=--pk11-libname=/usr/lib/64/libpkcs11.so.1 no-camellia no-capieng no-cms no-gmp no-jpake no-krb5 no-mdc2 no-montasm no-rc5 no-rfc3779 no-seed no-shared no-zlib no-zlib-dynamic +! CONFIGURE_ARGS=solaris64-x86_64-gcc --pk11-libname=/usr/lib/64/libpkcs11.so.1 +! SHLIB_TARGET=solaris-shared + + # HERE indicates where this Makefile lives. This can be used to indicate + # where sub-Makefiles are expected to be. Currently has very limited usage, +*************** +*** 28,33 **** +--- 28,36 ---- + INSTALL_PREFIX= + INSTALLTOP=/usr/local/ssl + ++ # You must set this through --pk11-libname configure option. ++ PK11_LIB_LOCATION=/usr/lib/64/libpkcs11.so.1 ++ + # Do not edit this manually. Use Configure --openssldir=DIR do change this! + OPENSSLDIR=/usr/local/ssl + +*************** +*** 59,78 **** + # equal 4. + # PKCS1_CHECK - pkcs1 tests. + +! CC= cc +! CFLAG= -O + DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED + PEX_LIBS= +! EX_LIBS= + EXE_EXT= + ARFLAGS= + AR=ar $(ARFLAGS) r + ARD=ar $(ARFLAGS) d + RANLIB= /usr/bin/ranlib +! PERL= /usr/bin/perl5 + TAR= tar + TARFLAGS= --no-recursion +! MAKEDEPPROG=makedepend + + # We let the C compiler driver to take care of .s files. This is done in + # order to be excused from maintaining a separate set of architecture +--- 62,81 ---- + # equal 4. + # PKCS1_CHECK - pkcs1 tests. + +! CC= gcc +! CFLAG= -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DPK11_LIB_LOCATION=\"/usr/lib/64/libpkcs11.so.1\" -m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int -DOPENSSL_BN_ASM_MONT -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM + DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED + PEX_LIBS= +! EX_LIBS= -lsocket -lnsl -ldl + EXE_EXT= + ARFLAGS= + AR=ar $(ARFLAGS) r + ARD=ar $(ARFLAGS) d + RANLIB= /usr/bin/ranlib +! PERL= /usr/bin/perl + TAR= tar + TARFLAGS= --no-recursion +! MAKEDEPPROG= gcc + + # We let the C compiler driver to take care of .s files. This is done in + # order to be excused from maintaining a separate set of architecture +*************** +*** 87,102 **** + PROCESSOR= + + # CPUID module collects small commonly used assembler snippets +! CPUID_OBJ= +! BN_ASM= bn_asm.o + DES_ENC= des_enc.o fcrypt_b.o +! AES_ASM_OBJ= aes_core.o aes_cbc.o + BF_ENC= bf_enc.o + CAST_ENC= c_enc.o +! RC4_ENC= rc4_enc.o rc4_skey.o + RC5_ENC= rc5_enc.o +! MD5_ASM_OBJ= +! SHA1_ASM_OBJ= + RMD160_ASM_OBJ= + + # KRB5 stuff +--- 90,105 ---- + PROCESSOR= + + # CPUID module collects small commonly used assembler snippets +! CPUID_OBJ= x86_64cpuid.o +! BN_ASM= x86_64-gcc.o x86_64-mont.o + DES_ENC= des_enc.o fcrypt_b.o +! AES_ASM_OBJ= aes-x86_64.o + BF_ENC= bf_enc.o + CAST_ENC= c_enc.o +! RC4_ENC= rc4-x86_64.o + RC5_ENC= rc5_enc.o +! MD5_ASM_OBJ= md5-x86_64.o +! SHA1_ASM_OBJ= sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o + RMD160_ASM_OBJ= + + # KRB5 stuff +*************** +*** 169,176 **** + SHARED_SSL=libssl$(SHLIB_EXT) + SHARED_FIPS= + SHARED_LIBS= +! SHARED_LIBS_LINK_EXTS= +! SHARED_LDFLAGS= + + GENERAL= Makefile + BASENAME= openssl +--- 172,179 ---- + SHARED_SSL=libssl$(SHLIB_EXT) + SHARED_FIPS= + SHARED_LIBS= +! SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so +! SHARED_LDFLAGS=-m64 -shared -static-libgcc + + GENERAL= Makefile + BASENAME= openssl +diff -cr openssl-0.9.8l/Makefile.bak openssl-0.9.8l-with_pkcs11_engine/Makefile.bak +*** openssl-0.9.8l/Makefile.bak Thu Nov 5 16:23:10 2009 +--- openssl-0.9.8l-with_pkcs11_engine/Makefile.bak Thu Nov 19 17:16:33 2009 +*************** +*** 12,20 **** + SHLIB_MAJOR=0 + SHLIB_MINOR=9.8 + SHLIB_EXT= +! PLATFORM=debug-ben-debug +! OPTIONS= no-camellia no-capieng no-cms no-gmp no-jpake no-krb5 no-mdc2 no-montasm no-rc5 no-rfc3779 no-seed no-shared no-zlib no-zlib-dynamic +! CONFIGURE_ARGS=debug-ben-debug + SHLIB_TARGET= + + # HERE indicates where this Makefile lives. This can be used to indicate +--- 12,20 ---- + SHLIB_MAJOR=0 + SHLIB_MINOR=9.8 + SHLIB_EXT= +! PLATFORM=dist +! OPTIONS=--pk11-libname=/usr/lib/64/libpkcs11.so.1 no-camellia no-capieng no-cms no-gmp no-jpake no-krb5 no-mdc2 no-montasm no-rc5 no-rfc3779 no-seed no-shared no-zlib no-zlib-dynamic +! CONFIGURE_ARGS=dist + SHLIB_TARGET= + + # HERE indicates where this Makefile lives. This can be used to indicate +*************** +*** 28,33 **** +--- 28,36 ---- + INSTALL_PREFIX= + INSTALLTOP=/usr/local/ssl + ++ # You must set this through --pk11-libname configure option. ++ PK11_LIB_LOCATION=/usr/lib/64/libpkcs11.so.1 ++ + # Do not edit this manually. Use Configure --openssldir=DIR do change this! + OPENSSLDIR=/usr/local/ssl + +*************** +*** 59,66 **** + # equal 4. + # PKCS1_CHECK - pkcs1 tests. + +! CC= gcc +! CFLAG= -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -g3 -O2 -pipe + DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED + PEX_LIBS= + EX_LIBS= +--- 62,69 ---- + # equal 4. + # PKCS1_CHECK - pkcs1 tests. + +! CC= cc +! CFLAG= -O + DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED + PEX_LIBS= + EX_LIBS= +*************** +*** 87,102 **** + PROCESSOR= + + # CPUID module collects small commonly used assembler snippets +! CPUID_OBJ= +! BN_ASM= bn_asm.o + DES_ENC= des_enc.o fcrypt_b.o +! AES_ASM_OBJ= aes_core.o aes_cbc.o + BF_ENC= bf_enc.o + CAST_ENC= c_enc.o +! RC4_ENC= rc4_enc.o rc4_skey.o + RC5_ENC= rc5_enc.o +! MD5_ASM_OBJ= +! SHA1_ASM_OBJ= + RMD160_ASM_OBJ= + + # KRB5 stuff +--- 90,105 ---- + PROCESSOR= + + # CPUID module collects small commonly used assembler snippets +! CPUID_OBJ= x86_64cpuid.o +! BN_ASM= x86_64-gcc.o x86_64-mont.o + DES_ENC= des_enc.o fcrypt_b.o +! AES_ASM_OBJ= aes-x86_64.o + BF_ENC= bf_enc.o + CAST_ENC= c_enc.o +! RC4_ENC= rc4-x86_64.o + RC5_ENC= rc5_enc.o +! MD5_ASM_OBJ= md5-x86_64.o +! SHA1_ASM_OBJ= sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o + RMD160_ASM_OBJ= + + # KRB5 stuff +*************** +*** 169,176 **** + SHARED_SSL=libssl$(SHLIB_EXT) + SHARED_FIPS= + SHARED_LIBS= +! SHARED_LIBS_LINK_EXTS= +! SHARED_LDFLAGS= + + GENERAL= Makefile + BASENAME= openssl +--- 172,179 ---- + SHARED_SSL=libssl$(SHLIB_EXT) + SHARED_FIPS= + SHARED_LIBS= +! SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so +! SHARED_LDFLAGS=-m64 -shared -static-libgcc + + GENERAL= Makefile + BASENAME= openssl +diff -cr openssl-0.9.8l/Makefile.org openssl-0.9.8l-with_pkcs11_engine/Makefile.org +*** openssl-0.9.8l/Makefile.org Tue Mar 3 23:40:29 2009 +--- openssl-0.9.8l-with_pkcs11_engine/Makefile.org Thu Nov 19 17:16:33 2009 +*************** +*** 26,31 **** +--- 26,34 ---- + INSTALL_PREFIX= + INSTALLTOP=/usr/local/ssl + ++ # You must set this through --pk11-libname configure option. ++ PK11_LIB_LOCATION= ++ + # Do not edit this manually. Use Configure --openssldir=DIR do change this! + OPENSSLDIR=/usr/local/ssl + +Only in openssl-0.9.8l-with_pkcs11_engine: Makefile.orig +diff -cr openssl-0.9.8l/apps/CA.pl openssl-0.9.8l-with_pkcs11_engine/apps/CA.pl +*** openssl-0.9.8l/apps/CA.pl Thu Nov 5 17:16:02 2009 +--- openssl-0.9.8l-with_pkcs11_engine/apps/CA.pl Thu Nov 19 17:28:03 2009 +*************** +*** 1,4 **** +! #!/usr/bin/perl5 + # + # CA - wrapper around ca to make it easier to use ... basically ca requires + # some setup stuff to be done before you can use it and this makes +--- 1,4 ---- +! #!/usr/bin/perl + # + # CA - wrapper around ca to make it easier to use ... basically ca requires + # some setup stuff to be done before you can use it and this makes +diff -cr openssl-0.9.8l/crypto/opensslconf.h openssl-0.9.8l-with_pkcs11_engine/crypto/opensslconf.h +*** openssl-0.9.8l/crypto/opensslconf.h Thu Nov 5 17:15:53 2009 +--- openssl-0.9.8l-with_pkcs11_engine/crypto/opensslconf.h Thu Nov 19 17:28:00 2009 +*************** +*** 38,43 **** +--- 38,46 ---- + + #endif /* OPENSSL_DOING_MAKEDEPEND */ + ++ #ifndef OPENSSL_THREADS ++ # define OPENSSL_THREADS ++ #endif + #ifndef OPENSSL_NO_DYNAMIC_ENGINE + # define OPENSSL_NO_DYNAMIC_ENGINE + #endif +*************** +*** 79,84 **** +--- 82,89 ---- + # endif + #endif + ++ #define OPENSSL_CPUID_OBJ ++ + /* crypto/opensslconf.h.in */ + + #ifdef OPENSSL_DOING_MAKEDEPEND +*************** +*** 140,146 **** + * This enables code handling data aligned at natural CPU word + * boundary. See crypto/rc4/rc4_enc.c for further details. + */ +! #undef RC4_CHUNK + #endif + #endif + +--- 145,151 ---- + * This enables code handling data aligned at natural CPU word + * boundary. See crypto/rc4/rc4_enc.c for further details. + */ +! #define RC4_CHUNK unsigned long + #endif + #endif + +*************** +*** 148,154 **** + /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a + * %20 speed up (longs are 8 bytes, int's are 4). */ + #ifndef DES_LONG +! #define DES_LONG unsigned long + #endif + #endif + +--- 153,159 ---- + /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a + * %20 speed up (longs are 8 bytes, int's are 4). */ + #ifndef DES_LONG +! #define DES_LONG unsigned int + #endif + #endif + +*************** +*** 162,170 **** + /* The prime number generation stuff may not work when + * EIGHT_BIT but I don't care since I've only used this mode + * for debuging the bignum libraries */ +! #undef SIXTY_FOUR_BIT_LONG + #undef SIXTY_FOUR_BIT +! #define THIRTY_TWO_BIT + #undef SIXTEEN_BIT + #undef EIGHT_BIT + #endif +--- 167,175 ---- + /* The prime number generation stuff may not work when + * EIGHT_BIT but I don't care since I've only used this mode + * for debuging the bignum libraries */ +! #define SIXTY_FOUR_BIT_LONG + #undef SIXTY_FOUR_BIT +! #undef THIRTY_TWO_BIT + #undef SIXTEEN_BIT + #undef EIGHT_BIT + #endif +*************** +*** 178,184 **** + + #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) + #define CONFIG_HEADER_BF_LOCL_H +! #undef BF_PTR + #endif /* HEADER_BF_LOCL_H */ + + #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) +--- 183,189 ---- + + #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) + #define CONFIG_HEADER_BF_LOCL_H +! #define BF_PTR2 + #endif /* HEADER_BF_LOCL_H */ + + #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) +*************** +*** 208,214 **** + /* Unroll the inner loop, this sometimes helps, sometimes hinders. + * Very mucy CPU dependant */ + #ifndef DES_UNROLL +! #undef DES_UNROLL + #endif + + /* These default values were supplied by +--- 213,219 ---- + /* Unroll the inner loop, this sometimes helps, sometimes hinders. + * Very mucy CPU dependant */ + #ifndef DES_UNROLL +! #define DES_UNROLL + #endif + + /* These default values were supplied by +diff -cr openssl-0.9.8l/crypto/engine/Makefile openssl-0.9.8l-with_pkcs11_engine/crypto/engine/Makefile +*** openssl-0.9.8l/crypto/engine/Makefile Thu Nov 5 14:53:23 2009 +--- openssl-0.9.8l-with_pkcs11_engine/crypto/engine/Makefile Thu Nov 19 17:31:35 2009 +*************** +*** 21,32 **** + eng_table.c eng_pkey.c eng_fat.c eng_all.c \ + tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ + tb_cipher.c tb_digest.c \ +! eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c + LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ + eng_table.o eng_pkey.o eng_fat.o eng_all.o \ + tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \ + tb_cipher.o tb_digest.o \ +! eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o + + SRC= $(LIBSRC) + +--- 21,34 ---- + eng_table.c eng_pkey.c eng_fat.c eng_all.c \ + tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ + tb_cipher.c tb_digest.c \ +! eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c \ +! hw_pk11.c hw_pk11_pub.c hw_pk11_uri.c + LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ + eng_table.o eng_pkey.o eng_fat.o eng_all.o \ + tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \ + tb_cipher.o tb_digest.o \ +! eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o \ +! hw_pk11.o hw_pk11_pub.o hw_pk11_uri.o + + SRC= $(LIBSRC) + +*************** +*** 286,291 **** +--- 288,348 ---- + eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h + eng_table.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h + eng_table.o: eng_table.c ++ hw_pk11.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h ++ hw_pk11.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h ++ hw_pk11.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h ++ hw_pk11.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ++ hw_pk11.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h ++ hw_pk11.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h ++ hw_pk11.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h ++ hw_pk11.o: ../../include/openssl/dh.h ../../include/openssl/rand.h ++ hw_pk11.o: ../../include/openssl/ui.h ../../include/openssl/err.h ++ hw_pk11.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h ++ hw_pk11.o: ../../include/openssl/pem.h ../../include/openssl/evp.h ++ hw_pk11.o: ../../include/openssl/md2.h ../../include/openssl/md4.h ++ hw_pk11.o: ../../include/openssl/md5.h ../../include/openssl/sha.h ++ hw_pk11.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h ++ hw_pk11.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h ++ hw_pk11.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h ++ hw_pk11.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h ++ hw_pk11.o: ../../include/openssl/cast.h ../../include/openssl/idea.h ++ hw_pk11.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h ++ hw_pk11.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h ++ hw_pk11.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h ++ hw_pk11.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h ++ hw_pk11.o: ../../include/openssl/pem2.h ../cryptlib.h ++ hw_pk11.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11.c ++ hw_pk11_pub.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h ++ hw_pk11_pub.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h ++ hw_pk11_pub.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h ++ hw_pk11_pub.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ++ hw_pk11_pub.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h ++ hw_pk11_pub.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h ++ hw_pk11_pub.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h ++ hw_pk11_pub.o: ../../include/openssl/dh.h ../../include/openssl/rand.h ++ hw_pk11_pub.o: ../../include/openssl/ui.h ../../include/openssl/err.h ++ hw_pk11_pub.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h ++ hw_pk11_pub.o: ../../include/openssl/pem.h ../../include/openssl/evp.h ++ hw_pk11_pub.o: ../../include/openssl/md2.h ../../include/openssl/md4.h ++ hw_pk11_pub.o: ../../include/openssl/md5.h ../../include/openssl/sha.h ++ hw_pk11_pub.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h ++ hw_pk11_pub.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h ++ hw_pk11_pub.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h ++ hw_pk11_pub.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h ++ hw_pk11_pub.o: ../../include/openssl/cast.h ../../include/openssl/idea.h ++ hw_pk11_pub.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h ++ hw_pk11_pub.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h ++ hw_pk11_pub.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h ++ hw_pk11_pub.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h ++ hw_pk11_pub.o: ../../include/openssl/pem2.h ../cryptlib.h ++ hw_pk11_pub.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11_pub.c ++ hw_pk11_uri.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h ++ hw_pk11_uri.o: ../../include/openssl/opensslconf.h ++ hw_pk11_uri.o: ../../include/openssl/opensslv.h ++ hw_pk11_uri.o: ../../include/openssl/ossl_typ.h ++ hw_pk11_uri.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h ++ hw_pk11_uri.o: ../../include/openssl/symhacks.h hw_pk11.h hw_pk11_err.h ++ hw_pk11_uri.o: hw_pk11_uri.c hw_pk11_uri.h pkcs11f.h pkcs11t.h + tb_cipher.o: ../../e_os.h ../../include/openssl/asn1.h + tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h + tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +diff -cr openssl-0.9.8l/crypto/engine/cryptoki.h openssl-0.9.8l-with_pkcs11_engine/crypto/engine/cryptoki.h +*** openssl-0.9.8l/crypto/engine/cryptoki.h Thu Nov 19 17:33:41 2009 +--- openssl-0.9.8l-with_pkcs11_engine/crypto/engine/cryptoki.h Thu Nov 19 17:16:33 2009 +*************** +*** 0 **** +--- 1,103 ---- ++ /* ++ * CDDL HEADER START ++ * ++ * The contents of this file are subject to the terms of the ++ * Common Development and Distribution License, Version 1.0 only ++ * (the "License"). You may not use this file except in compliance ++ * with the License. ++ * ++ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE ++ * or http://www.opensolaris.org/os/licensing. ++ * See the License for the specific language governing permissions ++ * and limitations under the License. ++ * ++ * When distributing Covered Code, include this CDDL HEADER in each ++ * file and include the License file at usr/src/OPENSOLARIS.LICENSE. ++ * If applicable, add the following below this CDDL HEADER, with the ++ * fields enclosed by brackets "[]" replaced with your own identifying ++ * information: Portions Copyright [yyyy] [name of copyright owner] ++ * ++ * CDDL HEADER END ++ */ ++ /* ++ * Copyright 2003 Sun Microsystems, Inc. All rights reserved. ++ * Use is subject to license terms. ++ */ ++ ++ #ifndef _CRYPTOKI_H ++ #define _CRYPTOKI_H ++ ++ #pragma ident "@(#)cryptoki.h 1.2 05/06/08 SMI" ++ ++ #ifdef __cplusplus ++ extern "C" { ++ #endif ++ ++ #ifndef CK_PTR ++ #define CK_PTR * ++ #endif ++ ++ #ifndef CK_DEFINE_FUNCTION ++ #define CK_DEFINE_FUNCTION(returnType, name) returnType name ++ #endif ++ ++ #ifndef CK_DECLARE_FUNCTION ++ #define CK_DECLARE_FUNCTION(returnType, name) returnType name ++ #endif ++ ++ #ifndef CK_DECLARE_FUNCTION_POINTER ++ #define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType (* name) ++ #endif ++ ++ #ifndef CK_CALLBACK_FUNCTION ++ #define CK_CALLBACK_FUNCTION(returnType, name) returnType (* name) ++ #endif ++ ++ #ifndef NULL_PTR ++ #include /* For NULL */ ++ #define NULL_PTR NULL ++ #endif ++ ++ /* ++ * pkcs11t.h defines TRUE and FALSE in a way that upsets lint ++ */ ++ #ifndef CK_DISABLE_TRUE_FALSE ++ #define CK_DISABLE_TRUE_FALSE ++ #ifndef TRUE ++ #define TRUE 1 ++ #endif /* TRUE */ ++ #ifndef FALSE ++ #define FALSE 0 ++ #endif /* FALSE */ ++ #endif /* CK_DISABLE_TRUE_FALSE */ ++ ++ #undef CK_PKCS11_FUNCTION_INFO ++ ++ #include "pkcs11.h" ++ ++ /* Solaris specific functions */ ++ ++ #include ++ ++ /* ++ * SUNW_C_GetMechSession will initialize the framework and do all ++ * the necessary PKCS#11 calls to create a session capable of ++ * providing operations on the requested mechanism ++ */ ++ CK_RV SUNW_C_GetMechSession(CK_MECHANISM_TYPE mech, ++ CK_SESSION_HANDLE_PTR hSession); ++ ++ /* ++ * SUNW_C_KeyToObject will create a secret key object for the given ++ * mechanism from the rawkey data. ++ */ ++ CK_RV SUNW_C_KeyToObject(CK_SESSION_HANDLE hSession, ++ CK_MECHANISM_TYPE mech, const void *rawkey, size_t rawkey_len, ++ CK_OBJECT_HANDLE_PTR obj); ++ ++ ++ #ifdef __cplusplus ++ } ++ #endif ++ ++ #endif /* _CRYPTOKI_H */ +diff -cr openssl-0.9.8l/crypto/engine/eng_all.c openssl-0.9.8l-with_pkcs11_engine/crypto/engine/eng_all.c +*** openssl-0.9.8l/crypto/engine/eng_all.c Wed Jun 4 20:01:39 2008 +--- openssl-0.9.8l-with_pkcs11_engine/crypto/engine/eng_all.c Thu Nov 19 17:16:33 2009 +*************** +*** 110,116 **** +--- 110,119 ---- + #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) + ENGINE_load_capi(); + #endif ++ #ifndef OPENSSL_NO_HW_PKCS11 ++ ENGINE_load_pk11(); + #endif ++ #endif + } + + #if defined(__OpenBSD__) || defined(__FreeBSD__) +diff -cr openssl-0.9.8l/crypto/engine/engine.h openssl-0.9.8l-with_pkcs11_engine/crypto/engine/engine.h +*** openssl-0.9.8l/crypto/engine/engine.h Wed Jun 4 20:01:40 2008 +--- openssl-0.9.8l-with_pkcs11_engine/crypto/engine/engine.h Thu Nov 19 17:16:33 2009 +*************** +*** 337,342 **** +--- 337,343 ---- + void ENGINE_load_ubsec(void); + #endif + void ENGINE_load_cryptodev(void); ++ void ENGINE_load_pk11(void); + void ENGINE_load_padlock(void); + void ENGINE_load_builtin_engines(void); + #ifndef OPENSSL_NO_CAPIENG +diff -cr openssl-0.9.8l/crypto/engine/hw_pk11.c openssl-0.9.8l-with_pkcs11_engine/crypto/engine/hw_pk11.c +*** openssl-0.9.8l/crypto/engine/hw_pk11.c Thu Nov 19 17:33:41 2009 +--- openssl-0.9.8l-with_pkcs11_engine/crypto/engine/hw_pk11.c Thu Nov 19 18:00:37 2009 +*************** +*** 0 **** +--- 1,3813 ---- ++ /* ++ * Copyright 2009 Sun Microsystems, Inc. All rights reserved. ++ * Use is subject to license terms. ++ */ ++ ++ /* crypto/engine/hw_pk11.c */ ++ /* ++ * This product includes software developed by the OpenSSL Project for ++ * use in the OpenSSL Toolkit (http://www.openssl.org/). ++ * ++ * This project also referenced hw_pkcs11-0.9.7b.patch written by ++ * Afchine Madjlessi. ++ */ ++ /* ++ * ==================================================================== ++ * Copyright (c) 2000-2001 The OpenSSL Project. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * 3. All advertising materials mentioning features or use of this ++ * software must display the following acknowledgment: ++ * "This product includes software developed by the OpenSSL Project ++ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" ++ * ++ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to ++ * endorse or promote products derived from this software without ++ * prior written permission. For written permission, please contact ++ * licensing at OpenSSL.org. ++ * ++ * 5. Products derived from this software may not be called "OpenSSL" ++ * nor may "OpenSSL" appear in their names without prior written ++ * permission of the OpenSSL Project. ++ * ++ * 6. Redistributions of any form whatsoever must retain the following ++ * acknowledgment: ++ * "This product includes software developed by the OpenSSL Project ++ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY ++ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR ++ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED ++ * OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ==================================================================== ++ * ++ * This product includes cryptographic software written by Eric Young ++ * (eay at cryptsoft.com). This product includes software written by Tim ++ * Hudson (tjh at cryptsoft.com). ++ * ++ */ ++ ++ #include ++ #include ++ #include ++ #include ++ #include ++ #include ++ ++ #include ++ #include ++ #include ++ #include ++ #include ++ #include ++ #include ++ #include ++ #ifndef OPENSSL_NO_RSA ++ #include ++ #endif ++ #ifndef OPENSSL_NO_DSA ++ #include ++ #endif ++ #ifndef OPENSSL_NO_DH ++ #include ++ #endif ++ #include ++ #include ++ #include ++ #include ++ #include ++ #include ++ #include ++ ++ #ifndef OPENSSL_NO_HW ++ #ifndef OPENSSL_NO_HW_PK11 ++ ++ /* label for debug messages printed on stderr */ ++ #define PK11_DBG "PKCS#11 ENGINE DEBUG" ++ /* prints a lot of debug messages on stderr about slot selection process */ ++ #undef DEBUG_SLOT_SELECTION ++ /* ++ * Solaris specific code. See comment at check_hw_mechanisms() for more ++ * information. ++ */ ++ #if defined(__SVR4) && defined(__sun) ++ #define SOLARIS_HW_SLOT_SELECTION ++ #endif ++ ++ /* ++ * AES counter mode is not supported in the OpenSSL EVP API yet and neither ++ * there are official OIDs for mechanisms based on this mode. With our changes, ++ * an application can define its own EVP calls for AES counter mode and then ++ * it can make use of hardware acceleration through this engine. However, it's ++ * better if we keep AES CTR support code under ifdef's. ++ */ ++ #define SOLARIS_AES_CTR ++ ++ #include "cryptoki.h" ++ #include "pkcs11.h" ++ #include "hw_pk11.h" ++ #include "hw_pk11_uri.h" ++ #include "hw_pk11_err.c" ++ ++ #ifdef SOLARIS_AES_CTR ++ /* ++ * NIDs for AES counter mode that will be defined during the engine ++ * initialization. ++ */ ++ int NID_aes_128_ctr = NID_undef; ++ int NID_aes_192_ctr = NID_undef; ++ int NID_aes_256_ctr = NID_undef; ++ #endif /* SOLARIS_AES_CTR */ ++ ++ /* ++ * We use this lock to prevent multiple C_Login()s, guard getpassphrase(), ++ * uri_struct manipulation, and static token info. All of that is used by the ++ * RSA keys by reference feature. ++ */ ++ pthread_mutex_t *uri_lock; ++ ++ #ifdef SOLARIS_HW_SLOT_SELECTION ++ /* ++ * Tables for symmetric ciphers and digest mechs found in the pkcs11_kernel ++ * library. See comment at check_hw_mechanisms() for more information. ++ */ ++ int *hw_cnids; ++ int *hw_dnids; ++ #endif /* SOLARIS_HW_SLOT_SELECTION */ ++ ++ /* PKCS#11 session caches and their locks for all operation types */ ++ static PK11_CACHE session_cache[OP_MAX]; ++ ++ /* ++ * We cache the flags so that we do not have to run C_GetTokenInfo() again when ++ * logging into the token. ++ */ ++ CK_FLAGS pubkey_token_flags; ++ ++ /* ++ * As stated in v2.20, 11.7 Object Management Function, in section for ++ * C_FindObjectsInit(), at most one search operation may be active at a given ++ * time in a given session. Therefore, C_Find{,Init,Final}Objects() should be ++ * grouped together to form one atomic search operation. This is already ++ * ensured by the property of unique PKCS#11 session handle used for each ++ * PK11_SESSION object. ++ * ++ * This is however not the biggest concern - maintaining consistency of the ++ * underlying object store is more important. The same section of the spec also ++ * says that one thread can be in the middle of a search operation while another ++ * thread destroys the object matching the search template which would result in ++ * invalid handle returned from the search operation. ++ * ++ * Hence, the following locks are used for both protection of the object stores. ++ * They are also used for active list protection. ++ */ ++ pthread_mutex_t *find_lock[OP_MAX] = { NULL }; ++ ++ /* ++ * lists of asymmetric key handles which are active (referenced by at least one ++ * PK11_SESSION structure, either held by a thread or present in free_session ++ * list) for given algorithm type ++ */ ++ PK11_active *active_list[OP_MAX] = { NULL }; ++ ++ /* ++ * Create all secret key objects in a global session so that they are available ++ * to use for other sessions. These other sessions may be opened or closed ++ * without losing the secret key objects. ++ */ ++ static CK_SESSION_HANDLE global_session = CK_INVALID_HANDLE; ++ ++ /* ENGINE level stuff */ ++ static int pk11_init(ENGINE *e); ++ static int pk11_library_init(ENGINE *e); ++ static int pk11_finish(ENGINE *e); ++ static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); ++ static int pk11_destroy(ENGINE *e); ++ ++ /* RAND stuff */ ++ static void pk11_rand_seed(const void *buf, int num); ++ static void pk11_rand_add(const void *buf, int num, double add_entropy); ++ static void pk11_rand_cleanup(void); ++ static int pk11_rand_bytes(unsigned char *buf, int num); ++ static int pk11_rand_status(void); ++ ++ /* These functions are also used in other files */ ++ PK11_SESSION *pk11_get_session(PK11_OPTYPE optype); ++ void pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype); ++ ++ /* active list manipulation functions used in this file */ ++ extern int pk11_active_delete(CK_OBJECT_HANDLE h, PK11_OPTYPE type); ++ extern void pk11_free_active_list(PK11_OPTYPE type); ++ ++ #ifndef OPENSSL_NO_RSA ++ int pk11_destroy_rsa_key_objects(PK11_SESSION *session); ++ int pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock); ++ int pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock); ++ #endif ++ #ifndef OPENSSL_NO_DSA ++ int pk11_destroy_dsa_key_objects(PK11_SESSION *session); ++ int pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock); ++ int pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock); ++ #endif ++ #ifndef OPENSSL_NO_DH ++ int pk11_destroy_dh_key_objects(PK11_SESSION *session); ++ int pk11_destroy_dh_object(PK11_SESSION *session, CK_BBOOL uselock); ++ #endif ++ ++ /* Local helper functions */ ++ static int pk11_free_all_sessions(void); ++ static int pk11_free_session_list(PK11_OPTYPE optype); ++ static int pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype); ++ static int pk11_destroy_cipher_key_objects(PK11_SESSION *session); ++ static int pk11_destroy_object(CK_SESSION_HANDLE handle, CK_OBJECT_HANDLE oh, ++ CK_BBOOL persistent); ++ static const char *get_PK11_LIBNAME(void); ++ static void free_PK11_LIBNAME(void); ++ static long set_PK11_LIBNAME(const char *name); ++ ++ /* Symmetric cipher and digest support functions */ ++ static int cipher_nid_to_pk11(int nid); ++ #ifdef SOLARIS_AES_CTR ++ static int pk11_add_NID(char *sn, char *ln); ++ static int pk11_add_aes_ctr_NIDs(void); ++ #endif /* SOLARIS_AES_CTR */ ++ static int pk11_usable_ciphers(const int **nids); ++ static int pk11_usable_digests(const int **nids); ++ static int pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, ++ const unsigned char *iv, int enc); ++ static int pk11_cipher_final(PK11_SESSION *sp); ++ static int pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, ++ const unsigned char *in, unsigned int inl); ++ static int pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx); ++ static int pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, ++ const int **nids, int nid); ++ static int pk11_engine_digests(ENGINE *e, const EVP_MD **digest, ++ const int **nids, int nid); ++ static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx, ++ const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp); ++ static int check_new_cipher_key(PK11_SESSION *sp, const unsigned char *key, ++ int key_len); ++ static int md_nid_to_pk11(int nid); ++ static int pk11_digest_init(EVP_MD_CTX *ctx); ++ static int pk11_digest_update(EVP_MD_CTX *ctx, const void *data, ++ size_t count); ++ static int pk11_digest_final(EVP_MD_CTX *ctx, unsigned char *md); ++ static int pk11_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from); ++ static int pk11_digest_cleanup(EVP_MD_CTX *ctx); ++ ++ static int pk11_choose_slots(int *any_slot_found); ++ static void pk11_find_symmetric_ciphers(CK_FUNCTION_LIST_PTR pflist, ++ CK_SLOT_ID current_slot, int *current_slot_n_cipher, ++ int *local_cipher_nids); ++ static void pk11_find_digests(CK_FUNCTION_LIST_PTR pflist, ++ CK_SLOT_ID current_slot, int *current_slot_n_digest, ++ int *local_digest_nids); ++ static void pk11_get_symmetric_cipher(CK_FUNCTION_LIST_PTR, int slot_id, ++ CK_MECHANISM_TYPE mech, int *current_slot_n_cipher, int *local_cipher_nids, ++ int id); ++ static void pk11_get_digest(CK_FUNCTION_LIST_PTR pflist, int slot_id, ++ CK_MECHANISM_TYPE mech, int *current_slot_n_digest, int *local_digest_nids, ++ int id); ++ ++ static int pk11_init_all_locks(void); ++ static void pk11_free_all_locks(void); ++ ++ #ifdef SOLARIS_HW_SLOT_SELECTION ++ static int check_hw_mechanisms(void); ++ static int nid_in_table(int nid, int *nid_table); ++ #endif /* SOLARIS_HW_SLOT_SELECTION */ ++ ++ /* Index for the supported ciphers */ ++ enum pk11_cipher_id { ++ PK11_DES_CBC, ++ PK11_DES3_CBC, ++ PK11_DES_ECB, ++ PK11_DES3_ECB, ++ PK11_RC4, ++ PK11_AES_128_CBC, ++ PK11_AES_192_CBC, ++ PK11_AES_256_CBC, ++ PK11_AES_128_ECB, ++ PK11_AES_192_ECB, ++ PK11_AES_256_ECB, ++ PK11_BLOWFISH_CBC, ++ #ifdef SOLARIS_AES_CTR ++ PK11_AES_128_CTR, ++ PK11_AES_192_CTR, ++ PK11_AES_256_CTR, ++ #endif /* SOLARIS_AES_CTR */ ++ PK11_CIPHER_MAX ++ }; ++ ++ /* Index for the supported digests */ ++ enum pk11_digest_id { ++ PK11_MD5, ++ PK11_SHA1, ++ PK11_SHA224, ++ PK11_SHA256, ++ PK11_SHA384, ++ PK11_SHA512, ++ PK11_DIGEST_MAX ++ }; ++ ++ #define TRY_OBJ_DESTROY(sp, obj_hdl, retval, uselock, alg_type) \ ++ { \ ++ if (uselock) \ ++ LOCK_OBJSTORE(alg_type); \ ++ if (pk11_active_delete(obj_hdl, alg_type) == 1) \ ++ { \ ++ retval = pk11_destroy_object(sp->session, obj_hdl, \ ++ sp->persistent); \ ++ } \ ++ if (uselock) \ ++ UNLOCK_OBJSTORE(alg_type); \ ++ } ++ ++ static int cipher_nids[PK11_CIPHER_MAX]; ++ static int digest_nids[PK11_DIGEST_MAX]; ++ static int cipher_count = 0; ++ static int digest_count = 0; ++ static CK_BBOOL pk11_have_rsa = CK_FALSE; ++ static CK_BBOOL pk11_have_dsa = CK_FALSE; ++ static CK_BBOOL pk11_have_dh = CK_FALSE; ++ static CK_BBOOL pk11_have_random = CK_FALSE; ++ ++ typedef struct PK11_CIPHER_st ++ { ++ enum pk11_cipher_id id; ++ int nid; ++ int iv_len; ++ int min_key_len; ++ int max_key_len; ++ CK_KEY_TYPE key_type; ++ CK_MECHANISM_TYPE mech_type; ++ } PK11_CIPHER; ++ ++ static PK11_CIPHER ciphers[] = ++ { ++ { PK11_DES_CBC, NID_des_cbc, 8, 8, 8, ++ CKK_DES, CKM_DES_CBC, }, ++ { PK11_DES3_CBC, NID_des_ede3_cbc, 8, 24, 24, ++ CKK_DES3, CKM_DES3_CBC, }, ++ { PK11_DES_ECB, NID_des_ecb, 0, 8, 8, ++ CKK_DES, CKM_DES_ECB, }, ++ { PK11_DES3_ECB, NID_des_ede3_ecb, 0, 24, 24, ++ CKK_DES3, CKM_DES3_ECB, }, ++ { PK11_RC4, NID_rc4, 0, 16, 256, ++ CKK_RC4, CKM_RC4, }, ++ { PK11_AES_128_CBC, NID_aes_128_cbc, 16, 16, 16, ++ CKK_AES, CKM_AES_CBC, }, ++ { PK11_AES_192_CBC, NID_aes_192_cbc, 16, 24, 24, ++ CKK_AES, CKM_AES_CBC, }, ++ { PK11_AES_256_CBC, NID_aes_256_cbc, 16, 32, 32, ++ CKK_AES, CKM_AES_CBC, }, ++ { PK11_AES_128_ECB, NID_aes_128_ecb, 0, 16, 16, ++ CKK_AES, CKM_AES_ECB, }, ++ { PK11_AES_192_ECB, NID_aes_192_ecb, 0, 24, 24, ++ CKK_AES, CKM_AES_ECB, }, ++ { PK11_AES_256_ECB, NID_aes_256_ecb, 0, 32, 32, ++ CKK_AES, CKM_AES_ECB, }, ++ { PK11_BLOWFISH_CBC, NID_bf_cbc, 8, 16, 16, ++ CKK_BLOWFISH, CKM_BLOWFISH_CBC, }, ++ #ifdef SOLARIS_AES_CTR ++ /* we don't know the correct NIDs until the engine is initialized */ ++ { PK11_AES_128_CTR, NID_undef, 16, 16, 16, ++ CKK_AES, CKM_AES_CTR, }, ++ { PK11_AES_192_CTR, NID_undef, 16, 24, 24, ++ CKK_AES, CKM_AES_CTR, }, ++ { PK11_AES_256_CTR, NID_undef, 16, 32, 32, ++ CKK_AES, CKM_AES_CTR, }, ++ #endif /* SOLARIS_AES_CTR */ ++ }; ++ ++ typedef struct PK11_DIGEST_st ++ { ++ enum pk11_digest_id id; ++ int nid; ++ CK_MECHANISM_TYPE mech_type; ++ } PK11_DIGEST; ++ ++ static PK11_DIGEST digests[] = ++ { ++ {PK11_MD5, NID_md5, CKM_MD5, }, ++ {PK11_SHA1, NID_sha1, CKM_SHA_1, }, ++ {PK11_SHA224, NID_sha224, CKM_SHA224, }, ++ {PK11_SHA256, NID_sha256, CKM_SHA256, }, ++ {PK11_SHA384, NID_sha384, CKM_SHA384, }, ++ {PK11_SHA512, NID_sha512, CKM_SHA512, }, ++ {0, NID_undef, 0xFFFF, }, ++ }; ++ ++ /* ++ * Structure to be used for the cipher_data/md_data in ++ * EVP_CIPHER_CTX/EVP_MD_CTX structures in order to use the same pk11 ++ * session in multiple cipher_update calls ++ */ ++ typedef struct PK11_CIPHER_STATE_st ++ { ++ PK11_SESSION *sp; ++ } PK11_CIPHER_STATE; ++ ++ ++ /* ++ * libcrypto EVP stuff - this is how we get wired to EVP so the engine gets ++ * called when libcrypto requests a cipher NID. ++ * ++ * Note how the PK11_CIPHER_STATE is used here. ++ */ ++ ++ /* DES CBC EVP */ ++ static const EVP_CIPHER pk11_des_cbc = ++ { ++ NID_des_cbc, ++ 8, 8, 8, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++ /* 3DES CBC EVP */ ++ static const EVP_CIPHER pk11_3des_cbc = ++ { ++ NID_des_ede3_cbc, ++ 8, 24, 8, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++ /* ++ * ECB modes don't use an Initial Vector so that's why set_asn1_parameters and ++ * get_asn1_parameters fields are set to NULL. ++ */ ++ static const EVP_CIPHER pk11_des_ecb = ++ { ++ NID_des_ecb, ++ 8, 8, 8, ++ EVP_CIPH_ECB_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ NULL, ++ NULL, ++ NULL ++ }; ++ ++ static const EVP_CIPHER pk11_3des_ecb = ++ { ++ NID_des_ede3_ecb, ++ 8, 24, 8, ++ EVP_CIPH_ECB_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ NULL, ++ NULL, ++ NULL ++ }; ++ ++ ++ static const EVP_CIPHER pk11_aes_128_cbc = ++ { ++ NID_aes_128_cbc, ++ 16, 16, 16, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++ static const EVP_CIPHER pk11_aes_192_cbc = ++ { ++ NID_aes_192_cbc, ++ 16, 24, 16, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++ static const EVP_CIPHER pk11_aes_256_cbc = ++ { ++ NID_aes_256_cbc, ++ 16, 32, 16, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++ /* ++ * ECB modes don't use IV so that's why set_asn1_parameters and ++ * get_asn1_parameters are set to NULL. ++ */ ++ static const EVP_CIPHER pk11_aes_128_ecb = ++ { ++ NID_aes_128_ecb, ++ 16, 16, 0, ++ EVP_CIPH_ECB_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ NULL, ++ NULL, ++ NULL ++ }; ++ ++ static const EVP_CIPHER pk11_aes_192_ecb = ++ { ++ NID_aes_192_ecb, ++ 16, 24, 0, ++ EVP_CIPH_ECB_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ NULL, ++ NULL, ++ NULL ++ }; ++ ++ static const EVP_CIPHER pk11_aes_256_ecb = ++ { ++ NID_aes_256_ecb, ++ 16, 32, 0, ++ EVP_CIPH_ECB_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ NULL, ++ NULL, ++ NULL ++ }; ++ ++ #ifdef SOLARIS_AES_CTR ++ /* ++ * NID_undef's will be changed to the AES counter mode NIDs as soon they are ++ * created in pk11_library_init(). Note that the need to change these structures ++ * is the reason why we don't define them with the const keyword. ++ */ ++ static EVP_CIPHER pk11_aes_128_ctr = ++ { ++ NID_undef, ++ 16, 16, 16, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++ static EVP_CIPHER pk11_aes_192_ctr = ++ { ++ NID_undef, ++ 16, 24, 16, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++ static EVP_CIPHER pk11_aes_256_ctr = ++ { ++ NID_undef, ++ 16, 32, 16, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ #endif /* SOLARIS_AES_CTR */ ++ ++ static const EVP_CIPHER pk11_bf_cbc = ++ { ++ NID_bf_cbc, ++ 8, 16, 8, ++ EVP_CIPH_VARIABLE_LENGTH, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++ static const EVP_CIPHER pk11_rc4 = ++ { ++ NID_rc4, ++ 1, 16, 0, ++ EVP_CIPH_VARIABLE_LENGTH, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ NULL, ++ NULL, ++ NULL ++ }; ++ ++ static const EVP_MD pk11_md5 = ++ { ++ NID_md5, ++ NID_md5WithRSAEncryption, ++ MD5_DIGEST_LENGTH, ++ 0, ++ pk11_digest_init, ++ pk11_digest_update, ++ pk11_digest_final, ++ pk11_digest_copy, ++ pk11_digest_cleanup, ++ EVP_PKEY_RSA_method, ++ MD5_CBLOCK, ++ sizeof (PK11_CIPHER_STATE), ++ }; ++ ++ static const EVP_MD pk11_sha1 = ++ { ++ NID_sha1, ++ NID_sha1WithRSAEncryption, ++ SHA_DIGEST_LENGTH, ++ 0, ++ pk11_digest_init, ++ pk11_digest_update, ++ pk11_digest_final, ++ pk11_digest_copy, ++ pk11_digest_cleanup, ++ EVP_PKEY_RSA_method, ++ SHA_CBLOCK, ++ sizeof (PK11_CIPHER_STATE), ++ }; ++ ++ static const EVP_MD pk11_sha224 = ++ { ++ NID_sha224, ++ NID_sha224WithRSAEncryption, ++ SHA224_DIGEST_LENGTH, ++ 0, ++ pk11_digest_init, ++ pk11_digest_update, ++ pk11_digest_final, ++ pk11_digest_copy, ++ pk11_digest_cleanup, ++ EVP_PKEY_RSA_method, ++ /* SHA-224 uses the same cblock size as SHA-256 */ ++ SHA256_CBLOCK, ++ sizeof (PK11_CIPHER_STATE), ++ }; ++ ++ static const EVP_MD pk11_sha256 = ++ { ++ NID_sha256, ++ NID_sha256WithRSAEncryption, ++ SHA256_DIGEST_LENGTH, ++ 0, ++ pk11_digest_init, ++ pk11_digest_update, ++ pk11_digest_final, ++ pk11_digest_copy, ++ pk11_digest_cleanup, ++ EVP_PKEY_RSA_method, ++ SHA256_CBLOCK, ++ sizeof (PK11_CIPHER_STATE), ++ }; ++ ++ static const EVP_MD pk11_sha384 = ++ { ++ NID_sha384, ++ NID_sha384WithRSAEncryption, ++ SHA384_DIGEST_LENGTH, ++ 0, ++ pk11_digest_init, ++ pk11_digest_update, ++ pk11_digest_final, ++ pk11_digest_copy, ++ pk11_digest_cleanup, ++ EVP_PKEY_RSA_method, ++ /* SHA-384 uses the same cblock size as SHA-512 */ ++ SHA512_CBLOCK, ++ sizeof (PK11_CIPHER_STATE), ++ }; ++ ++ static const EVP_MD pk11_sha512 = ++ { ++ NID_sha512, ++ NID_sha512WithRSAEncryption, ++ SHA512_DIGEST_LENGTH, ++ 0, ++ pk11_digest_init, ++ pk11_digest_update, ++ pk11_digest_final, ++ pk11_digest_copy, ++ pk11_digest_cleanup, ++ EVP_PKEY_RSA_method, ++ SHA512_CBLOCK, ++ sizeof (PK11_CIPHER_STATE), ++ }; ++ ++ /* ++ * Initialization function. Sets up various PKCS#11 library components. ++ * The definitions for control commands specific to this engine ++ */ ++ #define PK11_CMD_SO_PATH ENGINE_CMD_BASE ++ static const ENGINE_CMD_DEFN pk11_cmd_defns[] = ++ { ++ { ++ PK11_CMD_SO_PATH, ++ "SO_PATH", ++ "Specifies the path to the 'pkcs#11' shared library", ++ ENGINE_CMD_FLAG_STRING ++ }, ++ {0, NULL, NULL, 0} ++ }; ++ ++ ++ static RAND_METHOD pk11_random = ++ { ++ pk11_rand_seed, ++ pk11_rand_bytes, ++ pk11_rand_cleanup, ++ pk11_rand_add, ++ pk11_rand_bytes, ++ pk11_rand_status ++ }; ++ ++ ++ /* Constants used when creating the ENGINE */ ++ static const char *engine_pk11_id = "pkcs11"; ++ static const char *engine_pk11_name = "PKCS #11 engine support"; ++ ++ CK_FUNCTION_LIST_PTR pFuncList = NULL; ++ static const char PK11_GET_FUNCTION_LIST[] = "C_GetFunctionList"; ++ ++ /* ++ * This is a static string constant for the DSO file name and the function ++ * symbol names to bind to. We set it in the Configure script based on whether ++ * this is 32 or 64 bit build. ++ */ ++ static const char def_PK11_LIBNAME[] = PK11_LIB_LOCATION; ++ ++ static CK_BBOOL true = TRUE; ++ static CK_BBOOL false = FALSE; ++ /* Needed in hw_pk11_pub.c as well so that's why it is not static. */ ++ CK_SLOT_ID pubkey_SLOTID = 0; ++ static CK_SLOT_ID rand_SLOTID = 0; ++ static CK_SLOT_ID SLOTID = 0; ++ static CK_BBOOL pk11_library_initialized = FALSE; ++ static CK_BBOOL pk11_atfork_initialized = FALSE; ++ static int pk11_pid = 0; ++ ++ static DSO *pk11_dso = NULL; ++ ++ /* allocate and initialize all locks used by the engine itself */ ++ static int pk11_init_all_locks(void) ++ { ++ int type; ++ ++ #ifndef OPENSSL_NO_RSA ++ find_lock[OP_RSA] = OPENSSL_malloc(sizeof (pthread_mutex_t)); ++ if (find_lock[OP_RSA] == NULL) ++ goto malloc_err; ++ (void) pthread_mutex_init(find_lock[OP_RSA], NULL); ++ #endif /* OPENSSL_NO_RSA */ ++ ++ if ((uri_lock = OPENSSL_malloc(sizeof (pthread_mutex_t))) == NULL) ++ goto malloc_err; ++ (void) pthread_mutex_init(uri_lock, NULL); ++ ++ #ifndef OPENSSL_NO_DSA ++ find_lock[OP_DSA] = OPENSSL_malloc(sizeof (pthread_mutex_t)); ++ if (find_lock[OP_DSA] == NULL) ++ goto malloc_err; ++ (void) pthread_mutex_init(find_lock[OP_DSA], NULL); ++ #endif /* OPENSSL_NO_DSA */ ++ ++ #ifndef OPENSSL_NO_DH ++ find_lock[OP_DH] = OPENSSL_malloc(sizeof (pthread_mutex_t)); ++ if (find_lock[OP_DH] == NULL) ++ goto malloc_err; ++ (void) pthread_mutex_init(find_lock[OP_DH], NULL); ++ #endif /* OPENSSL_NO_DH */ ++ ++ for (type = 0; type < OP_MAX; type++) ++ { ++ session_cache[type].lock = ++ OPENSSL_malloc(sizeof (pthread_mutex_t)); ++ if (session_cache[type].lock == NULL) ++ goto malloc_err; ++ (void) pthread_mutex_init(session_cache[type].lock, NULL); ++ } ++ ++ return (1); ++ ++ malloc_err: ++ pk11_free_all_locks(); ++ PK11err(PK11_F_INIT_ALL_LOCKS, PK11_R_MALLOC_FAILURE); ++ return (0); ++ } ++ ++ static void pk11_free_all_locks(void) ++ { ++ int type; ++ ++ #ifndef OPENSSL_NO_RSA ++ if (find_lock[OP_RSA] != NULL) ++ { ++ (void) pthread_mutex_destroy(find_lock[OP_RSA]); ++ OPENSSL_free(find_lock[OP_RSA]); ++ find_lock[OP_RSA] = NULL; ++ } ++ #endif /* OPENSSL_NO_RSA */ ++ #ifndef OPENSSL_NO_DSA ++ if (find_lock[OP_DSA] != NULL) ++ { ++ (void) pthread_mutex_destroy(find_lock[OP_DSA]); ++ OPENSSL_free(find_lock[OP_DSA]); ++ find_lock[OP_DSA] = NULL; ++ } ++ #endif /* OPENSSL_NO_DSA */ ++ #ifndef OPENSSL_NO_DH ++ if (find_lock[OP_DH] != NULL) ++ { ++ (void) pthread_mutex_destroy(find_lock[OP_DH]); ++ OPENSSL_free(find_lock[OP_DH]); ++ find_lock[OP_DH] = NULL; ++ } ++ #endif /* OPENSSL_NO_DH */ ++ ++ for (type = 0; type < OP_MAX; type++) ++ { ++ if (session_cache[type].lock != NULL) ++ { ++ (void) pthread_mutex_destroy(session_cache[type].lock); ++ OPENSSL_free(session_cache[type].lock); ++ session_cache[type].lock = NULL; ++ } ++ } ++ } ++ ++ /* ++ * This internal function is used by ENGINE_pk11() and "dynamic" ENGINE support. ++ */ ++ static int bind_pk11(ENGINE *e) ++ { ++ #ifndef OPENSSL_NO_RSA ++ const RSA_METHOD *rsa = NULL; ++ RSA_METHOD *pk11_rsa = PK11_RSA(); ++ #endif /* OPENSSL_NO_RSA */ ++ if (!pk11_library_initialized) ++ if (!pk11_library_init(e)) ++ return (0); ++ ++ if (!ENGINE_set_id(e, engine_pk11_id) || ++ !ENGINE_set_name(e, engine_pk11_name) || ++ !ENGINE_set_ciphers(e, pk11_engine_ciphers) || ++ !ENGINE_set_digests(e, pk11_engine_digests)) ++ return (0); ++ #ifndef OPENSSL_NO_RSA ++ if (pk11_have_rsa == CK_TRUE) ++ { ++ if (!ENGINE_set_RSA(e, PK11_RSA()) || ++ !ENGINE_set_load_privkey_function(e, pk11_load_privkey) || ++ !ENGINE_set_load_pubkey_function(e, pk11_load_pubkey)) ++ return (0); ++ #ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: registered RSA\n", PK11_DBG); ++ #endif /* DEBUG_SLOT_SELECTION */ ++ } ++ #endif /* OPENSSL_NO_RSA */ ++ #ifndef OPENSSL_NO_DSA ++ if (pk11_have_dsa == CK_TRUE) ++ { ++ if (!ENGINE_set_DSA(e, PK11_DSA())) ++ return (0); ++ #ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: registered DSA\n", PK11_DBG); ++ #endif /* DEBUG_SLOT_SELECTION */ ++ } ++ #endif /* OPENSSL_NO_DSA */ ++ #ifndef OPENSSL_NO_DH ++ if (pk11_have_dh == CK_TRUE) ++ { ++ if (!ENGINE_set_DH(e, PK11_DH())) ++ return (0); ++ #ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: registered DH\n", PK11_DBG); ++ #endif /* DEBUG_SLOT_SELECTION */ ++ } ++ #endif /* OPENSSL_NO_DH */ ++ if (pk11_have_random) ++ { ++ if (!ENGINE_set_RAND(e, &pk11_random)) ++ return (0); ++ #ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: registered random\n", PK11_DBG); ++ #endif /* DEBUG_SLOT_SELECTION */ ++ } ++ if (!ENGINE_set_init_function(e, pk11_init) || ++ !ENGINE_set_destroy_function(e, pk11_destroy) || ++ !ENGINE_set_finish_function(e, pk11_finish) || ++ !ENGINE_set_ctrl_function(e, pk11_ctrl) || ++ !ENGINE_set_cmd_defns(e, pk11_cmd_defns)) ++ return (0); ++ ++ /* ++ * Apache calls OpenSSL function RSA_blinding_on() once during startup ++ * which in turn calls bn_mod_exp. Since we do not implement bn_mod_exp ++ * here, we wire it back to the OpenSSL software implementation. ++ * Since it is used only once, performance is not a concern. ++ */ ++ #ifndef OPENSSL_NO_RSA ++ rsa = RSA_PKCS1_SSLeay(); ++ pk11_rsa->rsa_mod_exp = rsa->rsa_mod_exp; ++ pk11_rsa->bn_mod_exp = rsa->bn_mod_exp; ++ #endif /* OPENSSL_NO_RSA */ ++ ++ /* Ensure the pk11 error handling is set up */ ++ ERR_load_pk11_strings(); ++ ++ return (1); ++ } ++ ++ /* Dynamic engine support is disabled at a higher level for Solaris */ ++ #ifdef ENGINE_DYNAMIC_SUPPORT ++ static int bind_helper(ENGINE *e, const char *id) ++ { ++ if (id && (strcmp(id, engine_pk11_id) != 0)) ++ return (0); ++ ++ if (!bind_pk11(e)) ++ return (0); ++ ++ return (1); ++ } ++ ++ IMPLEMENT_DYNAMIC_CHECK_FN() ++ IMPLEMENT_DYNAMIC_BIND_FN(bind_helper) ++ ++ #else ++ static ENGINE *engine_pk11(void) ++ { ++ ENGINE *ret = ENGINE_new(); ++ ++ if (!ret) ++ return (NULL); ++ ++ if (!bind_pk11(ret)) ++ { ++ ENGINE_free(ret); ++ return (NULL); ++ } ++ ++ return (ret); ++ } ++ ++ void ++ ENGINE_load_pk11(void) ++ { ++ ENGINE *e_pk11 = NULL; ++ ++ /* ++ * Do not use dynamic PKCS#11 library on Solaris due to ++ * security reasons. We will link it in statically. ++ */ ++ /* Attempt to load PKCS#11 library */ ++ if (!pk11_dso) ++ pk11_dso = DSO_load(NULL, get_PK11_LIBNAME(), NULL, 0); ++ ++ if (pk11_dso == NULL) ++ { ++ PK11err(PK11_F_LOAD, PK11_R_DSO_FAILURE); ++ return; ++ } ++ ++ e_pk11 = engine_pk11(); ++ if (!e_pk11) ++ { ++ DSO_free(pk11_dso); ++ pk11_dso = NULL; ++ return; ++ } ++ ++ /* ++ * At this point, the pk11 shared library is either dynamically ++ * loaded or statically linked in. So, initialize the pk11 ++ * library before calling ENGINE_set_default since the latter ++ * needs cipher and digest algorithm information ++ */ ++ if (!pk11_library_init(e_pk11)) ++ { ++ DSO_free(pk11_dso); ++ pk11_dso = NULL; ++ ENGINE_free(e_pk11); ++ return; ++ } ++ ++ ENGINE_add(e_pk11); ++ ++ ENGINE_free(e_pk11); ++ ERR_clear_error(); ++ } ++ #endif /* ENGINE_DYNAMIC_SUPPORT */ ++ ++ /* ++ * These are the static string constants for the DSO file name and ++ * the function symbol names to bind to. ++ */ ++ static const char *PK11_LIBNAME = NULL; ++ ++ static const char *get_PK11_LIBNAME(void) ++ { ++ if (PK11_LIBNAME) ++ return (PK11_LIBNAME); ++ ++ return (def_PK11_LIBNAME); ++ } ++ ++ static void free_PK11_LIBNAME(void) ++ { ++ if (PK11_LIBNAME) ++ OPENSSL_free((void*)PK11_LIBNAME); ++ ++ PK11_LIBNAME = NULL; ++ } ++ ++ static long set_PK11_LIBNAME(const char *name) ++ { ++ free_PK11_LIBNAME(); ++ ++ return ((PK11_LIBNAME = BUF_strdup(name)) != NULL ? 1 : 0); ++ } ++ ++ /* acquire all engine specific mutexes before fork */ ++ static void pk11_fork_prepare(void) ++ { ++ int i; ++ ++ if (!pk11_library_initialized) ++ return; ++ ++ LOCK_OBJSTORE(OP_RSA); ++ LOCK_OBJSTORE(OP_DSA); ++ LOCK_OBJSTORE(OP_DH); ++ (void) pthread_mutex_lock(uri_lock); ++ for (i = 0; i < OP_MAX; i++) ++ { ++ (void) pthread_mutex_lock(session_cache[i].lock); ++ } ++ } ++ ++ /* release all engine specific mutexes */ ++ static void pk11_fork_parent(void) ++ { ++ int i; ++ ++ if (!pk11_library_initialized) ++ return; ++ ++ for (i = OP_MAX - 1; i >= 0; i--) ++ { ++ (void) pthread_mutex_unlock(session_cache[i].lock); ++ } ++ UNLOCK_OBJSTORE(OP_DH); ++ UNLOCK_OBJSTORE(OP_DSA); ++ UNLOCK_OBJSTORE(OP_RSA); ++ (void) pthread_mutex_unlock(uri_lock); ++ } ++ ++ /* ++ * same situation as in parent - we need to unlock all locks to make them ++ * accessible to all threads. ++ */ ++ static void pk11_fork_child(void) ++ { ++ int i; ++ ++ if (!pk11_library_initialized) ++ return; ++ ++ for (i = OP_MAX - 1; i >= 0; i--) ++ { ++ (void) pthread_mutex_unlock(session_cache[i].lock); ++ } ++ UNLOCK_OBJSTORE(OP_DH); ++ UNLOCK_OBJSTORE(OP_DSA); ++ UNLOCK_OBJSTORE(OP_RSA); ++ (void) pthread_mutex_unlock(uri_lock); ++ } ++ ++ /* Initialization function for the pk11 engine */ ++ static int pk11_init(ENGINE *e) ++ { ++ return (pk11_library_init(e)); ++ } ++ ++ /* ++ * Initialization function. Sets up various PKCS#11 library components. ++ * It selects a slot based on predefined critiera. In the process, it also ++ * count how many ciphers and digests to support. Since the cipher and ++ * digest information is needed when setting default engine, this function ++ * needs to be called before calling ENGINE_set_default. ++ */ ++ /* ARGSUSED */ ++ static int pk11_library_init(ENGINE *e) ++ { ++ CK_C_GetFunctionList p; ++ CK_RV rv = CKR_OK; ++ CK_INFO info; ++ CK_ULONG ul_state_len; ++ int any_slot_found; ++ int i; ++ ++ /* ++ * pk11_library_initialized is set to 0 in pk11_finish() which is called ++ * from ENGINE_finish(). However, if there is still at least one ++ * existing functional reference to the engine (see engine(3) for more ++ * information), pk11_finish() is skipped. For example, this can happen ++ * if an application forgets to clear one cipher context. In case of a ++ * fork() when the application is finishing the engine so that it can be ++ * reinitialized in the child, forgotten functional reference causes ++ * pk11_library_initialized to stay 1. In that case we need the PID ++ * check so that we properly initialize the engine again. ++ */ ++ if (pk11_library_initialized) ++ { ++ if (pk11_pid == getpid()) ++ { ++ return (1); ++ } ++ else ++ { ++ global_session = CK_INVALID_HANDLE; ++ /* ++ * free the locks first to prevent memory leak in case ++ * the application calls fork() without finishing the ++ * engine first. ++ */ ++ pk11_free_all_locks(); ++ } ++ } ++ ++ if (pk11_dso == NULL) ++ { ++ PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE); ++ goto err; ++ } ++ ++ #ifdef SOLARIS_AES_CTR ++ /* ++ * We must do this before we start working with slots since we need all ++ * NIDs there. ++ */ ++ if (pk11_add_aes_ctr_NIDs() == 0) ++ goto err; ++ #endif /* SOLARIS_AES_CTR */ ++ ++ #ifdef SOLARIS_HW_SLOT_SELECTION ++ if (check_hw_mechanisms() == 0) ++ goto err; ++ #endif /* SOLARIS_HW_SLOT_SELECTION */ ++ ++ /* get the C_GetFunctionList function from the loaded library */ ++ p = (CK_C_GetFunctionList)DSO_bind_func(pk11_dso, ++ PK11_GET_FUNCTION_LIST); ++ if (!p) ++ { ++ PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE); ++ goto err; ++ } ++ ++ /* get the full function list from the loaded library */ ++ rv = p(&pFuncList); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE, rv); ++ goto err; ++ } ++ ++ rv = pFuncList->C_Initialize(NULL_PTR); ++ if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED)) ++ { ++ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_INITIALIZE, rv); ++ goto err; ++ } ++ ++ rv = pFuncList->C_GetInfo(&info); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_GETINFO, rv); ++ goto err; ++ } ++ ++ if (pk11_choose_slots(&any_slot_found) == 0) ++ goto err; ++ ++ /* ++ * The library we use, set in def_PK11_LIBNAME, may not offer any ++ * slot(s). In that case, we must not proceed but we must not return an ++ * error. The reason is that applications that try to set up the PKCS#11 ++ * engine don't exit on error during the engine initialization just ++ * because no slot was present. ++ */ ++ if (any_slot_found == 0) ++ return (1); ++ ++ if (global_session == CK_INVALID_HANDLE) ++ { ++ /* Open the global_session for the new process */ ++ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, ++ NULL_PTR, NULL_PTR, &global_session); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_LIBRARY_INIT, ++ PK11_R_OPENSESSION, rv); ++ goto err; ++ } ++ } ++ ++ /* ++ * Disable digest if C_GetOperationState is not supported since ++ * this function is required by OpenSSL digest copy function ++ */ ++ if (pFuncList->C_GetOperationState(global_session, NULL, &ul_state_len) ++ == CKR_FUNCTION_NOT_SUPPORTED) { ++ #ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: C_GetOperationState() not supported, " ++ "setting digest_count to 0\n", PK11_DBG); ++ #endif /* DEBUG_SLOT_SELECTION */ ++ digest_count = 0; ++ } ++ ++ pk11_library_initialized = TRUE; ++ pk11_pid = getpid(); ++ /* ++ * if initialization of the locks fails pk11_init_all_locks() ++ * will do the cleanup. ++ */ ++ if (!pk11_init_all_locks()) ++ goto err; ++ for (i = 0; i < OP_MAX; i++) ++ session_cache[i].head = NULL; ++ /* ++ * initialize active lists. We only use active lists ++ * for asymmetric ciphers. ++ */ ++ for (i = 0; i < OP_MAX; i++) ++ active_list[i] = NULL; ++ ++ if (!pk11_atfork_initialized) ++ { ++ if (pthread_atfork(pk11_fork_prepare, pk11_fork_parent, ++ pk11_fork_child) != 0) ++ { ++ PK11err(PK11_F_LIBRARY_INIT, PK11_R_ATFORK_FAILED); ++ goto err; ++ } ++ pk11_atfork_initialized = TRUE; ++ } ++ ++ return (1); ++ ++ err: ++ return (0); ++ } ++ ++ /* Destructor (complements the "ENGINE_pk11()" constructor) */ ++ /* ARGSUSED */ ++ static int pk11_destroy(ENGINE *e) ++ { ++ free_PK11_LIBNAME(); ++ ERR_unload_pk11_strings(); ++ return (1); ++ } ++ ++ /* ++ * Termination function to clean up the session, the token, and the pk11 ++ * library. ++ */ ++ /* ARGSUSED */ ++ static int pk11_finish(ENGINE *e) ++ { ++ int i; ++ ++ if (pk11_dso == NULL) ++ { ++ PK11err(PK11_F_FINISH, PK11_R_NOT_LOADED); ++ goto err; ++ } ++ ++ OPENSSL_assert(pFuncList != NULL); ++ ++ if (pk11_free_all_sessions() == 0) ++ goto err; ++ ++ /* free all active lists */ ++ for (i = 0; i < OP_MAX; i++) ++ pk11_free_active_list(i); ++ ++ pFuncList->C_CloseSession(global_session); ++ global_session = CK_INVALID_HANDLE; ++ ++ /* ++ * Since we are part of a library (libcrypto.so), calling this function ++ * may have side-effects. ++ */ ++ #if 0 ++ pFuncList->C_Finalize(NULL); ++ #endif ++ ++ if (!DSO_free(pk11_dso)) ++ { ++ PK11err(PK11_F_FINISH, PK11_R_DSO_FAILURE); ++ goto err; ++ } ++ pk11_dso = NULL; ++ pFuncList = NULL; ++ pk11_library_initialized = FALSE; ++ pk11_pid = 0; ++ /* ++ * There is no way how to unregister atfork handlers (other than ++ * unloading the library) so we just free the locks. For this reason ++ * the atfork handlers check if the engine is initialized and bail out ++ * immediately if not. This is necessary in case a process finishes ++ * the engine before calling fork(). ++ */ ++ pk11_free_all_locks(); ++ ++ return (1); ++ ++ err: ++ return (0); ++ } ++ ++ /* Standard engine interface function to set the dynamic library path */ ++ /* ARGSUSED */ ++ static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()) ++ { ++ int initialized = ((pk11_dso == NULL) ? 0 : 1); ++ ++ switch (cmd) ++ { ++ case PK11_CMD_SO_PATH: ++ if (p == NULL) ++ { ++ PK11err(PK11_F_CTRL, ERR_R_PASSED_NULL_PARAMETER); ++ return (0); ++ } ++ ++ if (initialized) ++ { ++ PK11err(PK11_F_CTRL, PK11_R_ALREADY_LOADED); ++ return (0); ++ } ++ ++ return (set_PK11_LIBNAME((const char *)p)); ++ default: ++ break; ++ } ++ ++ PK11err(PK11_F_CTRL, PK11_R_CTRL_COMMAND_NOT_IMPLEMENTED); ++ ++ return (0); ++ } ++ ++ ++ /* Required function by the engine random interface. It does nothing here */ ++ static void pk11_rand_cleanup(void) ++ { ++ return; ++ } ++ ++ /* ARGSUSED */ ++ static void pk11_rand_add(const void *buf, int num, double add) ++ { ++ PK11_SESSION *sp; ++ ++ if ((sp = pk11_get_session(OP_RAND)) == NULL) ++ return; ++ ++ /* ++ * Ignore any errors (e.g. CKR_RANDOM_SEED_NOT_SUPPORTED) since ++ * the calling functions do not care anyway ++ */ ++ pFuncList->C_SeedRandom(sp->session, (unsigned char *) buf, num); ++ pk11_return_session(sp, OP_RAND); ++ ++ return; ++ } ++ ++ static void pk11_rand_seed(const void *buf, int num) ++ { ++ pk11_rand_add(buf, num, 0); ++ } ++ ++ static int pk11_rand_bytes(unsigned char *buf, int num) ++ { ++ CK_RV rv; ++ PK11_SESSION *sp; ++ ++ if ((sp = pk11_get_session(OP_RAND)) == NULL) ++ return (0); ++ ++ rv = pFuncList->C_GenerateRandom(sp->session, buf, num); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_RAND_BYTES, PK11_R_GENERATERANDOM, rv); ++ pk11_return_session(sp, OP_RAND); ++ return (0); ++ } ++ ++ pk11_return_session(sp, OP_RAND); ++ return (1); ++ } ++ ++ /* Required function by the engine random interface. It does nothing here */ ++ static int pk11_rand_status(void) ++ { ++ return (1); ++ } ++ ++ /* Free all BIGNUM structures from PK11_SESSION. */ ++ static void pk11_free_nums(PK11_SESSION *sp, PK11_OPTYPE optype) ++ { ++ switch (optype) ++ { ++ #ifndef OPENSSL_NO_RSA ++ case OP_RSA: ++ if (sp->opdata_rsa_n_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_n_num); ++ sp->opdata_rsa_n_num = NULL; ++ } ++ if (sp->opdata_rsa_e_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_e_num); ++ sp->opdata_rsa_e_num = NULL; ++ } ++ if (sp->opdata_rsa_d_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_d_num); ++ sp->opdata_rsa_d_num = NULL; ++ } ++ break; ++ #endif ++ #ifndef OPENSSL_NO_DSA ++ case OP_DSA: ++ if (sp->opdata_dsa_pub_num != NULL) ++ { ++ BN_free(sp->opdata_dsa_pub_num); ++ sp->opdata_dsa_pub_num = NULL; ++ } ++ if (sp->opdata_dsa_priv_num != NULL) ++ { ++ BN_free(sp->opdata_dsa_priv_num); ++ sp->opdata_dsa_priv_num = NULL; ++ } ++ break; ++ #endif ++ #ifndef OPENSSL_NO_DH ++ case OP_DH: ++ if (sp->opdata_dh_priv_num != NULL) ++ { ++ BN_free(sp->opdata_dh_priv_num); ++ sp->opdata_dh_priv_num = NULL; ++ } ++ break; ++ #endif ++ default: ++ break; ++ } ++ } ++ ++ /* ++ * Get new PK11_SESSION structure ready for use. Every process must have ++ * its own freelist of PK11_SESSION structures so handle fork() here ++ * by destroying the old and creating new freelist. ++ * The returned PK11_SESSION structure is disconnected from the freelist. ++ */ ++ PK11_SESSION * ++ pk11_get_session(PK11_OPTYPE optype) ++ { ++ PK11_SESSION *sp = NULL, *sp1, *freelist; ++ pthread_mutex_t *freelist_lock; ++ static pid_t pid = 0; ++ pid_t new_pid; ++ CK_RV rv; ++ ++ switch (optype) ++ { ++ case OP_RSA: ++ case OP_DSA: ++ case OP_DH: ++ case OP_RAND: ++ case OP_DIGEST: ++ case OP_CIPHER: ++ freelist_lock = session_cache[optype].lock; ++ break; ++ default: ++ PK11err(PK11_F_GET_SESSION, ++ PK11_R_INVALID_OPERATION_TYPE); ++ return (NULL); ++ } ++ (void) pthread_mutex_lock(freelist_lock); ++ ++ /* ++ * Will use it to find out if we forked. We cannot use the PID field in ++ * the session structure because we could get a newly allocated session ++ * here, with no PID information. ++ */ ++ if (pid == 0) ++ pid = getpid(); ++ ++ freelist = session_cache[optype].head; ++ sp = freelist; ++ ++ /* ++ * If the free list is empty, allocate new unitialized (filled ++ * with zeroes) PK11_SESSION structure otherwise return first ++ * structure from the freelist. ++ */ ++ if (sp == NULL) ++ { ++ if ((sp = OPENSSL_malloc(sizeof (PK11_SESSION))) == NULL) ++ { ++ PK11err(PK11_F_GET_SESSION, ++ PK11_R_MALLOC_FAILURE); ++ goto err; ++ } ++ (void) memset(sp, 0, sizeof (PK11_SESSION)); ++ ++ /* ++ * It is a new session so it will look like a cache miss to the ++ * code below. So, we must not try to to destroy its members so ++ * mark them as unused. ++ */ ++ sp->opdata_rsa_priv_key = CK_INVALID_HANDLE; ++ sp->opdata_rsa_pub_key = CK_INVALID_HANDLE; ++ } ++ else ++ freelist = sp->next; ++ ++ /* ++ * Check whether we have forked. In that case, we must get rid of all ++ * inherited sessions and start allocating new ones. ++ */ ++ if (pid != (new_pid = getpid())) ++ { ++ pid = new_pid; ++ ++ /* ++ * We are a new process and thus need to free any inherited ++ * PK11_SESSION objects aside from the first session (sp) which ++ * is the only PK11_SESSION structure we will reuse (for the ++ * head of the list). ++ */ ++ while ((sp1 = freelist) != NULL) ++ { ++ freelist = sp1->next; ++ /* ++ * NOTE: we do not want to call pk11_free_all_sessions() ++ * here because it would close underlying PKCS#11 ++ * sessions and destroy all objects. ++ */ ++ pk11_free_nums(sp1, optype); ++ OPENSSL_free(sp1); ++ } ++ ++ /* we have to free the active list as well. */ ++ pk11_free_active_list(optype); ++ ++ /* Initialize the process */ ++ rv = pFuncList->C_Initialize(NULL_PTR); ++ if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED)) ++ { ++ PK11err_add_data(PK11_F_GET_SESSION, PK11_R_INITIALIZE, ++ rv); ++ OPENSSL_free(sp); ++ sp = NULL; ++ goto err; ++ } ++ ++ /* ++ * Choose slot here since the slot table is different on this ++ * process. If we are here then we must have found at least one ++ * usable slot before so we don't need to check any_slot_found. ++ * See pk11_library_init()'s usage of this function for more ++ * information. ++ */ ++ #ifdef SOLARIS_HW_SLOT_SELECTION ++ if (check_hw_mechanisms() == 0) ++ goto err; ++ #endif /* SOLARIS_HW_SLOT_SELECTION */ ++ if (pk11_choose_slots(NULL) == 0) ++ goto err; ++ ++ /* Open the global_session for the new process */ ++ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, ++ NULL_PTR, NULL_PTR, &global_session); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_GET_SESSION, PK11_R_OPENSESSION, ++ rv); ++ OPENSSL_free(sp); ++ sp = NULL; ++ goto err; ++ } ++ ++ /* ++ * It is an inherited session from our parent so it needs ++ * re-initialization. ++ */ ++ if (pk11_setup_session(sp, optype) == 0) ++ { ++ OPENSSL_free(sp); ++ sp = NULL; ++ goto err; ++ } ++ if (pk11_token_relogin(sp->session) == 0) ++ { ++ /* ++ * We will keep the session in the cache list and let ++ * the caller cope with the situation. ++ */ ++ freelist = sp; ++ sp = NULL; ++ goto err; ++ } ++ } ++ ++ if (sp->pid == 0) ++ { ++ /* It is a new session and needs initialization. */ ++ if (pk11_setup_session(sp, optype) == 0) ++ { ++ OPENSSL_free(sp); ++ sp = NULL; ++ } ++ } ++ ++ /* set new head for the list of PK11_SESSION objects */ ++ session_cache[optype].head = freelist; ++ ++ err: ++ if (sp != NULL) ++ sp->next = NULL; ++ ++ (void) pthread_mutex_unlock(freelist_lock); ++ ++ return (sp); ++ } ++ ++ ++ void ++ pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype) ++ { ++ pthread_mutex_t *freelist_lock; ++ PK11_SESSION *freelist; ++ ++ /* ++ * If this is a session from the parent it will be taken care of and ++ * freed in pk11_get_session() as part of the post-fork clean up the ++ * next time we will ask for a new session. ++ */ ++ if (sp == NULL || sp->pid != getpid()) ++ return; ++ ++ switch (optype) ++ { ++ case OP_RSA: ++ case OP_DSA: ++ case OP_DH: ++ case OP_RAND: ++ case OP_DIGEST: ++ case OP_CIPHER: ++ freelist_lock = session_cache[optype].lock; ++ break; ++ default: ++ PK11err(PK11_F_RETURN_SESSION, ++ PK11_R_INVALID_OPERATION_TYPE); ++ return; ++ } ++ ++ (void) pthread_mutex_lock(freelist_lock); ++ freelist = session_cache[optype].head; ++ sp->next = freelist; ++ session_cache[optype].head = sp; ++ (void) pthread_mutex_unlock(freelist_lock); ++ } ++ ++ ++ /* Destroy all objects. This function is called when the engine is finished */ ++ static int pk11_free_all_sessions() ++ { ++ int ret = 1; ++ int type; ++ ++ #ifndef OPENSSL_NO_RSA ++ (void) pk11_destroy_rsa_key_objects(NULL); ++ #endif /* OPENSSL_NO_RSA */ ++ #ifndef OPENSSL_NO_DSA ++ (void) pk11_destroy_dsa_key_objects(NULL); ++ #endif /* OPENSSL_NO_DSA */ ++ #ifndef OPENSSL_NO_DH ++ (void) pk11_destroy_dh_key_objects(NULL); ++ #endif /* OPENSSL_NO_DH */ ++ (void) pk11_destroy_cipher_key_objects(NULL); ++ ++ /* ++ * We try to release as much as we can but any error means that we will ++ * return 0 on exit. ++ */ ++ for (type = 0; type < OP_MAX; type++) ++ { ++ if (pk11_free_session_list(type) == 0) ++ ret = 0; ++ } ++ ++ return (ret); ++ } ++ ++ /* ++ * Destroy session structures from the linked list specified. Free as many ++ * sessions as possible but any failure in C_CloseSession() means that we ++ * return an error on return. ++ */ ++ static int pk11_free_session_list(PK11_OPTYPE optype) ++ { ++ CK_RV rv; ++ PK11_SESSION *sp = NULL; ++ PK11_SESSION *freelist = NULL; ++ pid_t mypid = getpid(); ++ pthread_mutex_t *freelist_lock; ++ int ret = 1; ++ ++ switch (optype) ++ { ++ case OP_RSA: ++ case OP_DSA: ++ case OP_DH: ++ case OP_RAND: ++ case OP_DIGEST: ++ case OP_CIPHER: ++ freelist_lock = session_cache[optype].lock; ++ break; ++ default: ++ PK11err(PK11_F_FREE_ALL_SESSIONS, ++ PK11_R_INVALID_OPERATION_TYPE); ++ return (0); ++ } ++ ++ (void) pthread_mutex_lock(freelist_lock); ++ freelist = session_cache[optype].head; ++ while ((sp = freelist) != NULL) ++ { ++ if (sp->session != CK_INVALID_HANDLE && sp->pid == mypid) ++ { ++ rv = pFuncList->C_CloseSession(sp->session); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_FREE_ALL_SESSIONS, ++ PK11_R_CLOSESESSION, rv); ++ ret = 0; ++ } ++ } ++ freelist = sp->next; ++ pk11_free_nums(sp, optype); ++ OPENSSL_free(sp); ++ } ++ ++ (void) pthread_mutex_unlock(freelist_lock); ++ return (ret); ++ } ++ ++ ++ static int ++ pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype) ++ { ++ CK_RV rv; ++ CK_SLOT_ID myslot; ++ ++ switch (optype) ++ { ++ case OP_RSA: ++ case OP_DSA: ++ case OP_DH: ++ myslot = pubkey_SLOTID; ++ break; ++ case OP_RAND: ++ myslot = rand_SLOTID; ++ break; ++ case OP_DIGEST: ++ case OP_CIPHER: ++ myslot = SLOTID; ++ break; ++ default: ++ PK11err(PK11_F_SETUP_SESSION, ++ PK11_R_INVALID_OPERATION_TYPE); ++ return (0); ++ } ++ ++ sp->session = CK_INVALID_HANDLE; ++ #ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: myslot=%d optype=%d\n", PK11_DBG, myslot, optype); ++ #endif /* DEBUG_SLOT_SELECTION */ ++ rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION, ++ NULL_PTR, NULL_PTR, &sp->session); ++ if (rv == CKR_CRYPTOKI_NOT_INITIALIZED) ++ { ++ /* ++ * We are probably a child process so force the ++ * reinitialize of the session ++ */ ++ pk11_library_initialized = FALSE; ++ if (!pk11_library_init(NULL)) ++ return (0); ++ rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION, ++ NULL_PTR, NULL_PTR, &sp->session); ++ } ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_SETUP_SESSION, PK11_R_OPENSESSION, rv); ++ return (0); ++ } ++ ++ sp->pid = getpid(); ++ ++ switch (optype) ++ { ++ #ifndef OPENSSL_NO_RSA ++ case OP_RSA: ++ sp->opdata_rsa_pub_key = CK_INVALID_HANDLE; ++ sp->opdata_rsa_priv_key = CK_INVALID_HANDLE; ++ sp->opdata_rsa_pub = NULL; ++ sp->opdata_rsa_n_num = NULL; ++ sp->opdata_rsa_e_num = NULL; ++ sp->opdata_rsa_priv = NULL; ++ sp->opdata_rsa_d_num = NULL; ++ break; ++ #endif /* OPENSSL_NO_RSA */ ++ #ifndef OPENSSL_NO_DSA ++ case OP_DSA: ++ sp->opdata_dsa_pub_key = CK_INVALID_HANDLE; ++ sp->opdata_dsa_priv_key = CK_INVALID_HANDLE; ++ sp->opdata_dsa_pub = NULL; ++ sp->opdata_dsa_pub_num = NULL; ++ sp->opdata_dsa_priv = NULL; ++ sp->opdata_dsa_priv_num = NULL; ++ break; ++ #endif /* OPENSSL_NO_DSA */ ++ #ifndef OPENSSL_NO_DH ++ case OP_DH: ++ sp->opdata_dh_key = CK_INVALID_HANDLE; ++ sp->opdata_dh = NULL; ++ sp->opdata_dh_priv_num = NULL; ++ break; ++ #endif /* OPENSSL_NO_DH */ ++ case OP_CIPHER: ++ sp->opdata_cipher_key = CK_INVALID_HANDLE; ++ sp->opdata_encrypt = -1; ++ break; ++ } ++ ++ /* ++ * We always initialize the session as containing a non-persistent ++ * object. The key load functions set it to persistent if that is so. ++ */ ++ sp->persistent = CK_FALSE; ++ return (1); ++ } ++ ++ #ifndef OPENSSL_NO_RSA ++ /* Destroy RSA public key from single session. */ ++ int ++ pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock) ++ { ++ int ret = 0; ++ ++ if (sp->opdata_rsa_pub_key != CK_INVALID_HANDLE) ++ { ++ TRY_OBJ_DESTROY(sp, sp->opdata_rsa_pub_key, ++ ret, uselock, OP_RSA); ++ sp->opdata_rsa_pub_key = CK_INVALID_HANDLE; ++ sp->opdata_rsa_pub = NULL; ++ if (sp->opdata_rsa_n_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_n_num); ++ sp->opdata_rsa_n_num = NULL; ++ } ++ if (sp->opdata_rsa_e_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_e_num); ++ sp->opdata_rsa_e_num = NULL; ++ } ++ } ++ ++ return (ret); ++ } ++ ++ /* Destroy RSA private key from single session. */ ++ int ++ pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock) ++ { ++ int ret = 0; ++ ++ if (sp->opdata_rsa_priv_key != CK_INVALID_HANDLE) ++ { ++ TRY_OBJ_DESTROY(sp, sp->opdata_rsa_priv_key, ++ ret, uselock, OP_RSA); ++ sp->opdata_rsa_priv_key = CK_INVALID_HANDLE; ++ sp->opdata_rsa_priv = NULL; ++ if (sp->opdata_rsa_d_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_d_num); ++ sp->opdata_rsa_d_num = NULL; ++ } ++ ++ /* ++ * For the RSA key by reference code, public components 'n'/'e' ++ * are the key components we use to check for the cache hit. We ++ * must free those as well. ++ */ ++ if (sp->opdata_rsa_n_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_n_num); ++ sp->opdata_rsa_n_num = NULL; ++ } ++ if (sp->opdata_rsa_e_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_e_num); ++ sp->opdata_rsa_e_num = NULL; ++ } ++ } ++ ++ return (ret); ++ } ++ ++ /* ++ * Destroy RSA key object wrapper. If session is NULL, try to destroy all ++ * objects in the free list. ++ */ ++ int ++ pk11_destroy_rsa_key_objects(PK11_SESSION *session) ++ { ++ int ret = 1; ++ PK11_SESSION *sp = NULL; ++ PK11_SESSION *local_free_session; ++ CK_BBOOL uselock = TRUE; ++ ++ if (session != NULL) ++ local_free_session = session; ++ else ++ { ++ (void) pthread_mutex_lock(session_cache[OP_RSA].lock); ++ local_free_session = session_cache[OP_RSA].head; ++ uselock = FALSE; ++ } ++ ++ /* ++ * go through the list of sessions and delete key objects ++ */ ++ while ((sp = local_free_session) != NULL) ++ { ++ local_free_session = sp->next; ++ ++ /* ++ * Do not terminate list traversal if one of the ++ * destroy operations fails. ++ */ ++ if (pk11_destroy_rsa_object_pub(sp, uselock) == 0) ++ { ++ ret = 0; ++ continue; ++ } ++ if (pk11_destroy_rsa_object_priv(sp, uselock) == 0) ++ { ++ ret = 0; ++ continue; ++ } ++ } ++ ++ if (session == NULL) ++ (void) pthread_mutex_unlock(session_cache[OP_RSA].lock); ++ ++ return (ret); ++ } ++ #endif /* OPENSSL_NO_RSA */ ++ ++ #ifndef OPENSSL_NO_DSA ++ /* Destroy DSA public key from single session. */ ++ int ++ pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock) ++ { ++ int ret = 0; ++ ++ if (sp->opdata_dsa_pub_key != CK_INVALID_HANDLE) ++ { ++ TRY_OBJ_DESTROY(sp, sp->opdata_dsa_pub_key, ++ ret, uselock, OP_DSA); ++ sp->opdata_dsa_pub_key = CK_INVALID_HANDLE; ++ sp->opdata_dsa_pub = NULL; ++ if (sp->opdata_dsa_pub_num != NULL) ++ { ++ BN_free(sp->opdata_dsa_pub_num); ++ sp->opdata_dsa_pub_num = NULL; ++ } ++ } ++ ++ return (ret); ++ } ++ ++ /* Destroy DSA private key from single session. */ ++ int ++ pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock) ++ { ++ int ret = 0; ++ ++ if (sp->opdata_dsa_priv_key != CK_INVALID_HANDLE) ++ { ++ TRY_OBJ_DESTROY(sp, sp->opdata_dsa_priv_key, ++ ret, uselock, OP_DSA); ++ sp->opdata_dsa_priv_key = CK_INVALID_HANDLE; ++ sp->opdata_dsa_priv = NULL; ++ if (sp->opdata_dsa_priv_num != NULL) ++ { ++ BN_free(sp->opdata_dsa_priv_num); ++ sp->opdata_dsa_priv_num = NULL; ++ } ++ } ++ ++ return (ret); ++ } ++ ++ /* ++ * Destroy DSA key object wrapper. If session is NULL, try to destroy all ++ * objects in the free list. ++ */ ++ int ++ pk11_destroy_dsa_key_objects(PK11_SESSION *session) ++ { ++ int ret = 1; ++ PK11_SESSION *sp = NULL; ++ PK11_SESSION *local_free_session; ++ CK_BBOOL uselock = TRUE; ++ ++ if (session != NULL) ++ local_free_session = session; ++ else ++ { ++ (void) pthread_mutex_lock(session_cache[OP_DSA].lock); ++ local_free_session = session_cache[OP_DSA].head; ++ uselock = FALSE; ++ } ++ ++ /* ++ * go through the list of sessions and delete key objects ++ */ ++ while ((sp = local_free_session) != NULL) ++ { ++ local_free_session = sp->next; ++ ++ /* ++ * Do not terminate list traversal if one of the ++ * destroy operations fails. ++ */ ++ if (pk11_destroy_dsa_object_pub(sp, uselock) == 0) ++ { ++ ret = 0; ++ continue; ++ } ++ if (pk11_destroy_dsa_object_priv(sp, uselock) == 0) ++ { ++ ret = 0; ++ continue; ++ } ++ } ++ ++ if (session == NULL) ++ (void) pthread_mutex_unlock(session_cache[OP_DSA].lock); ++ ++ return (ret); ++ } ++ #endif /* OPENSSL_NO_DSA */ ++ ++ #ifndef OPENSSL_NO_DH ++ /* Destroy DH key from single session. */ ++ int ++ pk11_destroy_dh_object(PK11_SESSION *sp, CK_BBOOL uselock) ++ { ++ int ret = 0; ++ ++ if (sp->opdata_dh_key != CK_INVALID_HANDLE) ++ { ++ TRY_OBJ_DESTROY(sp, sp->opdata_dh_key, ++ ret, uselock, OP_DH); ++ sp->opdata_dh_key = CK_INVALID_HANDLE; ++ sp->opdata_dh = NULL; ++ if (sp->opdata_dh_priv_num != NULL) ++ { ++ BN_free(sp->opdata_dh_priv_num); ++ sp->opdata_dh_priv_num = NULL; ++ } ++ } ++ ++ return (ret); ++ } ++ ++ /* ++ * Destroy DH key object wrapper. ++ * ++ * arg0: pointer to PKCS#11 engine session structure ++ * if session is NULL, try to destroy all objects in the free list ++ */ ++ int ++ pk11_destroy_dh_key_objects(PK11_SESSION *session) ++ { ++ int ret = 1; ++ PK11_SESSION *sp = NULL; ++ PK11_SESSION *local_free_session; ++ CK_BBOOL uselock = TRUE; ++ ++ if (session != NULL) ++ local_free_session = session; ++ else ++ { ++ (void) pthread_mutex_lock(session_cache[OP_DH].lock); ++ local_free_session = session_cache[OP_DH].head; ++ uselock = FALSE; ++ } ++ ++ while ((sp = local_free_session) != NULL) ++ { ++ local_free_session = sp->next; ++ ++ /* ++ * Do not terminate list traversal if one of the ++ * destroy operations fails. ++ */ ++ if (pk11_destroy_dh_object(sp, uselock) == 0) ++ { ++ ret = 0; ++ continue; ++ } ++ } ++ err: ++ if (session == NULL) ++ (void) pthread_mutex_unlock(session_cache[OP_DH].lock); ++ ++ return (ret); ++ } ++ #endif /* OPENSSL_NO_DH */ ++ ++ static int ++ pk11_destroy_object(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE oh, ++ CK_BBOOL persistent) ++ { ++ CK_RV rv; ++ ++ /* ++ * We never try to destroy persistent objects which are the objects ++ * stored in the keystore. Also, we always use read-only sessions so ++ * C_DestroyObject() would be returning CKR_SESSION_READ_ONLY here. ++ */ ++ if (persistent == CK_TRUE) ++ return (1); ++ ++ rv = pFuncList->C_DestroyObject(session, oh); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_DESTROY_OBJECT, PK11_R_DESTROYOBJECT, ++ rv); ++ return (0); ++ } ++ ++ return (1); ++ } ++ ++ ++ /* Symmetric ciphers and digests support functions */ ++ ++ static int ++ cipher_nid_to_pk11(int nid) ++ { ++ int i; ++ ++ for (i = 0; i < PK11_CIPHER_MAX; i++) ++ if (ciphers[i].nid == nid) ++ return (ciphers[i].id); ++ return (-1); ++ } ++ ++ static int ++ pk11_usable_ciphers(const int **nids) ++ { ++ if (cipher_count > 0) ++ *nids = cipher_nids; ++ else ++ *nids = NULL; ++ return (cipher_count); ++ } ++ ++ static int ++ pk11_usable_digests(const int **nids) ++ { ++ if (digest_count > 0) ++ *nids = digest_nids; ++ else ++ *nids = NULL; ++ return (digest_count); ++ } ++ ++ /* ++ * Init context for encryption or decryption using a symmetric key. ++ */ ++ static int pk11_init_symmetric(EVP_CIPHER_CTX *ctx, PK11_CIPHER *pcipher, ++ PK11_SESSION *sp, CK_MECHANISM_PTR pmech) ++ { ++ CK_RV rv; ++ #ifdef SOLARIS_AES_CTR ++ CK_AES_CTR_PARAMS ctr_params; ++ #endif /* SOLARIS_AES_CTR */ ++ ++ /* ++ * We expect pmech->mechanism to be already set and ++ * pParameter/ulParameterLen initialized to NULL/0 before ++ * pk11_init_symetric() is called. ++ */ ++ OPENSSL_assert(pmech->mechanism != NULL); ++ OPENSSL_assert(pmech->pParameter == NULL); ++ OPENSSL_assert(pmech->ulParameterLen == 0); ++ ++ #ifdef SOLARIS_AES_CTR ++ if (ctx->cipher->nid == NID_aes_128_ctr || ++ ctx->cipher->nid == NID_aes_192_ctr || ++ ctx->cipher->nid == NID_aes_256_ctr) ++ { ++ pmech->pParameter = (void *)(&ctr_params); ++ pmech->ulParameterLen = sizeof (ctr_params); ++ /* ++ * For now, we are limited to the fixed length of the counter, ++ * it covers the whole counter block. That's what RFC 4344 ++ * needs. For more information on internal structure of the ++ * counter block, see RFC 3686. If needed in the future, we can ++ * add code so that the counter length can be set via ++ * ENGINE_ctrl() function. ++ */ ++ ctr_params.ulCounterBits = AES_BLOCK_SIZE * 8; ++ OPENSSL_assert(pcipher->iv_len == AES_BLOCK_SIZE); ++ (void) memcpy(ctr_params.cb, ctx->iv, AES_BLOCK_SIZE); ++ } ++ else ++ #endif /* SOLARIS_AES_CTR */ ++ { ++ if (pcipher->iv_len > 0) ++ { ++ pmech->pParameter = (void *)ctx->iv; ++ pmech->ulParameterLen = pcipher->iv_len; ++ } ++ } ++ ++ /* if we get here, the encryption needs to be reinitialized */ ++ if (ctx->encrypt) ++ rv = pFuncList->C_EncryptInit(sp->session, pmech, ++ sp->opdata_cipher_key); ++ else ++ rv = pFuncList->C_DecryptInit(sp->session, pmech, ++ sp->opdata_cipher_key); ++ ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_CIPHER_INIT, ctx->encrypt ? ++ PK11_R_ENCRYPTINIT : PK11_R_DECRYPTINIT, rv); ++ pk11_return_session(sp, OP_CIPHER); ++ return (0); ++ } ++ ++ return (1); ++ } ++ ++ /* ARGSUSED */ ++ static int ++ pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, ++ const unsigned char *iv, int enc) ++ { ++ CK_MECHANISM mech; ++ int index; ++ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data; ++ PK11_SESSION *sp; ++ PK11_CIPHER *p_ciph_table_row; ++ ++ state->sp = NULL; ++ ++ index = cipher_nid_to_pk11(ctx->cipher->nid); ++ if (index < 0 || index >= PK11_CIPHER_MAX) ++ return (0); ++ ++ p_ciph_table_row = &ciphers[index]; ++ /* ++ * iv_len in the ctx->cipher structure is the maximum IV length for the ++ * current cipher and it must be less or equal to the IV length in our ++ * ciphers table. The key length must be in the allowed interval. From ++ * all cipher modes that the PKCS#11 engine supports only RC4 allows a ++ * key length to be in some range, all other NIDs have a precise key ++ * length. Every application can define its own EVP functions so this ++ * code serves as a sanity check. ++ * ++ * Note that the reason why the IV length in ctx->cipher might be ++ * greater than the actual length is that OpenSSL uses BLOCK_CIPHER_defs ++ * macro to define functions that return EVP structures for all DES ++ * modes. So, even ECB modes get 8 byte IV. ++ */ ++ if (ctx->cipher->iv_len < p_ciph_table_row->iv_len || ++ ctx->key_len < p_ciph_table_row->min_key_len || ++ ctx->key_len > p_ciph_table_row->max_key_len) { ++ PK11err(PK11_F_CIPHER_INIT, PK11_R_KEY_OR_IV_LEN_PROBLEM); ++ return (0); ++ } ++ ++ if ((sp = pk11_get_session(OP_CIPHER)) == NULL) ++ return (0); ++ ++ /* if applicable, the mechanism parameter is used for IV */ ++ mech.mechanism = p_ciph_table_row->mech_type; ++ mech.pParameter = NULL; ++ mech.ulParameterLen = 0; ++ ++ /* The key object is destroyed here if it is not the current key. */ ++ (void) check_new_cipher_key(sp, key, ctx->key_len); ++ ++ /* ++ * If the key is the same and the encryption is also the same, then ++ * just reuse it. However, we must not forget to reinitialize the ++ * context that was finalized in pk11_cipher_cleanup(). ++ */ ++ if (sp->opdata_cipher_key != CK_INVALID_HANDLE && ++ sp->opdata_encrypt == ctx->encrypt) ++ { ++ state->sp = sp; ++ if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0) ++ return (0); ++ ++ return (1); ++ } ++ ++ /* ++ * Check if the key has been invalidated. If so, a new key object ++ * needs to be created. ++ */ ++ if (sp->opdata_cipher_key == CK_INVALID_HANDLE) ++ { ++ sp->opdata_cipher_key = pk11_get_cipher_key( ++ ctx, key, p_ciph_table_row->key_type, sp); ++ } ++ ++ if (sp->opdata_encrypt != ctx->encrypt && sp->opdata_encrypt != -1) ++ { ++ /* ++ * The previous encryption/decryption is different. Need to ++ * terminate the previous * active encryption/decryption here. ++ */ ++ if (!pk11_cipher_final(sp)) ++ { ++ pk11_return_session(sp, OP_CIPHER); ++ return (0); ++ } ++ } ++ ++ if (sp->opdata_cipher_key == CK_INVALID_HANDLE) ++ { ++ pk11_return_session(sp, OP_CIPHER); ++ return (0); ++ } ++ ++ /* now initialize the context with a new key */ @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Nov 21 21:59:16 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Nov 2010 20:59:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[11677] csw/mgar/pkg/apache2/branches/fs-rework Message-ID: Revision: 11677 http://gar.svn.sourceforge.net/gar/?rev=11677&view=rev Author: bdwalton Date: 2010-11-21 20:59:15 +0000 (Sun, 21 Nov 2010) Log Message: ----------- apache2/fs-rework: merge in changes from trunk Modified Paths: -------------- csw/mgar/pkg/apache2/branches/fs-rework/Makefile csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template Removed Paths: ------------- csw/mgar/pkg/apache2/branches/fs-rework/files/server.crt.build_cas Property Changed: ---------------- csw/mgar/pkg/apache2/branches/fs-rework/ Property changes on: csw/mgar/pkg/apache2/branches/fs-rework ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/apache2/trunk:11641-11676 Modified: csw/mgar/pkg/apache2/branches/fs-rework/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/Makefile 2010-11-21 17:07:28 UTC (rev 11676) +++ csw/mgar/pkg/apache2/branches/fs-rework/Makefile 2010-11-21 20:59:15 UTC (rev 11677) @@ -40,7 +40,7 @@ DISTFILES += CSWapache2.preinstall # Configuration templates -DISTFILES += update20to22 server.crt.build_cas +DISTFILES += update20to22 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork DISTFILES += README.CSW.apache2rt @@ -198,7 +198,7 @@ PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; $$$$3 ~ /server.crt.CSW/ { $$$$1 = "e"; $$$$2 = "build"; $$$$4 = "0600" }; {print}' +PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; {print}' include gar/category.mk @@ -249,7 +249,4 @@ mv $$f $$f.CSW; \ $(abspath $(FILEDIR))/build_cas_template $$f > $$f; \ done ) - @echo " => Creating ssl server.crt build CAS template." - @(cp -p $(WORKDIR)/server.crt.build_cas $(PKGROOT)/$(prefix)/apache2/etc/server.crt.CSW; \ - chmod 600 $(PKGROOT)/$(prefix)/apache2/etc/server.crt.CSW ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template 2010-11-21 17:07:28 UTC (rev 11676) +++ csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template 2010-11-21 20:59:15 UTC (rev 11677) @@ -19,8 +19,7 @@ -e "s/^User.*daemon/User nobody/;" \ -e "s/^Group.*daemon/Group nobody/;" \ -e 's/^(LoadModule.*suexec.*)/#\$1/;' \ - -e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \ - -e 's/^#(Include.*httpd-ssl.conf)/\$1/;' \$CONF_FILE + -e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \$CONF_FILE chown root:bin \$CONF_FILE chmod 644 \$CONF_FILE Deleted: csw/mgar/pkg/apache2/branches/fs-rework/files/server.crt.build_cas =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/files/server.crt.build_cas 2010-11-21 17:07:28 UTC (rev 11676) +++ csw/mgar/pkg/apache2/branches/fs-rework/files/server.crt.build_cas 2010-11-21 20:59:15 UTC (rev 11677) @@ -1,39 +0,0 @@ -#!/bin/sh - -# On installation, generate a dummy ssl certificate (if required) - -PIR=${PKG_INSTALL_ROOT:-/} -AP2_PREFIX=/opt/csw/apache2 -AP2_CONFDIR=$AP2_PREFIX/etc - -if [ "$1" = install ]; then - # this gets captured and placed by the build CAS - echo This is a dummy file but still a part of CSWapache2 - echo Please do not remove. - - if [ ! -f $PIR/$AP2_CONFDIR/server.crt -a ! -f $PIR/$AP2_CONFDIR/server.key ]; then - echo Generating dummy ssl key and certificate... >&2 - - # this is likely overkill for a dummy cert, but why not - cat </dev/null 2>&1 -TS -Westfarthing -Hobbiton - - -`hostname` -bilbo at example.net - - -EOF - chmod 600 $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt - chown root:bin $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt - else - echo "Not touching existing SSL files." >&2 - fi -fi - -# No output on a remove action will see the file purged. -# As this is server.crt.CSW, that doesn't matter. The -# real files will be left behind in place whether they -# are the pretend or replaced with real files by the admin. 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 Nov 21 22:01:11 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Nov 2010 21:01:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[11678] csw/mgar/pkg/apache2/branches/fs-rework/files/ config.layout Message-ID: Revision: 11678 http://gar.svn.sourceforge.net/gar/?rev=11678&view=rev Author: bdwalton Date: 2010-11-21 21:01:11 +0000 (Sun, 21 Nov 2010) Log Message: ----------- apache2/fs-rework: update paths for some /etc and /var stuff Modified Paths: -------------- csw/mgar/pkg/apache2/branches/fs-rework/files/config.layout Modified: csw/mgar/pkg/apache2/branches/fs-rework/files/config.layout =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/files/config.layout 2010-11-21 20:59:15 UTC (rev 11677) +++ csw/mgar/pkg/apache2/branches/fs-rework/files/config.layout 2010-11-21 21:01:11 UTC (rev 11678) @@ -7,7 +7,7 @@ libdir: ${exec_prefix}/lib libexecdir: ${exec_prefix}/libexec mandir: ${exec_prefix}/man - sysconfdir: ${exec_prefix}/etc + sysconfdir: /etc/${prefix} datadir: ${prefix}/share installbuilddir: ${datadir}/build errordir: ${datadir}/error @@ -16,8 +16,8 @@ manualdir: ${datadir}/manual cgidir: ${datadir}/cgi-bin includedir: ${exec_prefix}/include - localstatedir: ${prefix}/var + localstatedir: /var/opt/csw/apache2 runtimedir: /var/run - logfiledir: ${localstatedir}/log + logfiledir: /var/opt/csw/log/apache2 proxycachedir: ${datadir}/proxy 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 Nov 21 22:14:06 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Nov 2010 21:14:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[11679] csw/mgar/pkg/apache2/branches/fs-rework Message-ID: Revision: 11679 http://gar.svn.sourceforge.net/gar/?rev=11679&view=rev Author: bdwalton Date: 2010-11-21 21:14:06 +0000 (Sun, 21 Nov 2010) Log Message: ----------- apache2/fs-rework: update the config file template handling, adding migration from old location if necessary Modified Paths: -------------- csw/mgar/pkg/apache2/branches/fs-rework/Makefile csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template Modified: csw/mgar/pkg/apache2/branches/fs-rework/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/Makefile 2010-11-21 21:01:11 UTC (rev 11678) +++ csw/mgar/pkg/apache2/branches/fs-rework/Makefile 2010-11-21 21:14:06 UTC (rev 11679) @@ -243,7 +243,7 @@ post-merge: create-templates @echo " => Creating template files and CAS shell scripts..." - @( cd $(PKGROOT)/opt/csw/apache2/etc; \ + @( cd $(PKGROOT)/etc/opt/csw/apache2/; \ for f in *conf extra/* mime* magic*; do \ echo "...$$f"; \ mv $$f $$f.CSW; \ Modified: csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template 2010-11-21 21:01:11 UTC (rev 11678) +++ csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template 2010-11-21 21:14:06 UTC (rev 11679) @@ -10,29 +10,35 @@ CONF_FILE=\$AP2_CONF/$1 if [ "\$1" = install ]; then - if [ ! -f "\$CONF_FILE" ]; then + if [ -f "\$NEW_CONF_FILE" ]; then + # existing 2.2.x install with migrated config. + echo "Doing nothing. Config file \$NEW_CONF_FILE in place already." + elif [ -f "\$OLD_CONF_FILE" ]; then + # migrate old config, ensure it's updated + cp -p \$OLD_CONF_FILE \$NEW_CONF_FILE + if [ -n "\`grep mod_auth.so \$NEW_CONF_FILE\`" ]; then + echo "Updating the syntax to 2.2 format though..." >&2 + \${PIR}/\$AP2_DIR/sbin/update20to22 \$NEW_CONF_FILE >&2 + fi + else + # so, we're not an existing or 'needs migration' install, we must + # install from the templates. echo "Installing $1 from CSW template." >&2 - cp -p \$CONF_FILE.CSW \$CONF_FILE + cp -p \$NEW_CONF_FILE.CSW \$NEW_CONF_FILE perl -pi \ -e "s/#*ServerName.*www.example.com/ServerName \`hostname\`/;" \ -e "s/#*ServerAdmin you\@example.com/ServerAdmin root\@\`hostname\`/;" \ -e "s/^User.*daemon/User nobody/;" \ -e "s/^Group.*daemon/Group nobody/;" \ -e 's/^(LoadModule.*suexec.*)/#\$1/;' \ - -e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \$CONF_FILE + -e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \$NEW_CONF_FILE - chown root:bin \$CONF_FILE - chmod 644 \$CONF_FILE - else - echo "Not updating $1. It already exists." >&2 - if [ -n "\`grep mod_auth.so \$CONF_FILE\`" ]; then - echo "Updating the syntax to 2.2 format though..." >&2 - \${PIR}/\$AP2_DIR/sbin/update20to22 \$CONF_FILE >&2 - fi + chown root:bin \$NEW_CONF_FILE + chmod 644 \$NEW_CONF_FILE fi else echo "Not removing $1." >&2 # preserve ourselves with no changes - cat \$CONF_FILE + cat \$NEW_CONF_FILE fi EOF 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 Nov 21 22:17:21 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Nov 2010 21:17:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[11680] csw/mgar/pkg/apache2/branches/fs-rework/files/ README.CSW.apache2 Message-ID: Revision: 11680 http://gar.svn.sourceforge.net/gar/?rev=11680&view=rev Author: bdwalton Date: 2010-11-21 21:17:20 +0000 (Sun, 21 Nov 2010) Log Message: ----------- apache2/fs-rework: note the configuration migration in README (displayed as postmsg too) Modified Paths: -------------- csw/mgar/pkg/apache2/branches/fs-rework/files/README.CSW.apache2 Modified: csw/mgar/pkg/apache2/branches/fs-rework/files/README.CSW.apache2 =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/files/README.CSW.apache2 2010-11-21 21:14:06 UTC (rev 11679) +++ csw/mgar/pkg/apache2/branches/fs-rework/files/README.CSW.apache2 2010-11-21 21:17:20 UTC (rev 11680) @@ -3,6 +3,8 @@ Please note that recent changes may affect the way you're used to working with the CSW apache2 packages. +***************************************************** + In the past, CSWap2prefork and CSWap2worker delivered a specific mpm module for use with apache2. We now ship the prefork mpm as part of CSWapache2 while the worker mpm remains in CSWap2worker. @@ -14,5 +16,17 @@ /opt/csw/sbin/alternatives --help for information on how you can do this. + +***************************************************** + +We are also moving configuration of apache from /opt/csw/apache2/etc +to /etc/opt/csw/apache2. The files should be auto-migrated upon +upgrade but if you've broken from the standard config file layout, +you'll need to manually copy in those additional files. Sorry for the +hassle, but this really needs to be done for a package like apache +where the configuration will be unique on most machines. + +***************************************************** + Thanks -The OpenCSW apache2 team. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Nov 22 01:57:41 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 22 Nov 2010 00:57:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[11681] csw/mgar/pkg/apache2/branches/fs-rework/Makefile Message-ID: Revision: 11681 http://gar.svn.sourceforge.net/gar/?rev=11681&view=rev Author: bdwalton Date: 2010-11-22 00:57:41 +0000 (Mon, 22 Nov 2010) Log Message: ----------- apache2/fs-rework: fix up prototype filter to properly catch etc files for build CAS Modified Paths: -------------- csw/mgar/pkg/apache2/branches/fs-rework/Makefile Modified: csw/mgar/pkg/apache2/branches/fs-rework/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/Makefile 2010-11-21 21:17:20 UTC (rev 11680) +++ csw/mgar/pkg/apache2/branches/fs-rework/Makefile 2010-11-22 00:57:41 UTC (rev 11681) @@ -198,7 +198,7 @@ PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; {print}' +PROTOTYPE_FILTER = gawk '$$$$3 ~ /etc\/apache2/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; {print}' include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Nov 22 02:19:24 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 22 Nov 2010 01:19:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[11682] csw/mgar/pkg/apache2/branches/fs-rework/Makefile Message-ID: Revision: 11682 http://gar.svn.sourceforge.net/gar/?rev=11682&view=rev Author: bdwalton Date: 2010-11-22 01:19:23 +0000 (Mon, 22 Nov 2010) Log Message: ----------- apache2/fs-rework: use _correct_ prototype filter to properly catch etc files for build CAS after moving to /etc Modified Paths: -------------- csw/mgar/pkg/apache2/branches/fs-rework/Makefile Modified: csw/mgar/pkg/apache2/branches/fs-rework/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/Makefile 2010-11-22 00:57:41 UTC (rev 11681) +++ csw/mgar/pkg/apache2/branches/fs-rework/Makefile 2010-11-22 01:19:23 UTC (rev 11682) @@ -198,7 +198,7 @@ PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PROTOTYPE_FILTER = gawk '$$$$3 ~ /etc\/apache2/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; {print}' +PROTOTYPE_FILTER = gawk '$$$$3 ~ /etc\/opt\/csw\/apache2/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; {print}' include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Nov 22 02:47:02 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 22 Nov 2010 01:47:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[11683] csw/mgar/pkg/apache2/branches/fs-rework/files/ build_cas_template Message-ID: Revision: 11683 http://gar.svn.sourceforge.net/gar/?rev=11683&view=rev Author: bdwalton Date: 2010-11-22 01:47:02 +0000 (Mon, 22 Nov 2010) Log Message: ----------- apache2/fs-rework: correct the cas build script to properly set new/old conf file values Modified Paths: -------------- csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template Modified: csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template 2010-11-22 01:19:23 UTC (rev 11682) +++ csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template 2010-11-22 01:47:02 UTC (rev 11683) @@ -5,9 +5,11 @@ PIR=\${PKG_INSTALL_ROOT:-/} AP2_DIR=\$PIR/opt/csw/apache2 -AP2_CONF=\$AP2_DIR/etc/ +AP2_CONF=\$PIR/etc/opt/csw/apache2 +OLD_CONF=\$PIR/\$AP2_DIR/etc -CONF_FILE=\$AP2_CONF/$1 +NEW_CONF_FILE=\$AP2_CONF/$1 +OLD_CONF_FILE=\$OLD_CONF/$1 if [ "\$1" = install ]; then if [ -f "\$NEW_CONF_FILE" ]; then 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 Nov 22 02:59:24 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 22 Nov 2010 01:59:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[11684] csw/mgar/pkg/apache2/branches/fs-rework/files/ build_cas_template Message-ID: Revision: 11684 http://gar.svn.sourceforge.net/gar/?rev=11684&view=rev Author: bdwalton Date: 2010-11-22 01:59:23 +0000 (Mon, 22 Nov 2010) Log Message: ----------- apache2/fs-rework: ensure echo statements in cas build scripts go to stderr, not stdout where they would be added to the files as content Modified Paths: -------------- csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template Modified: csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template 2010-11-22 01:47:02 UTC (rev 11683) +++ csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template 2010-11-22 01:59:23 UTC (rev 11684) @@ -14,9 +14,10 @@ if [ "\$1" = install ]; then if [ -f "\$NEW_CONF_FILE" ]; then # existing 2.2.x install with migrated config. - echo "Doing nothing. Config file \$NEW_CONF_FILE in place already." + echo "Doing nothing. Config file \$NEW_CONF_FILE in place already." >&2 elif [ -f "\$OLD_CONF_FILE" ]; then # migrate old config, ensure it's updated + echo "Importing old config file from \$OLD_CONF_FILE." >&2 cp -p \$OLD_CONF_FILE \$NEW_CONF_FILE if [ -n "\`grep mod_auth.so \$NEW_CONF_FILE\`" ]; then echo "Updating the syntax to 2.2 format though..." >&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 Nov 22 03:22:33 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 22 Nov 2010 02:22:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11685] csw/mgar/pkg/apache2/branches/fs-rework/files/ build_cas_template Message-ID: Revision: 11685 http://gar.svn.sourceforge.net/gar/?rev=11685&view=rev Author: bdwalton Date: 2010-11-22 02:22:33 +0000 (Mon, 22 Nov 2010) Log Message: ----------- apache2/fs-rework: modify old config files to adhere to new etc location Modified Paths: -------------- csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template Modified: csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template 2010-11-22 01:59:23 UTC (rev 11684) +++ csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template 2010-11-22 02:22:33 UTC (rev 11685) @@ -23,6 +23,10 @@ echo "Updating the syntax to 2.2 format though..." >&2 \${PIR}/\$AP2_DIR/sbin/update20to22 \$NEW_CONF_FILE >&2 fi + + # ensure we use the config files from the new location + perl -pi \ + -e "s/etc\//\/etc\/opt\/csw\/apache2\//" \$NEW_CONF_FILE else # so, we're not an existing or 'needs migration' install, we must # install from the templates. 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 Nov 22 03:35:09 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 22 Nov 2010 02:35:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[11686] csw/mgar/pkg/apache2/branches/fs-rework/files/ README.CSW.apache2 Message-ID: Revision: 11686 http://gar.svn.sourceforge.net/gar/?rev=11686&view=rev Author: bdwalton Date: 2010-11-22 02:35:09 +0000 (Mon, 22 Nov 2010) Log Message: ----------- apache2/fs-rework: note the changed log/ dir in the postmsg readme Modified Paths: -------------- csw/mgar/pkg/apache2/branches/fs-rework/files/README.CSW.apache2 Modified: csw/mgar/pkg/apache2/branches/fs-rework/files/README.CSW.apache2 =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/files/README.CSW.apache2 2010-11-22 02:22:33 UTC (rev 11685) +++ csw/mgar/pkg/apache2/branches/fs-rework/files/README.CSW.apache2 2010-11-22 02:35:09 UTC (rev 11686) @@ -28,5 +28,11 @@ ***************************************************** +The default log directory is now /var/opt/csw/log/apache2. Old logs +are not touched and the configuration will honour the old location. You +should updated this and move the logs manually. + +***************************************************** + Thanks -The OpenCSW apache2 team. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Nov 22 03:39:37 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 22 Nov 2010 02:39:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[11687] csw/mgar/pkg/apache2/branches/fs-rework/files/ build_cas_template Message-ID: Revision: 11687 http://gar.svn.sourceforge.net/gar/?rev=11687&view=rev Author: bdwalton Date: 2010-11-22 02:39:37 +0000 (Mon, 22 Nov 2010) Log Message: ----------- apache2/fs-rework: clean up use of pkg_install_root in cas build scripts Modified Paths: -------------- csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template Modified: csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template 2010-11-22 02:35:09 UTC (rev 11686) +++ csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template 2010-11-22 02:39:37 UTC (rev 11687) @@ -4,9 +4,9 @@ #!/bin/sh PIR=\${PKG_INSTALL_ROOT:-/} -AP2_DIR=\$PIR/opt/csw/apache2 +AP2_DIR=/opt/csw/apache2 AP2_CONF=\$PIR/etc/opt/csw/apache2 -OLD_CONF=\$PIR/\$AP2_DIR/etc +OLD_CONF=\$PIR\$AP2_DIR/etc NEW_CONF_FILE=\$AP2_CONF/$1 OLD_CONF_FILE=\$OLD_CONF/$1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Nov 22 03:51:29 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 22 Nov 2010 02:51:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[11688] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 11688 http://gar.svn.sourceforge.net/gar/?rev=11688&view=rev Author: bdwalton Date: 2010-11-22 02:51:29 +0000 (Mon, 22 Nov 2010) Log Message: ----------- apache2: merge in fs-rework branch Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 csw/mgar/pkg/apache2/trunk/files/build_cas_template csw/mgar/pkg/apache2/trunk/files/config.layout Property Changed: ---------------- csw/mgar/pkg/apache2/trunk/ Property changes on: csw/mgar/pkg/apache2/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/apache2/branches/fs-rework:11678-11687 Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-11-22 02:39:37 UTC (rev 11687) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-11-22 02:51:29 UTC (rev 11688) @@ -198,7 +198,7 @@ PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; {print}' +PROTOTYPE_FILTER = gawk '$$$$3 ~ /etc\/opt\/csw\/apache2/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; {print}' include gar/category.mk @@ -243,7 +243,7 @@ post-merge: create-templates @echo " => Creating template files and CAS shell scripts..." - @( cd $(PKGROOT)/opt/csw/apache2/etc; \ + @( cd $(PKGROOT)/etc/opt/csw/apache2/; \ for f in *conf extra/* mime* magic*; do \ echo "...$$f"; \ mv $$f $$f.CSW; \ Modified: csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 =================================================================== --- csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 2010-11-22 02:39:37 UTC (rev 11687) +++ csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 2010-11-22 02:51:29 UTC (rev 11688) @@ -3,6 +3,8 @@ Please note that recent changes may affect the way you're used to working with the CSW apache2 packages. +***************************************************** + In the past, CSWap2prefork and CSWap2worker delivered a specific mpm module for use with apache2. We now ship the prefork mpm as part of CSWapache2 while the worker mpm remains in CSWap2worker. @@ -14,5 +16,23 @@ /opt/csw/sbin/alternatives --help for information on how you can do this. + +***************************************************** + +We are also moving configuration of apache from /opt/csw/apache2/etc +to /etc/opt/csw/apache2. The files should be auto-migrated upon +upgrade but if you've broken from the standard config file layout, +you'll need to manually copy in those additional files. Sorry for the +hassle, but this really needs to be done for a package like apache +where the configuration will be unique on most machines. + +***************************************************** + +The default log directory is now /var/opt/csw/log/apache2. Old logs +are not touched and the configuration will honour the old location. You +should updated this and move the logs manually. + +***************************************************** + Thanks -The OpenCSW apache2 team. Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-22 02:39:37 UTC (rev 11687) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2010-11-22 02:51:29 UTC (rev 11688) @@ -4,35 +4,48 @@ #!/bin/sh PIR=\${PKG_INSTALL_ROOT:-/} -AP2_DIR=\$PIR/opt/csw/apache2 -AP2_CONF=\$AP2_DIR/etc/ +AP2_DIR=/opt/csw/apache2 +AP2_CONF=\$PIR/etc/opt/csw/apache2 +OLD_CONF=\$PIR\$AP2_DIR/etc -CONF_FILE=\$AP2_CONF/$1 +NEW_CONF_FILE=\$AP2_CONF/$1 +OLD_CONF_FILE=\$OLD_CONF/$1 if [ "\$1" = install ]; then - if [ ! -f "\$CONF_FILE" ]; then + if [ -f "\$NEW_CONF_FILE" ]; then + # existing 2.2.x install with migrated config. + echo "Doing nothing. Config file \$NEW_CONF_FILE in place already." >&2 + elif [ -f "\$OLD_CONF_FILE" ]; then + # migrate old config, ensure it's updated + echo "Importing old config file from \$OLD_CONF_FILE." >&2 + cp -p \$OLD_CONF_FILE \$NEW_CONF_FILE + if [ -n "\`grep mod_auth.so \$NEW_CONF_FILE\`" ]; then + echo "Updating the syntax to 2.2 format though..." >&2 + \${PIR}/\$AP2_DIR/sbin/update20to22 \$NEW_CONF_FILE >&2 + fi + + # ensure we use the config files from the new location + perl -pi \ + -e "s/etc\//\/etc\/opt\/csw\/apache2\//" \$NEW_CONF_FILE + else + # so, we're not an existing or 'needs migration' install, we must + # install from the templates. echo "Installing $1 from CSW template." >&2 - cp -p \$CONF_FILE.CSW \$CONF_FILE + cp -p \$NEW_CONF_FILE.CSW \$NEW_CONF_FILE perl -pi \ -e "s/#*ServerName.*www.example.com/ServerName \`hostname\`/;" \ -e "s/#*ServerAdmin you\@example.com/ServerAdmin root\@\`hostname\`/;" \ -e "s/^User.*daemon/User nobody/;" \ -e "s/^Group.*daemon/Group nobody/;" \ -e 's/^(LoadModule.*suexec.*)/#\$1/;' \ - -e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \$CONF_FILE + -e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \$NEW_CONF_FILE - chown root:bin \$CONF_FILE - chmod 644 \$CONF_FILE - else - echo "Not updating $1. It already exists." >&2 - if [ -n "\`grep mod_auth.so \$CONF_FILE\`" ]; then - echo "Updating the syntax to 2.2 format though..." >&2 - \${PIR}/\$AP2_DIR/sbin/update20to22 \$CONF_FILE >&2 - fi + chown root:bin \$NEW_CONF_FILE + chmod 644 \$NEW_CONF_FILE fi else echo "Not removing $1." >&2 # preserve ourselves with no changes - cat \$CONF_FILE + cat \$NEW_CONF_FILE fi EOF Modified: csw/mgar/pkg/apache2/trunk/files/config.layout =================================================================== --- csw/mgar/pkg/apache2/trunk/files/config.layout 2010-11-22 02:39:37 UTC (rev 11687) +++ csw/mgar/pkg/apache2/trunk/files/config.layout 2010-11-22 02:51:29 UTC (rev 11688) @@ -7,7 +7,7 @@ libdir: ${exec_prefix}/lib libexecdir: ${exec_prefix}/libexec mandir: ${exec_prefix}/man - sysconfdir: ${exec_prefix}/etc + sysconfdir: /etc/${prefix} datadir: ${prefix}/share installbuilddir: ${datadir}/build errordir: ${datadir}/error @@ -16,8 +16,8 @@ manualdir: ${datadir}/manual cgidir: ${datadir}/cgi-bin includedir: ${exec_prefix}/include - localstatedir: ${prefix}/var + localstatedir: /var/opt/csw/apache2 runtimedir: /var/run - logfiledir: ${localstatedir}/log + logfiledir: /var/opt/csw/log/apache2 proxycachedir: ${datadir}/proxy This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 22 11:30:25 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 22 Nov 2010 10:30:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[11689] csw/mgar/pkg Message-ID: Revision: 11689 http://gar.svn.sourceforge.net/gar/?rev=11689&view=rev Author: janholzh Date: 2010-11-22 10:30:25 +0000 (Mon, 22 Nov 2010) Log Message: ----------- moon-buggy: first checkin Added Paths: ----------- csw/mgar/pkg/moonbuggy/ csw/mgar/pkg/moonbuggy/branches/ csw/mgar/pkg/moonbuggy/tags/ csw/mgar/pkg/moonbuggy/trunk/ csw/mgar/pkg/moonbuggy/trunk/Makefile csw/mgar/pkg/moonbuggy/trunk/checksums csw/mgar/pkg/moonbuggy/trunk/files/ Property changes on: csw/mgar/pkg/moonbuggy/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/moonbuggy/trunk/Makefile =================================================================== --- csw/mgar/pkg/moonbuggy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/moonbuggy/trunk/Makefile 2010-11-22 10:30:25 UTC (rev 11689) @@ -0,0 +1,27 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = moonbuggy +GARVERSION = 1.0.51 +CATEGORIES = apps + +DESCRIPTION = Moon-buggy is a simple character graphics game +define BLURB +Moon-buggy is a simple character graphics game where you drive some kind of car across the moon's surface. Unfortunately there are dangerous craters there. Fortunately your car can jump over them! +endef + +MASTER_SITES = http://seehuhn.de/media/programs/ +DISTFILES = moon-buggy-$(GARVERSION).tar.gz +DISTNAME = moon-buggy-$(GARVERSION) + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + + +SKIPTEST = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/moonbuggy/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/moonbuggy/trunk/checksums =================================================================== --- csw/mgar/pkg/moonbuggy/trunk/checksums (rev 0) +++ csw/mgar/pkg/moonbuggy/trunk/checksums 2010-11-22 10:30:25 UTC (rev 11689) @@ -0,0 +1 @@ +bfe23ef5cfa838ac261eee34ea5322f3 moon-buggy-1.0.51.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 22 11:39:08 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 22 Nov 2010 10:39:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11690] csw/mgar/pkg/moonbuggy/trunk/Makefile Message-ID: Revision: 11690 http://gar.svn.sourceforge.net/gar/?rev=11690&view=rev Author: janholzh Date: 2010-11-22 10:39:08 +0000 (Mon, 22 Nov 2010) Log Message: ----------- moon-buggy: fix UFILES_REGEX Modified Paths: -------------- csw/mgar/pkg/moonbuggy/trunk/Makefile Modified: csw/mgar/pkg/moonbuggy/trunk/Makefile =================================================================== --- csw/mgar/pkg/moonbuggy/trunk/Makefile 2010-11-22 10:30:25 UTC (rev 11689) +++ csw/mgar/pkg/moonbuggy/trunk/Makefile 2010-11-22 10:39:08 UTC (rev 11690) @@ -13,12 +13,8 @@ DISTNAME = moon-buggy-$(GARVERSION) # File name regex to get notifications about upstream software releases -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = moon-buggy-(\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) 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 Nov 22 16:10:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 22 Nov 2010 15:10:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[11691] csw/mgar/pkg Message-ID: Revision: 11691 http://gar.svn.sourceforge.net/gar/?rev=11691&view=rev Author: dmichelsen Date: 2010-11-22 15:10:33 +0000 (Mon, 22 Nov 2010) Log Message: ----------- dia: Initial commit Added Paths: ----------- csw/mgar/pkg/dia/ csw/mgar/pkg/dia/branches/ csw/mgar/pkg/dia/tags/ csw/mgar/pkg/dia/trunk/ csw/mgar/pkg/dia/trunk/Makefile csw/mgar/pkg/dia/trunk/checksums csw/mgar/pkg/dia/trunk/files/ Property changes on: csw/mgar/pkg/dia/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/dia/trunk/Makefile =================================================================== --- csw/mgar/pkg/dia/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dia/trunk/Makefile 2010-11-22 15:10:33 UTC (rev 11691) @@ -0,0 +1,38 @@ +# $Id$ +GARNAME = dia +GARVERSION = 0.97 +CATEGORIES = apps + +DESCRIPTION = A GTK+ based diagram creation program +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +RUNTIME_DEP_PKGS_CSWdia += CSWlibxslt +RUNTIME_DEP_PKGS_CSWdia += CSWlibatk +RUNTIME_DEP_PKGS_CSWdia += CSWggettextrt +RUNTIME_DEP_PKGS_CSWdia += CSWpng +RUNTIME_DEP_PKGS_CSWdia += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWdia += CSWfconfig +RUNTIME_DEP_PKGS_CSWdia += CSWglib2 +RUNTIME_DEP_PKGS_CSWdia += CSWftype2 +RUNTIME_DEP_PKGS_CSWdia += CSWpango +RUNTIME_DEP_PKGS_CSWdia += CSWzlib +RUNTIME_DEP_PKGS_CSWdia += CSWlibart +RUNTIME_DEP_PKGS_CSWdia += CSWgtk2 +RUNTIME_DEP_PKGS_CSWdia += CSWlibcairo +RUNTIME_DEP_PKGS_CSWdia += CSWiconv + +include gar/category.mk + +# For GNU gettext like msgmerge +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/dia/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/dia/trunk/checksums =================================================================== --- csw/mgar/pkg/dia/trunk/checksums (rev 0) +++ csw/mgar/pkg/dia/trunk/checksums 2010-11-22 15:10:33 UTC (rev 11691) @@ -0,0 +1 @@ +3d11f9aaa5a4923f0a5533962c87bdfb dia-0.97.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 22 17:13:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 22 Nov 2010 16:13:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[11692] csw/mgar/pkg Message-ID: Revision: 11692 http://gar.svn.sourceforge.net/gar/?rev=11692&view=rev Author: dmichelsen Date: 2010-11-22 16:13:34 +0000 (Mon, 22 Nov 2010) Log Message: ----------- libemf: Initial commit Added Paths: ----------- csw/mgar/pkg/libemf/ csw/mgar/pkg/libemf/branches/ csw/mgar/pkg/libemf/tags/ csw/mgar/pkg/libemf/trunk/ csw/mgar/pkg/libemf/trunk/Makefile csw/mgar/pkg/libemf/trunk/checksums csw/mgar/pkg/libemf/trunk/files/ csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch Property changes on: csw/mgar/pkg/libemf/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/libemf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libemf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libemf/trunk/Makefile 2010-11-22 16:13:34 UTC (rev 11692) @@ -0,0 +1,32 @@ +# $Id$ +GARNAME = libemf +GARVERSION = 1.0.4 +CATEGORIES = lib + +DESCRIPTION = Library implementation of ECMA-234 API for the generation of enhanced metafiles +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTNAME = libEMF-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES = 0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch +PATCHFILES += 0002-Remove-unneeded-definition-causing-link-errors.patch +PATCHFILES += 0003-Always-use-csw-libtool.patch +PATCHFILES += 0004-Do-not-use-link-against-libstdc.patch + +VENDOR_URL = http://libemf.sourceforge.net/ + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# *We* can do 64 bit, but the tests dump core in CSWglib2 2.23.5,REV=2010.03.09 +# Re-enable when glib2 gets refreshed. +# BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + Property changes on: csw/mgar/pkg/libemf/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libemf/trunk/checksums =================================================================== --- csw/mgar/pkg/libemf/trunk/checksums (rev 0) +++ csw/mgar/pkg/libemf/trunk/checksums 2010-11-22 16:13:34 UTC (rev 11692) @@ -0,0 +1 @@ +23effe03c1b2eeb5229f14e461204198 libEMF-1.0.4.tar.gz Added: csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch =================================================================== --- csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch (rev 0) +++ csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch 2010-11-22 16:13:34 UTC (rev 11692) @@ -0,0 +1,93 @@ +From ce43acc3cf6e579264d7333221deb7c81bb29b54 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 22 Nov 2010 16:51:08 +0100 +Subject: [PATCH] Add __sparc and __i386 in addition to __*__ + +--- + include/libEMF/wine/winnt.h | 18 +++++++++--------- + 1 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/include/libEMF/wine/winnt.h b/include/libEMF/wine/winnt.h +index a455290..5aed45f 100644 +--- a/include/libEMF/wine/winnt.h ++++ b/include/libEMF/wine/winnt.h +@@ -29,11 +29,11 @@ + + /* Architecture dependent settings. */ + /* These are hardcoded to avoid dependencies on config.h in Winelib apps. */ +-#if defined(__i386__) ++#if defined(__i386__) || defined(__i386) + # undef WORDS_BIGENDIAN + # undef BITFIELDS_BIGENDIAN + # define ALLOW_UNALIGNED_ACCESS +-#elif defined(__sparc__) ++#elif defined(__sparc__) || defined(__sparc) + # define WORDS_BIGENDIAN + # define BITFIELDS_BIGENDIAN + # undef ALLOW_UNALIGNED_ACCESS +@@ -48,7 +48,7 @@ + + /* Calling conventions definitions */ + +-#ifdef __i386__ ++#if defined(__i386__) || defined(__i386) + # ifndef _X86_ + # define _X86_ + # endif +@@ -639,7 +639,7 @@ typedef struct _CONTEXT86 + #define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS) + + /* i386 context definitions */ +-#ifdef __i386__ ++#if defined(__i386__) || defined(__i386) + + #define CONTEXT_CONTROL CONTEXT86_CONTROL + #define CONTEXT_INTEGER CONTEXT86_INTEGER +@@ -969,7 +969,7 @@ typedef struct _STACK_FRAME_HEADER + + #endif /* __PPC__ */ + +-#ifdef __sparc__ ++#if defined(__sparc__) || defined(__sparc) + + /* + * FIXME: +@@ -1138,7 +1138,7 @@ typedef CONTEXT *PCONTEXT; + + #endif /* __i386__ */ + +-#ifdef __sparc__ ++#if defined(__sparc__) || defined(__sparc) + /* FIXME: use getcontext() to retrieve full context */ + #define _GET_CONTEXT \ + CONTEXT context; \ +@@ -1204,7 +1204,7 @@ typedef CONTEXT *PCONTEXT; + static void func(void) __attribute__((constructor)); \ + static void func(void) + #else /* __GNUC__ */ +-# ifdef __i386__ ++# if defined(__i386__) || defined(__i386) + # define DECL_GLOBAL_CONSTRUCTOR(func) \ + static void __dummy_init_##func(void) { \ + asm(".section .init,\"ax\"\n\t" \ +@@ -1218,7 +1218,7 @@ typedef CONTEXT *PCONTEXT; + + /* Segment register access */ + +-#ifdef __i386__ ++#if defined(__i386__) || defined(__i386) + # ifdef __GNUC__ + # define __DEFINE_GET_SEG(seg) \ + extern inline unsigned short __get_##seg(void) \ +@@ -2347,7 +2347,7 @@ typedef struct _NT_TIB + + struct _TEB; + +-#if defined(__i386__) && defined(__GNUC__) && !defined(__CHECKER__) ++#if (defined(__i386__) || defined(__i386)) && defined(__GNUC__) && !defined(__CHECKER__) + extern inline struct _TEB WINAPI *NtCurrentTeb(void); + extern inline struct _TEB WINAPI *NtCurrentTeb(void) + { +-- +1.7.3 + Added: csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch =================================================================== --- csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch (rev 0) +++ csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch 2010-11-22 16:13:34 UTC (rev 11692) @@ -0,0 +1,32 @@ +From 313b74dc289993a8a41974545df95d2e41f16978 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 22 Nov 2010 15:43:35 +0100 +Subject: [PATCH 2/2] Remove unneeded definition causing link errors + +--- + include/libEMF/wine/winbase.h | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/include/libEMF/wine/winbase.h b/include/libEMF/wine/winbase.h +index 366a777..3abb6b1 100644 +--- a/include/libEMF/wine/winbase.h ++++ b/include/libEMF/wine/winbase.h +@@ -1802,6 +1802,7 @@ LONG WINAPI InterlockedIncrement(PLONG); + VOID WINAPI SetLastError(DWORD); + #endif /* __i386__ && __GNUC__ */ + ++#if 0 + /* FIXME: should handle platforms where sizeof(void*) != sizeof(long) */ + static inline PVOID WINAPI InterlockedCompareExchangePointer( PVOID *dest, PVOID xchg, PVOID compare ) + { +@@ -1812,6 +1813,7 @@ static inline PVOID WINAPI InterlockedExchangePointer( PVOID *dest, PVOID val ) + { + return (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val ); + } ++#endif + + #ifdef __WINE__ + #define GetCurrentProcess() ((HANDLE)0xffffffff) +-- +1.7.3 + Added: csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch =================================================================== --- csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch (rev 0) +++ csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch 2010-11-22 16:13:34 UTC (rev 11692) @@ -0,0 +1,25 @@ +From 36faee190243cdb3e44b3f9a6f2898fb54eba387 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 22 Nov 2010 15:56:47 +0100 +Subject: [PATCH 3/3] Always use csw libtool + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index d419f8f..6a8cc02 100755 +--- a/configure ++++ b/configure +@@ -8419,7 +8419,7 @@ fi + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) /usr/bin/libtool' ++LIBTOOL='$(SHELL) /opt/csw/bin/libtool' + + + +-- +1.7.3 + Added: csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch =================================================================== --- csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch (rev 0) +++ csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch 2010-11-22 16:13:34 UTC (rev 11692) @@ -0,0 +1,39 @@ +From 110d57854830c674d7dbacb65331df0995d0d3ee Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 22 Nov 2010 16:40:39 +0100 +Subject: [PATCH 4/4] Do not use link against libstdc++ + +--- + src/Makefile.in | 2 +- + tests/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 2d7c678..7bd2c79 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -186,7 +186,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + INCLUDES = -I$(top_srcdir)/include +-LDADD = $(top_builddir)/libemf/libEMF.la -lstdc++ -lm ++LDADD = $(top_builddir)/libemf/libEMF.la -lm + all: all-am + + .SUFFIXES: +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 4e5ecfb..5c8fdb4 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -202,7 +202,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + INCLUDES = -I$(top_srcdir)/include +-LDADD = $(top_builddir)/libemf/libEMF.la -lstdc++ ++LDADD = $(top_builddir)/libemf/libEMF.la + TESTS = docheck1 docheck2 docheck3 + EXTRA_DIST = docheck1 docheck2 docheck3 emfs/check1.emf emfs/check3.emf + MOSTLYCLEANFILES = check1.emf check2.emf check3.emf +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 22 17:18:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 22 Nov 2010 16:18:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[11693] csw/mgar/pkg/dia/trunk Message-ID: Revision: 11693 http://gar.svn.sourceforge.net/gar/?rev=11693&view=rev Author: dmichelsen Date: 2010-11-22 16:18:07 +0000 (Mon, 22 Nov 2010) Log Message: ----------- dia: Add patch and check comment Modified Paths: -------------- csw/mgar/pkg/dia/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch Modified: csw/mgar/pkg/dia/trunk/Makefile =================================================================== --- csw/mgar/pkg/dia/trunk/Makefile 2010-11-22 16:13:34 UTC (rev 11692) +++ csw/mgar/pkg/dia/trunk/Makefile 2010-11-22 16:18:07 UTC (rev 11693) @@ -10,12 +10,16 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = 0001-Make-sure-for-loop-is-not-empty.patch + # File name regex to get notifications about upstream software releases UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check +# Tests for i386 fail in /Dia/Objects/Istar - goal/Copy with +# g_str_hash (100) + 16 +TEST_TARGET ?= check RUNTIME_DEP_PKGS_CSWdia += CSWlibxslt RUNTIME_DEP_PKGS_CSWdia += CSWlibatk Added: csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch =================================================================== --- csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch (rev 0) +++ csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch 2010-11-22 16:18:07 UTC (rev 11693) @@ -0,0 +1,43 @@ +From 9a204d8f2275609a613bbb27f69c4155ef4a497a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 22 Nov 2010 17:13:48 +0100 +Subject: [PATCH] Make sure for-loop is not empty + +--- + doc/Makefile.in | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/doc/Makefile.in b/doc/Makefile.in +index ec95c51..8c6aa6a 100644 +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -382,7 +382,7 @@ ctags-recursive: + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ list='x$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +@@ -408,7 +408,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ list='x$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +@@ -423,7 +423,7 @@ ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ list='x$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 23 11:34:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Nov 2010 10:34:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11694] csw/mgar/pkg/dia/trunk/files/ 0001-Make-sure-for-loop-is-not-empty.patch Message-ID: Revision: 11694 http://gar.svn.sourceforge.net/gar/?rev=11694&view=rev Author: dmichelsen Date: 2010-11-23 10:34:17 +0000 (Tue, 23 Nov 2010) Log Message: ----------- dia: Adjust install patch Modified Paths: -------------- csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch Modified: csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch =================================================================== --- csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch 2010-11-22 16:18:07 UTC (rev 11693) +++ csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch 2010-11-23 10:34:17 UTC (rev 11694) @@ -1,14 +1,14 @@ -From 9a204d8f2275609a613bbb27f69c4155ef4a497a Mon Sep 17 00:00:00 2001 +From 109bdcb02d7e43bf9b3d15382dd54681b09edc29 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Mon, 22 Nov 2010 17:13:48 +0100 +Date: Tue, 23 Nov 2010 11:09:26 +0100 Subject: [PATCH] Make sure for-loop is not empty --- - doc/Makefile.in | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + doc/Makefile.in | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/Makefile.in b/doc/Makefile.in -index ec95c51..8c6aa6a 100644 +index ec95c51..85a9b44 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -382,7 +382,7 @@ ctags-recursive: @@ -38,6 +38,15 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ +@@ -589,7 +589,7 @@ uninstall-am: uninstall-local + install-data-local: $(distfiles) + -(cd $(DESTDIR)$(helpdir) && rm -f C && ln -s en C) + $(mkinstalldirs) $(sysdoc) +- for i in $^; do \ ++ for i in x $^; do \ + if test -f "$$i"; then \ + echo "installing $$i" ;\ + $(INSTALL_DATA) $$i $(sysdoc)/$$(basename $$i); \ -- 1.7.3 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 Nov 23 13:40:39 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 23 Nov 2010 12:40:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11695] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 11695 http://gar.svn.sourceforge.net/gar/?rev=11695&view=rev Author: bonivart Date: 2010-11-23 12:40:39 +0000 (Tue, 23 Nov 2010) Log Message: ----------- clamav: update to 0.96.5 test release Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2010-11-23 10:34:17 UTC (rev 11694) +++ csw/mgar/pkg/clamav/trunk/Makefile 2010-11-23 12:40:39 UTC (rev 11695) @@ -1,6 +1,6 @@ GARNAME = clamav -GARVERSION = 0.96.4 -#DISTNAME = $(GARNAME)-devel-latest +GARVERSION = 0.96.5 +DISTNAME = $(GARNAME)-devel-latest CATEGORIES = apps DESCRIPTION = Clam AntiVirus @@ -13,10 +13,10 @@ endef SF_PROJ = clamav -MASTER_SITES = $(SF_MIRRORS) -#MASTER_SITES = http://www.clamav.net/snapshot/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#DISTFILES = $(GARNAME)-devel-latest.tar.gz +#MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES = http://www.clamav.net/snapshot/ +#DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-devel-latest.tar.gz PACKAGES = CSWclamav CSWlibclamav CSWlibclamav-devel CATALOGNAME_CSWclamav = clamav Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2010-11-23 10:34:17 UTC (rev 11694) +++ csw/mgar/pkg/clamav/trunk/checksums 2010-11-23 12:40:39 UTC (rev 11695) @@ -1 +1 @@ -7d47f73fe16b96544a4b5e41686e5060 clamav-0.96.4.tar.gz +8ed8891f057304aec9135c25c9afb238 clamav-devel-latest.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 Nov 23 14:25:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Nov 2010 13:25:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[11696] csw/mgar/pkg/libemf/trunk/Makefile Message-ID: Revision: 11696 http://gar.svn.sourceforge.net/gar/?rev=11696&view=rev Author: dmichelsen Date: 2010-11-23 13:25:21 +0000 (Tue, 23 Nov 2010) Log Message: ----------- libemf: Split packages Modified Paths: -------------- csw/mgar/pkg/libemf/trunk/Makefile Modified: csw/mgar/pkg/libemf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libemf/trunk/Makefile 2010-11-23 12:40:39 UTC (rev 11695) +++ csw/mgar/pkg/libemf/trunk/Makefile 2010-11-23 13:25:21 UTC (rev 11696) @@ -16,6 +16,19 @@ PATCHFILES += 0003-Always-use-csw-libtool.patch PATCHFILES += 0004-Do-not-use-link-against-libstdc.patch +PACKAGES = CSWlibemf CSWlibemf1 CSWlibemf-devel + +CATALOGNAME_CSWlibemf = libemf +CAtALOGNAME_CSWlibemf1 = libemf1 +CATALOGNAME_CSWlibemf-devel = libemf_devel + +SPKG_DESC_CSWlibemf = $(DESCRIPTION) +SPKG_DESC_CSWlibemf1 = Runtime library for libEMF 1.x +SPKG_DESC_CSWlibemf-devel = Development files for libEMF + +RUNTIME_DEP_PKGS_CSWlibemf = CSWlibemf1 CSWlibemf-devel +RUNTIME_DEP_PKGS_CSWlibemf-devel = CSWlibemf1 + VENDOR_URL = http://libemf.sourceforge.net/ # File name regex to get notifications about upstream software releases @@ -28,5 +41,16 @@ TEST_TARGET = check +PKGFILES_CSWlibemf1 = $(PKGFILES_RT) +PKGFILES_CSWlibemf-devel = $(PKGFILES_DEVEL) + +CHECKPKG_OVERRIDES_CSWlibemf += surplus-dependency|CSWlibemf-devel + +# This needs a fixed libtool first +CHECKPKG_OVERRIDES_CSWlibemf1 += bad-rpath-entry|/lib|opt/csw/lib/libEMF.so.1.0.0 +CHECKPKG_OVERRIDES_CSWlibemf1 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libEMF.so.1.0.0 +CHECKPKG_OVERRIDES_CSWlibemf1 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libEMF.so.1.0.0 +CHECKPKG_OVERRIDES_CSWlibemf1 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libEMF.so.1.0.0 + 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 Nov 23 14:41:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Nov 2010 13:41:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[11697] csw/mgar/pkg/libemf/trunk/files/ 0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch Message-ID: Revision: 11697 http://gar.svn.sourceforge.net/gar/?rev=11697&view=rev Author: dmichelsen Date: 2010-11-23 13:41:15 +0000 (Tue, 23 Nov 2010) Log Message: ----------- libemf: Adjust patch for i386 Modified Paths: -------------- csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch Modified: csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch =================================================================== --- csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch 2010-11-23 13:25:21 UTC (rev 11696) +++ csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch 2010-11-23 13:41:15 UTC (rev 11697) @@ -1,14 +1,14 @@ -From ce43acc3cf6e579264d7333221deb7c81bb29b54 Mon Sep 17 00:00:00 2001 +From 1df10ad110f4661217c2f68bbfbdcaa7b1cde2cf Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Mon, 22 Nov 2010 16:51:08 +0100 +Date: Tue, 23 Nov 2010 14:37:55 +0100 Subject: [PATCH] Add __sparc and __i386 in addition to __*__ --- - include/libEMF/wine/winnt.h | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) + include/libEMF/wine/winnt.h | 21 +++++++++++---------- + 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/include/libEMF/wine/winnt.h b/include/libEMF/wine/winnt.h -index a455290..5aed45f 100644 +index a455290..b052679 100644 --- a/include/libEMF/wine/winnt.h +++ b/include/libEMF/wine/winnt.h @@ -29,11 +29,11 @@ @@ -34,7 +34,17 @@ # ifndef _X86_ # define _X86_ # endif -@@ -639,7 +639,7 @@ typedef struct _CONTEXT86 +@@ -56,7 +56,8 @@ + # define __stdcall __attribute__((__stdcall__)) + # define __cdecl __attribute__((__cdecl__)) + # else +-# error You need gcc >= 2.7 to build Wine on a 386 ++# define __stdcall ++# define __cdecl + # endif /* __GNUC__ */ + #else /* __i386__ */ + # define __stdcall +@@ -639,7 +640,7 @@ typedef struct _CONTEXT86 #define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS) /* i386 context definitions */ @@ -43,7 +53,7 @@ #define CONTEXT_CONTROL CONTEXT86_CONTROL #define CONTEXT_INTEGER CONTEXT86_INTEGER -@@ -969,7 +969,7 @@ typedef struct _STACK_FRAME_HEADER +@@ -969,7 +970,7 @@ typedef struct _STACK_FRAME_HEADER #endif /* __PPC__ */ @@ -52,7 +62,7 @@ /* * FIXME: -@@ -1138,7 +1138,7 @@ typedef CONTEXT *PCONTEXT; +@@ -1138,7 +1139,7 @@ typedef CONTEXT *PCONTEXT; #endif /* __i386__ */ @@ -61,7 +71,7 @@ /* FIXME: use getcontext() to retrieve full context */ #define _GET_CONTEXT \ CONTEXT context; \ -@@ -1204,7 +1204,7 @@ typedef CONTEXT *PCONTEXT; +@@ -1204,7 +1205,7 @@ typedef CONTEXT *PCONTEXT; static void func(void) __attribute__((constructor)); \ static void func(void) #else /* __GNUC__ */ @@ -70,7 +80,7 @@ # define DECL_GLOBAL_CONSTRUCTOR(func) \ static void __dummy_init_##func(void) { \ asm(".section .init,\"ax\"\n\t" \ -@@ -1218,7 +1218,7 @@ typedef CONTEXT *PCONTEXT; +@@ -1218,7 +1219,7 @@ typedef CONTEXT *PCONTEXT; /* Segment register access */ @@ -79,7 +89,7 @@ # ifdef __GNUC__ # define __DEFINE_GET_SEG(seg) \ extern inline unsigned short __get_##seg(void) \ -@@ -2347,7 +2347,7 @@ typedef struct _NT_TIB +@@ -2347,7 +2348,7 @@ typedef struct _NT_TIB struct _TEB; 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 Nov 23 15:26:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Nov 2010 14:26:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[11698] csw/mgar/pkg/libtool/branches Message-ID: Revision: 11698 http://gar.svn.sourceforge.net/gar/?rev=11698&view=rev Author: dmichelsen Date: 2010-11-23 14:26:33 +0000 (Tue, 23 Nov 2010) Log Message: ----------- libtool: Make branches for legacy share lib package libltdl3 and current libtool 2.4 Modified Paths: -------------- csw/mgar/pkg/libtool/branches/libldtl3/Makefile csw/mgar/pkg/libtool/branches/libldtl3/checksums csw/mgar/pkg/libtool/branches/libtool24/Makefile csw/mgar/pkg/libtool/branches/libtool24/checksums Added Paths: ----------- csw/mgar/pkg/libtool/branches/libldtl3/ csw/mgar/pkg/libtool/branches/libtool24/ Modified: csw/mgar/pkg/libtool/branches/libldtl3/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2010-11-22 16:18:07 UTC (rev 11693) +++ csw/mgar/pkg/libtool/branches/libldtl3/Makefile 2010-11-23 14:26:33 UTC (rev 11698) @@ -1,16 +1,7 @@ GARNAME = libtool -GARVERSION = 2.2.10 +GARVERSION = 1.5.26 CATEGORIES = devel -EXTRA_MODULATORS = GARVERSION GARCOMPILER -MODULATIONS_GARVERSION = 1.5.26 2.2.10 -MODULATIONS_GARCOMPILER = GCC3 GCC4 SOS12 - -# Modulate over compiler only for 2.2.6 -SKIP_MODULATIONS = $(foreach I,sparcv8 sparcv9 i386 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-1.5.26-garcompiler-$C)) -# Compile 64 bit libraries only with SOS12 -SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-2.2.10-garcompiler-$C)) - DESCRIPTION = A generic library support tool define BLURB GNU libtool is a generic library support script. Libtool hides the complexity @@ -19,83 +10,33 @@ endef MASTER_SITES = $(GNU_MIRROR) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz) -DISTFILES = $(SOURCEFILES) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCH_LIBTOOL = patch-libtool.diff -PATCHFILES_POSTINSTALL_isa-i386-garversion-2.2.10-garcompiler-SOS12 = $(PATCH_LIBTOOL) -PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.10-garcompiler-SOS12 = $(PATCH_LIBTOOL) -DISTFILES += $(PATCH_LIBTOOL) +PACKAGES = CSWlibltdl3 +CATALOGNAME = libltdl3 -NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) - -EXTRA_TAGS = gcc3 gcc4 sos12 -COMPILER_TAGNAME_GCC3 = gcc3 -COMPILER_TAGNAME_GCC4 = gcc4 -COMPILER_TAGNAME_SOS12 = sos12 - -PACKAGES = CSWlibtool CSWlibtoolrt -CATALOGNAME_CSWlibtoolrt = libtool_rt - SPKG_SOURCEURL = http://www.gnu.org/software/libtool/ -RUNTIME_DEP_PKGS_CSWlibtool = CSWlibtoolrt +SPKG_DESC_CSWlibtoolrt = Runtime library for libtool 1.5.x -SPKG_DESC_CSWlibtool = A generic library support tool -SPKG_DESC_CSWlibtoolrt = A generic library support tool runtime libraries - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 -NOISAEXEC = 1 +NOISALIST = 1 -SKIPTEST = 1 +# There are three Fortran tests failing, which probably is not relevant to +# libltdl.so functionaility +# FAIL: f77demo-make.test +# FAIL: f77demo-make.test +# FAIL: f77demo-make.test +SKIPTEST ?= 1 + TEST_TARGET = check - MERGE_SCRIPTS_isa-default-garversion-1.5.26-garcompiler-SOS12 = copy-only - MERGE_DIRS_isa-default-garversion-1.5.26-garcompiler-SOS12 = $(libdir) - MERGE_SCRIPTS_isa-default64-garversion-1.5.26-garcompiler-SOS12 = copy-relocated-only - MERGE_DIRS_isa-default64-garversion-1.5.26-garcompiler-SOS12 = $(libdir) +PKGFILES_CSWlibltdl3 = $(PKGFILES_RT) - MERGE_SCRIPTS_isa-default-garversion-2.2.10-garcompiler-SOS12 = copy-all - MERGE_SCRIPTS_isa-default64-garversion-2.2.10-garcompiler-SOS12 = copy-relocated-only - MERGE_DIRS_isa-default64-garversion-2.2.10-garcompiler-SOS12 = $(libdir) - - MERGE_SCRIPTS_isa-default-garversion-2.2.10-garcompiler-GCC3 = copy-tags - MERGE_SCRIPTS_isa-default-garversion-2.2.10-garcompiler-GCC4 = copy-tags - -PKGFILES_CSWlibtoolrt = $(PKGFILES_RT) - -CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibtoolrt - include gar/category.mk -post-install-modulated: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool) -post-install-modulated: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER))) - -patch-libtool: - cat $(WORKDIR)/$(PATCHFILES_POSTINSTALL_$(MODULATION)) | (cd $(DESTDIR)$(bindir) && gpatch -p1) - # Remove arch-specific flags from the libtool-compilation so they don't spoil the target build - perl -pi -e 's/^LTCFLAGS=.*/LTCFLAGS="-O"/' $(DESTDIR)$(bindir)/libtool - @$(MAKECOOKIE) - -install-libtool-%: - perl -ane 'print if( /^available_tags/ ); $$p = 1 if( /^# ### BEGIN LIBTOOL CONFIG/ ); print if( $$p ); $$p = 0 if( /^# ### END LIBTOOL CONFIG/ )' \ - <$(DESTDIR)$(bindir)/libtool >$(DESTDIR)$(datadir)/libtool/$*.conf - perl -ane '$$p = 1 if( /^# ### BEGIN LIBTOOL TAG CONFIG/ ); print if( $$p ); if( /^# ### END LIBTOOL TAG CONFIG/ ) { $$p = 0; print "\n"; }' \ - <$(DESTDIR)$(bindir)/libtool >$(DESTDIR)$(datadir)/libtool/$*.tags - @$(MAKECOOKIE) - -merge-copy-tags: - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - -s ",^\(\..*\.conf\)\$$,\1,p" \ - -s ",^\(\..*\.tags\)\$$,\1,p" \ - -s ",.*,," \ - . $(PKGROOT) \ - ) - @$(MAKECOOKIE) - - Modified: csw/mgar/pkg/libtool/branches/libldtl3/checksums =================================================================== --- csw/mgar/pkg/libtool/trunk/checksums 2010-11-22 16:18:07 UTC (rev 11693) +++ csw/mgar/pkg/libtool/branches/libldtl3/checksums 2010-11-23 14:26:33 UTC (rev 11698) @@ -1,3 +1 @@ aa9c5107f3ec9ef4200eb6556f3b3c29 libtool-1.5.26.tar.gz -b745d220e88163fcd9eea0a90ccf21b0 libtool-2.2.10.tar.gz -92bb3c7712498b6a5993ab5d5fc8f077 patch-libtool.diff Modified: csw/mgar/pkg/libtool/branches/libtool24/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2010-11-22 16:18:07 UTC (rev 11693) +++ csw/mgar/pkg/libtool/branches/libtool24/Makefile 2010-11-23 14:26:33 UTC (rev 11698) @@ -1,16 +1,16 @@ GARNAME = libtool -GARVERSION = 2.2.10 +GARVERSION = 2.4 CATEGORIES = devel -EXTRA_MODULATORS = GARVERSION GARCOMPILER -MODULATIONS_GARVERSION = 1.5.26 2.2.10 +EXTRA_MODULATORS = GARCOMPILER MODULATIONS_GARCOMPILER = GCC3 GCC4 SOS12 -# Modulate over compiler only for 2.2.6 -SKIP_MODULATIONS = $(foreach I,sparcv8 sparcv9 i386 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-1.5.26-garcompiler-$C)) +# Modulate over compiler only for 2.4 # Compile 64 bit libraries only with SOS12 -SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-2.2.10-garcompiler-$C)) +SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garcompiler-$C)) +# TODO: Make sure -xnorunpath / -norunpath stays in cc and CC + DESCRIPTION = A generic library support tool define BLURB GNU libtool is a generic library support script. Libtool hides the complexity @@ -19,30 +19,32 @@ endef MASTER_SITES = $(GNU_MIRROR) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz) -DISTFILES = $(SOURCEFILES) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.xz PATCH_LIBTOOL = patch-libtool.diff -PATCHFILES_POSTINSTALL_isa-i386-garversion-2.2.10-garcompiler-SOS12 = $(PATCH_LIBTOOL) -PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.10-garcompiler-SOS12 = $(PATCH_LIBTOOL) +PATCHFILES_POSTINSTALL_isa-i386-garversion-2.4-garcompiler-SOS12 = $(PATCH_LIBTOOL) +PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.4-garcompiler-SOS12 = $(PATCH_LIBTOOL) DISTFILES += $(PATCH_LIBTOOL) -NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) - EXTRA_TAGS = gcc3 gcc4 sos12 COMPILER_TAGNAME_GCC3 = gcc3 COMPILER_TAGNAME_GCC4 = gcc4 COMPILER_TAGNAME_SOS12 = sos12 -PACKAGES = CSWlibtool CSWlibtoolrt +PACKAGES = CSWlibtool CSWlibltdl7 CSWlibtoolrt + +CATALOGNAME_CSWlibtool = libtool +CATALOGNAME_CSWlibltdl7 = libltdl7 CATALOGNAME_CSWlibtoolrt = libtool_rt SPKG_SOURCEURL = http://www.gnu.org/software/libtool/ -RUNTIME_DEP_PKGS_CSWlibtool = CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWlibtool = CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibtoolrt = CSWlibltdl3 CSWlibltdl7 SPKG_DESC_CSWlibtool = A generic library support tool -SPKG_DESC_CSWlibtoolrt = A generic library support tool runtime libraries +SPKG_DESC_CSWlibltdl7 = Libtool libltdl.so.7 from libtool 2.x +SPKG_DESC_CSWlibtoolrt = Runtime libraries for libtool # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -52,24 +54,23 @@ BUILD64 = 1 NOISAEXEC = 1 -SKIPTEST = 1 TEST_TARGET = check - MERGE_SCRIPTS_isa-default-garversion-1.5.26-garcompiler-SOS12 = copy-only - MERGE_DIRS_isa-default-garversion-1.5.26-garcompiler-SOS12 = $(libdir) - MERGE_SCRIPTS_isa-default64-garversion-1.5.26-garcompiler-SOS12 = copy-relocated-only - MERGE_DIRS_isa-default64-garversion-1.5.26-garcompiler-SOS12 = $(libdir) + MERGE_SCRIPTS_isa-default-garcompiler-SOS12 = copy-all + MERGE_SCRIPTS_isa-default64-garcompiler-SOS12 = copy-relocated-only + MERGE_DIRS_isa-default64-garcompiler-SOS12 = $(libdir) - MERGE_SCRIPTS_isa-default-garversion-2.2.10-garcompiler-SOS12 = copy-all - MERGE_SCRIPTS_isa-default64-garversion-2.2.10-garcompiler-SOS12 = copy-relocated-only - MERGE_DIRS_isa-default64-garversion-2.2.10-garcompiler-SOS12 = $(libdir) + MERGE_SCRIPTS_isa-default-garcompiler-GCC3 = copy-tags + MERGE_SCRIPTS_isa-default-garcompiler-GCC4 = copy-tags - MERGE_SCRIPTS_isa-default-garversion-2.2.10-garcompiler-GCC3 = copy-tags - MERGE_SCRIPTS_isa-default-garversion-2.2.10-garcompiler-GCC4 = copy-tags +PKGFILES_CSWlibltdl7 = $(PKGFILES_RT) +PKGFILES_CSWlibtoolrt = NONE -PKGFILES_CSWlibtoolrt = $(PKGFILES_RT) +ARCHALL_CSWlibtoolrt = 1 -CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibtoolrt +CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibltdl7 +CHECKPKG_OVERRIDES_CSWlibtoolrt += surplus-dependency|CSWlibltdl3 +CHECKPKG_OVERRIDES_CSWlibtoolrt += surplus-dependency|CSWlibltdl7 include gar/category.mk @@ -89,7 +90,7 @@ <$(DESTDIR)$(bindir)/libtool >$(DESTDIR)$(datadir)/libtool/$*.tags @$(MAKECOOKIE) -merge-copy-tags: +merge-copy-tags: $(PKGROOT) $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ -s ",^\(\..*\.conf\)\$$,\1,p" \ -s ",^\(\..*\.tags\)\$$,\1,p" \ Modified: csw/mgar/pkg/libtool/branches/libtool24/checksums =================================================================== --- csw/mgar/pkg/libtool/trunk/checksums 2010-11-22 16:18:07 UTC (rev 11693) +++ csw/mgar/pkg/libtool/branches/libtool24/checksums 2010-11-23 14:26:33 UTC (rev 11698) @@ -1,3 +1 @@ -aa9c5107f3ec9ef4200eb6556f3b3c29 libtool-1.5.26.tar.gz -b745d220e88163fcd9eea0a90ccf21b0 libtool-2.2.10.tar.gz -92bb3c7712498b6a5993ab5d5fc8f077 patch-libtool.diff +4e6144439d95d7332dc50ace6dd24c55 libtool-2.4.tar.xz 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 Nov 23 15:29:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Nov 2010 14:29:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[11699] csw/mgar/pkg/libtool/branches/libtool24/Makefile Message-ID: Revision: 11699 http://gar.svn.sourceforge.net/gar/?rev=11699&view=rev Author: dmichelsen Date: 2010-11-23 14:29:21 +0000 (Tue, 23 Nov 2010) Log Message: ----------- libtool 2.4: Skip tests because of failing Fortran stuff for now Modified Paths: -------------- csw/mgar/pkg/libtool/branches/libtool24/Makefile Modified: csw/mgar/pkg/libtool/branches/libtool24/Makefile =================================================================== --- csw/mgar/pkg/libtool/branches/libtool24/Makefile 2010-11-23 14:26:33 UTC (rev 11698) +++ csw/mgar/pkg/libtool/branches/libtool24/Makefile 2010-11-23 14:29:21 UTC (rev 11699) @@ -56,6 +56,9 @@ TEST_TARGET = check +# Some Fortran-specific tests fail which is probably not that important +SKIPTEST ?= 1 + MERGE_SCRIPTS_isa-default-garcompiler-SOS12 = copy-all MERGE_SCRIPTS_isa-default64-garcompiler-SOS12 = copy-relocated-only MERGE_DIRS_isa-default64-garcompiler-SOS12 = $(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 23 17:13:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Nov 2010 16:13:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[11700] csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile Message-ID: Revision: 11700 http://gar.svn.sourceforge.net/gar/?rev=11700&view=rev Author: dmichelsen Date: 2010-11-23 16:13:44 +0000 (Tue, 23 Nov 2010) Log Message: ----------- cpan/DBD-Sybase: Skip i386 with Sybase OCS binding until I get a hold on Sybase i386 32 bit Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile 2010-11-23 14:29:21 UTC (rev 11699) +++ csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile 2010-11-23 16:13:44 UTC (rev 11700) @@ -13,6 +13,9 @@ EXTRA_MODULATORS = DBDRIVER MODULATIONS_DBDRIVER = ocs freetds +# I just don't have Sybase x86 OCS in 32 bit +SKIP_MODULATIONS = isa-i386-dbdriver-ocs + PACKAGES = CSWpmdbdsybase CSWpmdbdsybaseftds CATALOGNAME_CSWpmdbdsybase = pm_dbdsybase 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 Nov 23 17:25:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Nov 2010 16:25:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11701] csw/mgar/pkg/Makefile Message-ID: Revision: 11701 http://gar.svn.sourceforge.net/gar/?rev=11701&view=rev Author: dmichelsen Date: 2010-11-23 16:25:59 +0000 (Tue, 23 Nov 2010) Log Message: ----------- mGAR pkg template: Use DISTNAME as it is more consistent with license lookup Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2010-11-23 16:13:44 UTC (rev 11700) +++ csw/mgar/pkg/Makefile 2010-11-23 16:25:59 UTC (rev 11701) @@ -59,7 +59,7 @@ # ... garlinks: - @(svn propget svn:externals -R | perl -ane 'next if( /^$$/ ); if( $$F[1] eq "-" ) { ($$path,$$sep,$$dir,$$link)=@F; } else { ($$dir,$$link) = @F; } ($$upsteps=$$path)=~s![^/]+!..!g;(($$linkdest=$$link))=~ s!https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar!$$upsteps!;print "Linking $$path/$$dir to ../$$linkdest", symlink("../$$linkdest","$$path/$$dir") ? "" : " failed", "\n";') + @(svn propget svn:externals -R | perl -ane 'next if( /^$$/ ); if( $$F[1] eq "-" ) { ($$path,$$sep,$$dir,$$link)=@F; } else { ($$dir,$$link) = @F; } ($$upsteps=$$path)=~s![^/]+!..!g;(($$linkdest=$$link))=~ s!https://gar.svn.(?:sourceforge|sf).net/svnroot/gar/csw/mgar!$$upsteps!;unlink("$$path/$$dir"); print "Linking $$path/$$dir to ../$$linkdest", symlink("../$$linkdest","$$path/$$dir") ? "" : " failed", "\n";') pkglist: @for i in $(filter-out $(FILTER_DIRS),$(foreach D,. $(SUBDIRS),$(wildcard $D/*/))) ; do \ @@ -79,7 +79,7 @@ echo "endef"; \ echo ""; \ echo "MASTER_SITES = "; \ - echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo "DISTFILES = $$(DISTNAME).tar.gz"; \ echo ""; \ echo "# File name regex to get notifications about upstream software releases"; \ echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 23 17:57:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Nov 2010 16:57:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11702] csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile Message-ID: Revision: 11702 http://gar.svn.sourceforge.net/gar/?rev=11702&view=rev Author: dmichelsen Date: 2010-11-23 16:57:22 +0000 (Tue, 23 Nov 2010) Log Message: ----------- cpan/DBD-Sybase: Rename package according to new standard Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile 2010-11-23 16:25:59 UTC (rev 11701) +++ csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile 2010-11-23 16:57:22 UTC (rev 11702) @@ -16,20 +16,20 @@ # I just don't have Sybase x86 OCS in 32 bit SKIP_MODULATIONS = isa-i386-dbdriver-ocs -PACKAGES = CSWpmdbdsybase CSWpmdbdsybaseftds +PACKAGES = CSWpm-dbd-sybase-ocs CSWpm-dbd-sybase-freetds -CATALOGNAME_CSWpmdbdsybase = pm_dbdsybase -CATALOGNAME_CSWpmdbdsybaseftds = pm_dbdsybaseftds +CATALOGNAME_CSWpm-dbd-sybase-ocs = pm_dbd_sybase_ocs +CATALOGNAME_CSWpm-dbd-sybase-freetds = pm_dbd_sybase_freetds -SPKG_DESC_CSWpmdbdsybase = $(DESCRIPTION) (Linked against Sybase OCS) -SPKG_DESC_CSWpmdbdsybaseftds = $(DESCRIPTION) (Linked against FreeTDS) +SPKG_DESC_CSWpm-dbd-sybase-ocs = $(DESCRIPTION) (Linked against Sybase OCS) +SPKG_DESC_CSWpm-dbd-sybase-freetds = $(DESCRIPTION) (Linked against FreeTDS) # The "standard" is to link against Sybase OCS as it does not have additional # dependencies. If you don't have that you can *additionally* install # the version linked against FreeTDS pulling in all additional dependencies. -RUNTIME_DEP_PKGS_CSWpmdbdsybaseftds += CSWpmdbdsybase -RUNTIME_DEP_PKGS_CSWpmdbdsybaseftds += CSWfreetds -RUNTIME_DEP_PKGS_CSWpmdbdsybaseftds += CSWggettextrt +RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-freetds += CSWfreetds +RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-freetds += CSWggettextrt +RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-ocs += CSWpm-dbd-sybase-freetds SYBASE_ocs = /opt/csw/sybase/OCS-12_5 SYBASE_freetds = /opt/csw @@ -60,19 +60,19 @@ EXTRA_PAX_ARGS = -s ",/Sybase\.bs$$,/Sybase-$(DBDRIVER).bs,p" EXTRA_PAX_ARGS += -s ",/Sybase\.so$$,/Sybase-$(DBDRIVER).so,p" -PKGFILES_CSWpmdbdsybaseftds = $(DBDSYBASEDIR)/.*-freetds\..* +PKGFILES_CSWpm-dbd-sybase-ocs = $(DBDSYBASEDIR)/.*-ocs\..* -ALTERNATIVES_CSWpmdbdsybase = ocs -ALTERNATIVES_CSWpmdbdsybaseftds = freetds +ALTERNATIVES_CSWpm-dbd-sybase-ocs = ocs +ALTERNATIVES_CSWpm-dbd-sybase-freetds = freetds ALTERNATIVE_ocs = $(DBDSYBASEDIR)/Sybase.so so $(DBDSYBASEDIR)/Sybase-ocs.so 200 ALTERNATIVE_ocs += $(DBDSYBASEDIR)/Sybase.bs bs $(DBDSYBASEDIR)/Sybase-ocs.bs ALTERNATIVE_freetds = $(DBDSYBASEDIR)/Sybase.so so $(DBDSYBASEDIR)/Sybase-freetds.so 100 ALTERNATIVE_freetds += $(DBDSYBASEDIR)/Sybase.bs bs $(DBDSYBASEDIR)/Sybase-freetds.bs # These are provided by the Sybase OCS libraries -CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so -CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so -CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so -CHECKPKG_OVERRIDES_CSWpmdbdsybase += soname-not-found|libct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so include gar/category.mk 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 Nov 23 21:28:35 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 23 Nov 2010 20:28:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[11703] csw/mgar/pkg/bash/trunk Message-ID: Revision: 11703 http://gar.svn.sourceforge.net/gar/?rev=11703&view=rev Author: chninkel Date: 2010-11-23 20:28:34 +0000 (Tue, 23 Nov 2010) Log Message: ----------- bash: added /opt/csw/bin in bashbug hardcoded paths for autoselecting EDITOR variable Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bash/trunk/files/0001-bashbug-editor-path.patch Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-11-23 16:57:22 UTC (rev 11702) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-11-23 20:28:34 UTC (rev 11703) @@ -66,6 +66,9 @@ # opencsw bash use /etc/bash.bashrc and /etc/bash.bash_logout files PATCHFILES += use_system_bashrc_and_logout.patch +# add /opt/csw/bin in the hardcoded paths used for auto-selecting the EDITOR variable +PATCHFILES += 0001-bashbug-editor-path.patch + LICENSE = COPYING # we add CSW bash to the /etc/shells files using the build script Added: csw/mgar/pkg/bash/trunk/files/0001-bashbug-editor-path.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/0001-bashbug-editor-path.patch (rev 0) +++ csw/mgar/pkg/bash/trunk/files/0001-bashbug-editor-path.patch 2010-11-23 20:28:34 UTC (rev 11703) @@ -0,0 +1,58 @@ +From 620ec77ec8e909bd492005b29762038668e3d77f Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Tue, 23 Nov 2010 21:21:40 +0100 +Subject: [PATCH] add /opt/csw/bin in the hardcoded paths used for auto-selecting the EDITOR variable. + +--- + support/bashbug.sh | 28 ++++++++-------------------- + 1 files changed, 8 insertions(+), 20 deletions(-) + +diff --git a/support/bashbug.sh b/support/bashbug.sh +index 7b36d40..6dfd9bb 100644 +--- a/support/bashbug.sh ++++ b/support/bashbug.sh +@@ -35,7 +35,7 @@ PATCHLEVEL="!PATCHLEVEL!" + RELSTATUS="!RELSTATUS!" + MACHTYPE="!MACHTYPE!" + +-PATH=/bin:/usr/bin:/usr/local/bin:$PATH ++PATH=/opt/csw/bin:/bin:/usr/bin:/usr/local/bin:$PATH + export PATH + + # Check if TMPDIR is set, default to /tmp +@@ -120,25 +120,13 @@ esac + BUGADDR="${1-$BUGBASH}" + + if [ -z "$DEFEDITOR" ] && [ -z "$EDITOR" ]; then +- if [ -x /usr/bin/editor ]; then +- DEFEDITOR=editor +- elif [ -x /usr/local/bin/ce ]; then +- DEFEDITOR=ce +- elif [ -x /usr/local/bin/emacs ]; then +- DEFEDITOR=emacs +- elif [ -x /usr/contrib/bin/emacs ]; then +- DEFEDITOR=emacs +- elif [ -x /usr/bin/emacs ]; then +- DEFEDITOR=emacs +- elif [ -x /usr/bin/xemacs ]; then +- DEFEDITOR=xemacs +- elif [ -x /usr/contrib/bin/jove ]; then +- DEFEDITOR=jove +- elif [ -x /usr/local/bin/jove ]; then +- DEFEDITOR=jove +- elif [ -x /usr/bin/vi ]; then +- DEFEDITOR=vi +- else ++ for E in editor ce emacs xemacs jove vi; do ++ if [ -x /opt/csw/bin/$E ] || [ -x /usr/bin/$E ] || [ -x /usr/local/bin/$E ] || [ -x /usr/contrib/bin/$E ]; then ++ DEFEDITOR=$E ++ break ++ fi ++ done ++ if [ -z "$DEFEDITOR" ]; then + echo "$0: No default editor found: attempting to use vi" >&2 + DEFEDITOR=vi + fi +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Nov 24 08:47:06 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 24 Nov 2010 07:47:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[11704] csw/mgar/pkg/fio/trunk Message-ID: Revision: 11704 http://gar.svn.sourceforge.net/gar/?rev=11704&view=rev Author: skayser Date: 2010-11-24 07:47:05 +0000 (Wed, 24 Nov 2010) Log Message: ----------- fio: integrate warning for missing directo IO support Modified Paths: -------------- csw/mgar/pkg/fio/trunk/Makefile csw/mgar/pkg/fio/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/fio/trunk/files/0005-Warn-on-missing-direct-IO-support.patch Modified: csw/mgar/pkg/fio/trunk/Makefile =================================================================== --- csw/mgar/pkg/fio/trunk/Makefile 2010-11-23 20:28:34 UTC (rev 11703) +++ csw/mgar/pkg/fio/trunk/Makefile 2010-11-24 07:47:05 UTC (rev 11704) @@ -27,6 +27,10 @@ PATCHFILES += 0003-Install-man-pages.patch PATCHFILES += 0004-Honor-GAR-provided-default-bindir-and-mandir.patch +# Should be integrated in future releases, +# cf. http://www.spinics.net/lists/fio/msg00580.html +PATCHFILES += 0005-Warn-on-missing-direct-IO-support.patch + # CLOCK_MONOTONIC undefined / not present on Solaris 9 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Added: csw/mgar/pkg/fio/trunk/files/0005-Warn-on-missing-direct-IO-support.patch =================================================================== --- csw/mgar/pkg/fio/trunk/files/0005-Warn-on-missing-direct-IO-support.patch (rev 0) +++ csw/mgar/pkg/fio/trunk/files/0005-Warn-on-missing-direct-IO-support.patch 2010-11-24 07:47:05 UTC (rev 11704) @@ -0,0 +1,24 @@ +From fce8a30df709f83e231a78f8d82765850c5fa6cf Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Wed, 24 Nov 2010 08:31:14 +0100 +Subject: [PATCH] Warn on missing direct IO support + +--- + ioengines.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/ioengines.c b/ioengines.c +index e0b0f22..35471ad 100644 +--- a/ioengines.c ++++ b/ioengines.c +@@ -402,6 +402,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f) + + if (ret) { + td_verror(td, ret, "fio_set_odirect"); ++ log_err("fio: the file system does not seem to support direct IO\n"); + goto err; + } + } +-- +1.7.3 + Modified: csw/mgar/pkg/fio/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/fio/trunk/files/changelog.CSW 2010-11-23 20:28:34 UTC (rev 11703) +++ csw/mgar/pkg/fio/trunk/files/changelog.CSW 2010-11-24 07:47:05 UTC (rev 11704) @@ -1,5 +1,5 @@ -fio (1.44.2,REV=2010.11.16) +fio (1.44.2,REV=2010.11.24) * Initial release. - -- Sebastian Kayser Tue, 16 Nov 2010 13:07:30 +0100 + -- Sebastian Kayser Wed, 24 Nov 2010 08:11:31 +0100 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 Nov 24 09:16:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Nov 2010 08:16:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[11705] csw/mgar/pkg/dia/trunk/Makefile Message-ID: Revision: 11705 http://gar.svn.sourceforge.net/gar/?rev=11705&view=rev Author: dmichelsen Date: 2010-11-24 08:16:06 +0000 (Wed, 24 Nov 2010) Log Message: ----------- dia: Add vendor url Modified Paths: -------------- csw/mgar/pkg/dia/trunk/Makefile Modified: csw/mgar/pkg/dia/trunk/Makefile =================================================================== --- csw/mgar/pkg/dia/trunk/Makefile 2010-11-24 07:47:05 UTC (rev 11704) +++ csw/mgar/pkg/dia/trunk/Makefile 2010-11-24 08:16:06 UTC (rev 11705) @@ -15,6 +15,8 @@ # File name regex to get notifications about upstream software releases UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://live.gnome.org/Dia + CONFIGURE_ARGS = $(DIRPATHS) # Tests for i386 fail in /Dia/Objects/Istar - goal/Copy with 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 Nov 24 09:39:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Nov 2010 08:39:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[11706] csw/mgar/pkg Message-ID: Revision: 11706 http://gar.svn.sourceforge.net/gar/?rev=11706&view=rev Author: dmichelsen Date: 2010-11-24 08:39:02 +0000 (Wed, 24 Nov 2010) Log Message: ----------- dia-shapes: Initial commit, needs some more work Added Paths: ----------- csw/mgar/pkg/dia-shapes/ csw/mgar/pkg/dia-shapes/branches/ csw/mgar/pkg/dia-shapes/tags/ csw/mgar/pkg/dia-shapes/trunk/ csw/mgar/pkg/dia-shapes/trunk/Makefile csw/mgar/pkg/dia-shapes/trunk/checksums csw/mgar/pkg/dia-shapes/trunk/files/ Property changes on: csw/mgar/pkg/dia-shapes/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/dia-shapes/trunk/Makefile =================================================================== --- csw/mgar/pkg/dia-shapes/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dia-shapes/trunk/Makefile 2010-11-24 08:39:02 UTC (rev 11706) @@ -0,0 +1,52 @@ +# $Id$ +GARNAME = dia-shapes +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Shapes for dia +define BLURB +endef + +SHAPES = building_site +SHAPES += central_data_processing +SHAPES += chemistry_lab +SHAPES += Circuit2 +SHAPES += cmos +SHAPES += digital +SHAPES += edpc +SHAPES += electric2 +SHAPES += electronic +SHAPES += gradient +SHAPES += lst +SHAPES += optics +SHAPES += Racks +SHAPES += renewable_energy +SHAPES += scenegraph +SHAPES += value_stream_mapping + +SHAPE_DESC_building_site = Building site shapes +SHAPE_DESC_central_data_processing = Central data processing shapes by Leonardo Oceano Martins +SHAPE_DESC_chemistry_lab = chemistry lab shapes by Ryan Stewart +SHAPE_DESC_Circuit2 = Additional Circuit shapes by Terry Sturtevant +SHAPE_DESC_cmos = CMOS shapes by Jason Klaus +SHAPE_DESC_digital = Digital shapes by Jason Klaus +SHAPE_DESC_edpc = EPC shapes +SHAPE_DESC_electric2 = Additional electronic shapes by Manoj Rawat +SHAPE_DESC_electronic = Electronic shapes by Jaroslav Benkovsky +SHAPE_DESC_gradient = Gradient shapes +SHAPE_DESC_lst = Living Systems Theory shapes by Ian Smith +SHAPE_DESC_optics = Optics shapes by Johann Kellerman +SHAPE_DESC_Racks = Server rack shapes by Jaroslav Benkovsky +SHAPE_DESC_renewable_energy = Renewable energy shapes by W. Martin Borgert +SHAPE_DESC_scenegraph = Scene graph shapes by Alejandro Aguilar Sierra +SHAPE_DESC_value_stream_mapping = Value stream mapping + +MASTER_SITES = $(foreach S,$(SHAPES),http://dia-installer.de/shapes/$S/) +DISTFILES = $(foreach S,$(SHAPES),$S.zip) + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# /opt/csw/share/dia/shapes + +include gar/category.mk Property changes on: csw/mgar/pkg/dia-shapes/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/dia-shapes/trunk/checksums =================================================================== 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 Nov 24 10:48:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Nov 2010 09:48:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[11707] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 11707 http://gar.svn.sourceforge.net/gar/?rev=11707&view=rev Author: dmichelsen Date: 2010-11-24 09:48:46 +0000 (Wed, 24 Nov 2010) Log Message: ----------- openldap: Enable dynamic binding Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-11-24 08:39:02 UTC (rev 11706) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-11-24 09:48:46 UTC (rev 11707) @@ -52,11 +52,13 @@ SPKG_DESC_CSWoldapdevel = OpenLDAP development support SPKG_DESC_CSWoldaprt = OpenLDAP runtime libraries -RUNTIME_DEP_PKGS_CSWoldap = CSWbdb48 CSWlibnet CSWlibtoolrt -RUNTIME_DEP_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc -RUNTIME_DEP_PKGS_CSWoldap += CSWlibicu CSWperl +RUNTIME_DEP_PKGS_CSWoldap = CSWbdb48 CSWlibnet CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc +RUNTIME_DEP_PKGS_CSWoldap += CSWlibicu CSWperl +RUNTIME_DEP_PKGS_CSWoldap += CSWoldaprt RUNTIME_DEP_PKGS_CSWoldapclient = CSWlibnet CSWosslrt CSWsasl -RUNTIME_DEP_PKGS_CSWoldaprt = CSWlibnet CSWosslrt CSWsasl +RUNTIME_DEP_PKGS_CSWoldapclient += CSWoldaprt +RUNTIME_DEP_PKGS_CSWoldaprt = CSWlibnet CSWosslrt CSWsasl SPKG_SOURCEURL = http://www.openldap.org @@ -103,6 +105,9 @@ CONFIGURE_ARGS += --enable-backends=mod CONFIGURE_ARGS += --enable-overlays=mod +# Is the absence of this arg causing https://www.opencsw.org/mantis/view.php?id=4468 ? +CONFIGURE_ARGS += --enable-dynamic + # Disable MySQL Cluster CONFIGURE_ARGS += --disable-ndb 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 Nov 24 12:14:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Nov 2010 11:14:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11708] csw/mgar/pkg/libtool/branches/libtool24 Message-ID: Revision: 11708 http://gar.svn.sourceforge.net/gar/?rev=11708&view=rev Author: dmichelsen Date: 2010-11-24 11:14:05 +0000 (Wed, 24 Nov 2010) Log Message: ----------- libtool/libtool24: Forward-port patches Modified Paths: -------------- csw/mgar/pkg/libtool/branches/libtool24/Makefile Added Paths: ----------- csw/mgar/pkg/libtool/branches/libtool24/files/0001-Preserve-norunpath.patch csw/mgar/pkg/libtool/branches/libtool24/files/0002-Forward-port-GCC-tags-patch.patch Removed Paths: ------------- csw/mgar/pkg/libtool/branches/libtool24/files/patch-libtool.diff Modified: csw/mgar/pkg/libtool/branches/libtool24/Makefile =================================================================== --- csw/mgar/pkg/libtool/branches/libtool24/Makefile 2010-11-24 09:48:46 UTC (rev 11707) +++ csw/mgar/pkg/libtool/branches/libtool24/Makefile 2010-11-24 11:14:05 UTC (rev 11708) @@ -21,11 +21,13 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.xz -PATCH_LIBTOOL = patch-libtool.diff -PATCHFILES_POSTINSTALL_isa-i386-garversion-2.4-garcompiler-SOS12 = $(PATCH_LIBTOOL) -PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.4-garcompiler-SOS12 = $(PATCH_LIBTOOL) +PATCH_LIBTOOL = 0002-Forward-port-GCC-tags-patch.patch +PATCHFILES_POSTINSTALL_isa-i386-garcompiler-SOS12 = $(PATCH_LIBTOOL) +PATCHFILES_POSTINSTALL_isa-sparcv8-garcompiler-SOS12 = $(PATCH_LIBTOOL) DISTFILES += $(PATCH_LIBTOOL) +PATCHFILES = 0001-Preserve-norunpath.patch + EXTRA_TAGS = gcc3 gcc4 sos12 COMPILER_TAGNAME_GCC3 = gcc3 COMPILER_TAGNAME_GCC4 = gcc4 Added: csw/mgar/pkg/libtool/branches/libtool24/files/0001-Preserve-norunpath.patch =================================================================== --- csw/mgar/pkg/libtool/branches/libtool24/files/0001-Preserve-norunpath.patch (rev 0) +++ csw/mgar/pkg/libtool/branches/libtool24/files/0001-Preserve-norunpath.patch 2010-11-24 11:14:05 UTC (rev 11708) @@ -0,0 +1,33 @@ +From 61f2e8e198520e36e898b2c52e06abfa1f2e0f3b Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 24 Nov 2010 10:45:07 +0100 +Subject: [PATCH] Preserve -norunpath + +--- + libltdl/config/ltmain.m4sh | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh +index 0418007..9792193 100644 +--- a/libltdl/config/ltmain.m4sh ++++ b/libltdl/config/ltmain.m4sh +@@ -5040,6 +5040,7 @@ func_mode_link () + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler ++ # -norunpath, -xnorunpath do not include compiler path in RPATH + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC +@@ -5051,7 +5052,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-norunpath|-xnorunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +-- +1.7.1 + Copied: csw/mgar/pkg/libtool/branches/libtool24/files/0002-Forward-port-GCC-tags-patch.patch (from rev 11703, csw/mgar/pkg/libtool/branches/libtool24/files/patch-libtool.diff) =================================================================== --- csw/mgar/pkg/libtool/branches/libtool24/files/0002-Forward-port-GCC-tags-patch.patch (rev 0) +++ csw/mgar/pkg/libtool/branches/libtool24/files/0002-Forward-port-GCC-tags-patch.patch 2010-11-24 11:14:05 UTC (rev 11708) @@ -0,0 +1,85 @@ +From 184e7e0619ef31887fc1986e368d48f0a3677b6b Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 24 Nov 2010 11:15:29 +0100 +Subject: [PATCH] Forward-port GCC tags patch + +--- + libtool | 24 ++++++++++++++++++------ + 1 files changed, 18 insertions(+), 6 deletions(-) + +diff --git a/libtool b/libtool +index 4539216..8ac45c1 100755 +--- a/libtool ++++ b/libtool +@@ -576,6 +576,8 @@ $lt_unset CDPATH + # positional parameter $0, within a function call, is the name of the + # function. + progpath="$0" ++confpath="$0" ++tagspath="$0" + + + +@@ -1347,11 +1349,11 @@ func_config () + re_endcf='^# ### END LIBTOOL' + + # Default configuration. +- $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" ++ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$confpath" + + # Now print the configurations for the tags. + for tagname in $taglist; do +- $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" ++ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$tagspath" + done + + exit $? +@@ -1401,14 +1403,14 @@ func_enable_tag () + case $tagname in + CC) ;; + *) +- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then ++ if $GREP "$re_begincf" "$tagspath" >/dev/null 2>&1; then + taglist="$taglist $tagname" + + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: +- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` ++ extractedcf=`$SED -n -e "$sed_extractcf" < "$tagspath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" +@@ -1609,6 +1611,16 @@ func_enable_tag "$optarg" + + # save first non-option argument + if test "$#" -gt 0; then ++ case `which "$opt"` in ++ /opt/csw/gcc3/bin/*) ++ . /opt/csw/share/libtool/gcc3.conf ++ tagspath=/opt/csw/share/libtool/gcc3.tags ++ ;; ++ /opt/csw/gcc4/bin/*) ++ . /opt/csw/share/libtool/gcc4.conf ++ tagspath=/opt/csw/share/libtool/gcc4.tags ++ ;; ++ esac + nonopt="$opt" + shift + fi +@@ -1828,9 +1840,9 @@ func_infer_tag () + # if we don't check for them as well. + *) + for z in $available_tags; do +- if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then ++ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$tagspath" > /dev/null; then + # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $tagspath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. +-- +1.7.3 + Deleted: csw/mgar/pkg/libtool/branches/libtool24/files/patch-libtool.diff =================================================================== --- csw/mgar/pkg/libtool/branches/libtool24/files/patch-libtool.diff 2010-11-24 09:48:46 UTC (rev 11707) +++ csw/mgar/pkg/libtool/branches/libtool24/files/patch-libtool.diff 2010-11-24 11:14:05 UTC (rev 11708) @@ -1,78 +0,0 @@ -diff -Naur lt-orig/libtool lt-patched/libtool ---- lt-orig/libtool 2009-09-03 20:43:39.235079615 +0200 -+++ lt-patched/libtool 2009-09-03 20:56:11.509318512 +0200 -@@ -682,6 +682,8 @@ - # positional parameter $0, within a function call, is the name of the - # function. - progpath="$0" -+confpath="$0" -+tagspath="$0" - - # The name of this program: - # In the unlikely event $progname began with a '-', it would play havoc with -@@ -1128,11 +1130,11 @@ - re_endcf='^# ### END LIBTOOL' - - # Default configuration. -- $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" -+ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$confpath" - - # Now print the configurations for the tags. - for tagname in $taglist; do -- $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" -+ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$tagspath" - done - - exit $? -@@ -1182,14 +1184,14 @@ - case $tagname in - CC) ;; - *) -- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then -+ if $GREP "$re_begincf" "$tagspath" >/dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: -- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` -+ extractedcf=`$SED -n -e "$sed_extractcf" < "$tagspath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" -@@ -1303,7 +1305,21 @@ - - -*) func_fatal_help "unrecognized option \`$opt'" ;; - -- *) nonopt="$opt" -+ *) case `which "$opt"` in -+ /opt/csw/gcc3/bin/*) -+ . /opt/csw/share/libtool/gcc3.conf -+ tagspath=/opt/csw/share/libtool/gcc3.tags -+ ;; -+ /opt/csw/gcc4/bin/*) -+ . /opt/csw/share/libtool/gcc4.conf -+ tagspath=/opt/csw/share/libtool/gcc4.tags -+ ;; -+ esac -+ -+ -+ -+ -+nonopt="$opt" - break - ;; - esac -@@ -1530,9 +1546,9 @@ - # if we don't check for them as well. - *) - for z in $available_tags; do -- if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then -+ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$tagspath" > /dev/null; then - # Evaluate the configuration. -- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $tagspath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. 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 Nov 24 12:33:59 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 24 Nov 2010 11:33:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[11709] csw/mgar/pkg/fio/trunk Message-ID: Revision: 11709 http://gar.svn.sourceforge.net/gar/?rev=11709&view=rev Author: skayser Date: 2010-11-24 11:33:59 +0000 (Wed, 24 Nov 2010) Log Message: ----------- fio: prepare for solaris 9, reduce patches via INSTALL_OVERRIDE_VARS Modified Paths: -------------- csw/mgar/pkg/fio/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/fio/trunk/files/0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch Modified: csw/mgar/pkg/fio/trunk/Makefile =================================================================== --- csw/mgar/pkg/fio/trunk/Makefile 2010-11-24 11:14:05 UTC (rev 11708) +++ csw/mgar/pkg/fio/trunk/Makefile 2010-11-24 11:33:59 UTC (rev 11709) @@ -1,5 +1,13 @@ # TODO (release-critical prefixed with !, non release-critical with *) +# +# ! Solaris 9 is missing getopt_long +# gcc -mtune=i686 -O2 -pipe -m32 -march=i386 -D__EXTENSIONS__ -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFIO_INC_DEBUG -o fio gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o eta.o verify.o memory.o io_u.o parse.o mutex.o options.o rbtree.o fifo.o smalloc.o filehash.o lib/strsep.o helpers.o solaris.o profile.o debug.o lib/rand.o lib/flist_sort.o lib/num2str.o crc/crc7.o crc/crc16.o crc/crc32.o crc/crc32c.o crc/crc32c-intel.o crc/crc64.o crc/sha1.o crc/sha256.o crc/sha512.o crc/md5.o engines/cpu.o engines/mmap.o engines/posixaio.o engines/sync.o engines/null.o engines/net.o engines/solarisaio.o -lpthread -lm -ldl -laio -lrt -lnsl -lsocket +# Undefined first referenced +# symbol in file +# getopt_long_only init.o +# + GARNAME = fio GARVERSION = 1.44.2 CATEGORIES = apps @@ -23,17 +31,12 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PATCHFILES += 0001-Honour-GAR-CFLAGS-and-use-inttypes.h-instead-of-stdi.patch -PATCHFILES += 0002-Honor-prefix-when-installing-fio.patch PATCHFILES += 0003-Install-man-pages.patch -PATCHFILES += 0004-Honor-GAR-provided-default-bindir-and-mandir.patch - # Should be integrated in future releases, # cf. http://www.spinics.net/lists/fio/msg00580.html PATCHFILES += 0005-Warn-on-missing-direct-IO-support.patch +PATCHFILES += 0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch -# CLOCK_MONOTONIC undefined / not present on Solaris 9 -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - # fio compiler/compiler.h #errors out non gcc compilers GARCOMPILER = GCC3 # Required for PTHREAD_STACK_MIN @@ -44,11 +47,13 @@ TEST_SCRIPTS = INSTALL_ARGS = -f Makefile.solaris +INSTALL_OVERRIDE_VARS = INSTALL prefix mandir +INSTALL_OVERRIDE_VAR_INSTALL = $(bindir)/ginstall +INSTALL_OVERRIDE_VAR_prefix = $(prefix) +INSTALL_OVERRIDE_VAR_mandir = $(mandir) + include gar/category.mk -# install target requires ginstall as install -PATH := /opt/csw/gnu/:$(PATH) - post-install-modulated: mkdir -p $(PKGROOT)$(docdir)/fio/examples cp $(WORKSRC)/examples/* $(PKGROOT)$(docdir)/fio/examples/ Added: csw/mgar/pkg/fio/trunk/files/0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch =================================================================== --- csw/mgar/pkg/fio/trunk/files/0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch (rev 0) +++ csw/mgar/pkg/fio/trunk/files/0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch 2010-11-24 11:33:59 UTC (rev 11709) @@ -0,0 +1,30 @@ +From b397b31970a4bba209fdd7d7e82d9ab0868ba0e2 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Wed, 24 Nov 2010 11:21:12 +0100 +Subject: [PATCH] Use CLOCK_HIGHRES if CLOCK_MONOTONIC is missing + +Needed for Solaris 9 where CLOCK_MONOTONIC isn't available. Samba +follows a similar approach, cf. +http://git.samba.org/samba.git/?p=samba.git;a=blob;f=lib/replace/system/time.h;h=5fce4dbc45b4203fe8a79c732692d3fd90aeb51e;hb=HEAD +--- + engines/posixaio.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/engines/posixaio.c b/engines/posixaio.c +index f27ad8c..0ca6818 100644 +--- a/engines/posixaio.c ++++ b/engines/posixaio.c +@@ -12,6 +12,10 @@ + + #include "../fio.h" + ++#ifndef CLOCK_MONOTONIC ++#define CLOCK_MONOTONIC CLOCK_HIGHRES ++#endif /* CLOCK_MONOTONIC isn't available on Solaris 9 */ ++ + #ifdef FIO_HAVE_POSIXAIO + + struct posixaio_data { +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Nov 24 12:34:47 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 24 Nov 2010 11:34:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[11710] csw/mgar/pkg/fio/trunk/files Message-ID: Revision: 11710 http://gar.svn.sourceforge.net/gar/?rev=11710&view=rev Author: skayser Date: 2010-11-24 11:34:47 +0000 (Wed, 24 Nov 2010) Log Message: ----------- fio: reduce patches via INSTALL_OVERRIDE_VARS (continued) Removed Paths: ------------- csw/mgar/pkg/fio/trunk/files/0002-Honor-prefix-when-installing-fio.patch csw/mgar/pkg/fio/trunk/files/0004-Honor-GAR-provided-default-bindir-and-mandir.patch Deleted: csw/mgar/pkg/fio/trunk/files/0002-Honor-prefix-when-installing-fio.patch =================================================================== --- csw/mgar/pkg/fio/trunk/files/0002-Honor-prefix-when-installing-fio.patch 2010-11-24 11:33:59 UTC (rev 11709) +++ csw/mgar/pkg/fio/trunk/files/0002-Honor-prefix-when-installing-fio.patch 2010-11-24 11:34:47 UTC (rev 11710) @@ -1,25 +0,0 @@ -From 766ada911aafeaa51e5ce2197f20ec1b6028557c Mon Sep 17 00:00:00 2001 -From: Sebastian Kayser -Date: Tue, 26 Oct 2010 00:20:35 +0200 -Subject: [PATCH] Honor --prefix when installing fio - ---- - Makefile.solaris | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.solaris b/Makefile.solaris -index 571bfb9..6824e10 100644 ---- a/Makefile.solaris -+++ b/Makefile.solaris -@@ -31,7 +31,7 @@ OBJS += engines/net.o - OBJS += engines/solarisaio.o - - INSTALL = install --prefix = /usr/local -+prefix ?= /usr/local - bindir = $(prefix)/bin - mandir = $(prefix)/man - --- -1.7.3 - Deleted: csw/mgar/pkg/fio/trunk/files/0004-Honor-GAR-provided-default-bindir-and-mandir.patch =================================================================== --- csw/mgar/pkg/fio/trunk/files/0004-Honor-GAR-provided-default-bindir-and-mandir.patch 2010-11-24 11:33:59 UTC (rev 11709) +++ csw/mgar/pkg/fio/trunk/files/0004-Honor-GAR-provided-default-bindir-and-mandir.patch 2010-11-24 11:34:47 UTC (rev 11710) @@ -1,28 +0,0 @@ -From 447f5383adbdb2f23496bebd1cd38a0bd0f4289b Mon Sep 17 00:00:00 2001 -From: Sebastian Kayser -Date: Tue, 26 Oct 2010 01:48:43 +0200 -Subject: [PATCH] Honor GAR-provided default bindir and mandir - -... in particular mandir was not set according to our standards. ---- - Makefile.solaris | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.solaris b/Makefile.solaris -index 76b2ed5..165a7a0 100644 ---- a/Makefile.solaris -+++ b/Makefile.solaris -@@ -32,8 +32,8 @@ OBJS += engines/solarisaio.o - - INSTALL = install - prefix ?= /usr/local --bindir = $(prefix)/bin --mandir = $(prefix)/man -+bindir ?= $(prefix)/bin -+mandir ?= $(prefix)/man - - %.o: %.c - $(CC) -o $*.o -c $(CFLAGS) $< --- -1.7.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 24 14:54:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Nov 2010 13:54:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[11711] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 11711 http://gar.svn.sourceforge.net/gar/?rev=11711&view=rev Author: dmichelsen Date: 2010-11-24 13:54:12 +0000 (Wed, 24 Nov 2010) Log Message: ----------- mGAR v2: Undo r11358 (move -norunpath to CC/CXX) as it breaks compilation e.g. taglib which then has no shared lib generated at all without errors Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-11-24 11:34:47 UTC (rev 11710) +++ csw/mgar/gar/v2/gar.conf.mk 2010-11-24 13:54:12 UTC (rev 11711) @@ -467,25 +467,25 @@ GCC3_CC ?= $(GCC3_CC_HOME)/bin/gcc GCC4_CC ?= $(GCC4_CC_HOME)/bin/gcc - SOS11_CC ?= $(SOS11_CC_HOME)/bin/cc -xnorunpath - SOS12_CC ?= $(SOS12_CC_HOME)/bin/cc -xnorunpath - SOS12U1_CC ?= $(SOS12U1_CC_HOME)/bin/cc -xnorunpath + SOS11_CC ?= $(SOS11_CC_HOME)/bin/cc + SOS12_CC ?= $(SOS12_CC_HOME)/bin/cc + SOS12U1_CC ?= $(SOS12U1_CC_HOME)/bin/cc GCC3_CXX ?= $(GCC3_CC_HOME)/bin/g++ GCC4_CXX ?= $(GCC4_CC_HOME)/bin/g++ - SOS11_CXX ?= $(SOS11_CC_HOME)/bin/CC -norunpath - SOS12_CXX ?= $(SOS12_CC_HOME)/bin/CC -norunpath - SOS12U1_CXX ?= $(SOS12U1_CC_HOME)/bin/CC -norunpath + SOS11_CXX ?= $(SOS11_CC_HOME)/bin/CC + SOS12_CXX ?= $(SOS12_CC_HOME)/bin/CC + SOS12U1_CXX ?= $(SOS12U1_CC_HOME)/bin/CC GCC3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) GCC4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) - SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) - SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) - SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) + SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath + SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath + SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath GCC3_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) GCC4_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) - SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) - SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) + SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -norunpath + SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -norunpath +SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -norunpath GCC3_AS_FLAGS ?= $(EXTRA_GCC3_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) @@ -493,9 +493,9 @@ SOS12U1_AS_FLAGS ?= $(EXTRA_SOS12U1_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) - SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) - SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) - SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) + SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath -xnorunpath + SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath + SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath # Compiler version GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 24 15:30:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Nov 2010 14:30:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[11712] csw/mgar/pkg/taglib/trunk/Makefile Message-ID: Revision: 11712 http://gar.svn.sourceforge.net/gar/?rev=11712&view=rev Author: dmichelsen Date: 2010-11-24 14:30:50 +0000 (Wed, 24 Nov 2010) Log Message: ----------- taglib: Add override for last old-style package Modified Paths: -------------- csw/mgar/pkg/taglib/trunk/Makefile Modified: csw/mgar/pkg/taglib/trunk/Makefile =================================================================== --- csw/mgar/pkg/taglib/trunk/Makefile 2010-11-24 13:54:12 UTC (rev 11711) +++ csw/mgar/pkg/taglib/trunk/Makefile 2010-11-24 14:30:50 UTC (rev 11712) @@ -41,4 +41,6 @@ TEST_TARGET = check +CHECKPKG_OVERRIDES_CSWtaglib += non-uniform-lib-versions-in-package|sonames=['libtag.so.1',|'libtag_c.so.0'] + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 24 16:44:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Nov 2010 15:44:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[11713] csw/mgar/pkg Message-ID: Revision: 11713 http://gar.svn.sourceforge.net/gar/?rev=11713&view=rev Author: dmichelsen Date: 2010-11-24 15:44:49 +0000 (Wed, 24 Nov 2010) Log Message: ----------- mailutils: Initial commit, strange compile errors, probably no clean gnulib bootstrap Added Paths: ----------- csw/mgar/pkg/mailutils/ csw/mgar/pkg/mailutils/branches/ csw/mgar/pkg/mailutils/tags/ csw/mgar/pkg/mailutils/trunk/ csw/mgar/pkg/mailutils/trunk/Makefile csw/mgar/pkg/mailutils/trunk/checksums csw/mgar/pkg/mailutils/trunk/files/ Property changes on: csw/mgar/pkg/mailutils/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/mailutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/mailutils/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mailutils/trunk/Makefile 2010-11-24 15:44:49 UTC (rev 11713) @@ -0,0 +1,30 @@ +# $Id$ +GARNAME = mailutils +GARVERSION = 2.2 +CATEGORIES = utils + +DESCRIPTION = A collection of mail related utilities +define BLURB +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(DISTNAME).tar.xz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://savannah.gnu.org/projects/mailutils/ + +# This is needed for __FUNCTION__ +EXTRA_CPPFLAGS = -features=extensions -D__FUNCTION__=__func__ + +# This is to find the gnulib generated local lib/stdint.h +EXTRA_CPPFLAGS += -I../lib -I../../lib + +CONFIGURE_ARGS = $(DIRPATHS) + +# Make sure the gnulib is built first +BUILD_SCRIPTS = $(WORKSRC)/lib/Makefile +BUILD_SCRIPTS += $(WORKSRC)/Makefile + +include gar/category.mk Property changes on: csw/mgar/pkg/mailutils/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mailutils/trunk/checksums =================================================================== --- csw/mgar/pkg/mailutils/trunk/checksums (rev 0) +++ csw/mgar/pkg/mailutils/trunk/checksums 2010-11-24 15:44:49 UTC (rev 11713) @@ -0,0 +1 @@ +e183e91d3f2369c49360c9a07abf4c3c mailutils-2.2.tar.xz 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 Nov 24 16:49:08 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Nov 2010 15:49:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[11714] csw/mgar/pkg/guile/trunk/Makefile Message-ID: Revision: 11714 http://gar.svn.sourceforge.net/gar/?rev=11714&view=rev Author: dmichelsen Date: 2010-11-24 15:49:08 +0000 (Wed, 24 Nov 2010) Log Message: ----------- guile: Minor enhancements, still does not compile with Sun Studio Modified Paths: -------------- csw/mgar/pkg/guile/trunk/Makefile Modified: csw/mgar/pkg/guile/trunk/Makefile =================================================================== --- csw/mgar/pkg/guile/trunk/Makefile 2010-11-24 15:44:49 UTC (rev 11713) +++ csw/mgar/pkg/guile/trunk/Makefile 2010-11-24 15:49:08 UTC (rev 11714) @@ -16,17 +16,13 @@ SPKG_DESC_CSWguilelib12 = GNU extensibility library (shared libraries) -# There has to be something wrong when a package depends on *both* gcc3 and gcc4 - trygve -RUNTIME_DEP_PKGS = CSWgcc3core -RUNTIME_DEP_PKGS += CSWgcc3corert -RUNTIME_DEP_PKGS += CSWgcc4corert RUNTIME_DEP_PKGS += CSWggettextrt RUNTIME_DEP_PKGS += CSWlibgmp RUNTIME_DEP_PKGS += CSWlibtoolrt RUNTIME_DEP_PKGS += CSWncurses RUNTIME_DEP_PKGS += CSWreadline -MASTER_SITES = ftp://ftp.gnu.org/pub/gnu/guile/ +MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release @@ -34,10 +30,10 @@ GARCOMPILER = GNU +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-error-on-warning=no TEST_SCRIPTS = -BUILD_64BIT = yes 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 Wed Nov 24 22:58:22 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 24 Nov 2010 21:58:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[11715] csw/mgar/pkg/mediawiki/trunk/Makefile Message-ID: Revision: 11715 http://gar.svn.sourceforge.net/gar/?rev=11715&view=rev Author: rthurner Date: 2010-11-24 21:58:22 +0000 (Wed, 24 Nov 2010) Log Message: ----------- mediawiki: do not package .git files Modified Paths: -------------- csw/mgar/pkg/mediawiki/trunk/Makefile Modified: csw/mgar/pkg/mediawiki/trunk/Makefile =================================================================== --- csw/mgar/pkg/mediawiki/trunk/Makefile 2010-11-24 15:49:08 UTC (rev 11714) +++ csw/mgar/pkg/mediawiki/trunk/Makefile 2010-11-24 21:58:22 UTC (rev 11715) @@ -41,7 +41,7 @@ install-custom: @ginstall -d $(DESTDIR)$(RELOCATE_PREFIX)/mediawiki @cd $(WORKSRC); \ - /usr/bin/pax -rw -v ./ $(abspath $(DESTDIR)$(RELOCATE_PREFIX)/mediawiki) + /usr/bin/pax -rw -v ./ -s ',.*/\.git.*,,' $(abspath $(DESTDIR)$(RELOCATE_PREFIX)/mediawiki) @ginstall -D $(DOWNLOADDIR)/README.CSW \ $(DESTDIR)$(RELOCATE_PREFIX)/mediawiki/documentation/README.CSW @ginstall -D $(DOWNLOADDIR)/httpd-mediawiki.conf.CSW \ 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 Nov 25 12:18:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Nov 2010 11:18:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11716] csw/mgar/pkg Message-ID: Revision: 11716 http://gar.svn.sourceforge.net/gar/?rev=11716&view=rev Author: dmichelsen Date: 2010-11-25 11:18:05 +0000 (Thu, 25 Nov 2010) Log Message: ----------- gif2png: Initial commit Added Paths: ----------- csw/mgar/pkg/gif2png/ csw/mgar/pkg/gif2png/branches/ csw/mgar/pkg/gif2png/tags/ csw/mgar/pkg/gif2png/trunk/ csw/mgar/pkg/gif2png/trunk/Makefile csw/mgar/pkg/gif2png/trunk/checksums csw/mgar/pkg/gif2png/trunk/files/ Property changes on: csw/mgar/pkg/gif2png/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/gif2png/trunk/Makefile =================================================================== --- csw/mgar/pkg/gif2png/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gif2png/trunk/Makefile 2010-11-25 11:18:05 UTC (rev 11716) @@ -0,0 +1,23 @@ +# $Id$ +GARNAME = gif2png +GARVERSION = 2.5.4 +CATEGORIES = utils + +DESCRIPTION = Converts files from GIF to PNG +define BLURB +endef + +MASTER_SITES = http://www.catb.org/~esr/gif2png/ +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +RUNTIME_DEP_PKGS_CSWgif2png += CSWzlib +RUNTIME_DEP_PKGS_CSWgif2png += CSWpng + +include gar/category.mk Property changes on: csw/mgar/pkg/gif2png/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gif2png/trunk/checksums =================================================================== --- csw/mgar/pkg/gif2png/trunk/checksums (rev 0) +++ csw/mgar/pkg/gif2png/trunk/checksums 2010-11-25 11:18:05 UTC (rev 11716) @@ -0,0 +1 @@ +d63ea3fc6b6119589e8d4d6fead30df9 gif2png-2.5.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 Thu Nov 25 12:37:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Nov 2010 11:37:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[11717] csw/mgar/pkg/libtool/branches/libtool24 Message-ID: Revision: 11717 http://gar.svn.sourceforge.net/gar/?rev=11717&view=rev Author: dmichelsen Date: 2010-11-25 11:37:57 +0000 (Thu, 25 Nov 2010) Log Message: ----------- libtool24: Add README.CSW Modified Paths: -------------- csw/mgar/pkg/libtool/branches/libtool24/Makefile Added Paths: ----------- csw/mgar/pkg/libtool/branches/libtool24/files/README.CSW Modified: csw/mgar/pkg/libtool/branches/libtool24/Makefile =================================================================== --- csw/mgar/pkg/libtool/branches/libtool24/Makefile 2010-11-25 11:18:05 UTC (rev 11716) +++ csw/mgar/pkg/libtool/branches/libtool24/Makefile 2010-11-25 11:37:57 UTC (rev 11717) @@ -20,6 +20,7 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.xz +DISTFILES += README.CSW PATCH_LIBTOOL = 0002-Forward-port-GCC-tags-patch.patch PATCHFILES_POSTINSTALL_isa-i386-garcompiler-SOS12 = $(PATCH_LIBTOOL) @@ -81,6 +82,8 @@ post-install-modulated: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool) post-install-modulated: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER))) + ginstall -d $(DESTDIR)$(docdir)/libtool + ginstall $(WORKDIR)/README.CSW $(DESTDIR)$(docdir)/libtool/README.CSW patch-libtool: cat $(WORKDIR)/$(PATCHFILES_POSTINSTALL_$(MODULATION)) | (cd $(DESTDIR)$(bindir) && gpatch -p1) Added: csw/mgar/pkg/libtool/branches/libtool24/files/README.CSW =================================================================== --- csw/mgar/pkg/libtool/branches/libtool24/files/README.CSW (rev 0) +++ csw/mgar/pkg/libtool/branches/libtool24/files/README.CSW 2010-11-25 11:37:57 UTC (rev 11717) @@ -0,0 +1,4 @@ +This version of libtool has been patched to keep the options + -norunpath -xnorunpath +and do not strip them out. + 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 Nov 25 12:56:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Nov 2010 11:56:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11718] csw/mgar/pkg Message-ID: Revision: 11718 http://gar.svn.sourceforge.net/gar/?rev=11718&view=rev Author: dmichelsen Date: 2010-11-25 11:56:16 +0000 (Thu, 25 Nov 2010) Log Message: ----------- mc: Initial commit Added Paths: ----------- csw/mgar/pkg/mc/ csw/mgar/pkg/mc/branches/ csw/mgar/pkg/mc/tags/ csw/mgar/pkg/mc/trunk/ csw/mgar/pkg/mc/trunk/Makefile csw/mgar/pkg/mc/trunk/checksums csw/mgar/pkg/mc/trunk/files/ csw/mgar/pkg/mc/trunk/files/0001-Honour-HAVE_STDINT_H.patch Property changes on: csw/mgar/pkg/mc/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/mc/trunk/Makefile =================================================================== --- csw/mgar/pkg/mc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mc/trunk/Makefile 2010-11-25 11:56:16 UTC (rev 11718) @@ -0,0 +1,20 @@ +# $Id$ +GARNAME = mc +GARVERSION = 4.7.0.10 +CATEGORIES = utils + +DESCRIPTION = A curses-based visual shell and file manager +define BLURB +endef + +MASTER_SITES = http://www.midnight-commander.org/downloads/ +DISTFILES = $(DISTNAME).tar.lzma + +PATCHFILES = 0001-Honour-HAVE_STDINT_H.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/mc/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mc/trunk/checksums =================================================================== --- csw/mgar/pkg/mc/trunk/checksums (rev 0) +++ csw/mgar/pkg/mc/trunk/checksums 2010-11-25 11:56:16 UTC (rev 11718) @@ -0,0 +1 @@ +1c906166fcf1025c93ed37607085f33f mc-4.7.0.10.tar.lzma Added: csw/mgar/pkg/mc/trunk/files/0001-Honour-HAVE_STDINT_H.patch =================================================================== --- csw/mgar/pkg/mc/trunk/files/0001-Honour-HAVE_STDINT_H.patch (rev 0) +++ csw/mgar/pkg/mc/trunk/files/0001-Honour-HAVE_STDINT_H.patch 2010-11-25 11:56:16 UTC (rev 11718) @@ -0,0 +1,68 @@ +From 0bad1a848932b074637ea76251f3da1a655ff3ea Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 25 Nov 2010 12:42:22 +0100 +Subject: [PATCH] Honour HAVE_STDINT_H + +--- + lib/vfs/mc-vfs/direntry.c | 6 ++++++ + lib/vfs/mc-vfs/fish.c | 6 ++++++ + lib/vfs/mc-vfs/ftpfs.c | 6 ++++++ + 3 files changed, 18 insertions(+), 0 deletions(-) + +diff --git a/lib/vfs/mc-vfs/direntry.c b/lib/vfs/mc-vfs/direntry.c +index 055b1e7..311c715 100644 +--- a/lib/vfs/mc-vfs/direntry.c ++++ b/lib/vfs/mc-vfs/direntry.c +@@ -35,7 +35,13 @@ + /* includes fcntl.h see IEEE Std 1003.1-2008 */ + #include + #include /* gettimeofday() */ ++#ifdef HAVE_STDINT_H_WITH_UINTMAX + #include /* uintmax_t */ ++#else ++#ifdef HAVE_INTTYPES_H_WITH_UINTMAX ++#include /* uintmax_t */ ++#endif ++#endif + + #include "lib/global.h" + +diff --git a/lib/vfs/mc-vfs/fish.c b/lib/vfs/mc-vfs/fish.c +index 6502549..e9d0406 100644 +--- a/lib/vfs/mc-vfs/fish.c ++++ b/lib/vfs/mc-vfs/fish.c +@@ -54,7 +54,13 @@ + #include /* gettimeofday() */ + #include + #include ++#ifdef HAVE_STDINT_H_WITH_UINTMAX + #include /* uintmax_t */ ++#else ++#ifdef HAVE_INTTYPES_H_WITH_UINTMAX ++#include /* uintmax_t */ ++#endif ++#endif + + #include "lib/global.h" + #include "lib/fs.h" +diff --git a/lib/vfs/mc-vfs/ftpfs.c b/lib/vfs/mc-vfs/ftpfs.c +index 7c35749..d607dd1 100644 +--- a/lib/vfs/mc-vfs/ftpfs.c ++++ b/lib/vfs/mc-vfs/ftpfs.c +@@ -84,7 +84,13 @@ What to do with this? + #include + #include + #include /* gettimeofday() */ ++#ifdef HAVE_STDINT_H_WITH_UINTMAX + #include /* uintmax_t */ ++#else ++#ifdef HAVE_INTTYPES_H_WITH_UINTMAX ++#include /* uintmax_t */ ++#endif ++#endif + + #include "lib/global.h" + +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 25 14:21:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Nov 2010 13:21:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[11719] csw/mgar/pkg/vim/trunk/Makefile Message-ID: Revision: 11719 http://gar.svn.sourceforge.net/gar/?rev=11719&view=rev Author: dmichelsen Date: 2010-11-25 13:21:44 +0000 (Thu, 25 Nov 2010) Log Message: ----------- vim: Fix typo Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2010-11-25 11:56:16 UTC (rev 11718) +++ csw/mgar/pkg/vim/trunk/Makefile 2010-11-25 13:21:44 UTC (rev 11719) @@ -46,7 +46,7 @@ CONFIGURE_ARGS += --enable-cscope BUILD_ARGS = "VIMRCLOC=/opt/csw/share/vim" -BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim72" +BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim73" PATCHDIRLEVEL = 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 Thu Nov 25 14:21:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Nov 2010 13:21:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[11720] csw/mgar/pkg/gvim/trunk/Makefile Message-ID: Revision: 11720 http://gar.svn.sourceforge.net/gar/?rev=11720&view=rev Author: dmichelsen Date: 2010-11-25 13:21:55 +0000 (Thu, 25 Nov 2010) Log Message: ----------- gvim: Fix typo Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2010-11-25 13:21:44 UTC (rev 11719) +++ csw/mgar/pkg/gvim/trunk/Makefile 2010-11-25 13:21:55 UTC (rev 11720) @@ -38,7 +38,7 @@ CONFIGURE_ARGS += --enable-gui=gnome2 BUILD_ARGS = "VIMRCLOC=/opt/csw/share/vim" -BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim72" +BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim73" PATCHDIRLEVEL = 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 Thu Nov 25 16:22:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Nov 2010 15:22:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[11721] csw/mgar/pkg/openssh/branches Message-ID: Revision: 11721 http://gar.svn.sourceforge.net/gar/?rev=11721&view=rev Author: dmichelsen Date: 2010-11-25 15:22:36 +0000 (Thu, 25 Nov 2010) Log Message: ----------- openssh-5.6p1+lpk: Do not require posixAccount Modified Paths: -------------- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile Added Paths: ----------- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0002-Do-not-require-posixAccount.patch Modified: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile =================================================================== --- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile 2010-11-25 13:21:55 UTC (rev 11720) +++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile 2010-11-25 15:22:36 UTC (rev 11721) @@ -123,6 +123,7 @@ # LDAP Public Key Patch, forward port from # http://code.google.com/p/openssh-lpk/source/browse/#svn/trunk/patch/contrib PATCHFILES = 0001-Forward-port-of-contrib-openssh-lpk-5.4p1-0.3.13.pat.patch +PATCHFILES += 0002-Do-not-require-posixAccount.patch # The GSSAPI key exchange patch PATCHFILES += openssh-$(GSSKEX_PATCH_VERSION)-gsskex-all-$(GSSKEX_PATCH_DATE).patch Added: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0002-Do-not-require-posixAccount.patch =================================================================== --- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0002-Do-not-require-posixAccount.patch (rev 0) +++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0002-Do-not-require-posixAccount.patch 2010-11-25 15:22:36 UTC (rev 11721) @@ -0,0 +1,109 @@ +From b011265657248a4c5a6f34733b7c1b6c39d01f67 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 25 Nov 2010 14:58:07 +0100 +Subject: [PATCH 2/2] Do not require posixAccount + +--- + README.lpk | 7 ++----- + ldapauth.c | 25 +------------------------ + sshd_config | 2 +- + 3 files changed, 4 insertions(+), 30 deletions(-) + +diff --git a/README.lpk b/README.lpk +index d0b6de0..2d7ac42 100644 +--- a/README.lpk ++++ b/README.lpk +@@ -58,7 +58,6 @@ example schema: + * LDAP user(/group) entry (look at users.ldif (& groups.ldif)): + User entry: + - attached to the 'ldapPublicKey' objectclass +- - attached to the 'posixAccount' objectclass + - with a filled 'sshPublicKey' attribute + Example: + dn: uid=eau,ou=users,dc=cuckoos,dc=net +@@ -111,7 +110,7 @@ example schema: + + 7 tokens are added to sshd_config : + # here is the new patched ldap related tokens +- # entries in your LDAP must be posixAccount & strongAuthenticationUser & posixGroup ++ # entries in your LDAP must be strongAuthenticationUser & posixGroup + UseLPK yes # look the pub key into LDAP + LpkServers ldap://10.31.32.5/ ldap://10.31.32.4 ldap://10.31.32.3 # which LDAP server for users ? (URL format) + LpkUserDN ou=users,dc=foobar,dc=net # which base DN for users ? +@@ -133,7 +132,6 @@ example schema: + + # you add this to the user entry in the LDIF file : + [...] +- objectclass: posixAccount + objectclass: ldapPublicKey + [...] + sshPubliKey: ssh-dss AAAABDh12DDUR2... +@@ -159,8 +157,7 @@ example schema: + Blocking a user account can be done directly from the LDAP (if sshd is using RSAAuth + ldap only). + + - RULES : +- Entry in the LDAP server must respect 'posixAccount' and 'ldapPublicKey' which are defined in core.schema. +- and the additionnal lpk.schema. ++ Entry in the LDAP server must respect 'ldapPublicKey' which are defined in the additionnal lpk.schema. + + This patch could allow a smooth transition between standard auth (/etc/passwd) and complete LDAP based authentication + (pamldap, nss_ldap, etc..). +diff --git a/ldapauth.c b/ldapauth.c +index cf1e7f0..118a4cc 100644 +--- a/ldapauth.c ++++ b/ldapauth.c +@@ -54,29 +54,6 @@ + return FAILURE; \ + } \ + snprintf(buffer, REQUEST_GROUP_SIZE(prefilter,pwname), prefilter, pwname) +-/* +-XXX OLD group building macros +-#define REQUEST_GROUP_SIZE(grp, uid) (size_t) (strlen(grp)+strlen(uid)+46) +-#define REQUEST_GROUP(buffer,pwname,grp) \ +- buffer = (char *) calloc(REQUEST_GROUP_SIZE(grp, pwname), sizeof(char)); \ +- if (!buffer) { \ +- perror("calloc()"); \ +- return FAILURE; \ +- } \ +- snprintf(buffer,REQUEST_GROUP_SIZE(grp,pwname),"(&(objectclass=posixGroup)(cn=%s)(memberUid=%s))",grp,pwname) +- */ +- +-/* +-XXX stock upstream version without extra filter support +-#define REQUEST_USER_SIZE(uid) (size_t) (strlen(uid)+64) +-#define REQUEST_USER(buffer, pwname) \ +- buffer = (char *) calloc(REQUEST_USER_SIZE(pwname), sizeof(char)); \ +- if (!buffer) { \ +- perror("calloc()"); \ +- return NULL; \ +- } \ +- snprintf(buffer,REQUEST_USER_SIZE(pwname),"(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s))",pwname) +- */ + + #define REQUEST_USER_SIZE(uid, filter) (size_t) (strlen(uid)+64+(filter != NULL ? strlen(filter) : 0)) + #define REQUEST_USER(buffer, pwname, customfilter) \ +@@ -86,7 +63,7 @@ XXX stock upstream version without extra filter support + return NULL; \ + } \ + snprintf(buffer, REQUEST_USER_SIZE(pwname, customfilter), \ +- "(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s)%s)", \ ++ "(&(objectclass=ldapPublicKey)(uid=%s)%s)", \ + pwname, (customfilter != NULL ? customfilter : "")) + + /* some portable and working tokenizer, lame though */ +diff --git a/sshd_config b/sshd_config +index fdafc31..3d658d8 100644 +--- a/sshd_config ++++ b/sshd_config +@@ -108,7 +108,7 @@ + #Banner none + + # here are the new patched ldap related tokens +-# entries in your LDAP must have posixAccount & ldapPublicKey objectclass ++# entries in your LDAP must have ldapPublicKey objectclass + #UseLPK yes + #LpkLdapConf /etc/ldap.conf + #LpkServers ldap://10.1.7.1/ ldap://10.1.7.2/ +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Nov 25 22:01:46 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 25 Nov 2010 21:01:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[11722] csw/mgar/pkg/fio/trunk/Makefile Message-ID: Revision: 11722 http://gar.svn.sourceforge.net/gar/?rev=11722&view=rev Author: skayser Date: 2010-11-25 21:01:46 +0000 (Thu, 25 Nov 2010) Log Message: ----------- fio: pull in CSWlibgnugetopt on Solaris 9 Modified Paths: -------------- csw/mgar/pkg/fio/trunk/Makefile Modified: csw/mgar/pkg/fio/trunk/Makefile =================================================================== --- csw/mgar/pkg/fio/trunk/Makefile 2010-11-25 15:22:36 UTC (rev 11721) +++ csw/mgar/pkg/fio/trunk/Makefile 2010-11-25 21:01:46 UTC (rev 11722) @@ -1,13 +1,5 @@ # TODO (release-critical prefixed with !, non release-critical with *) -# -# ! Solaris 9 is missing getopt_long -# gcc -mtune=i686 -O2 -pipe -m32 -march=i386 -D__EXTENSIONS__ -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFIO_INC_DEBUG -o fio gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o eta.o verify.o memory.o io_u.o parse.o mutex.o options.o rbtree.o fifo.o smalloc.o filehash.o lib/strsep.o helpers.o solaris.o profile.o debug.o lib/rand.o lib/flist_sort.o lib/num2str.o crc/crc7.o crc/crc16.o crc/crc32.o crc/crc32c.o crc/crc32c-intel.o crc/crc64.o crc/sha1.o crc/sha256.o crc/sha512.o crc/md5.o engines/cpu.o engines/mmap.o engines/posixaio.o engines/sync.o engines/null.o engines/net.o engines/solarisaio.o -lpthread -lm -ldl -laio -lrt -lnsl -lsocket -# Undefined first referenced -# symbol in file -# getopt_long_only init.o -# - GARNAME = fio GARVERSION = 1.44.2 CATEGORIES = apps @@ -30,12 +22,24 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# On Solaris 9 getopt_long isn't part of the OS, thus we pull in CSWlibgnugetopt +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 +RUNTIME_DEP_PKGS = $(RUNTIME_DEP_PKGS_$(GAROSREL)) +RUNTIME_DEP_PKGS_5.9 = CSWlibgnugetopt + +EXTRA_BUILD_EXPORTS = EXTLIBS +EXTLIBS = $(EXTLIBS_$(GAROSREL)) +EXTLIBS_5.9 = -lgnugetopt +# / On Solaris 9 getopt_long isn't part of the OS + PATCHFILES += 0001-Honour-GAR-CFLAGS-and-use-inttypes.h-instead-of-stdi.patch +PATCHFILES += 0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch + +# These ones went upstream, should be integrated in post 1.44.2 releases +# cf. http://www.spinics.net/lists/fio/msg00580.html +# http://www.spinics.net/lists/fio/msg00582.html PATCHFILES += 0003-Install-man-pages.patch -# Should be integrated in future releases, -# cf. http://www.spinics.net/lists/fio/msg00580.html PATCHFILES += 0005-Warn-on-missing-direct-IO-support.patch -PATCHFILES += 0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch # fio compiler/compiler.h #errors out non gcc compilers GARCOMPILER = GCC3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Nov 26 02:20:44 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 26 Nov 2010 01:20:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[11723] csw/mgar/gar/v2-noexternals/gar.mk Message-ID: Revision: 11723 http://gar.svn.sourceforge.net/gar/?rev=11723&view=rev Author: bdwalton Date: 2010-11-26 01:20:44 +0000 (Fri, 26 Nov 2010) Log Message: ----------- gar/v2: add NOGITPATCH toggle to disable the git makepatch stuff Modified Paths: -------------- csw/mgar/gar/v2-noexternals/gar.mk Modified: csw/mgar/gar/v2-noexternals/gar.mk =================================================================== --- csw/mgar/gar/v2-noexternals/gar.mk 2010-11-25 21:01:46 UTC (rev 11722) +++ csw/mgar/gar/v2-noexternals/gar.mk 2010-11-26 01:20:44 UTC (rev 11723) @@ -396,7 +396,7 @@ # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) -extract: checksum $(COOKIEDIR) pre-extract pre-extract-git-check extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract +extract: checksum $(COOKIEDIR) pre-extract $(if $(NOGITPATCH),,pre-extract-git-check) extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract @$(DONADA) extract-global: $(if $(filter global,$(MODULATION)),extract-modulated) @@ -407,7 +407,7 @@ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated \ - $(if $(filter global,$(MODULATION)),,post-extract-gitsnap) \ + $(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-extract-gitsnap)) \ $(foreach FILE,$(EXPANDVARS),expandvars-$(FILE)) @$(DONADA) @@ -468,7 +468,7 @@ patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch @$(DONADA) -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,post-patch-gitsnap) post-patch-$(MODULATION) post-patch-modulated +patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-patch-gitsnap)) post-patch-$(MODULATION) post-patch-modulated @$(DONADA) # returns true if patch has completed successfully, false @@ -485,9 +485,13 @@ fi ) @$(MAKECOOKIE) -makepatch: $(addprefix patch-,$(MODULATIONS)) $(addprefix makepatch-,$(MODULATIONS)) +makepatch: $(if $(NOGITPATCH),makepatch-nogit,$(addprefix patch-,$(MODULATIONS)) $(addprefix makepatch-,$(MODULATIONS))) @$(DONADA) +makepatch-nogit: + @echo You set NOGITPATCH in your build recipe. I can't create a patch. + @$(DONADA) + # Allow generation of patches from modified work source. makepatch-modulated: $(FILEDIR) @( if [ -d "$(WORKSRC)/.git" ]; then \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Nov 26 02:38:57 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 26 Nov 2010 01:38:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[11724] csw/mgar/pkg/mediawiki/trunk Message-ID: Revision: 11724 http://gar.svn.sourceforge.net/gar/?rev=11724&view=rev Author: bdwalton Date: 2010-11-26 01:38:57 +0000 (Fri, 26 Nov 2010) Log Message: ----------- mediawiki: use the NOGITPATCH support Modified Paths: -------------- csw/mgar/pkg/mediawiki/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/mediawiki/trunk/ Property changes on: csw/mgar/pkg/mediawiki/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-relocate + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/mediawiki/trunk/Makefile =================================================================== --- csw/mgar/pkg/mediawiki/trunk/Makefile 2010-11-26 01:20:44 UTC (rev 11723) +++ csw/mgar/pkg/mediawiki/trunk/Makefile 2010-11-26 01:38:57 UTC (rev 11724) @@ -18,6 +18,10 @@ ALLOW_RELOCATE = 1 RELOCATE_PREFIX = /opt/csw/share/www +# we don't want to use git to manage patches for this one as we'd +# then need to avoid copying in the .git dir in install-custom. +NOGITPATCH = 1 + CATALOGNAME_CSWmediawiki = mediawiki SPKG_DESC_CSWmediawiki = $(DESCRIPTION) @@ -41,7 +45,7 @@ install-custom: @ginstall -d $(DESTDIR)$(RELOCATE_PREFIX)/mediawiki @cd $(WORKSRC); \ - /usr/bin/pax -rw -v ./ -s ',.*/\.git.*,,' $(abspath $(DESTDIR)$(RELOCATE_PREFIX)/mediawiki) + /usr/bin/pax -rw -v ./ $(abspath $(DESTDIR)$(RELOCATE_PREFIX)/mediawiki) @ginstall -D $(DOWNLOADDIR)/README.CSW \ $(DESTDIR)$(RELOCATE_PREFIX)/mediawiki/documentation/README.CSW @ginstall -D $(DOWNLOADDIR)/httpd-mediawiki.conf.CSW \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Nov 26 04:27:15 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 26 Nov 2010 03:27:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11725] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 11725 http://gar.svn.sourceforge.net/gar/?rev=11725&view=rev Author: bdwalton Date: 2010-11-26 03:27:15 +0000 (Fri, 26 Nov 2010) Log Message: ----------- git: version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-11-26 01:38:57 UTC (rev 11724) +++ csw/mgar/pkg/git/trunk/Makefile 2010-11-26 03:27:15 UTC (rev 11725) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.7.3 +GARVERSION = 1.7.3.2 #PATCHLEVEL = rc1 CATEGORIES = devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Nov 26 09:49:09 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 26 Nov 2010 08:49:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[11726] csw/mgar/pkg/fio/trunk Message-ID: Revision: 11726 http://gar.svn.sourceforge.net/gar/?rev=11726&view=rev Author: skayser Date: 2010-11-26 08:49:09 +0000 (Fri, 26 Nov 2010) Log Message: ----------- fio: add README and HOWTO (both referenced in man page) Modified Paths: -------------- csw/mgar/pkg/fio/trunk/Makefile csw/mgar/pkg/fio/trunk/files/changelog.CSW Modified: csw/mgar/pkg/fio/trunk/Makefile =================================================================== --- csw/mgar/pkg/fio/trunk/Makefile 2010-11-26 03:27:15 UTC (rev 11725) +++ csw/mgar/pkg/fio/trunk/Makefile 2010-11-26 08:49:09 UTC (rev 11726) @@ -59,8 +59,10 @@ include gar/category.mk post-install-modulated: - mkdir -p $(PKGROOT)$(docdir)/fio/examples - cp $(WORKSRC)/examples/* $(PKGROOT)$(docdir)/fio/examples/ + mkdir -p $(DESTDIR)$(docdir)/fio/examples + cp $(WORKSRC)/examples/* $(DESTDIR)$(docdir)/fio/examples/ + cp $(WORKSRC)/README $(DESTDIR)$(docdir)/fio/ + cp $(WORKSRC)/HOWTO $(DESTDIR)$(docdir)/fio/ @$(MAKECOOKIE) # Install changelog.CSW Modified: csw/mgar/pkg/fio/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/fio/trunk/files/changelog.CSW 2010-11-26 03:27:15 UTC (rev 11725) +++ csw/mgar/pkg/fio/trunk/files/changelog.CSW 2010-11-26 08:49:09 UTC (rev 11726) @@ -1,5 +1,5 @@ -fio (1.44.2,REV=2010.11.24) +fio (1.44.2,REV=2010.11.26) * Initial release. - -- Sebastian Kayser Wed, 24 Nov 2010 08:11:31 +0100 + -- Sebastian Kayser Fri, 26 Nov 2010 09:46:51 +0100 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 Nov 26 09:50:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 26 Nov 2010 08:50:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[11727] csw/mgar/gar/v2/lib/python Message-ID: Revision: 11727 http://gar.svn.sourceforge.net/gar/?rev=11727&view=rev Author: wahwah Date: 2010-11-26 08:50:19 +0000 (Fri, 26 Nov 2010) Log Message: ----------- mGAR v2: checkpkg, throwing an error in the presence of .git and/or .CVS files. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-11-26 08:49:09 UTC (rev 11726) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-11-26 08:50:19 UTC (rev 11727) @@ -84,6 +84,10 @@ (r"opt/csw/var($|/)", ("The /opt/csw/var directory is not writable on " "sparse non-global zones. " "Please use /var/opt/csw instead.")), + (r"\.git", ("Git files in most cases shouldn't be included in " + "a package.")), + (r"\.CVS", ("CVS files in most cases shouldn't be included in " + "a package.")), ) RPATH_PARTS = { 'prefix': r"(?P/opt/csw)", Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-11-26 08:49:09 UTC (rev 11726) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-11-26 08:50:19 UTC (rev 11727) @@ -1142,6 +1142,19 @@ 'discouraged-path-in-pkgmap', '/opt/csw/var') +class TestCheckDiscouragedFileNamePatternsGit(CheckpkgUnitTestHelper, + unittest.TestCase): + FUNCTION_NAME = 'CheckDiscouragedFileNamePatterns' + def CheckpkgTest(self): + # The data need to be copied, because otherwise all other tests will + # also process modified data. + self.pkg_data = copy.deepcopy(rsync_stats[0]) + self.pkg_data["pkgmap"].append( + { "type": "f", "path": "/opt/csw/share/.git/foo", }) + self.error_mgr_mock.ReportError( + 'discouraged-path-in-pkgmap', '/opt/csw/share/.git/foo') + + class TestSetCheckDirectoryDepsTwoPackages(CheckpkgUnitTestHelper, unittest.TestCase): """Test whether appropriate files are provided. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Nov 26 10:05:53 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 26 Nov 2010 09:05:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11728] csw/mgar/pkg/fio/trunk/Makefile Message-ID: Revision: 11728 http://gar.svn.sourceforge.net/gar/?rev=11728&view=rev Author: skayser Date: 2010-11-26 09:05:53 +0000 (Fri, 26 Nov 2010) Log Message: ----------- fio: use /bin/bash for fio_generate_plots as it contains bash constructs Modified Paths: -------------- csw/mgar/pkg/fio/trunk/Makefile Modified: csw/mgar/pkg/fio/trunk/Makefile =================================================================== --- csw/mgar/pkg/fio/trunk/Makefile 2010-11-26 08:50:19 UTC (rev 11727) +++ csw/mgar/pkg/fio/trunk/Makefile 2010-11-26 09:05:53 UTC (rev 11728) @@ -63,6 +63,7 @@ cp $(WORKSRC)/examples/* $(DESTDIR)$(docdir)/fio/examples/ cp $(WORKSRC)/README $(DESTDIR)$(docdir)/fio/ cp $(WORKSRC)/HOWTO $(DESTDIR)$(docdir)/fio/ + perl -pi -e 's,/bin/sh,/bin/bash,' $(DESTDIR)$(bindir)/fio_generate_plots @$(MAKECOOKIE) # Install changelog.CSW 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 Nov 26 10:29:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Nov 2010 09:29:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[11729] csw/mgar/pkg/vim/trunk/Makefile Message-ID: Revision: 11729 http://gar.svn.sourceforge.net/gar/?rev=11729&view=rev Author: dmichelsen Date: 2010-11-26 09:29:39 +0000 (Fri, 26 Nov 2010) Log Message: ----------- vim: Enhance version compatibility Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2010-11-26 09:05:53 UTC (rev 11728) +++ csw/mgar/pkg/vim/trunk/Makefile 2010-11-26 09:29:39 UTC (rev 11729) @@ -46,7 +46,7 @@ CONFIGURE_ARGS += --enable-cscope BUILD_ARGS = "VIMRCLOC=/opt/csw/share/vim" -BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim73" +BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim$(subst .,,$(DISTVERSION))" PATCHDIRLEVEL = 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 Fri Nov 26 10:29:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Nov 2010 09:29:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[11730] csw/mgar/pkg/gvim/trunk/Makefile Message-ID: Revision: 11730 http://gar.svn.sourceforge.net/gar/?rev=11730&view=rev Author: dmichelsen Date: 2010-11-26 09:29:56 +0000 (Fri, 26 Nov 2010) Log Message: ----------- gvim: Enhance version compatibility Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2010-11-26 09:29:39 UTC (rev 11729) +++ csw/mgar/pkg/gvim/trunk/Makefile 2010-11-26 09:29:56 UTC (rev 11730) @@ -38,7 +38,7 @@ CONFIGURE_ARGS += --enable-gui=gnome2 BUILD_ARGS = "VIMRCLOC=/opt/csw/share/vim" -BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim73" +BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim$(subst .,,$(DISTVERSION))" PATCHDIRLEVEL = 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 Fri Nov 26 16:00:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Nov 2010 15:00:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[11731] csw/mgar/pkg Message-ID: Revision: 11731 http://gar.svn.sourceforge.net/gar/?rev=11731&view=rev Author: dmichelsen Date: 2010-11-26 15:00:06 +0000 (Fri, 26 Nov 2010) Log Message: ----------- pacparser: Initial commit, does not compile yet Added Paths: ----------- csw/mgar/pkg/pacparser/ csw/mgar/pkg/pacparser/branches/ csw/mgar/pkg/pacparser/tags/ csw/mgar/pkg/pacparser/trunk/ csw/mgar/pkg/pacparser/trunk/Makefile csw/mgar/pkg/pacparser/trunk/checksums csw/mgar/pkg/pacparser/trunk/files/ Property changes on: csw/mgar/pkg/pacparser/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/pacparser/trunk/Makefile =================================================================== --- csw/mgar/pkg/pacparser/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pacparser/trunk/Makefile 2010-11-26 15:00:06 UTC (rev 11731) @@ -0,0 +1,27 @@ +# $Id$ +GARNAME = pacparser +GARVERSION = 1.2.6 +#SPKG_VERSION = $(subst -,.,$(GARVERSION)) +CATEGORIES = lib + +DESCRIPTION = A library to parse proxy auto-config (PAC) files +define BLURB + pacparser is a library to parse proxy auto-config (PAC) files. Proxy auto-config + files are a vastly used proxy configuration method these days. Web browsers can + use a PAC file to determine which proxy server to use or whether to go direct for + a given URL. PAC files are written in JavaScript and can be programmed to return + different proxy methods (e.g. "PROXY proxy1:port; DIRECT") depending upon URL, + source IP address, protocol, time of the day etc. PAC files introduce a lot of + possibilities. Look at the wikipedia link above to find out more about them. +endef + +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/pacparser/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pacparser/trunk/checksums =================================================================== --- csw/mgar/pkg/pacparser/trunk/checksums (rev 0) +++ csw/mgar/pkg/pacparser/trunk/checksums 2010-11-26 15:00:06 UTC (rev 11731) @@ -0,0 +1 @@ +612a355115d70a842dde661eee2c915b pacparser-1.2.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 Sat Nov 27 14:44:07 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 27 Nov 2010 13:44:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[11732] csw/mgar/pkg/git/trunk Message-ID: Revision: 11732 http://gar.svn.sourceforge.net/gar/?rev=11732&view=rev Author: bdwalton Date: 2010-11-27 13:44:06 +0000 (Sat, 27 Nov 2010) Log Message: ----------- git: patch git-init documentation to use csw path Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-11-26 15:00:06 UTC (rev 11731) +++ csw/mgar/pkg/git/trunk/Makefile 2010-11-27 13:44:06 UTC (rev 11732) @@ -86,6 +86,8 @@ DISTFILES = CSWgit.postinstall +PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch + fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files $(foreach d,$(fdirs),$(d)/.*$(1).*) $(sharedstatedir)/$(1).* Added: csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch 2010-11-27 13:44:06 UTC (rev 11732) @@ -0,0 +1,28 @@ +From fdeecebd75b2c65ba516026dcbf2c25b239eb830 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 27 Nov 2010 14:42:01 +0100 +Subject: [PATCH] Update path in documentation to be CSW-proper. + +Change /usr/share to /opt/csw/share in the git-init documentation. + +Signed-off-by: Ben Walton +--- + Documentation/git-init.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt +index 00d4a12..3180a1f 100644 +--- a/Documentation/git-init.txt ++++ b/Documentation/git-init.txt +@@ -114,7 +114,7 @@ The template directory used will (in order): + + - The `init.templatedir` configuration variable. + +- - The default template directory: `/usr/share/git-core/templates`. ++ - The default template directory: `/opt/csw/share/git-core/templates`. + + The default template directory includes some directory structure, some + suggested "exclude patterns", and copies of sample "hook" files. +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Nov 27 15:16:55 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 27 Nov 2010 14:16:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[11733] csw/mgar/pkg/git/trunk Message-ID: Revision: 11733 http://gar.svn.sourceforge.net/gar/?rev=11733&view=rev Author: bdwalton Date: 2010-11-27 14:16:55 +0000 (Sat, 27 Nov 2010) Log Message: ----------- git: patch the default value of _PATH_DEFPATH Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-11-27 13:44:06 UTC (rev 11732) +++ csw/mgar/pkg/git/trunk/Makefile 2010-11-27 14:16:55 UTC (rev 11733) @@ -87,6 +87,7 @@ DISTFILES = CSWgit.postinstall PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch +PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch 2010-11-27 14:16:55 UTC (rev 11733) @@ -0,0 +1,31 @@ +From 937605b8ae8eac2bf669af619f60eed3b3b42d23 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 27 Nov 2010 15:11:49 +0100 +Subject: [PATCH 3/3] Alter the value of _PATH_DEFPATH when paths.h not present + +Since solaris doesn't provide paths.h, we won't get a system value +for _PATH_DEFPATH. This is handled by conditionally setting it, but +the value includes /usr/local/bin as the first item. We'll swap that +out for /opt/csw/bin instead. + +Signed-off-by: Ben Walton +--- + git-compat-util.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/git-compat-util.h b/git-compat-util.h +index 2af8d3e..762f620 100644 +--- a/git-compat-util.h ++++ b/git-compat-util.h +@@ -184,7 +184,7 @@ extern char *gitbasename(char *); + #include + #endif + #ifndef _PATH_DEFPATH +-#define _PATH_DEFPATH "/usr/local/bin:/usr/bin:/bin" ++#define _PATH_DEFPATH "/opt/csw/bin:/usr/bin:/bin" + #endif + + #ifndef STRIP_EXTENSION +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Nov 27 15:28:02 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 27 Nov 2010 14:28:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[11734] csw/mgar/pkg/git/trunk Message-ID: Revision: 11734 http://gar.svn.sourceforge.net/gar/?rev=11734&view=rev Author: bdwalton Date: 2010-11-27 14:28:02 +0000 (Sat, 27 Nov 2010) Log Message: ----------- git: patch the sample hook file to reference a CSW path Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0003-Update-path-in-sample-hook-file.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-11-27 14:16:55 UTC (rev 11733) +++ csw/mgar/pkg/git/trunk/Makefile 2010-11-27 14:28:02 UTC (rev 11734) @@ -88,6 +88,7 @@ PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch +PATCHFILES += 0003-Update-path-in-sample-hook-file.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0003-Update-path-in-sample-hook-file.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0003-Update-path-in-sample-hook-file.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0003-Update-path-in-sample-hook-file.patch 2010-11-27 14:28:02 UTC (rev 11734) @@ -0,0 +1,26 @@ +From 0aaf1ea1247f9821df75908d3343a0efe43cb3ac Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 27 Nov 2010 15:25:31 +0100 +Subject: [PATCH] Update path in sample hook file + +The post-receive-email sample hook file referenced /usr/share. Update +this to be /opt/csw/share. + +Signed-off-by: Ben Walton +--- + templates/hooks--post-receive.sample | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/templates/hooks--post-receive.sample b/templates/hooks--post-receive.sample +index 7a83e17..aaa5121 100755 +--- a/templates/hooks--post-receive.sample ++++ b/templates/hooks--post-receive.sample +@@ -12,4 +12,4 @@ + # see contrib/hooks/ for a sample, or uncomment the next line and + # rename the file to "post-receive". + +-#. /usr/share/doc/git-core/contrib/hooks/post-receive-email ++#. /opt/csw/share/doc/git/contrib/hooks/post-receive-email +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Nov 27 15:34:17 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 27 Nov 2010 14:34:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[11735] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 11735 http://gar.svn.sourceforge.net/gar/?rev=11735&view=rev Author: bdwalton Date: 2010-11-27 14:34:17 +0000 (Sat, 27 Nov 2010) Log Message: ----------- git: install the post-receive-email contrib/hooks file Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-11-27 14:28:02 UTC (rev 11734) +++ csw/mgar/pkg/git/trunk/Makefile 2010-11-27 14:34:17 UTC (rev 11735) @@ -181,6 +181,7 @@ @( cd $(WORKSRC); $(MAKE) -C contrib/emacs ) post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME) +post-install-modulated: CONTHOOKS=$(GD)/contrib/hooks post-install-modulated: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d post-install-modulated: ID=$(DESTDIR)/$(includedir)/git post-install-modulated: LD=$(DESTDIR)/$(libdir_install)/git @@ -211,4 +212,7 @@ ginstall -c -m 0755 -d $(BD); \ cp contrib/completion/* \ $(BD)/ ) + @( cd $(WORKSRC)/contrib/hooks; \ + ginstall -c -d -m 0755 $(CONTHOOKS); \ + ginstall -c -m 0644 post-receive-email $(CONTHOOKS) ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Nov 27 15:39:51 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 27 Nov 2010 14:39:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[11736] csw/mgar/pkg/git/trunk Message-ID: Revision: 11736 http://gar.svn.sourceforge.net/gar/?rev=11736&view=rev Author: bdwalton Date: 2010-11-27 14:39:50 +0000 (Sat, 27 Nov 2010) Log Message: ----------- git: patch the contributed hook script to use csw bash and set PATH Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-11-27 14:34:17 UTC (rev 11735) +++ csw/mgar/pkg/git/trunk/Makefile 2010-11-27 14:39:50 UTC (rev 11736) @@ -89,6 +89,7 @@ PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch PATCHFILES += 0003-Update-path-in-sample-hook-file.patch +PATCHFILES += 0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch 2010-11-27 14:39:50 UTC (rev 11736) @@ -0,0 +1,36 @@ +From 97a0f24b6e27759fc1f22fc513fc7a7133cfd749 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 27 Nov 2010 15:37:56 +0100 +Subject: [PATCH] Use bash and set PATH in contributed hook file + +Now that we're shipping this contributed hook, we should give it a chance +of running in an OpenCSW environment. + +Signed-off-by: Ben Walton +--- + contrib/hooks/post-receive-email | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email +index 0085086..8601a84 100755 +--- a/contrib/hooks/post-receive-email ++++ b/contrib/hooks/post-receive-email +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + # + # Copyright (c) 2007 Andy Parkins + # +@@ -68,6 +68,9 @@ + # give information for debugging. + # + ++# Added by OpenCSW to ensure we have a sane place to find our git ++PATH=/opt/csw/bin:$PATH ++ + # ---------------------------- Functions + + # +-- +1.7.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Nov 28 03:00:15 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 28 Nov 2010 02:00:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11737] csw/mgar/gar/v2/bin/add_ap2mod_build_scripts Message-ID: Revision: 11737 http://gar.svn.sourceforge.net/gar/?rev=11737&view=rev Author: bdwalton Date: 2010-11-28 02:00:15 +0000 (Sun, 28 Nov 2010) Log Message: ----------- gar/v2: add a script that will create the build CAS script for an apache module Added Paths: ----------- csw/mgar/gar/v2/bin/add_ap2mod_build_scripts Added: csw/mgar/gar/v2/bin/add_ap2mod_build_scripts =================================================================== --- csw/mgar/gar/v2/bin/add_ap2mod_build_scripts (rev 0) +++ csw/mgar/gar/v2/bin/add_ap2mod_build_scripts 2010-11-28 02:00:15 UTC (rev 11737) @@ -0,0 +1,68 @@ +#!/bin/bash + +cd "$1" + +BUILDSCRIPTS=opt/csw/apache2/ap2mod + +for f in $(find . -name "$2" -print0); do + modfile=$(basename $f) + modname=$(echo $modfile | sed 's/mod_//; s/\.so//') + + + [ -d "$BUILDSCRIPTS" ] || mkdir -p "$BUILDSCRIPTS" + + cat < $BUILDSCRIPTS/${modname} +PIR=\${PKG_INSTALL_ROOT:-'/'} +AP2_PREFIX=/opt/csw/apache2 +AP2_BINDIR=\$AP2_PREFIX/sbin +AP2_LIBEXEC=\$AP2_PREFIX/libexec +AP2_CONFDIR=/etc/opt/csw/apache2/ +AP2_CONFIG=\$AP2_CONFDIR/httpd.conf +AP2_APXS=\$AP2_BINDIR/apxs + +if [ "\$1" = install ]; then + +echo "File created by \$PKGINST during install. Please do not remove." > \$PIR/opt/csw/apache2/ap2mod/$modname + +# Source csw.conf, if it exists +if [ -f \$PIR/opt/csw/etc/csw.conf ] ; then + . \$PIR/opt/csw/etc/csw.conf +fi +if [ -f \$PIR/etc/opt/csw/csw.conf ] ; then + . \$PIR/etc/opt/csw/csw.conf +fi + +# Modules will be enabled by default, but a global kill switch +# is checked , followed by a module specific value. Thus, +# either ap2_enable_modules or ap2_enable_suexec (for example) +# could disable activation of the suexec module. The +# +# This value is passed to apxs (-a: add, enable; -A: add, +# disable) +enmod=-a + +if [ "\$ap2_enable_modules" = "no" ]; then + enmod=-A +fi + +if [ "\$ap2_enable_suexec" = "no" ]; then + enmod=-A +elif [ "" = "yes" ]; then + enmod=-a +fi + +if [ -f "\$PIR/\$AP2_CONFIG" -a -x "\$PIR/\$AP2_APXS" ]; then + # Add the module module, optionally enabling it by default + chroot \$PIR \$AP2_APXS -e \$enmod -n $modname $modfile +fi + +else + +rm \$PIR/opt/csw/apache2/ap2mod/$modname + +if [ -f "\$PIR/\$AP2_CONFIG" -a -x "\$PIR/\$AP2_APXS" ]; then + chroot \$PIR \$AP2_APXS -e -A -n $modname $modfile +fi +fi +EOF +done Property changes on: csw/mgar/gar/v2/bin/add_ap2mod_build_scripts ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Nov 28 03:43:05 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 28 Nov 2010 02:43:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[11738] csw/mgar/gar/v2/bin Message-ID: Revision: 11738 http://gar.svn.sourceforge.net/gar/?rev=11738&view=rev Author: bdwalton Date: 2010-11-28 02:43:04 +0000 (Sun, 28 Nov 2010) Log Message: ----------- gar/v2: update apache2 config dir in module building script; remove redundant copy as previous changes were comitted Modified Paths: -------------- csw/mgar/gar/v2/bin/ap2mod_build_scripts Removed Paths: ------------- csw/mgar/gar/v2/bin/add_ap2mod_build_scripts Deleted: csw/mgar/gar/v2/bin/add_ap2mod_build_scripts =================================================================== --- csw/mgar/gar/v2/bin/add_ap2mod_build_scripts 2010-11-28 02:00:15 UTC (rev 11737) +++ csw/mgar/gar/v2/bin/add_ap2mod_build_scripts 2010-11-28 02:43:04 UTC (rev 11738) @@ -1,68 +0,0 @@ -#!/bin/bash - -cd "$1" - -BUILDSCRIPTS=opt/csw/apache2/ap2mod - -for f in $(find . -name "$2" -print0); do - modfile=$(basename $f) - modname=$(echo $modfile | sed 's/mod_//; s/\.so//') - - - [ -d "$BUILDSCRIPTS" ] || mkdir -p "$BUILDSCRIPTS" - - cat < $BUILDSCRIPTS/${modname} -PIR=\${PKG_INSTALL_ROOT:-'/'} -AP2_PREFIX=/opt/csw/apache2 -AP2_BINDIR=\$AP2_PREFIX/sbin -AP2_LIBEXEC=\$AP2_PREFIX/libexec -AP2_CONFDIR=/etc/opt/csw/apache2/ -AP2_CONFIG=\$AP2_CONFDIR/httpd.conf -AP2_APXS=\$AP2_BINDIR/apxs - -if [ "\$1" = install ]; then - -echo "File created by \$PKGINST during install. Please do not remove." > \$PIR/opt/csw/apache2/ap2mod/$modname - -# Source csw.conf, if it exists -if [ -f \$PIR/opt/csw/etc/csw.conf ] ; then - . \$PIR/opt/csw/etc/csw.conf -fi -if [ -f \$PIR/etc/opt/csw/csw.conf ] ; then - . \$PIR/etc/opt/csw/csw.conf -fi - -# Modules will be enabled by default, but a global kill switch -# is checked , followed by a module specific value. Thus, -# either ap2_enable_modules or ap2_enable_suexec (for example) -# could disable activation of the suexec module. The -# -# This value is passed to apxs (-a: add, enable; -A: add, -# disable) -enmod=-a - -if [ "\$ap2_enable_modules" = "no" ]; then - enmod=-A -fi - -if [ "\$ap2_enable_suexec" = "no" ]; then - enmod=-A -elif [ "" = "yes" ]; then - enmod=-a -fi - -if [ -f "\$PIR/\$AP2_CONFIG" -a -x "\$PIR/\$AP2_APXS" ]; then - # Add the module module, optionally enabling it by default - chroot \$PIR \$AP2_APXS -e \$enmod -n $modname $modfile -fi - -else - -rm \$PIR/opt/csw/apache2/ap2mod/$modname - -if [ -f "\$PIR/\$AP2_CONFIG" -a -x "\$PIR/\$AP2_APXS" ]; then - chroot \$PIR \$AP2_APXS -e -A -n $modname $modfile -fi -fi -EOF -done Modified: csw/mgar/gar/v2/bin/ap2mod_build_scripts =================================================================== --- csw/mgar/gar/v2/bin/ap2mod_build_scripts 2010-11-28 02:00:15 UTC (rev 11737) +++ csw/mgar/gar/v2/bin/ap2mod_build_scripts 2010-11-28 02:43:04 UTC (rev 11738) @@ -18,7 +18,7 @@ AP2_PREFIX=/opt/csw/apache2 AP2_BINDIR=\$AP2_PREFIX/sbin AP2_LIBEXEC=\$AP2_PREFIX/libexec -AP2_CONFDIR=\$AP2_PREFIX/etc +AP2_CONFDIR=/etc/opt/csw/apache2 AP2_CONFIG=\$AP2_CONFDIR/httpd.conf AP2_APXS=\$AP2_BINDIR/apxs 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 Nov 28 04:04:32 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 28 Nov 2010 03:04:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[11739] csw/mgar/gar/v2 Message-ID: Revision: 11739 http://gar.svn.sourceforge.net/gar/?rev=11739&view=rev Author: bdwalton Date: 2010-11-28 03:04:32 +0000 (Sun, 28 Nov 2010) Log Message: ----------- gar/v2: merge in v2-relocate branch Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Property Changed: ---------------- csw/mgar/gar/v2/ csw/mgar/gar/v2/pkglib/csw/depend Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-sqlite:10434-10449 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-sqlite:10434-10449 Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-11-28 02:43:04 UTC (rev 11738) +++ csw/mgar/gar/v2/gar.conf.mk 2010-11-28 03:04:32 UTC (rev 11739) @@ -145,6 +145,11 @@ perlcswlib ?= $(perllib)/csw perlpackroot ?= $(perlcswlib)/auto +# This Variable is only used if you make your package relocatable +# using ALLOW_RELOCATE, it will allow you to change your default +# directory for BASEDIR +RELOCATE_PREFIX ?= $(prefix) + # These variables are used to construct pathes. If you temporarily reset the above # variables for special install locations (like /opt/csw/bin/bdb44/) the definitions # here make sure the binaries for the make process are still found. Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-11-28 02:43:04 UTC (rev 11738) +++ csw/mgar/gar/v2/gar.mk 2010-11-28 03:04:32 UTC (rev 11739) @@ -843,14 +843,14 @@ # Copy the whole tree verbatim merge-copy-all: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \ . $(PKGROOT)) @$(MAKECOOKIE) # Copy only the merge directories merge-copy-only: $(PKGROOT) - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -858,7 +858,7 @@ # Copy the whole tree and relocate the directories in $(MERGE_DIRS) merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ . $(PKGROOT) \ ) @@ -866,7 +866,7 @@ # Copy only the relocated directories merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -874,7 +874,7 @@ # Copy merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pax -r -w -v $(_PAX_ARGS) \ -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ -s ",.*,," \ . $(PKGROOT) \ Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-11-28 02:43:04 UTC (rev 11738) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-11-28 03:04:32 UTC (rev 11739) @@ -385,12 +385,16 @@ # for distributing files to individual packages. PROTOTYPE = $(WORKDIR)/prototype +define dontrelocate + $(shell gsed -i -e 's,\(.\) .* \($(1)[\s/]*\),\1 norelocate /\2,g' $(2)) +endef + # Dynamic prototypes work like this: # - A prototype from DISTFILES takes precedence over # Pulled in from pkglib/csw_prototype.gspec $(PROTOTYPE): $(WORKDIR) merge - $(_DBG)cswproto -c $(GARDIR)/etc/commondirs-$(GARCH) -r $(PKGROOT) $(PKGROOT)=/ >$@ + $(_DBG)cswproto -c $(GARDIR)/etc/commondirs-$(GARCH) -r $(PKGROOT) $(PKGROOT)=$(if $(ALLOW_RELOCATE),,'/') >$@ # pathfilter lives in bin/pathfilter and takes care of including/excluding paths from # a prototype (see "perldoc bin/pathfilter"). We employ it here to: @@ -431,6 +435,7 @@ else \ cat $(PROTOTYPE) $(call checkpkg_override_filter,$*) $(_CSWCLASS_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ fi + $(if $(ALLOW_RELOCATE),$(call dontrelocate,opt,$(PROTOTYPE))) $(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype $(_DBG)cat $(WORKDIR)/$*.prototype >$@ @@ -582,7 +587,8 @@ echo "VENDOR=$(call pkgvar,SPKG_VENDOR,$*)"; \ echo "EMAIL=$(call pkgvar,SPKG_EMAIL,$*)"; \ echo "PSTAMP=$(LOGNAME)@$(shell hostname)-$(shell date '+%Y%m%d%H%M%S')"; \ - echo "CLASSES=$(call pkgvar,SPKG_CLASSES,$*)"; \ + $(if $(ALLOW_RELOCATE),echo "CLASSES=$(call pkgvar,SPKG_CLASSES,$*) norelocate"; \ + ,echo "CLASSES=$(call pkgvar,SPKG_CLASSES,$*)";) \ echo "HOTLINE=http://www.opencsw.org/bugtrack/"; \ echo "OPENCSW_CATALOGNAME=$(call catalogname,$*)"; \ echo "OPENCSW_MODE64=$(call mode64,$*)"; \ @@ -590,6 +596,7 @@ echo "OPENCSW_BUNDLE=$(BUNDLE)"; \ $(_CATEGORY_PKGINFO) \ ) >$@ + $(if $(ALLOW_RELOCATE),echo "BASEDIR=$(RELOCATE_PREFIX)" >>$@) # findlicensefile - Find an existing file for a given license name Property changes on: csw/mgar/gar/v2/pkglib/csw/depend ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678 /csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend:10585-10737 /csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649 /csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 /csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449 + /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678 /csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend:10585-10737 /csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649 /csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 /csw/mgar/gar/v2-relocate/pkglib/csw/depend:5028-11738 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 /csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 28 13:04:15 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 28 Nov 2010 12:04:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[11740] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 11740 http://gar.svn.sourceforge.net/gar/?rev=11740&view=rev Author: chninkel Date: 2010-11-28 12:04:15 +0000 (Sun, 28 Nov 2010) Log Message: ----------- openssl: removed generic so files to follow opencsw standard Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2010-11-28 03:04:32 UTC (rev 11739) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2010-11-28 12:04:15 UTC (rev 11740) @@ -181,4 +181,9 @@ rm -rf $(PKGROOT)/$(prefix)/etc/ssl/private && ln -s ../../../../etc/opt/csw/ssl/private $(PKGROOT)/$(prefix)/etc/ssl/private @$(MAKECOOKIE) -pre-package: install-certs install-changelog install-doc +remove-generic-so-files: + gfind $(PKGROOT)/$(libdir) -name "libcrypto.so" -exec rm '{}' ';' + gfind $(PKGROOT)/$(libdir) -name "libssl.so" -exec rm '{}' ';' + + +pre-package: install-certs install-changelog install-doc remove-generic-so-files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 28 20:35:30 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 28 Nov 2010 19:35:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[11741] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 11741 http://gar.svn.sourceforge.net/gar/?rev=11741&view=rev Author: chninkel Date: 2010-11-28 19:35:29 +0000 (Sun, 28 Nov 2010) Log Message: ----------- openssl: some changes to be able to build the PKCS11 engine Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2010-11-28 12:04:15 UTC (rev 11740) +++ csw/mgar/pkg/openssl/trunk/Makefile 2010-11-28 19:35:29 UTC (rev 11741) @@ -10,6 +10,9 @@ # software causes damage. ##################################################################### +# Uncomment to enable PKCS11 engine +# PKCS11 = 1 + ###### Package information ####### GARNAME = openssl @@ -103,6 +106,12 @@ ##### Build and installation information ##### +# Sun Studio 12 incorrectly outputs v8plus code instead of +# v8 code under Solaris 10 so we use Sun Studio 12 update 1 +ifneq ($(shell /usr/bin/uname -r),5.9) + GARCOMPILER = SOS12U1 +endif + # The list of instructions set for which we will # provide optimized libraries and binaries EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 @@ -153,8 +162,11 @@ # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine ifdef PKCS11 + PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 +ifneq ($(shell /usr/bin/uname -r),5.9) PATCHFILES += pkcs11_engine-0.9.8o.patch.2010-09-03 CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) +endif endif include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Nov 29 17:15:20 2010 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Mon, 29 Nov 2010 16:15:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[11739] csw/mgar/gar/v2 In-Reply-To: References: Message-ID: No dia 28 de Novembro de 2010 03:04, escreveu: > Revision: 11739 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=11739&view=rev > Author: ? bdwalton > Date: ? ? 2010-11-28 03:04:32 +0000 (Sun, 28 Nov 2010) > > Log Message: > ----------- > gar/v2: merge in v2-relocate branch Ah, dammit. It reminds me that checkpkg doesn't understand relocatable packages at the moment. From chninkel at users.sourceforge.net Mon Nov 29 23:21:53 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 29 Nov 2010 22:21:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[11742] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 11742 http://gar.svn.sourceforge.net/gar/?rev=11742&view=rev Author: chninkel Date: 2010-11-29 22:21:53 +0000 (Mon, 29 Nov 2010) Log Message: ----------- cyrus_imapd: moved to dynamic prototype, moved from /opt/csw/{etc,var} to /{etc,var}/opt/csw Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.preinstall csw/mgar/pkg/cyrus_imapd/trunk/files/README.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus.conf csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/imapd.conf Added Paths: ----------- csw/mgar/pkg/cyrus_imapd/trunk/files/0002-fix-config2header.patch Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2010-11-28 19:35:29 UTC (rev 11741) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2010-11-29 22:21:53 UTC (rev 11742) @@ -33,7 +33,7 @@ SPKG_DESC_CSWcyrusimapd = Pop and Imap server from the Cyrus mail system CATALOGNAME_CSWcyrusimapd = cyrus_imapd -RUNTIME_DEP_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWnetsnmp CSWpcrert CSWzlib +RUNTIME_DEP_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWnetsnmp CSWpcrert CSWzlib CSWtcpwrap #SPKG_CLASSES_CSWcyrusimapd = none services cswpreserveconf cswinitsmf SPKG_DESC_CSWcyrusimapdutils = Various admin utilities for Cyrus Imapd/Popd @@ -46,56 +46,33 @@ RUNTIME_DEP_PKGS_CSWpmcyrus = CSWperl CSWbdb42 CSWosslrt CSWsasl CSWzlib #SPKG_CLASSES_CSWpmcyrus = none -PKGFILES_CSWcyrusimapd = $(sbindir)/arbitronsort -PKGFILES_CSWcyrusimapd += $(sbindir)/cyrus-dohash -PKGFILES_CSWcyrusimapd += $(sbindir)/masssievec -PKGFILES_CSWcyrusimapd += $(sbindir)/migrate-metadata -PKGFILES_CSWcyrusimapd += $(sbindir)/cyrus-mkdirs -PKGFILES_CSWcyrusimapd += $(sbindir)/cyrus-mknewsgroups -PKGFILES_CSWcyrusimapd += $(sbindir)/cyrus-rehash -PKGFILES_CSWcyrusimapd += $(sbindir)/translatesieve -PKGFILES_CSWcyrusimapd += $(sbindir)/cyrus-undohash -PKGFILES_CSWcyrusimapd += $(sbindir)/sievec -PKGFILES_CSWcyrusimapd += $(sbindir)/cyrus-master -PKGFILES_CSWcyrusimapd += $(sbindir)/make_md5 -PKGFILES_CSWcyrusimapd += $(sbindir)/make_sha1 -PKGFILES_CSWcyrusimapd += $(sbindir)/reconstruct -PKGFILES_CSWcyrusimapd += $(sbindir)/quota -PKGFILES_CSWcyrusimapd += $(sbindir)/ipurge -PKGFILES_CSWcyrusimapd += $(sbindir)/cyrdump -PKGFILES_CSWcyrusimapd += $(sbindir)/chk_cyrus -PKGFILES_CSWcyrusimapd += $(sbindir)/cvt_cyrusdb -PKGFILES_CSWcyrusimapd += $(sbindir)/deliver -PKGFILES_CSWcyrusimapd += $(sbindir)/ctl_mboxlist -PKGFILES_CSWcyrusimapd += $(sbindir)/ctl_deliver -PKGFILES_CSWcyrusimapd += $(sbindir)/ctl_cyrusdb -PKGFILES_CSWcyrusimapd += $(sbindir)/squatter -PKGFILES_CSWcyrusimapd += $(sbindir)/mbexamine -PKGFILES_CSWcyrusimapd += $(sbindir)/mbpath -PKGFILES_CSWcyrusimapd += $(sbindir)/cyr_expire -PKGFILES_CSWcyrusimapd += $(sbindir)/arbitron -PKGFILES_CSWcyrusimapd += $(sbindir)/tls_prune +PKGFILES_CSWcyrusimapd = $(sbindir)/.* PKGFILES_CSWcyrusimapd += $(sysconfdir)/cyrus PKGFILES_CSWcyrusimapd += $(docdir)/cyrus_imapd/.* PKGFILES_CSWcyrusimapd += $(mandir)/man5/.* PKGFILES_CSWcyrusimapd += $(mandir)/man8/.* -PKGFILES_CSWcyrusimapd += $(libexecdir)/cyrus +PKGFILES_CSWcyrusimapd += $(libexecdir)/cyrus.* PKGFILES_CSWcyrusimapd += $(sysconfdir)/cyrus/imapd.conf.CSW PKGFILES_CSWcyrusimapd += $(sysconfdir)/cyrus/cyrus.conf.CSW -PKGFILES_CSWcyrusimapd += $(localstatedir)/cyrus -PKGFILES_CSWcyrusimapd += $(sysconfdir)/init.d/cswcyrus -PKGFILES_CSWcyrusimapd += $(localstatedir)/svc/manifest/network/cswcyrus.xml +PKGFILES_CSWcyrusimapd += /etc$(prefix)/init.d/cswcyrus +PKGFILES_CSWcyrusimapd += /var/$(prefix)/svc/manifest/network/cswcyrus.xml +PKGFILES_CSWcyrusimapd += $(localstatedir)/cyrus.* +PROTOTYPE_MODIFIERS = cyrusdir +PROTOTYPE_FILES_cyrusdir = $(localstatedir)/cyrus.* +PROTOTYPE_USER_cyrusdir = cyrus +PROTOTYPE_GROUP_cyrusdir = mail + PRESERVECONF = $(sysconfdir)/cyrus/imapd.conf PRESERVECONF += $(sysconfdir)/cyrus/cyrus.conf -INITSMF = $(sysconfdir)/init.d/cswcyrus -ETCSERVICES = /etc/opt/csw/pkg/CSWcyrusimapd/services +INITSMF = /etc$(prefix)/init.d/cswcyrus +ETCSERVICES = /etc/$(prefix)/pkg/CSWcyrusimapd/services LICENSE = COPYRIGHT PKGFILES_CSWcyrusimapdutils = $(bindir)/.* -PKGFILES_CSWcyrusimapd += $(mandir)/man1/.* -PKGFILES_CSWcyrusimapd += $(docdir)/cyrus_imapd_utils/.* +PKGFILES_CSWcyrusimapdutils += $(mandir)/man1/.* +PKGFILES_CSWcyrusimapdutils += $(docdir)/cyrus_imapd_utils/.* PKGFILES_CSWpmcyrus = $(perllib)/.* PKGFILES_CSWpmcyrus += $(mandir)/man3/Cyrus::.* @@ -123,6 +100,9 @@ DISTFILES += cyrus_imapd_utils.changelog.CSW DISTFILES += pm_cyrus.changelog.CSW +# We move from /opt/csw/{etc,var} to /{etc,var}/opt/csw +MIGRATE_FILES_CSWcyrusimapd = cyrus + # compile_et is not provided by krb5lib_dev so we must provide our own version # taken from the krb5 source. DISTFILES += compile_et et_c.awk et_h.awk @@ -163,6 +143,11 @@ ##### Build and installation information ##### +# to support shared /opt/csw setup +# see http://wiki.opencsw.org/shared-opt-csw-setup +localstatedir = /var$(prefix) +sysconfdir = /etc$(prefix) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-cyrus-prefix=$(prefix) CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus @@ -185,6 +170,8 @@ TEST_SCRIPTS = +CYRUS_DAEMONS = fud idled imapd lmtpd lmtpproxyd mupdate notifyd pop3d pop3proxyd proxyd sieved smmapd timsieved + include gar/category.mk # compile_et is missing so we want our to be used @@ -233,18 +220,25 @@ ginstall -D "$(WORKDIR_FIRSTMOD)/cyrus.conf" "$(PKGROOT)/$(sysconfdir)/cyrus/cyrus.conf.CSW" ( cd "$(PKGROOT)$(libexecdir)/cyrus/" && \ - for E in sievec cyrus-master make_md5 make_sha1 \ - reconstruct quota ipurge cyrdump chk_cyrus \ - cvt_cyrusdb deliver ctl_mboxlist ctl_deliver \ - ctl_cyrusdb squatter mbexamine mbpath cyr_expire \ - arbitron tls_prune; do \ - mv -f $$E ../../sbin/$$E && ln -sf ../../sbin/$$E; \ + for E in *; do \ + echo $(CYRUS_DAEMONS) | grep -w $$E >/dev/null && continue; \ + [ -L $$E ] || ( mv -f $$E ../../sbin/$$E && ln -sf ../../sbin/$$E ); \ done ) - + + # let's create the directory structure where mails + # and other cyrus stuffs will be stored + for D in sieve config/proc config/db config/socket config/log \ + config/msg config/ptclient mail mail/stage.; do \ + mkdir -p "$(PKGROOT)/$(localstatedir)/cyrus/$$D"; \ + done + # we install binary under tools as part of the package cp -r $(WORKSRC_FIRSTMOD)/tools/* $(PKGROOT)$(sbindir) - ginstall -D $(PKGROOT)$(sbindir)/arbitronsort.pl $(PKGROOT)$(sbindir)/arbitronsort - + [ -f "$(PKGROOT)$(sbindir)/arbitronsort.pl" ] && mv "$(PKGROOT)$(sbindir)/arbitronsort.pl" "$(PKGROOT)$(sbindir)/arbitronsort" + for F in config2header config2man not-mkdep migrate-metadata mupdate-loadgen.pl upgradesieve convert-sieve.pl; do \ + rm -f $(PKGROOT)$(sbindir)/$$F; \ + done + # we want perl script to use opencsw perl perl -pi -e 's/exec\s+perl/exec \/opt\/csw\/bin\/perl/g' $(PKGROOT)$(sbindir)/* $(PKGROOT)$(bindir)/* ( for FILE in convert-sieve.pl mupdate-loadgen.pl translatesieve undohash upgradesieve arbitronsort; do \ @@ -259,9 +253,9 @@ done ) # we rename some tools with too generic names - ginstall -D $(PKGROOT)/$(sbindir)/mkimap $(PKGROOT)/$(sbindir)/mkdirs + mv $(PKGROOT)/$(sbindir)/mkimap $(PKGROOT)/$(sbindir)/mkdirs ( for FILE in mkdirs mknewsgroups dohash undohash rehash; do \ - ginstall -D $(PKGROOT)/$(sbindir)/$$FILE $(PKGROOT)/$(sbindir)/cyrus-$$FILE; \ + mv $(PKGROOT)/$(sbindir)/$$FILE $(PKGROOT)/$(sbindir)/cyrus-$$FILE; \ done ) # we fix some permission problems @@ -269,5 +263,7 @@ # let's remove pod files gfind $(PKGROOT)$(perllib) -name "perllocal.pod" -exec rm '{}' ';' + # and CVS directories + gfind $(PKGROOT) -type d -depth -name "CVS" -exec rm -rf '{}' ';' @$(MAKECOOKIE) Added: csw/mgar/pkg/cyrus_imapd/trunk/files/0002-fix-config2header.patch =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/0002-fix-config2header.patch (rev 0) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/0002-fix-config2header.patch 2010-11-29 22:21:53 UTC (rev 11742) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru ./tools/config2header ./tools/config2header.new +--- ./tools/config2header Sat Nov 20 00:11:21 2010 ++++ ./tools/config2header.new Sat Nov 20 00:11:11 2010 +@@ -71,7 +71,7 @@ + # Look for CC=xxx "assigments" in the argument list. + # + while ($#ARGV >= 0) { +- last unless ($ARGV[0] =~ m/^(\S+)=(\S+)$/); ++ last unless ($ARGV[0] =~ m/^(\S+)=(.+)$/); + eval "\$$1='$2';"; + die "$@" if ($@); + shift @ARGV; Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.preinstall =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.preinstall 2010-11-28 19:35:29 UTC (rev 11741) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/CSWcyrusimapd.preinstall 2010-11-29 22:21:53 UTC (rev 11742) @@ -4,9 +4,9 @@ if [ $? -ne 0 ] ; then echo "Creating cyrus user..." if [ -n "${BASEDIR}" ]; then - chroot ${BASEDIR} /usr/sbin/useradd -d /opt/csw/var/cyrus -g mail -c "Cyrus user" $CYRUS_USER + chroot ${BASEDIR} /usr/sbin/useradd -d /var/opt/csw/cyrus -g mail -c "Cyrus user" $CYRUS_USER else - /usr/sbin/useradd -d /opt/csw/var/cyrus -g mail -c "Cyrus user" $CYRUS_USER + /usr/sbin/useradd -d /var/opt/csw/cyrus -g mail -c "Cyrus user" $CYRUS_USER fi fi Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/README.CSW 2010-11-28 19:35:29 UTC (rev 11741) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/README.CSW 2010-11-29 22:21:53 UTC (rev 11742) @@ -4,8 +4,8 @@ - Cyrus configuration -Rename /opt/csw/etc/cyrus/imapd.conf.CSW to /opt/csw/etc/cyrus/imapd.conf and - /opt/csw/etc/cyrus/cyrus.conf.CSW to /opt/csw/etc/cyrus/cyrus.conf +Rename /etc/opt/csw/cyrus/imapd.conf.CSW to /etc/opt/csw/cyrus/imapd.conf and + /etc/opt/csw/cyrus/cyrus.conf.CSW to /etc/opt/csw/cyrus/cyrus.conf and customize these files according to your needs. Warning: daemons which can only be launched from the master process live in @@ -29,24 +29,24 @@ - configure it - launch the daemon, /etc/init.d/cswsaslauthd start - add the cyrus user to the sasl group, usermod -G sasl cyrus - - launch or relaunch cyrus, /etc/init.d/cswcyrus start + - launch or relaunch cyrus, /etc/init.d/cswcyrus start or svcadm restart cswcyrus Authentication should be working. You can also directly use Cyrus Imap directly with berkeleydb (or mysql, or postgres) user databases. You must then change the sasl_pwcheck_method parameter to auxprop -in /opt/csw/etc/cyrus/imapd.conf, but remember that Cyrus runs as the cyrus user, so +in /etc/opt/csw/cyrus/imapd.conf, but remember that Cyrus runs as the cyrus user, so for example, berkeleydb databases files will have to be readable by the cyrus user. - Enable SSL/TLS To enable ssl and tls for Imap/Pop/..., create the certificate and fill accordingly the -paramaters tls_cert_file and tls_key_file in /opt/csw/etc/cyrus/imapd.conf. +paramaters tls_cert_file and tls_key_file in /etc/opt/csw/cyrus/imapd.conf. You can use different certificates for each service by using parameters _tls_cert_file and _tls_key_file (imap_tls_cert_file, pop3_tls_key_file, imaps_tls_key_file, ...). -Then for ssl, also uncomment the lines concerning pops and imaps in /opt/csw/etc/cyrus/cyrus.conf +Then for ssl, also uncomment the lines concerning pops and imaps in /etc/opt/csw/cyrus/cyrus.conf - Configure Sendmail to deliver to cyrus mailboxes @@ -54,7 +54,7 @@ You will have to add the following lines in sendmail.mc: define(`confLOCAL_MAILER', `cyrusv2')dnl -define(`CYRUSV2_MAILER_ARGS', `FILE /opt/csw/var/cyrus/config/socket/lmtp')dnl +define(`CYRUSV2_MAILER_ARGS', `FILE /var/opt/csw/cyrus/config/socket/lmtp')dnl MAILER(`cyrusv2')dnl @@ -63,7 +63,7 @@ define(`CYRUSV2_MAILER_ARGS', `TCP name_of_the_cyrus_host lmtp')dnl -and enable lmtp tcp listening by uncommenting this line in /opt/csw/etc/cyrus/cyrus.conf: +and enable lmtp tcp listening by uncommenting this line in /etc/opt/csw/cyrus/cyrus.conf: lmtp cmd="lmtpd" listen="lmtp" prefork=0 @@ -102,7 +102,7 @@ available in the Fedora Core package and own-made. These patches make Cyrus more tolerant with non-standard emails sent by a lot of bad mail user agent, they allow respectively to accept 8bits characters in header - (configurable in /opt/csw/etc/cyrus/imapd.conf), to accept email with colon-less From + (configurable in /etc/opt/csw/cyrus/imapd.conf), to accept email with colon-less From ("From john at doe") header and to allow email with a bare newline in it. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus 2010-11-28 19:35:29 UTC (rev 11741) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus 2010-11-29 22:21:53 UTC (rev 11742) @@ -15,7 +15,7 @@ PID_FILE="/var/run/cyrus-master.pid" COMMAND=/opt/csw/sbin/cyrus-master -[ -f /opt/csw/etc/cyrus/cyrus.conf ] || exit 0 +[ -f /etc/opt/csw/cyrus/cyrus.conf ] || exit 0 check_proc () { Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus.conf =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus.conf 2010-11-28 19:35:29 UTC (rev 11741) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus.conf 2010-11-29 22:21:53 UTC (rev 11742) @@ -23,10 +23,10 @@ # at least one LMTP is required for delivery # lmtp cmd="lmtpd" listen="lmtp" prefork=0 - lmtpunix cmd="lmtpd" listen="/opt/csw/var/cyrus/config/socket/lmtp" prefork=1 + lmtpunix cmd="lmtpd" listen="/var/opt/csw/cyrus/config/socket/lmtp" prefork=1 # this is only necessary if using notifications -# notify cmd="notifyd" listen="/opt/csw/var/cyrus/config/socket/notify" proto="udp" prefork=1 +# notify cmd="notifyd" listen="/var/opt/csw/cyrus/config/socket/notify" proto="udp" prefork=1 } EVENTS { Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2010-11-28 19:35:29 UTC (rev 11741) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2010-11-29 22:21:53 UTC (rev 11742) @@ -1,7 +1,8 @@ cyrus_imapd (2.3.16,REV=2010.11.21) unstable * Added missing zlib dependancy. - * Removed useless tcpwrap depandancy. + * Moved configuration from /opt/csw/etc/cyrus to /etc/opt/csw/cyrus/. + * Moved default cyrus directiry from /opt/csw/var/cyrus to /var/opt/csw/cyrus. * [gar] switched do dynamic prototype. -- Yann Rouillard Sun, 21 Nov 2010 15:25:09 +0100 Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/imapd.conf =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/imapd.conf 2010-11-28 19:35:29 UTC (rev 11741) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/imapd.conf 2010-11-29 22:21:53 UTC (rev 11742) @@ -1,12 +1,12 @@ # The path where cyrus store its database files for # mailboxes list, seen states, folder subscription lists, ... -configdirectory: /opt/csw/var/cyrus/config +configdirectory: /var/opt/csw/cyrus/config # The path where cyrus will store inboxes and folders -partition-default: /opt/csw/var/cyrus/mail +partition-default: /var/opt/csw/cyrus/mail # The path where cyrus store sieve filters -sievedir: /opt/csw/var/cyrus/sieve +sievedir: /var/opt/csw/cyrus/sieve # Names of admins user who will have right to delete and # change acls of any mailboxes 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 Nov 30 16:51:58 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Nov 2010 15:51:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[11743] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 11743 http://gar.svn.sourceforge.net/gar/?rev=11743&view=rev Author: bonivart Date: 2010-11-30 15:51:57 +0000 (Tue, 30 Nov 2010) Log Message: ----------- clamav: update to 0.96.5 final, rename libclamav to libclam6 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2010-11-29 22:21:53 UTC (rev 11742) +++ csw/mgar/pkg/clamav/trunk/Makefile 2010-11-30 15:51:57 UTC (rev 11743) @@ -1,6 +1,6 @@ GARNAME = clamav GARVERSION = 0.96.5 -DISTNAME = $(GARNAME)-devel-latest +#DISTNAME = $(GARNAME)-devel-latest CATEGORIES = apps DESCRIPTION = Clam AntiVirus @@ -13,22 +13,28 @@ endef SF_PROJ = clamav -#MASTER_SITES = $(SF_MIRRORS) -MASTER_SITES = http://www.clamav.net/snapshot/ -#DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES = $(GARNAME)-devel-latest.tar.gz +MASTER_SITES = $(SF_MIRRORS) +#MASTER_SITES = http://www.clamav.net/snapshot/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +#DISTFILES = $(GARNAME)-devel-latest.tar.gz -PACKAGES = CSWclamav CSWlibclamav CSWlibclamav-devel +PACKAGES = CSWclamav CSWlibclam6 CSWlibclamav-devel + CATALOGNAME_CSWclamav = clamav SPKG_DESC_CSWclamav = $(DESCRIPTION) -CATALOGNAME_CSWlibclamav = libclamav -SPKG_DESC_CSWlibclamav = $(DESCRIPTION) Library + +CATALOGNAME_CSWlibclamav = libclam6 +SPKG_DESC_CSWlibclam6 = $(DESCRIPTION) Library + CATALOGNAME_CSWlibclamav-devel = libclamav_devel SPKG_DESC_CSWlibclamav-devel = $(DESCRIPTION) Development -RUNTIME_DEP_PKGS_CSWclamav = CSWlibclamav CSWzlib CSWbzip2 CSWiconv CSWncurses CSWlibtoolrt -RUNTIME_DEP_PKGS_CSWlibclamav = CSWzlib CSWbzip2 CSWiconv CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWclamav = CSWlibclam6 CSWzlib CSWbzip2 CSWiconv CSWncurses +RUNTIME_DEP_PKGS_CSWclamav += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibclam6 = CSWzlib CSWbzip2 CSWiconv +RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibltdl7 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -61,9 +67,9 @@ EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la -PKGFILES_CSWlibclamav-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibclamav = $(PKGFILES_RT) -PKGFILES_CSWlibclamav += $(docdir)/libclamav/.* +PKGFILES_CSWlibclamav-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibclam6 = $(PKGFILES_RT) +PKGFILES_CSWlibclam6 += $(docdir)/libclamav/.* PROTOTYPE_MODIFIERS = 1 PROTOTYPE_FILES_1 = \/var\/opt\/csw\/clamav.* @@ -85,7 +91,9 @@ TEST_TARGET = check -CHECKPKG_OVERRIDES_CSWlibclamav += shared-lib-pkgname-mismatch +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.7|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=['CSWlibclamav6'] +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.7|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=['CSWlibclamunrar6'] +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.7|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=['CSWlibclamunrar-iface6'] include gar/category.mk Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2010-11-29 22:21:53 UTC (rev 11742) +++ csw/mgar/pkg/clamav/trunk/checksums 2010-11-30 15:51:57 UTC (rev 11743) @@ -1 +1 @@ -8ed8891f057304aec9135c25c9afb238 clamav-devel-latest.tar.gz +202e51d47298779e5babacc443102c6a clamav-0.96.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.